X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=blobdiff_plain;f=adm%2Ftemplates%2Fenv.bat;h=38dd5aee92bf0c8995138375d7e4e7fcaf99eb7d;hp=68024b0d56b160f6d17c85e79bf1a2ae949f7519;hb=e31a8e52bbb2953fbafb83c12825404fea187777;hpb=ea991a6ef3294189d46fb5f77c3a108c239f4258 diff --git a/adm/templates/env.bat b/adm/templates/env.bat index 68024b0d56..38dd5aee92 100644 --- a/adm/templates/env.bat +++ b/adm/templates/env.bat @@ -9,11 +9,9 @@ rem vc8 win32 Release set "SCRIPTROOT=%~dp0" set "SCRIPTROOT=%SCRIPTROOT:~0,-1%" -set "CASROOT=__CASROOT__" -if not ["%CASROOT%"] == [""] if exist "%SCRIPTROOT%\%CASROOT%" set "CASROOT=%SCRIPTROOT%\%CASROOT%" -if ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%" rem ----- Reset values to defaults ----- +set "CASROOT=__CASROOT__" set "CASDEB=" set "VCVER=vc8" set "ARCH=32" @@ -31,10 +29,16 @@ set "CSF_OPT_BIN32=" set "CSF_OPT_BIN64=" rem ----- Load local settings ----- +if not ["%CASROOT%"] == [""] if exist "%CASROOT%\custom.bat" ( + call "%CASROOT%\custom.bat" %1 %2 %3 %4 %5 +) if exist "%~dp0custom.bat" ( call "%~dp0custom.bat" %1 %2 %3 %4 %5 ) +if not ["%CASROOT%"] == [""] if exist "%SCRIPTROOT%\%CASROOT%" set "CASROOT=%SCRIPTROOT%\%CASROOT%" +if ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%" + rem ----- Read script arguments (override local settings) ----- if not ["%1"] == [""] set "VCVER=%1" if not ["%2"] == [""] set "ARCH=%2"