Changeset 7471


Ignore:
Timestamp:
12/29/10 09:11:41 (9 years ago)
Author:
melissa
Message:

'bfview' now has the same behavior as 'showinf', except that a deprecation message is printed when using 'bfview'. Closes #613.

Location:
trunk/tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/bfview

    r6182 r7471  
    1212# LOCI_DEVEL environment variable to use them instead. 
    1313 
    14 PROG=loci.formats.gui.ImageViewer 
    15 DIR=`dirname "$0"` 
    16  
    17 if [ $LOCI_DEVEL ] 
    18 then 
    19   java -mx512m $PROG "$@" 
    20 elif [ -e "$DIR/loci_tools.jar" ] || [ -e "$DIR/bio-formats.jar" ] 
    21 then 
    22   java -mx512m -cp "$DIR":"$DIR/bio-formats.jar":"$DIR/loci_tools.jar" $PROG "$@" 
    23 else 
    24   echo "Required JAR libraries not found. Please download:" 
    25   echo "  loci_tools.jar" 
    26   echo "from:" 
    27   echo "  http://www.loci.wisc.edu/bio-formats/downloads" 
    28   echo "and place in the same directory as the command line tools." 
    29 fi 
     14echo "The 'bfview' command is now deprecated.  Please use the 'showinf' command instead." 
     15showinf "$@" 
  • trunk/tools/bfview.bat

    r6192 r7471  
    1212rem LOCI_DEVEL environment variable to use them instead. 
    1313 
    14 set PROG=loci.formats.gui.ImageViewer 
    15 set DIR=%~dp0 
    16 if "%DIR:~1%" == ":\" ( 
    17   set DIR1=%DIR% 
    18 ) else ( 
    19   rem Remove trailing backslash 
    20   set DIR1=%DIR:~0,-1% 
    21 ) 
    22  
    23 if "%LOCI_DEVEL%" == "" ( 
    24   rem Developer environment variable unset; look for proper libraries 
    25   if exist "%DIR%loci_tools.jar" goto found 
    26   if exist "%DIR%bio-formats.jar" goto found 
    27   goto missing 
    28 ) else ( 
    29   rem Developer environment variable set; try to launch 
    30   java -mx512m %PROG% %* 
    31   goto end 
    32 ) 
    33  
    34 :found 
    35 rem Library found; try to launch 
    36 java -mx512m -cp "%DIR1%";"%DIR%bio-formats.jar";"%DIR%loci_tools.jar" %PROG% %* 
    37 goto end 
    38  
    39 :missing 
    40 echo Required JAR libraries not found. Please download: 
    41 echo   loci_tools.jar 
    42 echo from: 
    43 echo   http://www.loci.wisc.edu/bio-formats/downloads 
    44 echo and place in the same directory as the command line tools. 
    45  
    46 :end 
     14echo The 'bfview' command is now deprecated.  Please use the 'showinf' command instead. 
     15showinf %* 
Note: See TracChangeset for help on using the changeset viewer.