From: ibs Date: Thu, 28 Feb 2013 11:39:53 +0000 (+0400) Subject: __CASROOT__ in amk case is current dir ($pwd - lin; %~dp0 - win) X-Git-Tag: V6_7_1~58 X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=4ea5f3cfdf463ddc6bcb85a05e9a2f97bf5fe58c;p=occt-wok.git __CASROOT__ in amk case is current dir ($pwd - lin; %~dp0 - win) --- diff --git a/src/WOKsite/wok_tclshrc.tcl b/src/WOKsite/wok_tclshrc.tcl index d856e07..0e9b0f1 100644 --- a/src/WOKsite/wok_tclshrc.tcl +++ b/src/WOKsite/wok_tclshrc.tcl @@ -242,8 +242,10 @@ proc wgenprojbat {thePath theIDE} { wokcd $aWokCD set aPlatformExt sh + set aPlatformCurrentDir "\$PWD" if { "$::tcl_platform(platform)" == "windows" } { set aPlatformExt bat + set aPlatformCurrentDir "\%\~dp0" } set aBox [file normalize "$thePath/.."] @@ -265,7 +267,7 @@ proc wgenprojbat {thePath theIDE} { set anOsIncPath [relativePath "$aBox" "$anOsRootPath"] if { "$theIDE" == "amk" } { - regsub -all -- {__CASROOT__} $anEnvTmpl "\$PWD" anEnvTmpl + regsub -all -- {__CASROOT__} $anEnvTmpl "$aPlatformCurrentDir" anEnvTmpl regsub -all -- {__CASBIN__} $anEnvTmpl "" anEnvTmpl regsub -all -- {__BIN_PATH__} $anEnvTmpl "BIN_PATH=\${CASBIN}bin\${CASDEB}" anEnvTmpl regsub -all -- {__LIBS_PATH__} $anEnvTmpl "LIBS_PATH=\${CASBIN}lib\${CASDEB}" anEnvTmpl