Changeset 241 for build/snova/trunk/obuild/sh/build_app_prog_snova

Timestamp:

Feb 15, 2007, 10:20:56 AM (17 years ago)

Author:

barrand

Message:

 

File:

• build/snova/trunk/obuild/sh/build_app_prog_snova (modified) (4 diffs)

build/snova/trunk/obuild/sh/build_app_prog_snova

@@ -125 +125 @@
   exit
 fi
+obuild_platform_result=`"${obuild_platform_exe}" ${obuild_platform} 'UNIX'`
+if [ ${obuild_platform_result} = yes ] ; then
+HDF5_home="/usr/local/HDF5/1.6.5"
+fi
+unset obuild_platform_result
+if [ "${obuild_platform_exe}" = "" ] ; then
+  echo "Variable obuild_platform_exe not defined."
+  exit
+fi
+obuild_platform_result=`"${obuild_platform_exe}" ${obuild_platform} 'UNIX'`
+if [ ${obuild_platform_result} = yes ] ; then
+zlib_home="/usr"
+fi
+unset obuild_platform_result
+if [ "${obuild_platform_exe}" = "" ] ; then
+  echo "Variable obuild_platform_exe not defined."
+  exit
+fi
 obuild_platform_result=`"${obuild_platform_exe}" ${obuild_platform} 'Darwin'`
 if [ ${obuild_platform_result} = yes ] ; then
@@ -302 +320 @@
   exit
 fi
-obuild_HDF5_path=`"${obuild_find_exe}" HDF5 'v1r*'`
-if [ "${obuild_HDF5_path}" = "" ] ; then
-  echo "Can't find HDF5 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
   echo "Can't find bhep package."
-  exit
-fi
-if [ "${obuild_find_exe}" = "" ] ; then
-  echo "Variable obuild_find_exe not defined."
-  exit
-fi
-obuild_HDF5_path=`"${obuild_find_exe}" HDF5 'v1r*'`
-if [ "${obuild_HDF5_path}" = "" ] ; then
-  echo "Can't find HDF5 package."
-  exit
-fi
-if [ "${obuild_find_exe}" = "" ] ; then
-  echo "Variable obuild_find_exe not defined."
-  exit
-fi
-obuild_zlib_path=`"${obuild_find_exe}" zlib 'v1r*'`
-if [ "${obuild_zlib_path}" = "" ] ; then
-  echo "Can't find zlib package."
   exit
 fi
@@ -358 +349 @@
 fi
 unset obuild_platform_result
-obuild_cxx_includes="${obuild_cxx_includes} -I\"${obuild_HDF5_path}/include\""
+if [ "${obuild_platform_exe}" = "" ] ; then
+  echo "Variable obuild_platform_exe not defined."
+  exit
+fi
+obuild_platform_result=`"${obuild_platform_exe}" ${obuild_platform} 'UNIX'`
+if [ ${obuild_platform_result} = yes ] ; then
+obuild_cxx_includes="${obuild_cxx_includes} -I${HDF5_home}/include"
+fi
+unset obuild_platform_result
 
 if [ ${obuild_dir_bin_o_cleanup} = yes ] ; then
@@ -490 +489 @@
 obuild_linked_paths="${obuild_linked_paths} -L\"${obuild_bhep_path}/${obuild_dir_bin}\""
 obuild_linked_libraries="${obuild_linked_libraries}  -lbhep"
-obuild_linked_paths="${obuild_linked_paths} -L\"${obuild_HDF5_path}/${obuild_dir_bin}\""
-obuild_linked_libraries="${obuild_linked_libraries}  -losc_HDF5"
-obuild_linked_paths="${obuild_linked_paths} -L\"${obuild_zlib_path}/${obuild_dir_bin}\""
-obuild_linked_libraries="${obuild_linked_libraries}  -losc_z"
+if [ "${obuild_platform_exe}" = "" ] ; then
+  echo "Variable obuild_platform_exe not defined."
+  exit
+fi
+obuild_platform_result=`"${obuild_platform_exe}" ${obuild_platform} 'UNIX'`
+if [ ${obuild_platform_result} = yes ] ; then
+obuild_linked_libraries="${obuild_linked_libraries} -L${HDF5_home}/lib -lhdf5.0.0.0"
+fi
+unset obuild_platform_result
+if [ "${obuild_platform_exe}" = "" ] ; then
+  echo "Variable obuild_platform_exe not defined."
+  exit
+fi
+obuild_platform_result=`"${obuild_platform_exe}" ${obuild_platform} 'UNIX'`
+if [ ${obuild_platform_result} = yes ] ; then
+obuild_linked_libraries="${obuild_linked_libraries} -L${zlib_home}/lib -lz"
+fi
+unset obuild_platform_result
 obuild_linked_libraries="${obuild_linked_libraries} -L${Geant4_home}/lib -lG4interfaces"
 obuild_linked_libraries="${obuild_linked_libraries} -L${Geant4_home}/lib -lG4vis_management"