Changeset 199 for build


Ignore:
Timestamp:
Feb 13, 2007, 7:06:20 PM (17 years ago)
Author:
barrand
Message:
 
Location:
build/snova/trunk/obuild
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • build/snova/trunk/obuild/DOS/build.bat

    r144 r199  
    180180:end_if_main_3
    181181:end_if_group_3
    182 
    183182IF NOT %obuild_group% == main GOTO end_if_group_4
    184183IF NOT %obuild_do_mains% == yes GOTO end_if_main_4
    185   IF NOT EXIST .\DOS\build_app_prog_snova.bat  GOTO end_if_build_4
    186     CALL .\DOS\build_app_prog_snova.bat %obuild_args%
     184  IF NOT EXIST .\DOS\build_lib_snova_ui.bat  GOTO end_if_build_4
     185    CALL .\DOS\build_lib_snova_ui.bat %obuild_args%
    187186    @IF ERRORLEVEL 1 @GOTO obuild_return
    188187    @ECHO OFF
     
    191190:end_if_group_4
    192191
     192IF NOT %obuild_group% == main GOTO end_if_group_5
     193IF NOT %obuild_do_mains% == yes GOTO end_if_main_5
     194  IF NOT EXIST .\DOS\build_app_prog_snova.bat  GOTO end_if_build_5
     195    CALL .\DOS\build_app_prog_snova.bat %obuild_args%
     196    @IF ERRORLEVEL 1 @GOTO obuild_return
     197    @ECHO OFF
     198:end_if_build_5
     199:end_if_main_5
     200:end_if_group_5
     201
    193202:obuild_return
    194203ENDLOCAL
  • build/snova/trunk/obuild/DOS/build_app_prog_snova.bat

    r151 r199  
    460460:end_if_opt_build_app_prog_snova_sh_39
    461461
    462 SET obuild_linked_libraries="%obuild_snova_path%\%obuild_dir_bin%\snova.lib"
     462SET obuild_linked_libraries="%obuild_snova_path%\%obuild_dir_bin%\snova_ui.lib"
     463SET obuild_linked_libraries=%obuild_linked_libraries% "%obuild_snova_path%\%obuild_dir_bin%\snova.lib"
    463464SET obuild_linked_libraries=%obuild_linked_libraries% "%obuild_snova_path%\%obuild_dir_bin%\snvertex.lib"
    464465SET obuild_linked_libraries=%obuild_linked_libraries% "%obuild_snova_path%\%obuild_dir_bin%\sngeom.lib"
     
    467468SET obuild_linked_libraries=%obuild_linked_libraries% "%obuild_HDF5_path%\%obuild_dir_bin%\osc_HDF5.lib"
    468469SET obuild_linked_libraries=%obuild_linked_libraries% "%obuild_zlib_path%\%obuild_dir_bin%\osc_z.lib"
     470SET obuild_linked_libraries=%obuild_linked_libraries% -L${Geant4_home}/lib -lG4interfaces
     471SET obuild_linked_libraries=%obuild_linked_libraries% -L${Geant4_home}/lib -lG4vis_management
     472SET obuild_linked_libraries=%obuild_linked_libraries% -L${Geant4_home}/lib -lG4modeling
     473SET obuild_linked_libraries=%obuild_linked_libraries% -L${Geant4_home}/lib -lG4Tree
    469474FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_snova_0=%%d
    470475cd "%obuild_snova_path%\%obuild_dir_bin%"
     
    473478cd "%obuild_pwd_snova_0%"
    474479SET obuild_pwd_snova_0=
    475 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_47
     480IF NOT %obuild_platform_result% == yes GOTO end_if_platform_52
    476481SET obuild_linked_libraries=%obuild_linked_libraries% -L${Geant4_home}/lib -lG4readout -lG4run -lG4event -lG4tracking -lG4processes -lG4digits_hits -lG4track -lG4particles -lG4geometry -lG4graphics_reps -lG4materials -lG4intercoms -lG4global
    477 :end_if_platform_47
     482:end_if_platform_52
    478483SET obuild_platform_result=
    479484FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_snova_0=%%d
     
    483488cd "%obuild_pwd_snova_0%"
    484489SET obuild_pwd_snova_0=
    485 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_48
     490IF NOT %obuild_platform_result% == yes GOTO end_if_platform_53
    486491SET obuild_linked_libraries=%obuild_linked_libraries% -L${CLHEP_home}/lib -lCLHEP
    487 :end_if_platform_48
     492:end_if_platform_53
    488493SET obuild_platform_result=
    489494
  • build/snova/trunk/obuild/DOS/build_lib_snova.bat

    r151 r199  
    324324@IF %obuild_verbose% == yes @ECHO ON
    325325cd "%obuild_snova_path%\%obuild_dir_bin%"
     326%obuild_cxx_command% /c %obuild_cxx_debug_local% %obuild_cxx_optimize_local% %obuild_cxx_options% %obuild_cxx_macros% %obuild_cxx_includes% /Fo.\lib_snova\event.obj  /Tp"..\source\snova\base\event.cc" 1> cl_exe_error
     327@IF ERRORLEVEL 1 @TYPE cl_exe_error && @GOTO obuild_return
     328@IF NOT ERRORLEVEL 1 @DEL cl_exe_error
     329cd "%obuild_snova_path%\obuild"
     330
     331cd "%obuild_snova_path%\%obuild_dir_bin%"
     332%obuild_cxx_command% /c %obuild_cxx_debug_local% %obuild_cxx_optimize_local% %obuild_cxx_options% %obuild_cxx_macros% %obuild_cxx_includes% /Fo.\lib_snova\generator.obj  /Tp"..\source\snova\base\generator.cc" 1> cl_exe_error
     333@IF ERRORLEVEL 1 @TYPE cl_exe_error && @GOTO obuild_return
     334@IF NOT ERRORLEVEL 1 @DEL cl_exe_error
     335cd "%obuild_snova_path%\obuild"
     336
     337cd "%obuild_snova_path%\%obuild_dir_bin%"
     338%obuild_cxx_command% /c %obuild_cxx_debug_local% %obuild_cxx_optimize_local% %obuild_cxx_options% %obuild_cxx_macros% %obuild_cxx_includes% /Fo.\lib_snova\run.obj  /Tp"..\source\snova\base\run.cc" 1> cl_exe_error
     339@IF ERRORLEVEL 1 @TYPE cl_exe_error && @GOTO obuild_return
     340@IF NOT ERRORLEVEL 1 @DEL cl_exe_error
     341cd "%obuild_snova_path%\obuild"
     342
     343cd "%obuild_snova_path%\%obuild_dir_bin%"
     344%obuild_cxx_command% /c %obuild_cxx_debug_local% %obuild_cxx_optimize_local% %obuild_cxx_options% %obuild_cxx_macros% %obuild_cxx_includes% /Fo.\lib_snova\snova_const.obj  /Tp"..\source\snova\base\snova_const.cc" 1> cl_exe_error
     345@IF ERRORLEVEL 1 @TYPE cl_exe_error && @GOTO obuild_return
     346@IF NOT ERRORLEVEL 1 @DEL cl_exe_error
     347cd "%obuild_snova_path%\obuild"
     348
     349cd "%obuild_snova_path%\%obuild_dir_bin%"
     350%obuild_cxx_command% /c %obuild_cxx_debug_local% %obuild_cxx_optimize_local% %obuild_cxx_options% %obuild_cxx_macros% %obuild_cxx_includes% /Fo.\lib_snova\snova_mgr.obj  /Tp"..\source\snova\base\snova_mgr.cc" 1> cl_exe_error
     351@IF ERRORLEVEL 1 @TYPE cl_exe_error && @GOTO obuild_return
     352@IF NOT ERRORLEVEL 1 @DEL cl_exe_error
     353cd "%obuild_snova_path%\obuild"
     354
     355cd "%obuild_snova_path%\%obuild_dir_bin%"
    326356%obuild_cxx_command% /c %obuild_cxx_debug_local% %obuild_cxx_optimize_local% %obuild_cxx_options% %obuild_cxx_macros% %obuild_cxx_includes% /Fo.\lib_snova\snova_utils.obj  /Tp"..\source\snova\base\snova_utils.cc" 1> cl_exe_error
    327 @IF ERRORLEVEL 1 @TYPE cl_exe_error && @GOTO obuild_return
    328 @IF NOT ERRORLEVEL 1 @DEL cl_exe_error
    329 cd "%obuild_snova_path%\obuild"
    330 
    331 cd "%obuild_snova_path%\%obuild_dir_bin%"
    332 %obuild_cxx_command% /c %obuild_cxx_debug_local% %obuild_cxx_optimize_local% %obuild_cxx_options% %obuild_cxx_macros% %obuild_cxx_includes% /Fo.\lib_snova\event.obj  /Tp"..\source\snova\base\event.cc" 1> cl_exe_error
    333 @IF ERRORLEVEL 1 @TYPE cl_exe_error && @GOTO obuild_return
    334 @IF NOT ERRORLEVEL 1 @DEL cl_exe_error
    335 cd "%obuild_snova_path%\obuild"
    336 
    337 cd "%obuild_snova_path%\%obuild_dir_bin%"
    338 %obuild_cxx_command% /c %obuild_cxx_debug_local% %obuild_cxx_optimize_local% %obuild_cxx_options% %obuild_cxx_macros% %obuild_cxx_includes% /Fo.\lib_snova\generator.obj  /Tp"..\source\snova\base\generator.cc" 1> cl_exe_error
    339 @IF ERRORLEVEL 1 @TYPE cl_exe_error && @GOTO obuild_return
    340 @IF NOT ERRORLEVEL 1 @DEL cl_exe_error
    341 cd "%obuild_snova_path%\obuild"
    342 
    343 cd "%obuild_snova_path%\%obuild_dir_bin%"
    344 %obuild_cxx_command% /c %obuild_cxx_debug_local% %obuild_cxx_optimize_local% %obuild_cxx_options% %obuild_cxx_macros% %obuild_cxx_includes% /Fo.\lib_snova\run.obj  /Tp"..\source\snova\base\run.cc" 1> cl_exe_error
    345 @IF ERRORLEVEL 1 @TYPE cl_exe_error && @GOTO obuild_return
    346 @IF NOT ERRORLEVEL 1 @DEL cl_exe_error
    347 cd "%obuild_snova_path%\obuild"
    348 
    349 cd "%obuild_snova_path%\%obuild_dir_bin%"
    350 %obuild_cxx_command% /c %obuild_cxx_debug_local% %obuild_cxx_optimize_local% %obuild_cxx_options% %obuild_cxx_macros% %obuild_cxx_includes% /Fo.\lib_snova\snova_const.obj  /Tp"..\source\snova\base\snova_const.cc" 1> cl_exe_error
    351 @IF ERRORLEVEL 1 @TYPE cl_exe_error && @GOTO obuild_return
    352 @IF NOT ERRORLEVEL 1 @DEL cl_exe_error
    353 cd "%obuild_snova_path%\obuild"
    354 
    355 cd "%obuild_snova_path%\%obuild_dir_bin%"
    356 %obuild_cxx_command% /c %obuild_cxx_debug_local% %obuild_cxx_optimize_local% %obuild_cxx_options% %obuild_cxx_macros% %obuild_cxx_includes% /Fo.\lib_snova\snova_mgr.obj  /Tp"..\source\snova\base\snova_mgr.cc" 1> cl_exe_error
    357357@IF ERRORLEVEL 1 @TYPE cl_exe_error && @GOTO obuild_return
    358358@IF NOT ERRORLEVEL 1 @DEL cl_exe_error
  • build/snova/trunk/obuild/sh/build

    r144 r199  
    147147fi
    148148fi
     149if [ "${obuild_group}" = main ] ; then
     150if [ "${obuild_do_mains}" = yes ] ; then
     151  if [ -e ./sh/build_lib_snova_ui ] ; then
     152    ./sh/build_lib_snova_ui ${obuild_args}
     153    obuild_status=$?;if [ ${obuild_status} != 0 ] ; then exit ${obuild_status};fi
     154  fi
     155fi
     156fi
    149157
    150158if [ "${obuild_group}" = main ] ; then
  • build/snova/trunk/obuild/sh/build_app_prog_snova

    r151 r199  
    479479fi
    480480obuild_linked_paths="-L\"${obuild_snova_path}/${obuild_dir_bin}\""
    481 obuild_linked_libraries=" -lsnova"
     481obuild_linked_libraries=" -lsnova_ui"
     482obuild_linked_paths="${obuild_linked_paths} -L\"${obuild_snova_path}/${obuild_dir_bin}\""
     483obuild_linked_libraries="${obuild_linked_libraries}  -lsnova"
    482484obuild_linked_paths="${obuild_linked_paths} -L\"${obuild_snova_path}/${obuild_dir_bin}\""
    483485obuild_linked_libraries="${obuild_linked_libraries}  -lsnvertex"
     
    492494obuild_linked_paths="${obuild_linked_paths} -L\"${obuild_zlib_path}/${obuild_dir_bin}\""
    493495obuild_linked_libraries="${obuild_linked_libraries}  -losc_z"
     496obuild_linked_libraries="${obuild_linked_libraries} -L${Geant4_home}/lib -lG4interfaces"
     497obuild_linked_libraries="${obuild_linked_libraries} -L${Geant4_home}/lib -lG4vis_management"
     498obuild_linked_libraries="${obuild_linked_libraries} -L${Geant4_home}/lib -lG4modeling"
     499obuild_linked_libraries="${obuild_linked_libraries} -L${Geant4_home}/lib -lG4Tree"
    494500if [ "${obuild_platform_exe}" = "" ] ; then
    495501  echo "Variable obuild_platform_exe not defined."
  • build/snova/trunk/obuild/sh/build_lib_snova

    r151 r199  
    344344if [ ${obuild_verbose} = yes ] ; then set -x;fi
    345345cd "${obuild_snova_path}/${obuild_dir_bin}"
     346 eval ${obuild_cxx_command} -c ${obuild_cxx_debug_local} ${obuild_cxx_optimize_local} ${obuild_cxx_options} ${obuild_cxx_macros} ${obuild_cxx_includes} -o ./lib_snova/event.o \"../source/snova/base/event.cc\"
     347obuild_status=$?;if [ ${obuild_status} != 0 ] ; then exit ${obuild_status};fi
     348cd "${obuild_snova_path}/obuild"
     349
     350cd "${obuild_snova_path}/${obuild_dir_bin}"
     351 eval ${obuild_cxx_command} -c ${obuild_cxx_debug_local} ${obuild_cxx_optimize_local} ${obuild_cxx_options} ${obuild_cxx_macros} ${obuild_cxx_includes} -o ./lib_snova/generator.o \"../source/snova/base/generator.cc\"
     352obuild_status=$?;if [ ${obuild_status} != 0 ] ; then exit ${obuild_status};fi
     353cd "${obuild_snova_path}/obuild"
     354
     355cd "${obuild_snova_path}/${obuild_dir_bin}"
     356 eval ${obuild_cxx_command} -c ${obuild_cxx_debug_local} ${obuild_cxx_optimize_local} ${obuild_cxx_options} ${obuild_cxx_macros} ${obuild_cxx_includes} -o ./lib_snova/run.o \"../source/snova/base/run.cc\"
     357obuild_status=$?;if [ ${obuild_status} != 0 ] ; then exit ${obuild_status};fi
     358cd "${obuild_snova_path}/obuild"
     359
     360cd "${obuild_snova_path}/${obuild_dir_bin}"
     361 eval ${obuild_cxx_command} -c ${obuild_cxx_debug_local} ${obuild_cxx_optimize_local} ${obuild_cxx_options} ${obuild_cxx_macros} ${obuild_cxx_includes} -o ./lib_snova/snova_const.o \"../source/snova/base/snova_const.cc\"
     362obuild_status=$?;if [ ${obuild_status} != 0 ] ; then exit ${obuild_status};fi
     363cd "${obuild_snova_path}/obuild"
     364
     365cd "${obuild_snova_path}/${obuild_dir_bin}"
     366 eval ${obuild_cxx_command} -c ${obuild_cxx_debug_local} ${obuild_cxx_optimize_local} ${obuild_cxx_options} ${obuild_cxx_macros} ${obuild_cxx_includes} -o ./lib_snova/snova_mgr.o \"../source/snova/base/snova_mgr.cc\"
     367obuild_status=$?;if [ ${obuild_status} != 0 ] ; then exit ${obuild_status};fi
     368cd "${obuild_snova_path}/obuild"
     369
     370cd "${obuild_snova_path}/${obuild_dir_bin}"
    346371 eval ${obuild_cxx_command} -c ${obuild_cxx_debug_local} ${obuild_cxx_optimize_local} ${obuild_cxx_options} ${obuild_cxx_macros} ${obuild_cxx_includes} -o ./lib_snova/snova_utils.o \"../source/snova/base/snova_utils.cc\"
    347 obuild_status=$?;if [ ${obuild_status} != 0 ] ; then exit ${obuild_status};fi
    348 cd "${obuild_snova_path}/obuild"
    349 
    350 cd "${obuild_snova_path}/${obuild_dir_bin}"
    351  eval ${obuild_cxx_command} -c ${obuild_cxx_debug_local} ${obuild_cxx_optimize_local} ${obuild_cxx_options} ${obuild_cxx_macros} ${obuild_cxx_includes} -o ./lib_snova/event.o \"../source/snova/base/event.cc\"
    352 obuild_status=$?;if [ ${obuild_status} != 0 ] ; then exit ${obuild_status};fi
    353 cd "${obuild_snova_path}/obuild"
    354 
    355 cd "${obuild_snova_path}/${obuild_dir_bin}"
    356  eval ${obuild_cxx_command} -c ${obuild_cxx_debug_local} ${obuild_cxx_optimize_local} ${obuild_cxx_options} ${obuild_cxx_macros} ${obuild_cxx_includes} -o ./lib_snova/generator.o \"../source/snova/base/generator.cc\"
    357 obuild_status=$?;if [ ${obuild_status} != 0 ] ; then exit ${obuild_status};fi
    358 cd "${obuild_snova_path}/obuild"
    359 
    360 cd "${obuild_snova_path}/${obuild_dir_bin}"
    361  eval ${obuild_cxx_command} -c ${obuild_cxx_debug_local} ${obuild_cxx_optimize_local} ${obuild_cxx_options} ${obuild_cxx_macros} ${obuild_cxx_includes} -o ./lib_snova/run.o \"../source/snova/base/run.cc\"
    362 obuild_status=$?;if [ ${obuild_status} != 0 ] ; then exit ${obuild_status};fi
    363 cd "${obuild_snova_path}/obuild"
    364 
    365 cd "${obuild_snova_path}/${obuild_dir_bin}"
    366  eval ${obuild_cxx_command} -c ${obuild_cxx_debug_local} ${obuild_cxx_optimize_local} ${obuild_cxx_options} ${obuild_cxx_macros} ${obuild_cxx_includes} -o ./lib_snova/snova_const.o \"../source/snova/base/snova_const.cc\"
    367 obuild_status=$?;if [ ${obuild_status} != 0 ] ; then exit ${obuild_status};fi
    368 cd "${obuild_snova_path}/obuild"
    369 
    370 cd "${obuild_snova_path}/${obuild_dir_bin}"
    371  eval ${obuild_cxx_command} -c ${obuild_cxx_debug_local} ${obuild_cxx_optimize_local} ${obuild_cxx_options} ${obuild_cxx_macros} ${obuild_cxx_includes} -o ./lib_snova/snova_mgr.o \"../source/snova/base/snova_mgr.cc\"
    372372obuild_status=$?;if [ ${obuild_status} != 0 ] ; then exit ${obuild_status};fi
    373373cd "${obuild_snova_path}/obuild"
Note: See TracChangeset for help on using the changeset viewer.