Changeset 249 for build/bhep/trunk/obuild/sh/build_lib_bhep

Timestamp:

Feb 15, 2007, 11:45:43 AM (17 years ago)

Author:

barrand

Message:

 

File:

• build/bhep/trunk/obuild/sh/build_lib_bhep (modified) (3 diffs)

build/bhep/trunk/obuild/sh/build_lib_bhep

@@ -116 +116 @@
   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
@@ -258 +276 @@
 fi
 
-if [ "${obuild_platform_exe}" = "" ] ; then
-  echo "Variable obuild_platform_exe not defined."
-  exit
-fi
-obuild_platform_result=`"${obuild_platform_exe}" ${obuild_platform} 'Windows_NT'`
-if [ ${obuild_platform_result} = yes ] ; then
-obuild_cxx_macros="${obuild_cxx_macros} -D_HDF5USEDLL_"
-fi
-unset obuild_platform_result
-
-if [ ! -e "${obuild_bhep_path}/${obuild_dir_bin}/obuild_find" ] ; then
-  if [ ! -e "${obuild_bhep_path}/obuild/cpp/obuild_find.cpp" ] ; then
-    echo "Program source obuild_find.cpp not found."
-    exit
-  fi
-  if [ "${obuild_cxx_command}" = "" ] ; then
-    if [  "${OBUILD_CXX}" != "" ] ; then
-      obuild_find_compiler=${OBUILD_CXX}
-    else
-      obuild_find_compiler=c++
-    fi
-  else
-    obuild_find_compiler=${obuild_cxx_command}
-  fi
-  ${obuild_find_compiler} -o "${obuild_bhep_path}/${obuild_dir_bin}/obuild_find" "${obuild_bhep_path}/obuild/cpp/obuild_find.cpp"
-  unset obuild_find_compiler
-  if [ ! -e "${obuild_bhep_path}/${obuild_dir_bin}/obuild_find" ] ; then
-    echo "Program obuild_find not found."
-    exit
-  fi
-fi
-obuild_find_exe="${obuild_bhep_path}/${obuild_dir_bin}/obuild_find"
-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
 
 obuild_cxx_includes="-I\"${obuild_bhep_path}\""
@@ -320 +288 @@
 fi
 unset obuild_platform_result
-obuild_cxx_includes="${obuild_cxx_includes} -I\"${obuild_HDF5_path}/include\""
-obuild_cxx_includes="${obuild_cxx_includes} -I\"${obuild_zlib_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