Changeset 127 for build

Timestamp:

Feb 9, 2007, 4:07:36 PM (17 years ago)

Author:

barrand

Message:

 

Location:

build/bhep/trunk/obuild

Files:

• DOS/build_lib_bhep.bat (modified) (8 diffs)
• sh/build_lib_bhep (modified) (3 diffs)
• this.obuild (modified) (2 diffs)

build/bhep/trunk/obuild/DOS/build_lib_bhep.bat

@@ -261 +261 @@
 :end_if_opt_build_lib_bhep_sh_17
 
-FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
-cd "%obuild_bhep_path%\%obuild_dir_bin%"
-IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
-FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Darwin`) DO SET obuild_platform_result=%%j
+
+FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
+cd "%obuild_bhep_path%\%obuild_dir_bin%"
+IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
+FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
 cd "%obuild_pwd_bhep_0%"
 SET obuild_pwd_bhep_0=
 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_18
-SET obuild_c_command=cc
+SET obuild_cxx_macros=%obuild_cxx_macros% /D_HDF5USEDLL_
 :end_if_platform_18
 SET obuild_platform_result=
-FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
-cd "%obuild_bhep_path%\%obuild_dir_bin%"
-IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
-FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Linux`) DO SET obuild_platform_result=%%j
-cd "%obuild_pwd_bhep_0%"
-SET obuild_pwd_bhep_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_19
-SET obuild_c_command=cc
-:end_if_platform_19
-SET obuild_platform_result=
-FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
-cd "%obuild_bhep_path%\%obuild_dir_bin%"
-IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
-FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% OSF1`) DO SET obuild_platform_result=%%j
-cd "%obuild_pwd_bhep_0%"
-SET obuild_pwd_bhep_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_20
-SET obuild_c_command=cc
-:end_if_platform_20
-SET obuild_platform_result=
-FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
-cd "%obuild_bhep_path%\%obuild_dir_bin%"
-IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
-FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
+
+IF NOT EXIST "%obuild_bhep_path%\%obuild_dir_bin%" MKDIR "%obuild_bhep_path%\%obuild_dir_bin%"
+IF NOT EXIST "%obuild_bhep_path%\%obuild_dir_bin%\obuild_find.exe" (
+  cl.exe /nologo /DWIN32 /MD /O2 /W3 /GX /GR /Fe"%obuild_bhep_path%\%obuild_dir_bin%\obuild_find.exe" "%obuild_bhep_path%\obuild\cpp\obuild_find.cpp" 1> NUL
+  IF EXIST obuild_find.obj DEL obuild_find.obj
+)
+FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
+cd "%obuild_bhep_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  HDF5 v1r*`) DO SET obuild_HDF5_path=%%j
+cd "%obuild_pwd_bhep_0%"
+SET obuild_pwd_bhep_0=
+IF NOT DEFINED obuild_HDF5_path  ECHO Can't find HDF5 package.  && GOTO obuild_return
+FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
+cd "%obuild_bhep_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  zlib v1r*`) DO SET obuild_zlib_path=%%j
+cd "%obuild_pwd_bhep_0%"
+SET obuild_pwd_bhep_0=
+IF NOT DEFINED obuild_zlib_path  ECHO Can't find zlib package.  && GOTO obuild_return
+
+SET obuild_cxx_includes=/I"%obuild_bhep_path%"
+SET obuild_cxx_includes=%obuild_cxx_includes% /I"%obuild_bhep_path%\bhep"
+FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
+cd "%obuild_bhep_path%\%obuild_dir_bin%"
+IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
+FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% UNIX`) DO SET obuild_platform_result=%%j
 cd "%obuild_pwd_bhep_0%"
 SET obuild_pwd_bhep_0=
 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_21
-SET obuild_c_command=cl.exe
+SET obuild_cxx_includes=%obuild_cxx_includes% -I${CLHEP_home}/include
 :end_if_platform_21
 SET obuild_platform_result=
-IF "%obuild_c_command%" == ""  ECHO Variable obuild_c_command not defined.  && GOTO obuild_return
-
-FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
-cd "%obuild_bhep_path%\%obuild_dir_bin%"
-IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
-FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Darwin`) DO SET obuild_platform_result=%%j
-cd "%obuild_pwd_bhep_0%"
-SET obuild_pwd_bhep_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_22
-SET obuild_c_optimize=-O
-:end_if_platform_22
-SET obuild_platform_result=
-FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
-cd "%obuild_bhep_path%\%obuild_dir_bin%"
-IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
-FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Linux`) DO SET obuild_platform_result=%%j
-cd "%obuild_pwd_bhep_0%"
-SET obuild_pwd_bhep_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_23
-SET obuild_c_optimize=-O
-:end_if_platform_23
-SET obuild_platform_result=
-FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
-cd "%obuild_bhep_path%\%obuild_dir_bin%"
-IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
-FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% OSF1`) DO SET obuild_platform_result=%%j
-cd "%obuild_pwd_bhep_0%"
-SET obuild_pwd_bhep_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_24
-SET obuild_c_optimize=-O
-:end_if_platform_24
-SET obuild_platform_result=
-FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
-cd "%obuild_bhep_path%\%obuild_dir_bin%"
-IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
-FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
-cd "%obuild_pwd_bhep_0%"
-SET obuild_pwd_bhep_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_25
-SET obuild_c_optimize=/O2
-:end_if_platform_25
-SET obuild_platform_result=
-
-FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
-cd "%obuild_bhep_path%\%obuild_dir_bin%"
-IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
-FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Darwin`) DO SET obuild_platform_result=%%j
-cd "%obuild_pwd_bhep_0%"
-SET obuild_pwd_bhep_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_26
-SET obuild_c_debug=-g
-:end_if_platform_26
-SET obuild_platform_result=
-FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
-cd "%obuild_bhep_path%\%obuild_dir_bin%"
-IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
-FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Linux`) DO SET obuild_platform_result=%%j
-cd "%obuild_pwd_bhep_0%"
-SET obuild_pwd_bhep_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_27
-SET obuild_c_debug=-g
-:end_if_platform_27
-SET obuild_platform_result=
-FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
-cd "%obuild_bhep_path%\%obuild_dir_bin%"
-IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
-FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% OSF1`) DO SET obuild_platform_result=%%j
-cd "%obuild_pwd_bhep_0%"
-SET obuild_pwd_bhep_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_28
-SET obuild_c_debug=-g
-:end_if_platform_28
-SET obuild_platform_result=
-FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
-cd "%obuild_bhep_path%\%obuild_dir_bin%"
-IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
-FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
-cd "%obuild_pwd_bhep_0%"
-SET obuild_pwd_bhep_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_29
-SET obuild_c_debug=/ZI /Od
-:end_if_platform_29
-SET obuild_platform_result=
-
-FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
-cd "%obuild_bhep_path%\%obuild_dir_bin%"
-IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
-FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Linux`) DO SET obuild_platform_result=%%j
-cd "%obuild_pwd_bhep_0%"
-SET obuild_pwd_bhep_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_30
-SET obuild_c_options=-fPIC
-:end_if_platform_30
-SET obuild_platform_result=
-FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
-cd "%obuild_bhep_path%\%obuild_dir_bin%"
-IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
-FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% OSF1`) DO SET obuild_platform_result=%%j
-cd "%obuild_pwd_bhep_0%"
-SET obuild_pwd_bhep_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_31
-SET obuild_c_options=-std
-:end_if_platform_31
-SET obuild_platform_result=
-FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
-cd "%obuild_bhep_path%\%obuild_dir_bin%"
-IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
-FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
-cd "%obuild_pwd_bhep_0%"
-SET obuild_pwd_bhep_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_32
-SET obuild_c_options=/nologo /DWIN32 /MD /W3
-:end_if_platform_32
-SET obuild_platform_result=
-
-IF NOT %obuild_debug% == yes GOTO else_if_db_build_lib_bhep_sh_33
-  SET obuild_c_debug_local=%obuild_c_debug%
-  GOTO end_if_db_build_lib_bhep_sh_33
-:else_if_db_build_lib_bhep_sh_33
-  SET obuild_c_debug_local=
-:end_if_db_build_lib_bhep_sh_33
-
-IF NOT %obuild_optimize% == yes GOTO else_if_opt_build_lib_bhep_sh_34
-  SET obuild_c_optimize_local=%obuild_c_optimize%
-  GOTO end_if_opt_build_lib_bhep_sh_34
-:else_if_opt_build_lib_bhep_sh_34
-  SET obuild_c_optimize_local=
-:end_if_opt_build_lib_bhep_sh_34
-
-
-
-SET obuild_cxx_includes=/I"%obuild_bhep_path%"
+SET obuild_cxx_includes=%obuild_cxx_includes% /I"%obuild_HDF5_path%\include"
+SET obuild_cxx_includes=%obuild_cxx_includes% /I"%obuild_zlib_path%\include"
 
 IF EXIST "%obuild_bhep_path%\%obuild_dir_bin%\lib_bhep" RMDIR /S /Q "%obuild_bhep_path%\%obuild_dir_bin%\lib_bhep"
@@ -643 +517 @@
 
 cd "%obuild_bhep_path%\%obuild_dir_bin%"
-%obuild_c_command% /c %obuild_c_debug_local% %obuild_c_optimize_local% %obuild_c_options% %obuild_c_macros% %obuild_c_includes% /Fo.\lib_bhep\EventManager.obj "..\source\tools\EventManager.c" 1> cl_exe_error
+%obuild_cxx_command% /c %obuild_cxx_debug_local% %obuild_cxx_optimize_local% %obuild_cxx_options% %obuild_cxx_macros% %obuild_cxx_includes% /Fo.\lib_bhep\EventManager.obj  /Tp"..\source\tools\EventManager.cpp" 1> cl_exe_error
 @IF ERRORLEVEL 1 @TYPE cl_exe_error && @GOTO obuild_return
 @IF NOT ERRORLEVEL 1 @DEL cl_exe_error
@@ -656 +530 @@
 cd "%obuild_pwd_bhep_0%"
 SET obuild_pwd_bhep_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_71
+IF NOT %obuild_platform_result% == yes GOTO end_if_platform_59
 SET obuild_cxx_linker_command=c++
-:end_if_platform_71
+:end_if_platform_59
 SET obuild_platform_result=
 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
@@ -666 +540 @@
 cd "%obuild_pwd_bhep_0%"
 SET obuild_pwd_bhep_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_72
+IF NOT %obuild_platform_result% == yes GOTO end_if_platform_60
 SET obuild_cxx_linker_command=c++
-:end_if_platform_72
+:end_if_platform_60
 SET obuild_platform_result=
 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
@@ -676 +550 @@
 cd "%obuild_pwd_bhep_0%"
 SET obuild_pwd_bhep_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_73
+IF NOT %obuild_platform_result% == yes GOTO end_if_platform_61
 SET obuild_cxx_linker_command=cxx
-:end_if_platform_73
-SET obuild_platform_result=
-FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
-cd "%obuild_bhep_path%\%obuild_dir_bin%"
-IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
-FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
-cd "%obuild_pwd_bhep_0%"
-SET obuild_pwd_bhep_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_74
+:end_if_platform_61
+SET obuild_platform_result=
+FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
+cd "%obuild_bhep_path%\%obuild_dir_bin%"
+IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
+FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
+cd "%obuild_pwd_bhep_0%"
+SET obuild_pwd_bhep_0=
+IF NOT %obuild_platform_result% == yes GOTO end_if_platform_62
 SET obuild_cxx_linker_command=link.exe
-:end_if_platform_74
+:end_if_platform_62
 SET obuild_platform_result=
 IF "%obuild_cxx_linker_command%" == ""  ECHO Variable obuild_cxx_linker_command not defined.  && GOTO obuild_return
@@ -698 +572 @@
 cd "%obuild_pwd_bhep_0%"
 SET obuild_pwd_bhep_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_75
+IF NOT %obuild_platform_result% == yes GOTO end_if_platform_63
 SET obuild_cxx_linker_debug=-g
-:end_if_platform_75
+:end_if_platform_63
 SET obuild_platform_result=
 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
@@ -708 +582 @@
 cd "%obuild_pwd_bhep_0%"
 SET obuild_pwd_bhep_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_76
+IF NOT %obuild_platform_result% == yes GOTO end_if_platform_64
 SET obuild_cxx_linker_debug=-g
-:end_if_platform_76
+:end_if_platform_64
 SET obuild_platform_result=
 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
@@ -718 +592 @@
 cd "%obuild_pwd_bhep_0%"
 SET obuild_pwd_bhep_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_77
+IF NOT %obuild_platform_result% == yes GOTO end_if_platform_65
 SET obuild_cxx_linker_debug=-g
-:end_if_platform_77
-SET obuild_platform_result=
-FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
-cd "%obuild_bhep_path%\%obuild_dir_bin%"
-IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
-FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
-cd "%obuild_pwd_bhep_0%"
-SET obuild_pwd_bhep_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_78
+:end_if_platform_65
+SET obuild_platform_result=
+FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
+cd "%obuild_bhep_path%\%obuild_dir_bin%"
+IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
+FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
+cd "%obuild_pwd_bhep_0%"
+SET obuild_pwd_bhep_0=
+IF NOT %obuild_platform_result% == yes GOTO end_if_platform_66
 SET obuild_cxx_linker_debug=/DEBUG
-:end_if_platform_78
-SET obuild_platform_result=
-
-FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
-cd "%obuild_bhep_path%\%obuild_dir_bin%"
-IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
-FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
-cd "%obuild_pwd_bhep_0%"
-SET obuild_pwd_bhep_0=
-IF NOT %obuild_platform_result% == yes GOTO end_if_platform_79
+:end_if_platform_66
+SET obuild_platform_result=
+
+FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
+cd "%obuild_bhep_path%\%obuild_dir_bin%"
+IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
+FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
+cd "%obuild_pwd_bhep_0%"
+SET obuild_pwd_bhep_0=
+IF NOT %obuild_platform_result% == yes GOTO end_if_platform_67
 SET obuild_cxx_linker_options=/nologo
-:end_if_platform_79
-SET obuild_platform_result=
-
-IF NOT %obuild_debug% == yes GOTO else_if_db_build_lib_bhep_sh_80
+:end_if_platform_67
+SET obuild_platform_result=
+
+IF NOT %obuild_debug% == yes GOTO else_if_db_build_lib_bhep_sh_68
   SET obuild_cxx_linker_debug_local=%obuild_cxx_linker_debug%
-  GOTO end_if_db_build_lib_bhep_sh_80
-:else_if_db_build_lib_bhep_sh_80
+  GOTO end_if_db_build_lib_bhep_sh_68
+:else_if_db_build_lib_bhep_sh_68
   SET obuild_cxx_linker_debug_local=
-:end_if_db_build_lib_bhep_sh_80
-
-IF NOT %obuild_optimize% == yes GOTO else_if_opt_build_lib_bhep_sh_81
+:end_if_db_build_lib_bhep_sh_68
+
+IF NOT %obuild_optimize% == yes GOTO else_if_opt_build_lib_bhep_sh_69
   SET obuild_cxx_linker_optimize_local=%obuild_cxx_linker_optimize%
-  GOTO end_if_opt_build_lib_bhep_sh_81
-:else_if_opt_build_lib_bhep_sh_81
+  GOTO end_if_opt_build_lib_bhep_sh_69
+:else_if_opt_build_lib_bhep_sh_69
   SET obuild_cxx_linker_optimize_local=
-:end_if_opt_build_lib_bhep_sh_81
+:end_if_opt_build_lib_bhep_sh_69
 
 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d

build/bhep/trunk/obuild/sh/build_lib_bhep

@@ -257 +257 @@
   obuild_cxx_optimize_local=
 fi
-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
-obuild_c_command="cc"
-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} 'Linux'`
-if [ ${obuild_platform_result} = yes ] ; then
-obuild_c_command="cc"
-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} 'OSF1'`
-if [ ${obuild_platform_result} = yes ] ; then
-obuild_c_command="cc"
-fi
-unset obuild_platform_result
+
 if [ "${obuild_platform_exe}" = "" ] ; then
   echo "Variable obuild_platform_exe not defined."
@@ -290 +264 @@
 obuild_platform_result=`"${obuild_platform_exe}" ${obuild_platform} 'Windows_NT'`
 if [ ${obuild_platform_result} = yes ] ; then
-obuild_c_command="cl.exe"
-fi
-unset obuild_platform_result
-if [ "${obuild_c_command}" = "" ] ; then
-  echo "Variable obuild_c_command not defined."
-  exit
-fi
-
-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
-obuild_c_optimize="-O"
-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} 'Linux'`
-if [ ${obuild_platform_result} = yes ] ; then
-obuild_c_optimize="-O"
-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} 'OSF1'`
-if [ ${obuild_platform_result} = yes ] ; then
-obuild_c_optimize="-O"
-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} 'Windows_NT'`
-if [ ${obuild_platform_result} = yes ] ; then
-obuild_c_optimize="/O2"
-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
-obuild_c_debug="-g"
-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} 'Linux'`
-if [ ${obuild_platform_result} = yes ] ; then
-obuild_c_debug="-g"
-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} 'OSF1'`
-if [ ${obuild_platform_result} = yes ] ; then
-obuild_c_debug="-g"
-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} 'Windows_NT'`
-if [ ${obuild_platform_result} = yes ] ; then
-obuild_c_debug="/ZI /Od"
-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} 'Linux'`
-if [ ${obuild_platform_result} = yes ] ; then
-obuild_c_options="-fPIC"
-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} 'OSF1'`
-if [ ${obuild_platform_result} = yes ] ; then
-obuild_c_options="-std"
-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} 'Windows_NT'`
-if [ ${obuild_platform_result} = yes ] ; then
-obuild_c_options="/nologo /DWIN32 /MD /W3"
-fi
-unset obuild_platform_result
-
-if [ ${obuild_debug} = yes ] ; then
-  obuild_c_debug_local=${obuild_c_debug}
-else
-  obuild_c_debug_local=
-fi
-
-if [ ${obuild_optimize} = yes ] ; then
-  obuild_c_optimize_local=${obuild_c_optimize}
-else
-  obuild_c_optimize_local=
-fi
-
+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}\""
+obuild_cxx_includes="${obuild_cxx_includes} -I\"${obuild_bhep_path}/bhep\""
+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${CLHEP_home}/include"
+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_dir_bin_o_cleanup} = yes ] ; then
@@ -596 +504 @@
 
 cd "${obuild_bhep_path}/${obuild_dir_bin}"
