Changeset 219 for osc_snovis

Timestamp:

Feb 14, 2007, 3:55:37 PM (17 years ago)

Author:

barrand

Message:

 

Location:

osc_snovis/trunk/obuild

Files:

• DOS/build_release.bat (modified) (2 diffs)
• sh/build_release (modified) (2 diffs)
• this.obuild (modified) (1 diff)

osc_snovis/trunk/obuild/DOS/build_release.bat

@@ -9465 +9465 @@
 SET obuild_pwd_osc_snovis_1=
 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_1308
-IF EXIST "%obuild_osc_snovis_path%\%obuild_dir_bin%\osc_snovis_v1r0_intel_osx_gcc401.zip" DEL "%obuild_osc_snovis_path%\%obuild_dir_bin%\osc_snovis_v1r0_intel_osx_gcc401.zip"
 IF EXIST "%obuild_dir_project%\Resources/Geant4/data" RMDIR /S /Q "%obuild_dir_project%\Resources/Geant4/data"
 IF EXIST "%obuild_dir_project%\Resources/Geant4" RMDIR /S /Q "%obuild_dir_project%\Resources/Geant4"
 IF EXIST "%obuild_dir_project%\Resources/CLHEP" RMDIR /S /Q "%obuild_dir_project%\Resources/CLHEP"
+IF EXIST "%obuild_osc_snovis_path%\%obuild_dir_bin%\osc_snovis_v1r0_intel_osx_gcc401.zip" DEL "%obuild_osc_snovis_path%\%obuild_dir_bin%\osc_snovis_v1r0_intel_osx_gcc401.zip"
 :end_if_platform_1308
 SET obuild_platform_result=
@@ -9478 +9478 @@
 SET obuild_pwd_osc_snovis_1=
 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_1310
-IF EXIST "%obuild_osc_snovis_path%\%obuild_dir_bin%\osc_snovis_v1r0_m32_sl3_gcc323.zip" DEL "%obuild_osc_snovis_path%\%obuild_dir_bin%\osc_snovis_v1r0_m32_sl3_gcc323.zip"
 IF EXIST "%obuild_dir_project%\Resources/Geant4/data" RMDIR /S /Q "%obuild_dir_project%\Resources/Geant4/data"
 IF EXIST "%obuild_dir_project%\Resources/Geant4" RMDIR /S /Q "%obuild_dir_project%\Resources/Geant4"
 IF EXIST "%obuild_dir_project%\Resources/CLHEP" RMDIR /S /Q "%obuild_dir_project%\Resources/CLHEP"
+DEL  "%obuild_dir_project%"\libXm.so.2*
+IF EXIST "%obuild_osc_snovis_path%\%obuild_dir_bin%\osc_snovis_v1r0_m32_sl3_gcc323.zip" DEL "%obuild_osc_snovis_path%\%obuild_dir_bin%\osc_snovis_v1r0_m32_sl3_gcc323.zip"
 :end_if_platform_1310
 SET obuild_platform_result=

osc_snovis/trunk/obuild/sh/build_release

@@ -9303 +9303 @@
 obuild_platform_result=`"${obuild_platform_exe}" ${obuild_platform} 'Darwin'`
 if [ ${obuild_platform_result} = yes ] ; then
-/bin/rm -f "${obuild_osc_snovis_path}/${obuild_dir_bin}/osc_snovis_v1r0_intel_osx_gcc401.zip"
-zip -q -r "${obuild_osc_snovis_path}/${obuild_dir_bin}/osc_snovis_v1r0_intel_osx_gcc401.zip" "${obuild_osc_snovis_path}/${obuild_dir_bin}/osc_snovis"
 /bin/rm -R -f "${obuild_dir_project}/Resources/Geant4/data"
 /bin/rm -R -f "${obuild_dir_project}/Resources/Geant4"
 /bin/rm -R -f "${obuild_dir_project}/Resources/CLHEP"
+/bin/rm -f "${obuild_osc_snovis_path}/${obuild_dir_bin}/osc_snovis_v1r0_intel_osx_gcc401.zip"
+zip -q -r "${obuild_osc_snovis_path}/${obuild_dir_bin}/osc_snovis_v1r0_intel_osx_gcc401.zip" "${obuild_osc_snovis_path}/${obuild_dir_bin}/osc_snovis"
 fi
 unset obuild_platform_result
@@ -9316 +9316 @@
 obuild_platform_result=`"${obuild_platform_exe}" ${obuild_platform} 'Linux'`
 if [ ${obuild_platform_result} = yes ] ; then
-/bin/rm -f "${obuild_osc_snovis_path}/${obuild_dir_bin}/osc_snovis_v1r0_m32_sl3_gcc323.zip"
-zip -q -r "${obuild_osc_snovis_path}/${obuild_dir_bin}/osc_snovis_v1r0_m32_sl3_gcc323.zip" "${obuild_osc_snovis_path}/${obuild_dir_bin}/osc_snovis"
 /bin/rm -R -f "${obuild_dir_project}/Resources/Geant4/data"
 /bin/rm -R -f "${obuild_dir_project}/Resources/Geant4"
 /bin/rm -R -f "${obuild_dir_project}/Resources/CLHEP"
+find "${obuild_dir_project}" -name 'libXm.so.2*' -follow -exec /bin/rm -f {} \;
+/bin/rm -f "${obuild_osc_snovis_path}/${obuild_dir_bin}/osc_snovis_v1r0_m32_sl3_gcc323.zip"
+zip -q -r "${obuild_osc_snovis_path}/${obuild_dir_bin}/osc_snovis_v1r0_m32_sl3_gcc323.zip" "${obuild_osc_snovis_path}/${obuild_dir_bin}/osc_snovis"
 fi
 unset obuild_platform_result

osc_snovis/trunk/obuild/this.obuild

@@ -17 +17 @@
     <zip platform="Darwin">
       <file>@@package@@_@@version@@_intel_osx_gcc401.zip</file>
-      <remove_dir>Resources/Geant4/data</remove_dir>
-      <remove_dir>Resources/Geant4</remove_dir>
-      <remove_dir>Resources/CLHEP</remove_dir>
+      <rm_dir>Resources/Geant4/data</rm_dir>
+      <rm_dir>Resources/Geant4</rm_dir>
+      <rm_dir>Resources/CLHEP</rm_dir>
     </zip>
 
     <zip platform="Linux">
       <file>@@package@@_@@version@@_m32_sl3_gcc323.zip</file>
-      <remove_dir>Resources/Geant4/data</remove_dir>
-      <remove_dir>Resources/Geant4</remove_dir>
-      <remove_dir>Resources/CLHEP</remove_dir>
-      <remove_files>libXm.so.2*</remove_files>
+      <rm_dir>Resources/Geant4/data</rm_dir>
+      <rm_dir>Resources/Geant4</rm_dir>
+      <rm_dir>Resources/CLHEP</rm_dir>
+      <rm_files>libXm.so.2*</rm_files>
     </zip>