Changeset 2644


Ignore:
Timestamp:
04/19/07 12:46:08 (13 years ago)
Author:
curtis
Message:

Update build scripts to include targets for both new 'OME Notebook'
(*-notebook) and old 'OME Metadata Editor' (*-editor); rename
'OME Metadata Notebook' to 'OME Metadata Editor' in more places.

Location:
trunk
Files:
5 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/build.properties

    r2639 r2644  
    136136notebook.jar       = ome-notebook.jar 
    137137notebook.main      = loci.ome.notebook.Notebook 
    138 notebook.source    = loci/ome/notebook/**/*.java \ 
    139                      loci/ome/viewer/**/*.java 
     138notebook.source    = loci/ome/notebook/**/*.java 
    140139notebook.classpath = bio-formats.jar \ 
    141140                     commons-httpclient-2.0-rc2.jar \ 
     
    149148                     QTJava.zip \ 
    150149                     xmlrpc-1.2-b1.jar 
    151 notebook.files     = loci/ome/notebook/** \ 
    152                      loci/ome/viewer/** 
     150notebook.files     = loci/ome/notebook/** 
    153151notebook.resources = loci/ome/notebook/templates/* \ 
    154152                     loci/ome/notebook/editor/*  
     153 
     154### OME Metadata Editor ### 
     155 
     156editor.jar       = ome-editor.jar 
     157editor.main      = loci.ome.editor.MetadataNotebook 
     158editor.source    = loci/ome/editor/**/*.java \ 
     159                   loci/ome/viewer/**/*.java 
     160editor.classpath = bio-formats.jar \ 
     161                   commons-httpclient-2.0-rc2.jar \ 
     162                   commons-logging.jar \ 
     163                   forms-1.0.4.jar \ 
     164                   ij.jar \ 
     165                   jai_imageio.jar \ 
     166                   mdbtools-java.jar \ 
     167                   ome-java.jar \ 
     168                   poi-loci.jar \ 
     169                   QTJava.zip \ 
     170                   xmlrpc-1.2-b1.jar 
     171editor.files     = loci/ome/editor/** \ 
     172                   loci/ome/viewer/** 
     173editor.resources = loci/ome/editor/Template.xml \ 
     174                   loci/ome/editor/Icons/* \ 
     175                   loci/ome/editor/TypeDefs/** 
    155176 
    156177### Movie Stitcher ### 
  • trunk/build.xml

    r2468 r2644  
    7070    License:       LGPL 
    7171 
    72 OME Metadata Notebook 
     72OME Notebook 
    7373    JAR file:      ome-notebook.jar 
    74     Folders:       loci/ome/notebook 
    75                    loci/ome/viewer (temporary) 
    76     Main class:    loci.ome.notebook.MetadataNotebook 
     74    Folder:        loci/ome/notebook 
     75    Main class:    loci.ome.editor.MetadataNotebook 
    7776    Dependencies:  bio-formats.jar 
    7877                   commons-httpclient-2.0-rc2.jar (ome-java.jar) 
     
    8685                   compile-notebook 
    8786                   jar-notebook 
     87    License:       LGPL 
     88 
     89OME Metadata Editor 
     90    JAR file:      ome-editor.jar 
     91    Folders:       loci/ome/editor 
     92                   loci/ome/viewer 
     93    Main class:    loci.ome.editor.MetadataNotebook 
     94    Dependencies:  bio-formats.jar 
     95                   commons-httpclient-2.0-rc2.jar (ome-java.jar) 
     96                   commons-logging.jar (ome-java.jar) 
     97                   forms-1.0.4.jar 
     98                   jai_imageio.jar (bio-formats.jar) 
     99                   ome-java.jar 
     100                   poi-loci.jar (bio-formats.jar) 
     101                   xmlrpc-1.2-b1.jar (ome-java.jar) 
     102    Targets:       style-editor 
     103                   compile-editor 
     104                   jar-editor 
    88105    License:       LGPL 
    89106 
     
    248265  <target name="style" 
    249266    depends="style-formats, style-visbio, style-plugins, style-notebook, 
    250       style-stitcher, style-slim, style-checks" 
     267      style-editor, style-stitcher, style-slim, style-checks" 
    251268    description="check source code style for LOCI software packages"/> 
    252269 
     
    261278  <target name="compile" 
    262279    depends="compile-formats, compile-visbio, compile-plugins, 
    263       compile-notebook, compile-stitcher, compile-slim" 
     280      compile-notebook, compile-editor, compile-stitcher, compile-slim" 
    264281    description="compile classes for LOCI software packages"/> 
    265282 
    266283  <target name="jars" 
    267284    depends="jar-formats, jar-visbio, jar-plugins, jar-notebook, 
    268       jar-stitcher, jar-slim, jar-checks" 
     285      jar-editor, jar-stitcher, jar-slim, jar-checks" 
    269286    description="generate JAR files for LOCI software packages"/> 
    270287 
     
    627644  </target> 
    628645 
    629   <!-- OME Metadata Notebook --> 
     646  <!-- OME Notebook --> 
    630647 
    631648  <target name="style-notebook" depends="copy-source, jar-checks" 
    632     description="check source code style for OME Metadata Notebook"> 
     649    description="check source code style for OME Notebook"> 
    633650    <checkstyle config="checkstyle.xml" failOnViolation="false"> 
    634651      <fileset dir="${dest.dir}" includes="${notebook.source}"/> 
     
    637654 
    638655  <target name="compile-notebook" depends="copy-source" 
    639     description="compile classes for OME Metadata Notebook"> 
     656    description="compile classes for OME Notebook"> 
    640657    <mkdir dir="${classes.dir}"/> 
    641658    <javac srcdir="${dest.dir}" destdir="${classes.dir}" 
     
    646663  <target name="jar-notebook" 
    647664    depends="compile-notebook, copy-jars, jar-formats" 
    648     description="generate JAR file for OME Metadata Notebook"> 
     665    description="generate JAR file for OME Notebook"> 
    649666    <copy todir="${classes.dir}" preservelastmodified="true"> 
    650667      <fileset dir="${src.dir}" includes="${notebook.resources}"/> 
     
    655672        <attribute name="Main-Class" value="${notebook.main}"/> 
    656673        <attribute name="Class-Path" value="${notebook.classpath}"/> 
     674      </manifest> 
     675    </jar> 
     676  </target> 
     677 
     678  <!-- OME Metadata Editor --> 
     679 
     680  <target name="style-editor" depends="copy-source, jar-checks" 
     681    description="check source code style for OME Metadata Editor"> 
     682    <checkstyle config="checkstyle.xml" failOnViolation="false"> 
     683      <fileset dir="${dest.dir}" includes="${editor.source}"/> 
     684    </checkstyle> 
     685  </target> 
     686 
     687  <target name="compile-editor" depends="copy-source" 
     688    description="compile classes for OME Metadata Editor"> 
     689    <mkdir dir="${classes.dir}"/> 
     690    <javac srcdir="${dest.dir}" destdir="${classes.dir}" 
     691      includes="${editor.source}" classpath="${ext.jars}" 
     692      debug="true" deprecation="true" source="1.4" target="1.4"/> 
     693  </target> 
     694 
     695  <target name="jar-editor" 
     696    depends="compile-editor, copy-jars, jar-formats" 
     697    description="generate JAR file for OME Metadata Editor"> 
     698    <copy todir="${classes.dir}" preservelastmodified="true"> 
     699      <fileset dir="${src.dir}" includes="${editor.resources}"/> 
     700    </copy> 
     701    <jar jarfile="${jar.dir}/${editor.jar}" basedir="${classes.dir}" 
     702      includes="${editor.files}"> 
     703      <manifest> 
     704        <attribute name="Main-Class" value="${editor.main}"/> 
     705        <attribute name="Class-Path" value="${editor.classpath}"/> 
    657706      </manifest> 
    658707    </jar> 
  • trunk/loci/ome/editor/MetadataNotebook.java

    r2544 r2644  
    124124    boolean addSave, boolean editable) 
    125125  { 
    126     super("OME Metadata Notebook"); 
     126    super("OME Metadata Editor"); 
    127127    if (title != null) setTitle(title); 
    128128 
     
    162162      currentFile = file; 
    163163      metadata = new MetadataPane(file, addSave, editable); 
    164       setTitle("OME Metadata Notebook - " + file); 
     164      setTitle("OME Metadata Editor - " + file); 
    165165    } 
    166166    else metadata = new MetadataPane((File) null, addSave, editable); 
     
    356356    scanP.setOMEXML(metadata.getRoot()); 
    357357    if (noteView.getState()) noteP.setPanels(metadata.panelList); 
    358     setTitle("OME Metadata Notebook - " + file); 
     358    setTitle("OME Metadata Editor - " + file); 
    359359  } 
    360360 
     
    417417          options[0]); //default button title 
    418418        if (n == JOptionPane.YES_OPTION) { 
    419           setTitle("OME Metadata Notebook"); 
     419          setTitle("OME Metadata Editor"); 
    420420          currentFile = null; 
    421421          metadata.setupTabs(); 
     
    423423      } 
    424424      else { 
    425         setTitle("OME Metadata Notebook"); 
     425        setTitle("OME Metadata Editor"); 
    426426        currentFile = null; 
    427427        metadata.setupTabs(); 
     
    500500    else if ("about".equals(cmd)) { 
    501501      JOptionPane.showMessageDialog(this, 
    502         "OME Metadata Notebook\n" + 
     502        "OME Metadata Editor\n" + 
    503503        "Built @date@\n\n" + 
    504         "The OME Metadata Notebook is LOCI software written by\n" + 
     504        "The OME Metadata Editor is LOCI software written by\n" + 
    505505        "Christopher Peterson.\n" + 
    506506        "http://www.loci.wisc.edu/software/#notebook", 
    507         "OME Metadata Notebook", JOptionPane.INFORMATION_MESSAGE); 
     507        "OME Metadata Editor", JOptionPane.INFORMATION_MESSAGE); 
    508508    } 
    509509    else if (cmd.startsWith("tabChange")) { 
  • trunk/loci/ome/editor/MetadataPane.java

    r2587 r2644  
    350350        if (getTopLevelAncestor() instanceof MetadataNotebook) { 
    351351          MetadataNotebook mdn = (MetadataNotebook) getTopLevelAncestor(); 
    352           mdn.setTitle("OME Metadata Notebook - " + file); 
     352          mdn.setTitle("OME Metadata Editor - " + file); 
    353353        } 
    354354      } 
  • trunk/loci/ome/editor/editor.bat

    r2522 r2644  
    1 @java loci.ome.notebook.MetadataNotebook %1 %2 %3 %4 %5 %6 %7 %8 %9 
     1@java loci.ome.editor.MetadataNotebook %1 %2 %3 %4 %5 %6 %7 %8 %9 
  • trunk/loci/ome/editor/package.html

    r2522 r2644  
    11<html><body> 
    2 OME Metadata Notebook application for exploration and editing of 
     2OME Metadata Editor application for exploration and editing of 
    33OME-XML and OME-TIFF metadata. 
    44</body></html> 
Note: See TracChangeset for help on using the changeset viewer.