- eval ${obuild_c_command} -c ${obuild_c_debug_local} ${obuild_c_optimize_local} ${obuild_c_options} ${obuild_c_macros} ${obuild_c_includes} -o ./lib_bhep/EventManager.o \"../source/tools/EventManager.c\"
+ eval ${obuild_cxx_command} -c ${obuild_cxx_debug_local} ${obuild_cxx_optimize_local} ${obuild_cxx_options} ${obuild_cxx_macros} ${obuild_cxx_includes} -o ./lib_bhep/EventManager.o \"../source/tools/EventManager.cpp\"
 obuild_status=$?;if [ ${obuild_status} != 0 ] ; then exit ${obuild_status};fi
 cd "${obuild_bhep_path}/obuild"

build/bhep/trunk/obuild/this.obuild

@@ -9 +9 @@
     <reference package="foreign" version="v1r*" file="CLHEP.obuild"/>
 
-<!--
-    <reference package="bhep" version="v1r1" file="obuild/snova.obuild"/>
-
-    <reference package="G4Lab" version="v8r*" file="obuild/export.obuild"/>
-  
     <use name="HDF5" version="v1r*">
       <c_include>include</c_include>
       <lib>osc_HDF5</lib>
     </use>
--->
+  
+    <use name="zlib" version="v1r*">
+      <c_include>include</c_include>
+      <lib>osc_z</lib>
+    </use>
 
     <!-- this : -->
