Changeset 206 for snovis

Timestamp:

Feb 13, 2007, 7:26:36 PM (17 years ago)

Author:

barrand

Message:

 

Location:

snovis/trunk/obuild

Files:

• DOS/build_app_prog_snova.bat (modified) (4 diffs)
• setup.csh (modified) (1 diff)
• setup.sh (modified) (1 diff)
• sh/build_app_prog_snova (modified) (3 diffs)
• this.obuild (modified) (3 diffs)

snovis/trunk/obuild/DOS/build_app_prog_snova.bat

@@ -350 +350 @@
 cd "%obuild_snovis_path%\%obuild_dir_bin%"
 IF NOT EXIST obuild_find.exe  ECHO Program obuild_find.exe not found.  && GOTO obuild_return
+FOR /F "usebackq delims=;" %%j IN (`.\obuild_find.exe  snova v2r0p0`) DO SET obuild_snova_path=%%j
+cd "%obuild_pwd_snovis_0%"
+SET obuild_pwd_snovis_0=
+IF NOT DEFINED obuild_snova_path  ECHO Can't find snova package.  && GOTO obuild_return
+FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_snovis_0=%%d
+cd "%obuild_snovis_path%\%obuild_dir_bin%"
+IF NOT EXIST obuild_find.exe  ECHO Program obuild_find.exe not found.  && GOTO obuild_return
 FOR /F "usebackq delims=;" %%j IN (`.\obuild_find.exe  bhep v1r4p2`) DO SET obuild_bhep_path=%%j
 cd "%obuild_pwd_snovis_0%"
@@ -516 +523 @@
 :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"
 SET obuild_linked_libraries=%obuild_linked_libraries% "%obuild_snova_path%\%obuild_dir_bin%\geomutils.lib"
 SET obuild_linked_libraries=%obuild_linked_libraries% "%obuild_bhep_path%\%obuild_dir_bin%\bhep.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_snovis_0=%%d
 cd "%obuild_snovis_path%\%obuild_dir_bin%"
@@ -527 +539 @@
 cd "%obuild_pwd_snovis_0%"
 SET obuild_pwd_snovis_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_45
+IF NOT %obuild_platform_result% == yes GOTO end_if_platform_50
 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_45
+:end_if_platform_50
 SET obuild_platform_result=
 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_snovis_0=%%d
@@ -537 +549 @@
 cd "%obuild_pwd_snovis_0%"
 SET obuild_pwd_snovis_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_46
+IF NOT %obuild_platform_result% == yes GOTO end_if_platform_51
 SET obuild_linked_libraries=%obuild_linked_libraries% -L${CLHEP_home}/lib -lCLHEP
-:end_if_platform_46
+:end_if_platform_51
 SET obuild_platform_result=
 SET obuild_linked_libraries=%obuild_linked_libraries% "%obuild_HDF5_path%\%obuild_dir_bin%\osc_HDF5.lib"

snovis/trunk/obuild/setup.csh

@@ -41 +41 @@
 #////////////////////////////////////////////////
 
-set obuild_snovis_path="@@absolute_dir@@"
+set obuild_snovis_path="/Users/barrand/dev/exp/nemo/snovis/v1r1"
 
 

snovis/trunk/obuild/setup.sh

@@ -41 +41 @@
 #////////////////////////////////////////////////
 
-obuild_snovis_path="@@absolute_dir@@"
+obuild_snovis_path="/Users/barrand/dev/exp/nemo/snovis/v1r1"
 
 if [ "${obuild_snovis_path}" = '@@absolute_dir@@' ] ; then

snovis/trunk/obuild/sh/build_app_prog_snova

@@ -383 +383 @@
   exit
 fi
+obuild_snova_path=`"${obuild_find_exe}" snova 'v2r0p0'`
+if [ "${obuild_snova_path}" = "" ] ; then
+  echo "Can't find snova package."
+  exit
+fi
+if [ "${obuild_find_exe}" = "" ] ; then
+  echo "Variable obuild_find_exe not defined."
+  exit
+fi
 obuild_bhep_path=`"${obuild_find_exe}" bhep 'v1r4p2'`
 if [ "${obuild_bhep_path}" = "" ] ; then
@@ -551 +560 @@
 fi
 obuild_linked_paths="-L\"${obuild_snova_path}/${obuild_dir_bin}\""
-obuild_linked_libraries=" -lsnova"
+obuild_linked_libraries=" -lsnova_ui"
+obuild_linked_paths="${obuild_linked_paths} -L\"${obuild_snova_path}/${obuild_dir_bin}\""
+obuild_linked_libraries="${obuild_linked_libraries}  -lsnova"
 obuild_linked_paths="${obuild_linked_paths} -L\"${obuild_snova_path}/${obuild_dir_bin}\""
 obuild_linked_libraries="${obuild_linked_libraries}  -lsnvertex"
@@ -560 +571 @@
 obuild_linked_paths="${obuild_linked_paths} -L\"${obuild_bhep_path}/${obuild_dir_bin}\""
 obuild_linked_libraries="${obuild_linked_libraries}  -lbhep"
+obuild_linked_libraries="${obuild_linked_libraries} -L${Geant4_home}/lib -lG4interfaces"
+obuild_linked_libraries="${obuild_linked_libraries} -L${Geant4_home}/lib -lG4vis_management"
+obuild_linked_libraries="${obuild_linked_libraries} -L${Geant4_home}/lib -lG4modeling"
+obuild_linked_libraries="${obuild_linked_libraries} -L${Geant4_home}/lib -lG4Tree"
 if [ "${obuild_platform_exe}" = "" ] ; then
   echo "Variable obuild_platform_exe not defined."

snovis/trunk/obuild/this.obuild

@@ -59 +59 @@
       <cxx_include copy="c_include" from="HDF5"/>
 
+      <lib copy="lib_snova_ui" from="snova"/>
       <lib copy="lib" from="snova"/>
       <lib copy="lib_snvertex" from="snova"/>
@@ -65 +66 @@
       <lib copy="lib" from="bhep"/>
 
-<!--  <lib copy="interfaces_lib" from="Geant4"/> -->
+      <lib copy="lib_G4interfaces" from="Geant4"/>
+      <lib copy="lib_G4vis_management" from="Geant4"/>
+      <lib copy="lib_G4modeling" from="Geant4"/>
+      <lib copy="lib_G4Tree" from="Geant4"/>
 
       <lib copy="lib" from="Geant4"/>
@@ -105 +109 @@
       <lib copy="lib_G4LabUIOnX" from="G4Lab"/>
       <lib copy="lib_G4LabCore" from="G4Lab"/>
-<!--  <lib copy="interfaces_lib" from="Geant4"/> -->
       <lib copy="lib" from="Geant4"/>
       <lib copy="lib" from="CLHEP"/>