Changeset 199 for build/snova/trunk/obuild/DOS

Timestamp:

Feb 13, 2007, 7:06:20 PM (17 years ago)

Author:

barrand

Message:

 

Location:

build/snova/trunk/obuild/DOS

Files:

• build.bat (modified) (2 diffs)
• build_app_prog_snova.bat (modified) (4 diffs)
• build_lib_snova.bat (modified) (1 diff)

build/snova/trunk/obuild/DOS/build.bat

@@ -180 +180 @@
 :end_if_main_3
 :end_if_group_3
-
 IF NOT %obuild_group% == main GOTO end_if_group_4
 IF NOT %obuild_do_mains% == yes GOTO end_if_main_4
-  IF NOT EXIST .\DOS\build_app_prog_snova.bat  GOTO end_if_build_4
-    CALL .\DOS\build_app_prog_snova.bat %obuild_args%
+  IF NOT EXIST .\DOS\build_lib_snova_ui.bat  GOTO end_if_build_4
+    CALL .\DOS\build_lib_snova_ui.bat %obuild_args%
     @IF ERRORLEVEL 1 @GOTO obuild_return
     @ECHO OFF
@@ -191 +190 @@
 :end_if_group_4
 
+IF NOT %obuild_group% == main GOTO end_if_group_5
+IF NOT %obuild_do_mains% == yes GOTO end_if_main_5
+  IF NOT EXIST .\DOS\build_app_prog_snova.bat  GOTO end_if_build_5
+    CALL .\DOS\build_app_prog_snova.bat %obuild_args%
+    @IF ERRORLEVEL 1 @GOTO obuild_return
+    @ECHO OFF
+:end_if_build_5
+:end_if_main_5
+:end_if_group_5
+
 :obuild_return
 ENDLOCAL

build/snova/trunk/obuild/DOS/build_app_prog_snova.bat

@@ -460 +460 @@
 :end_if_opt_build_app_prog_snova_sh_39
 
-SET obuild_linked_libraries="%obuild_snova_path%\%obuild_dir_bin%\snova.lib"
+SET obuild_linked_libraries="%obuild_snova_path%\%obuild_dir_bin%\snova_ui.lib"
+SET obuild_linked_libraries=%obuild_linked_libraries% "%obuild_snova_path%\%obuild_dir_bin%\snova.lib"
 SET obuild_linked_libraries=%obuild_linked_libraries% "%obuild_snova_path%\%obuild_dir_bin%\snvertex.lib"
 SET obuild_linked_libraries=%obuild_linked_libraries% "%obuild_snova_path%\%obuild_dir_bin%\sngeom.lib"
@@ -467 +468 @@
 SET obuild_linked_libraries=%obuild_linked_libraries% "%obuild_HDF5_path%\%obuild_dir_bin%\osc_HDF5.lib"
 SET obuild_linked_libraries=%obuild_linked_libraries% "%obuild_zlib_path%\%obuild_dir_bin%\osc_z.lib"
+SET obuild_linked_libraries=%obuild_linked_libraries% -L${Geant4_home}/lib -lG4interfaces
+SET obuild_linked_libraries=%obuild_linked_libraries% -L${Geant4_home}/lib -lG4vis_management
+SET obuild_linked_libraries=%obuild_linked_libraries% -L${Geant4_home}/lib -lG4modeling
+SET obuild_linked_libraries=%obuild_linked_libraries% -L${Geant4_home}/lib -lG4Tree
 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_snova_0=%%d
 cd "%obuild_snova_path%\%obuild_dir_bin%"
@@ -473 +478 @@
 cd "%obuild_pwd_snova_0%"
 SET obuild_pwd_snova_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_47
+IF NOT %obuild_platform_result% == yes GOTO end_if_platform_52
 SET 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
-:end_if_platform_47
+:end_if_platform_52
 SET obuild_platform_result=
 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_snova_0=%%d