@@ -57 +56 @@
       <file>../source/histos/axis.cpp</file>
       <file>../source/histos/histogram.cpp</file>
-      <file>../source/tools/EventManager.c</file>
+      <file>../source/tools/EventManager.cpp</file>
 
       <cxx_include>${obuild_bhep_path}</cxx_include>
+      <cxx_include>${obuild_bhep_path}/bhep</cxx_include>
 
       <!-- not this : -->
+      <cxx_include copy="cxx_include" from="CLHEP"/>
 
-<!--
-      <cxx_include copy="cxx_include" from="Lib"/>
-      <cxx_include copy="cxx_include" from="Slash"/>
-      <cxx_include copy="cxx_include" from="AIDA"/>
-      <cxx_include copy="cxx_include" from="OnX"/>
-      <cxx_include copy="cxx_include" from="G4Lab"/>
-      <cxx_include copy="cxx_include" from="BatchLab"/>
-
-      <cxx_include copy="cxx_include" from="HEPVis"/>
-      <cxx_include copy="cxx_include" from="CoinGL"/>
-
-      <lib copy="lib_LibXML" from="Lib"/>
-      <lib copy="lib" from="expat"/>
-      <lib copy="lib_LibZip" from="Lib"/>
-      <lib copy="lib" from="zlib"/>
-      <lib copy="lib_LibUtils" from="Lib"/>
-
-      <lib copy="lib_HEPVisGeometry" from="HEPVis"/>
-      <lib copy="lib_HEPVisUtils" from="HEPVis"/>
-      <lib copy="lib" from="jpeg"/>
-      <lib copy="lib" from="dvi2bitmap"/>
-      <lib copy="lib" from="freetype2"/>
-      <lib copy="lib" from="CoinGL"/>
--->
+      <cxx_macro platform="Windows_NT" name="_HDF5USEDLL_"/>
+      <cxx_include copy="c_include" from="HDF5"/>
+      <cxx_include copy="c_include" from="zlib"/>
     </library>