--- trunk/defaults/startXULU.bat 2009/02/25 11:54:01 2 +++ trunk/defaults/startXULU.bat 2010/10/26 15:10:56 104 @@ -1,19 +1,24 @@ @echo off setlocal -set LIB_ROOT="..\xululib" +rem ### Root directory of the libs only XULU depends on ##### +set LIB_ROOT="lib" +set DIST_ROOT="dist" +rem set DIST_ROOT="lib\xulu" + +rem ### Root directory of the libs also SCHMITZM depends on ##### +rem --> All libs were moved from SCHMITZM to XULU +rem set SCHMITZM_LIB_ROOT="E:\Arbeit\SCHMITZM\Trunk\lib" +set SCHMITZM_LIB_ROOT=%LIB_ROOT% rem ################################################################### rem ############# Xulu library paths and parameters ############### rem ################################################################### -set XULU_LIB=classes -set XULU_MODELS_LIB=classes_models -if "%1"=="/useXuluJar" set XULU_LIB=%LIB_ROOT%\xulu\XuluModellingPlatform.jar -if "%1"=="/useXuluJar" set XULU_MODELS_LIB=%LIB_ROOT%\xulu\XuluModellingPlatformModels.jar +set XULU_LIB=%DIST_ROOT%\xulu.jar +if "%1"=="/useXuluJar" set XULU_LIB=%DIST_ROOT%\xulu.jar if "%1"=="/useXuluClasses" set XULU_LIB=classes -if "%1"=="/useXuluClasses" set XULU_MODELS_LIB=classes_models -set XULU_REGISTRY=registry_arrayGrid.xif +set XULU_REGISTRY=registry.xif set XULU_LANGUAGE=de set XULU_WORK_DIR=C:\ set XULU_START_SCRIPTS= @@ -26,14 +31,37 @@ rem ##### Where to find "Java Advanced Imaging" (and ImageIO) ##### set JAI_ROOT=%LIB_ROOT%\jai-1_1_3\lib -rem ##### Where to find "GeoTools" ##### -set GT_ROOT=%LIB_ROOT%\gt2-2.4.4 +rem ##### Where to find "SCHMITZM library" ##### +set SCHMITZM_ROOT=%LIB_ROOT%\schmitzm + +rem ##### Where to find "JINI" ##### +set JINI_ROOT=%LIB_ROOT%\jini + +rem ##### Where to find "R" ##### +set R_ROOT=%LIB_ROOT%\JavaRInterface + +rem ##### Where to find miscellaneous libraries ##### +set MISC_ROOT=%LIB_ROOT%\misc + -rem ##### Where to find gt2-arcgrid-2.1.x.jar (from SpearfishDemo) ##### -set GT_ARCGRID_ROOT=%LIB_ROOT%\geotoolsArcGrid +rem ##### combine the external libs ##### +set SCHMITZM_LIB=%SCHMITZM_ROOT%\* +set JAI_LIB=%JAI_ROOT%\* +set JINI_LIB=%JINI_ROOT%\lib\* +rem set JINI_LIB=%JINI_ROOT%\lib\*;%JINI_ROOT%\lib-dl\*;%JINI_ROOT%\lib-ext\* +set R_LIB=%R_ROOT%\JRI.jar;%R_ROOT%\libjri.so;%R_ROOT%\libR.so +set MISC_LIB=%MISC_ROOT%\* -rem ##### Where to find "Adagios" ##### -set ADAGIOS_ROOT=%LIB_ROOT%\ADaGIoS +set LIB_ALL=%XULU_LIB%;%SCHMITZM_LIB%;%JAI_LIB%;%JINI_LIB%;%R_LIB%;%MISC_LIB% + + +rem #################################################### +rem ####### External libraries of SCHMITZM ######### +rem #################################################### +set LIB_ROOT=%SCHMITZM_LIB_ROOT% + +rem ##### Where to find "GeoTools" ##### +set GT_ROOT=%LIB_ROOT%\gt2-2.6 rem ##### Where to find "Log4j" ##### set LOG4J_ROOT=%LIB_ROOT%\log4j-1.2.14 @@ -41,27 +69,19 @@ rem ##### Where to find "JINI" ##### set JINI_ROOT=%LIB_ROOT%\jini -rem ##### Where to find "R" ##### -set R_ROOT=%LIB_ROOT%\JavaRInterface - rem ##### Where to find "jFreeChart" ##### set JFREECHART_ROOT=%LIB_ROOT%\jFreeChart rem ##### combine the external libs ##### -set JAI_LIB=%JAI_ROOT%\* set GT_LIB=%GT_ROOT%\* -set GT_LIB=%GT_LIB%;%GT_ARCGRID_ROOT%\gt2-arcgrid-2.3.0-M0.jar;%GT_ARCGRID_ROOT%\junit-4.4.jar -set ADAGIOS_LIB=%ADAGIOS_ROOT%\AdagiosJavaLib.jar -set JINI_LIB=%JINI_ROOT%\lib\*;%JINI_ROOT%\lib-dl\*;%JINI_ROOT%\lib-ext\* -rem set JINI_LIB=%JINI_ROOT%\lib\jsk-platform.jar;%JINI_ROOT%\lib\tools.jar set LOG4J_LIB=%LOG4J_ROOT%\log4j-1.2.14.jar -set R_LIB=%R_ROOT%\JRI.jar;%R_ROOT%\libjri.so;%R_ROOT%\libR.so -set JFREECHART_LIB=%JFREECHART_ROOT%\jfreechart-1.0.6.jar;%JFREECHART_ROOT%\jcommon-1.0.10.jar +set JINI_LIB=%JINI_ROOT%\lib\* +rem set JINI_LIB=%JINI_ROOT%\lib\*;%JINI_ROOT%\lib-dl\*;%JINI_ROOT%\lib-ext\* +set JFREECHART_LIB=%JFREECHART_ROOT%\* -set LIB_ALL=%XULU_LIB%;%JAI_LIB%;%GT_LIB%;%ADAGIOS_LIB%;%LOG4J_LIB%;%JINI_LIB%;%R_LIB%;%JFREECHART_LIB% +set LIB_ALL=%LIB_ALL%;%GT_LIB%;%LOG4J_LIB%;%JINI_LIB%;%JFREECHART_LIB% rem ##### combine the native libs ##### -rem set JAI_NATIVE=%JAI_ROOT%\native_win\mlib_jai.dll;%JAI_ROOT%\native_win\mlib_jai_mmx.dll;%JAI_ROOT%\native_win\mlib_jai_util.dll set JAI_NATIVE=%JAI_ROOT%\native_win set LIB_NATIVE=%JAI_NATIVE%