@@ -483 +488 @@
 cd "%obuild_pwd_snova_0%"
 SET obuild_pwd_snova_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_48
+IF NOT %obuild_platform_result% == yes GOTO end_if_platform_53
 SET obuild_linked_libraries=%obuild_linked_libraries% -L${CLHEP_home}/lib -lCLHEP
-:end_if_platform_48
+:end_if_platform_53
 SET obuild_platform_result=
 

build/snova/trunk/obuild/DOS/build_lib_snova.bat

@@ -324 +324 @@
 @IF %obuild_verbose% == yes @ECHO ON 
 cd "%obuild_snova_path%\%obuild_dir_bin%"
+%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
+@IF ERRORLEVEL 1 @TYPE cl_exe_error && @GOTO obuild_return
+@IF NOT ERRORLEVEL 1 @DEL cl_exe_error
+cd "%obuild_snova_path%\obuild"
+
+cd "%obuild_snova_path%\%obuild_dir_bin%"
+%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
+@IF ERRORLEVEL 1 @TYPE cl_exe_error && @GOTO obuild_return
+@IF NOT ERRORLEVEL 1 @DEL cl_exe_error
+cd "%obuild_snova_path%\obuild"
+
+cd "%obuild_snova_path%\%obuild_dir_bin%"
+%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
+@IF ERRORLEVEL 1 @TYPE cl_exe_error && @GOTO obuild_return
+@IF NOT ERRORLEVEL 1 @DEL cl_exe_error
+cd "%obuild_snova_path%\obuild"
+
+cd "%obuild_snova_path%\%obuild_dir_bin%"
+%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
+@IF ERRORLEVEL 1 @TYPE cl_exe_error && @GOTO obuild_return
+@IF NOT ERRORLEVEL 1 @DEL cl_exe_error
+cd "%obuild_snova_path%\obuild"
+
+cd "%obuild_snova_path%\%obuild_dir_bin%"
+%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
+@IF ERRORLEVEL 1 @TYPE cl_exe_error && @GOTO obuild_return
+@IF NOT ERRORLEVEL 1 @DEL cl_exe_error
+cd "%obuild_snova_path%\obuild"
+
+cd "%obuild_snova_path%\%obuild_dir_bin%"
 %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
-@IF ERRORLEVEL 1 @TYPE cl_exe_error && @GOTO obuild_return
-@IF NOT ERRORLEVEL 1 @DEL cl_exe_error
-cd "%obuild_snova_path%\obuild"
-
-cd "%obuild_snova_path%\%obuild_dir_bin%"
-%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
-@IF ERRORLEVEL 1 @TYPE cl_exe_error && @GOTO obuild_return
-@IF NOT ERRORLEVEL 1 @DEL cl_exe_error
-cd "%obuild_snova_path%\obuild"
-
-cd "%obuild_snova_path%\%obuild_dir_bin%"
-%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
-@IF ERRORLEVEL 1 @TYPE cl_exe_error && @GOTO obuild_return
-@IF NOT ERRORLEVEL 1 @DEL cl_exe_error
-cd "%obuild_snova_path%\obuild"
-
-cd "%obuild_snova_path%\%obuild_dir_bin%"
-%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
-@IF ERRORLEVEL 1 @TYPE cl_exe_error && @GOTO obuild_return
-@IF NOT ERRORLEVEL 1 @DEL cl_exe_error
-cd "%obuild_snova_path%\obuild"
-
-cd "%obuild_snova_path%\%obuild_dir_bin%"
-%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
-@IF ERRORLEVEL 1 @TYPE cl_exe_error && @GOTO obuild_return
-@IF NOT ERRORLEVEL 1 @DEL cl_exe_error
-cd "%obuild_snova_path%\obuild"
-
-cd "%obuild_snova_path%\%obuild_dir_bin%"
-%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
 @IF ERRORLEVEL 1 @TYPE cl_exe_error && @GOTO obuild_return
 @IF NOT ERRORLEVEL 1 @DEL cl_exe_error