Changeset 4734


Ignore:
Timestamp:
01/06/09 19:04:42 (11 years ago)
Author:
curtis
Message:

Fix dependencies for editor, notes and ijview command line tools.

Location:
trunk/tools
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/editor

    r4207 r4734  
    33# editor: a script for launching the OME Metadata Editor 
    44 
    5 # Required JARs: loci_tools.jar 
     5# Required JARs: loci_tools.jar, ome-editor.jar, 
     6#                ome-java.jar, ome-java-deprecated.jar 
    67 
    78# JAR libraries must be in the same directory as this 
     
    1819then 
    1920  java -mx512m $PROG "$@" 
    20 elif [ -e "$DIR/loci_tools.jar" ] || [ -e "$DIR/bio-formats.jar" ] 
     21elif \ 
     22  ([ -e "$DIR/loci_tools.jar" ] || [ -e "$DIR/bio-formats.jar" ]) && \ 
     23  [ -e "$DIR/ome-editor.jar" ] && \ 
     24  [ -e "$DIR/ome-java.jar" ] && \ 
     25  [ -e "$DIR/ome-java-deprecated.jar" ] 
    2126then 
    22   java -mx512m -cp "$DIR/bio-formats.jar":"$DIR/loci_tools.jar" $PROG "$@" 
     27  java -mx512m -cp "$DIR/bio-formats.jar":"$DIR/loci_tools.jar":"$DIR/ome-editor.jar":"$DIR/ome-java.jar":"$DIR/ome-java-deprecated.jar" $PROG "$@" 
    2328else 
    2429  echo "Required JAR libraries not found. Please download:" 
     
    2631  echo "from:" 
    2732  echo "  http://www.loci.wisc.edu/ome/formats.html" 
     33  echo "as well as the OME Metadata Notebook JARs from:" 
     34  echo "  http://www.loci.wisc.edu/software/daily/ome-editor.jar" 
     35  echo "  http://www.loci.wisc.edu/software/daily/ome-java.jar" 
     36  echo "  http://www.loci.wisc.edu/software/daily/ome-java-deprecated.jar" 
    2837  echo "and place in the same directory as the command line tools." 
     38  echo "" 
     39  echo "Please note that the OME Metadata Notebook is legacy software that " 
     40  echo "has been discontinued. Use at your own risk." 
    2941fi 
  • trunk/tools/editor.bat

    r4206 r4734  
    33rem editor.bat: a batch file for launching the OME Metadata Editor 
    44 
    5 rem Required JARs: loci_tools.jar 
     5rem Required JARs: loci_tools.jar, ome-editor.jar, 
     6rem                ome-java.jar, ome-java-deprecated.jar 
    67 
    78rem JAR libraries must be in the same directory as this 
     
    1718if "%LOCI_DEVEL%" == "" ( 
    1819  rem Developer environment variable unset; look for proper libraries 
     20  if not exist "%DIR%ome-editor.jar" goto missing 
     21  if not exist "%DIR%ome-java.jar" goto missing 
     22  if not exist "%DIR%ome-java-deprecated.jar" goto missing 
    1923  if exist "%DIR%loci_tools.jar" goto found 
    2024  if exist "%DIR%bio-formats.jar" goto found 
     
    2832:found 
    2933rem Library found; try to launch 
    30 java -mx512m -cp "%DIR%bio-formats.jar";"%DIR%loci_tools.jar" %PROG% %* 
     34java -mx512m -cp "%DIR%bio-formats.jar";"%DIR%loci_tools.jar";"%DIR%ome-editor.jar";"%DIR%ome-java.jar";"%DIR%ome-java-deprecated.jar" %PROG% %* 
    3135goto end 
    3236 
     
    3640echo from: 
    3741echo   http://www.loci.wisc.edu/ome/formats.html 
     42echo as well as the OME Metadata Notebook JARs from: 
     43echo   http://www.loci.wisc.edu/software/daily/ome-editor.jar 
     44echo   http://www.loci.wisc.edu/software/daily/ome-java.jar 
     45echo   http://www.loci.wisc.edu/software/daily/ome-java-deprecated.jar 
    3846echo and place in the same directory as the command line tools. 
     47echo. 
     48echo Please note that the OME Metadata Notebook is legacy software that 
     49echo has been discontinued. Use at your own risk." 
    3950 
    4051:end 
  • trunk/tools/ijview

    r4207 r4734  
    1919then 
    2020  java -mx512m $PROG "$@" 
    21 elif [ -e "$DIR/loci_tools.jar" ] || [ -e "$DIR/bio-formats.jar" ] 
     21elif \ 
     22  ([ -e "$DIR/loci_tools.jar" ] || [ -e "$DIR/bio-formats.jar" ]) && \ 
     23  [ -e "ij.jar" ] 
    2224then 
    23   java -mx512m -cp "$DIR/bio-formats.jar":"$DIR/loci_tools.jar" $PROG "$@" 
     25  java -mx512m -cp \ 
     26    "$DIR/bio-formats.jar":"$DIR/loci_tools.jar":"$DIR/ij.jar" \ 
     27    $PROG "$@" 
    2428else 
    2529  echo "Required JAR libraries not found. Please download:" 
  • trunk/tools/ijview.bat

    r4206 r4734  
    3030:found 
    3131rem Library found; try to launch 
    32 java -mx512m -cp "%DIR%bio-formats.jar";"%DIR%ij.jar";"%DIR%loci_tools.jar" %PROG% %* 
     32java -mx512m -cp "%DIR%bio-formats.jar";"%DIR%loci_tools.jar";"%DIR%ij.jar" %PROG% %* 
    3333goto end 
    3434 
  • trunk/tools/notes

    r4207 r4734  
    33# notes: a script for launching OME Notes 
    44 
    5 # Required JARs: loci_tools.jar 
     5# Required JARs: loci_tools.jar, ome-notes.jar 
    66 
    77# JAR libraries must be in the same directory as this 
     
    1818then 
    1919  java -mx512m $PROG "$@" 
    20 elif [ -e "$DIR/loci_tools.jar" ] || [ -e "$DIR/bio-formats.jar" ] 
     20elif \ 
     21  ([ -e "$DIR/loci_tools.jar" ] || [ -e "$DIR/bio-formats.jar" ]) && \ 
     22  [ -e "$DIR/ome-notes.jar" ] 
    2123then 
    22   java -mx512m -cp "$DIR/bio-formats.jar":"$DIR/loci_tools.jar" $PROG "$@" 
     24  java -mx512m -cp \ 
     25    "$DIR/bio-formats.jar":"$DIR/loci_tools.jar":"$DIR/ome-notes.jar" \ 
     26    $PROG "$@" 
    2327else 
    2428  echo "Required JAR libraries not found. Please download:" 
     
    2630  echo "from:" 
    2731  echo "  http://www.loci.wisc.edu/ome/formats.html" 
     32  echo "as well as the OME Notes JAR from:" 
     33  echo "  http://www.loci.wisc.edu/software/daily/ome-notes.jar" 
    2834  echo "and place in the same directory as the command line tools." 
     35  echo "" 
     36  echo "Please note that OME Notes is legacy software that " 
     37  echo "has been discontinued. Use at your own risk." 
    2938fi 
  • trunk/tools/notes.bat

    r4206 r4734  
    33rem notes.bat: a batch file for launching OME Notes 
    44 
    5 rem Required JARs: loci_tools.jar 
     5rem Required JARs: loci_tools.jar, ome-notes.jar 
    66 
    77rem JAR libraries must be in the same directory as this 
     
    1717if "%LOCI_DEVEL%" == "" ( 
    1818  rem Developer environment variable unset; look for proper libraries 
     19  if not exist "%DIR%ome-notes.jar" goto missing 
    1920  if exist "%DIR%loci_tools.jar" goto found 
    2021  if exist "%DIR%bio-formats.jar" goto found 
     
    2829:found 
    2930rem Library found; try to launch 
    30 java -mx512m -cp "%DIR%bio-formats.jar";"%DIR%loci_tools.jar" %PROG% %* 
     31java -mx512m -cp "%DIR%bio-formats.jar";"%DIR%loci_tools.jar";"%DIR%ome-notes.jar" %PROG% %* 
    3132goto end 
    3233 
     
    3637echo from: 
    3738echo   http://www.loci.wisc.edu/ome/formats.html 
     39echo as well as the OME Notes JAR from: 
     40echo   http://www.loci.wisc.edu/software/daily/ome-notes.jar 
    3841echo and place in the same directory as the command line tools. 
     42echo. 
     43echo Please note that OME Notes is legacy software that 
     44echo has been discontinued. Use at your own risk." 
    3945 
    4046:end 
Note: See TracChangeset for help on using the changeset viewer.