Changeset 274 for build


Ignore:
Timestamp:
Mar 1, 2007, 11:06:54 AM (17 years ago)
Author:
barrand
Message:
 
Location:
build/bhep/trunk/obuild
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • build/bhep/trunk/obuild/DOS/build.bat

    r126 r274  
    9090
    9191  IF "%OBUILD_DIR_BIN%" == "" (
    92     SET obuild_dir_bin=%obuild_platform%_obuild
     92    SET obuild_dir_bin=bin_obuild
    9393  ) ELSE (
    9494    SET obuild_dir_bin=%OBUILD_DIR_BIN%
  • build/bhep/trunk/obuild/DOS/build_lib_bhep.bat

    r264 r274  
    7474
    7575IF "%OBUILD_DIR_BIN%" == "" (
    76   SET obuild_dir_bin=%obuild_platform%_obuild
     76  SET obuild_dir_bin=bin_obuild
    7777) ELSE (
    7878  SET obuild_dir_bin=%OBUILD_DIR_BIN%
     
    9595cd "%obuild_bhep_path%\%obuild_dir_bin%"
    9696IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    97 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% UNIX`) DO SET obuild_platform_result=%%j
     97FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
     98cd "%obuild_pwd_bhep_0%"
     99SET obuild_pwd_bhep_0=
     100IF NOT %obuild_platform_result% == yes GOTO end_if_platform_0
     101SET obuild_cxx_command=cl.exe
     102:end_if_platform_0
     103SET obuild_platform_result=
     104IF "%obuild_cxx_command%" == ""  ECHO Variable obuild_cxx_command not defined.  && GOTO obuild_return
     105
     106FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
     107cd "%obuild_bhep_path%\%obuild_dir_bin%"
     108IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
     109FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
    98110cd "%obuild_pwd_bhep_0%"
    99111SET obuild_pwd_bhep_0=
    100112IF NOT %obuild_platform_result% == yes GOTO end_if_platform_1
    101 SET CLHEP_home=/usr/local/CLHEP/2.0.3.1
     113SET obuild_cxx_optimize=/O2
    102114:end_if_platform_1
    103115SET obuild_platform_result=
    104 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    105 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    106 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    107 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% UNIX`) DO SET obuild_platform_result=%%j
     116
     117FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
     118cd "%obuild_bhep_path%\%obuild_dir_bin%"
     119IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
     120FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
     121cd "%obuild_pwd_bhep_0%"
     122SET obuild_pwd_bhep_0=
     123IF NOT %obuild_platform_result% == yes GOTO end_if_platform_2
     124SET obuild_cxx_debug=/ZI /Od
     125:end_if_platform_2
     126SET obuild_platform_result=
     127
     128FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
     129cd "%obuild_bhep_path%\%obuild_dir_bin%"
     130IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
     131FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
    108132cd "%obuild_pwd_bhep_0%"
    109133SET obuild_pwd_bhep_0=
    110134IF NOT %obuild_platform_result% == yes GOTO end_if_platform_3
    111 SET HDF5_home=/usr/local/HDF5/1.6.5
     135SET obuild_cxx_options=/nologo /DWIN32 /MD /GX /GR /W3
    112136:end_if_platform_3
    113137SET obuild_platform_result=
    114 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    115 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    116 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    117 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% UNIX`) DO SET obuild_platform_result=%%j
    118 cd "%obuild_pwd_bhep_0%"
    119 SET obuild_pwd_bhep_0=
    120 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_5
    121 SET zlib_home=/usr
    122 :end_if_platform_5
    123 SET obuild_platform_result=
    124 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    125 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    126 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    127 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Darwin`) DO SET obuild_platform_result=%%j
    128 cd "%obuild_pwd_bhep_0%"
    129 SET obuild_pwd_bhep_0=
    130 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_6
    131 SET obuild_cxx_command=c++
    132 :end_if_platform_6
    133 SET obuild_platform_result=
    134 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    135 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    136 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    137 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Linux`) DO SET obuild_platform_result=%%j
    138 cd "%obuild_pwd_bhep_0%"
    139 SET obuild_pwd_bhep_0=
    140 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_7
    141 SET obuild_cxx_command=c++
    142 :end_if_platform_7
    143 SET obuild_platform_result=
    144 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    145 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    146 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    147 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% OSF1`) DO SET obuild_platform_result=%%j
    148 cd "%obuild_pwd_bhep_0%"
    149 SET obuild_pwd_bhep_0=
    150 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_8
    151 SET obuild_cxx_command=cxx
    152 :end_if_platform_8
    153 SET obuild_platform_result=
    154 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    155 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    156 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    157 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
    158 cd "%obuild_pwd_bhep_0%"
    159 SET obuild_pwd_bhep_0=
    160 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_9
    161 SET obuild_cxx_command=cl.exe
    162 :end_if_platform_9
    163 SET obuild_platform_result=
    164 IF "%obuild_cxx_command%" == ""  ECHO Variable obuild_cxx_command not defined.  && GOTO obuild_return
    165 
    166 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    167 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    168 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    169 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Darwin`) DO SET obuild_platform_result=%%j
    170 cd "%obuild_pwd_bhep_0%"
    171 SET obuild_pwd_bhep_0=
    172 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_10
    173 SET obuild_cxx_optimize=-O
    174 :end_if_platform_10
    175 SET obuild_platform_result=
    176 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    177 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    178 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    179 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Linux`) DO SET obuild_platform_result=%%j
    180 cd "%obuild_pwd_bhep_0%"
    181 SET obuild_pwd_bhep_0=
    182 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_11
    183 SET obuild_cxx_optimize=-O
    184 :end_if_platform_11
    185 SET obuild_platform_result=
    186 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    187 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    188 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    189 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% OSF1`) DO SET obuild_platform_result=%%j
    190 cd "%obuild_pwd_bhep_0%"
    191 SET obuild_pwd_bhep_0=
    192 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_12
    193 SET obuild_cxx_optimize=-O
    194 :end_if_platform_12
    195 SET obuild_platform_result=
    196 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    197 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    198 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    199 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
    200 cd "%obuild_pwd_bhep_0%"
    201 SET obuild_pwd_bhep_0=
    202 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_13
    203 SET obuild_cxx_optimize=/O2
    204 :end_if_platform_13
    205 SET obuild_platform_result=
    206 
    207 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    208 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    209 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    210 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Darwin`) DO SET obuild_platform_result=%%j
    211 cd "%obuild_pwd_bhep_0%"
    212 SET obuild_pwd_bhep_0=
    213 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_14
    214 SET obuild_cxx_debug=-g
    215 :end_if_platform_14
    216 SET obuild_platform_result=
    217 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    218 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    219 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    220 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Linux`) DO SET obuild_platform_result=%%j
    221 cd "%obuild_pwd_bhep_0%"
    222 SET obuild_pwd_bhep_0=
    223 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_15
    224 SET obuild_cxx_debug=-g
    225 :end_if_platform_15
    226 SET obuild_platform_result=
    227 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    228 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    229 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    230 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% OSF1`) DO SET obuild_platform_result=%%j
    231 cd "%obuild_pwd_bhep_0%"
    232 SET obuild_pwd_bhep_0=
    233 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_16
    234 SET obuild_cxx_debug=-g
    235 :end_if_platform_16
    236 SET obuild_platform_result=
    237 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    238 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    239 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    240 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
    241 cd "%obuild_pwd_bhep_0%"
    242 SET obuild_pwd_bhep_0=
    243 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_17
    244 SET obuild_cxx_debug=/ZI /Od
    245 :end_if_platform_17
    246 SET obuild_platform_result=
    247 
    248 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    249 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    250 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    251 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Linux`) DO SET obuild_platform_result=%%j
    252 cd "%obuild_pwd_bhep_0%"
    253 SET obuild_pwd_bhep_0=
    254 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_18
    255 SET obuild_cxx_options=-fPIC
    256 :end_if_platform_18
    257 SET obuild_platform_result=
    258 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    259 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    260 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    261 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
    262 cd "%obuild_pwd_bhep_0%"
    263 SET obuild_pwd_bhep_0=
    264 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_19
    265 SET obuild_cxx_options=/nologo /DWIN32 /MD /GX /GR /W3
    266 :end_if_platform_19
    267 SET obuild_platform_result=
    268 
    269 IF NOT %obuild_debug% == yes GOTO else_if_db_build_lib_bhep_sh_20
     138
     139IF NOT %obuild_debug% == yes GOTO else_if_db_build_lib_bhep_sh_4
    270140  SET obuild_cxx_debug_local=%obuild_cxx_debug%
    271   GOTO end_if_db_build_lib_bhep_sh_20
    272 :else_if_db_build_lib_bhep_sh_20
     141  GOTO end_if_db_build_lib_bhep_sh_4
     142:else_if_db_build_lib_bhep_sh_4
    273143  SET obuild_cxx_debug_local=
    274 :end_if_db_build_lib_bhep_sh_20
    275 
    276 IF NOT %obuild_optimize% == yes GOTO else_if_opt_build_lib_bhep_sh_21
     144:end_if_db_build_lib_bhep_sh_4
     145
     146IF NOT %obuild_optimize% == yes GOTO else_if_opt_build_lib_bhep_sh_5
    277147  SET obuild_cxx_optimize_local=%obuild_cxx_optimize%
    278   GOTO end_if_opt_build_lib_bhep_sh_21
    279 :else_if_opt_build_lib_bhep_sh_21
     148  GOTO end_if_opt_build_lib_bhep_sh_5
     149:else_if_opt_build_lib_bhep_sh_5
    280150  SET obuild_cxx_optimize_local=
    281 :end_if_opt_build_lib_bhep_sh_21
     151:end_if_opt_build_lib_bhep_sh_5
    282152
    283153
     
    285155SET obuild_cxx_includes=/I"%obuild_bhep_path%"
    286156SET obuild_cxx_includes=%obuild_cxx_includes% /I"%obuild_bhep_path%\bhep"
    287 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    288 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    289 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    290 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% UNIX`) DO SET obuild_platform_result=%%j
    291 cd "%obuild_pwd_bhep_0%"
    292 SET obuild_pwd_bhep_0=
    293 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_24
    294 SET obuild_cxx_includes=%obuild_cxx_includes% -I${CLHEP_home}/include
    295 :end_if_platform_24
    296 SET obuild_platform_result=
    297 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    298 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    299 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    300 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% UNIX`) DO SET obuild_platform_result=%%j
    301 cd "%obuild_pwd_bhep_0%"
    302 SET obuild_pwd_bhep_0=
    303 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_25
    304 SET obuild_cxx_includes=%obuild_cxx_includes% -I${HDF5_home}/include
    305 :end_if_platform_25
    306 SET obuild_platform_result=
    307157
    308158IF EXIST "%obuild_bhep_path%\%obuild_dir_bin%\lib_bhep" RMDIR /S /Q "%obuild_bhep_path%\%obuild_dir_bin%\lib_bhep"
     
    310160
    311161REM # pre_build scripts :
    312 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    313 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    314 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    315 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% UNIX`) DO SET obuild_platform_result=%%j
    316 cd "%obuild_pwd_bhep_0%"
    317 SET obuild_pwd_bhep_0=
    318 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_26
    319 chmod a+x ./pre_build;./pre_build
    320 :end_if_platform_26
    321 SET obuild_platform_result=
    322162
    323163@IF %obuild_verbose% == yes @ECHO ON
     
    537377cd "%obuild_bhep_path%\%obuild_dir_bin%"
    538378IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    539 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Darwin`) DO SET obuild_platform_result=%%j
    540 cd "%obuild_pwd_bhep_0%"
    541 SET obuild_pwd_bhep_0=
    542 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_62
    543 SET obuild_cxx_linker_command=c++
    544 :end_if_platform_62
    545 SET obuild_platform_result=
    546 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    547 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    548 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    549 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Linux`) DO SET obuild_platform_result=%%j
    550 cd "%obuild_pwd_bhep_0%"
    551 SET obuild_pwd_bhep_0=
    552 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_63
    553 SET obuild_cxx_linker_command=c++
    554 :end_if_platform_63
    555 SET obuild_platform_result=
    556 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    557 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    558 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    559 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% OSF1`) DO SET obuild_platform_result=%%j
    560 cd "%obuild_pwd_bhep_0%"
    561 SET obuild_pwd_bhep_0=
    562 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_64
    563 SET obuild_cxx_linker_command=cxx
    564 :end_if_platform_64
    565 SET obuild_platform_result=
    566 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    567 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    568 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    569 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
    570 cd "%obuild_pwd_bhep_0%"
    571 SET obuild_pwd_bhep_0=
    572 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_65
     379FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
     380cd "%obuild_pwd_bhep_0%"
     381SET obuild_pwd_bhep_0=
     382IF NOT %obuild_platform_result% == yes GOTO end_if_platform_43
    573383SET obuild_cxx_linker_command=link.exe
    574 :end_if_platform_65
     384:end_if_platform_43
    575385SET obuild_platform_result=
    576386IF "%obuild_cxx_linker_command%" == ""  ECHO Variable obuild_cxx_linker_command not defined.  && GOTO obuild_return
     
    579389cd "%obuild_bhep_path%\%obuild_dir_bin%"
    580390IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    581 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Darwin`) DO SET obuild_platform_result=%%j
    582 cd "%obuild_pwd_bhep_0%"
    583 SET obuild_pwd_bhep_0=
    584 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_66
    585 SET obuild_cxx_linker_debug=-g
    586 :end_if_platform_66
    587 SET obuild_platform_result=
    588 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    589 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    590 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    591 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Linux`) DO SET obuild_platform_result=%%j
    592 cd "%obuild_pwd_bhep_0%"
    593 SET obuild_pwd_bhep_0=
    594 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_67
    595 SET obuild_cxx_linker_debug=-g
    596 :end_if_platform_67
    597 SET obuild_platform_result=
    598 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    599 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    600 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    601 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% OSF1`) DO SET obuild_platform_result=%%j
    602 cd "%obuild_pwd_bhep_0%"
    603 SET obuild_pwd_bhep_0=
    604 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_68
    605 SET obuild_cxx_linker_debug=-g
    606 :end_if_platform_68
    607 SET obuild_platform_result=
    608 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    609 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    610 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    611 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
    612 cd "%obuild_pwd_bhep_0%"
    613 SET obuild_pwd_bhep_0=
    614 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_69
     391FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
     392cd "%obuild_pwd_bhep_0%"
     393SET obuild_pwd_bhep_0=
     394IF NOT %obuild_platform_result% == yes GOTO end_if_platform_44
    615395SET obuild_cxx_linker_debug=/DEBUG
    616 :end_if_platform_69
    617 SET obuild_platform_result=
    618 
    619 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    620 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    621 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    622 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
    623 cd "%obuild_pwd_bhep_0%"
    624 SET obuild_pwd_bhep_0=
    625 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_70
     396:end_if_platform_44
     397SET obuild_platform_result=
     398
     399FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
     400cd "%obuild_bhep_path%\%obuild_dir_bin%"
     401IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
     402FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% Windows_NT`) DO SET obuild_platform_result=%%j
     403cd "%obuild_pwd_bhep_0%"
     404SET obuild_pwd_bhep_0=
     405IF NOT %obuild_platform_result% == yes GOTO end_if_platform_45
    626406SET obuild_cxx_linker_options=/nologo
    627 :end_if_platform_70
    628 SET obuild_platform_result=
    629 
    630 IF NOT %obuild_debug% == yes GOTO else_if_db_build_lib_bhep_sh_71
     407:end_if_platform_45
     408SET obuild_platform_result=
     409
     410IF NOT %obuild_debug% == yes GOTO else_if_db_build_lib_bhep_sh_46
    631411  SET obuild_cxx_linker_debug_local=%obuild_cxx_linker_debug%
    632   GOTO end_if_db_build_lib_bhep_sh_71
    633 :else_if_db_build_lib_bhep_sh_71
     412  GOTO end_if_db_build_lib_bhep_sh_46
     413:else_if_db_build_lib_bhep_sh_46
    634414  SET obuild_cxx_linker_debug_local=
    635 :end_if_db_build_lib_bhep_sh_71
    636 
    637 IF NOT %obuild_optimize% == yes GOTO else_if_opt_build_lib_bhep_sh_72
     415:end_if_db_build_lib_bhep_sh_46
     416
     417IF NOT %obuild_optimize% == yes GOTO else_if_opt_build_lib_bhep_sh_47
    638418  SET obuild_cxx_linker_optimize_local=%obuild_cxx_linker_optimize%
    639   GOTO end_if_opt_build_lib_bhep_sh_72
    640 :else_if_opt_build_lib_bhep_sh_72
     419  GOTO end_if_opt_build_lib_bhep_sh_47
     420:else_if_opt_build_lib_bhep_sh_47
    641421  SET obuild_cxx_linker_optimize_local=
    642 :end_if_opt_build_lib_bhep_sh_72
     422:end_if_opt_build_lib_bhep_sh_47
    643423
    644424FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
  • build/bhep/trunk/obuild/setup.bat

    r249 r274  
    3232
    3333IF "%OBUILD_DIR_BIN%" == "" (
    34   SET obuild_dir_bin=%obuild_platform%_obuild
     34  SET obuild_dir_bin=bin_obuild
    3535) ELSE (
    3636  SET obuild_dir_bin=%OBUILD_DIR_BIN%
     
    4242)
    4343
    44 IF NOT EXIST "%obuild_bhep_path%\%obuild_dir_bin%" MKDIR "%obuild_bhep_path%\%obuild_dir_bin%"
    45 IF NOT EXIST "%obuild_bhep_path%\%obuild_dir_bin%\obuild_platform.exe" (
    46   cl.exe /nologo /DWIN32 /MD /O2 /W3  /GX /GR /Fe"%obuild_bhep_path%\%obuild_dir_bin%\obuild_platform.exe" "%obuild_bhep_path%\obuild\cpp\obuild_platform.cpp" 1> NUL
    47   IF EXIST obuild_platform.obj DEL obuild_platform.obj
    48 )
    49 
    50 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    51 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    52 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    53 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% UNIX`) DO SET obuild_platform_result=%%j
    54 cd "%obuild_pwd_bhep_0%"
    55 SET obuild_pwd_bhep_0=
    56 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_1
    57 SET CLHEP_home=/usr/local/CLHEP/2.0.3.1
    58 :end_if_platform_1
    59 SET obuild_platform_result=
    60 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    61 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    62 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    63 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% UNIX`) DO SET obuild_platform_result=%%j
    64 cd "%obuild_pwd_bhep_0%"
    65 SET obuild_pwd_bhep_0=
    66 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_3
    67 SET HDF5_home=/usr/local/HDF5/1.6.5
    68 :end_if_platform_3
    69 SET obuild_platform_result=
    70 FOR /F "usebackq delims=;" %%d IN (`cd`) DO SET obuild_pwd_bhep_0=%%d
    71 cd "%obuild_bhep_path%\%obuild_dir_bin%"
    72 IF NOT EXIST .\obuild_platform.exe  ECHO Program obuild_platform.exe not found.  && GOTO obuild_return
    73 FOR /F "usebackq" %%j IN (`.\obuild_platform.exe  %obuild_platform% UNIX`) DO SET obuild_platform_result=%%j
    74 cd "%obuild_pwd_bhep_0%"
    75 SET obuild_pwd_bhep_0=
    76 IF NOT %obuild_platform_result% == yes GOTO end_if_platform_5
    77 SET zlib_home=/usr
    78 :end_if_platform_5
    79 SET obuild_platform_result=
    8044REM # Set environment variables of this package :
    8145
    82 IF DEFINED PATH GOTO else_if_path_bhep_6
     46IF DEFINED PATH GOTO else_if_path_bhep_0
    8347  SET PATH=%obuild_bhep_path%\%obuild_dir_bin%
    84   GOTO end_if_path_bhep_6
    85 :else_if_path_bhep_6
     48  GOTO end_if_path_bhep_0
     49:else_if_path_bhep_0
    8650  SET PATH=%PATH%;%obuild_bhep_path%\%obuild_dir_bin%
    87 :end_if_path_bhep_6
     51:end_if_path_bhep_0
    8852
    8953:obuild_return
  • build/bhep/trunk/obuild/setup.csh

    r249 r274  
    8484if ( $?OBUILD_DIR_BIN ) then
    8585  if (  "${OBUILD_DIR_BIN}" == "" ) then
    86     set obuild_dir_bin=${obuild_platform}_obuild
     86    set obuild_dir_bin=bin_obuild
    8787  else
    8888    set obuild_dir_bin=${OBUILD_DIR_BIN}
    8989  endif
    9090else
    91   set obuild_dir_bin=${obuild_platform}_obuild
     91  set obuild_dir_bin=bin_obuild
    9292endif
    9393
  • build/bhep/trunk/obuild/setup.sh

    r249 r274  
    7878
    7979if [  "${OBUILD_DIR_BIN}" = "" ] ; then
    80   obuild_dir_bin=${obuild_platform}_obuild
     80  obuild_dir_bin=bin_obuild
    8181else
    8282  obuild_dir_bin=${OBUILD_DIR_BIN}
  • build/bhep/trunk/obuild/sh/broadcast_install

    r126 r274  
    4646
    4747if [  "${OBUILD_DIR_BIN}" = "" ] ; then
    48   obuild_dir_bin=${obuild_platform}_obuild
     48  obuild_dir_bin=bin_obuild
    4949else
    5050  obuild_dir_bin=${OBUILD_DIR_BIN}
  • build/bhep/trunk/obuild/sh/build

    r126 r274  
    100100  fi
    101101  if [  "${OBUILD_DIR_BIN}" = "" ] ; then
    102     obuild_dir_bin=${obuild_platform}_obuild
     102    obuild_dir_bin=bin_obuild
    103103  else
    104104    obuild_dir_bin=${OBUILD_DIR_BIN}
  • build/bhep/trunk/obuild/sh/build_lib_bhep

    r264 r274  
    6464
    6565if [  "${OBUILD_DIR_BIN}" = "" ] ; then
    66   obuild_dir_bin=${obuild_platform}_obuild
     66  obuild_dir_bin=bin_obuild
    6767else
    6868  obuild_dir_bin=${OBUILD_DIR_BIN}
     
    157157fi
    158158unset obuild_platform_result
    159 if [ "${obuild_platform_exe}" = "" ] ; then
    160   echo "Variable obuild_platform_exe not defined."
    161   exit
    162 fi
    163 obuild_platform_result=`"${obuild_platform_exe}" ${obuild_platform} 'Windows_NT'`
    164 if [ ${obuild_platform_result} = yes ] ; then
    165 obuild_cxx_command="cl.exe"
    166 fi
    167 unset obuild_platform_result
    168159if [ "${obuild_cxx_command}" = "" ] ; then
    169160  echo "Variable obuild_cxx_command not defined."
     
    198189fi
    199190unset obuild_platform_result
    200 if [ "${obuild_platform_exe}" = "" ] ; then
    201   echo "Variable obuild_platform_exe not defined."
    202   exit
    203 fi
    204 obuild_platform_result=`"${obuild_platform_exe}" ${obuild_platform} 'Windows_NT'`
    205 if [ ${obuild_platform_result} = yes ] ; then
    206 obuild_cxx_optimize="/O2"
    207 fi
    208 unset obuild_platform_result
    209191
    210192if [ "${obuild_platform_exe}" = "" ] ; then
     
    235217fi
    236218unset obuild_platform_result
    237 if [ "${obuild_platform_exe}" = "" ] ; then
    238   echo "Variable obuild_platform_exe not defined."
    239   exit
    240 fi
    241 obuild_platform_result=`"${obuild_platform_exe}" ${obuild_platform} 'Windows_NT'`
    242 if [ ${obuild_platform_result} = yes ] ; then
    243 obuild_cxx_debug="/ZI /Od"
    244 fi
    245 unset obuild_platform_result
    246219
    247220if [ "${obuild_platform_exe}" = "" ] ; then
     
    252225if [ ${obuild_platform_result} = yes ] ; then
    253226obuild_cxx_options="-fPIC"
    254 fi
    255 unset obuild_platform_result
    256 if [ "${obuild_platform_exe}" = "" ] ; then
    257   echo "Variable obuild_platform_exe not defined."
    258   exit
    259 fi
    260 obuild_platform_result=`"${obuild_platform_exe}" ${obuild_platform} 'Windows_NT'`
    261 if [ ${obuild_platform_result} = yes ] ; then
    262 obuild_cxx_options="/nologo /DWIN32 /MD /GX /GR /W3"
    263227fi
    264228unset obuild_platform_result
  • build/bhep/trunk/obuild/sh/check_foreigns

    r249 r274  
    2828
    2929if [  "${OBUILD_DIR_BIN}" = "" ] ; then
    30   obuild_dir_bin=${obuild_platform}_obuild
     30  obuild_dir_bin=bin_obuild
    3131else
    3232  obuild_dir_bin=${OBUILD_DIR_BIN}
Note: See TracChangeset for help on using the changeset viewer.