diff options
Diffstat (limited to 'solenv/config/sdev300.ini')
-rw-r--r-- | solenv/config/sdev300.ini | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 7fffd7eaca26..735a52d589dc 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -202,8 +202,8 @@ finish } common_1 { - BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy - BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple + BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy + BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple DPKG %BUILD_TOOLS%$/dpkg PATH .$:$cp(%SOLARENV%$/bin)$:$cp(%COMMON_BUILD_TOOLS%)$:$cp(%BUILD_TOOLS%$/dmake412)$:$cp(%BUILD_TOOLS%)$:$cp(%COMMON_ENV_TOOLS%)$:$cp(%ENV_TOOLS%)$:$cp(%COMPATH%$/bin)$:$cp(%JDKPATH%)$:$cp(%PATHEXTRA%)$:%PATH% PATH_SEPERATOR $; @@ -2363,7 +2363,7 @@ wntgcci1 COPY_PACKED TRUE DEVROOT %SOL_TMP%$/r FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK - NSIS_PATH %SOL_TMP%$/NSIS_242_unicode + NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode PCLEAN_PATH %SOLARROOT%$/etw PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl PSDK %SOL_TMP%$/r$/MinGW$/w32api @@ -2379,7 +2379,7 @@ wntgcci1 COMPATH %SOL_TMP%$/r$/MinGW COPYALL FALSE FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK - NSIS_PATH %SOL_TMP%$/NSIS_242_unicode + NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode PCLEAN_PATH %SOL_TMP%$/r$/etw PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl PSDK %SOL_TMP%$/r$/MinGW$/w32api @@ -2673,7 +2673,6 @@ wntmsci11 *s cdd %SOLARVERSION% *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl BIG_SVX - BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl DMAKEROOT %SOLARENV%$/inc$/startup @@ -2888,10 +2887,10 @@ wntmsci12 COPY_PACKED TRUE DEVROOT %SOL_TMP%$/r DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK - ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP% + ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP% FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5 F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0 - NSIS_PATH %SOL_TMP%$/NSIS_242_unicode + NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode PCLEAN_PATH %SOLARROOT%$/etw PERL %SOL_TMP%$/r$/%PERLDIR% PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1 @@ -2906,15 +2905,15 @@ wntmsci12 } cax { - BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% + BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR% COMPATH %SOL_TMP%$/r$/msvc9p COMPROOT %SOL_TMP%$/r$/msvc9p COPYALL FALSE DSDK %COMPATH%$/DirectXSDK - ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP% + ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP% FSDK %COMPATH%$/Sdk$/v3.5 F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0 - NSIS_PATH %SOL_TMP%$/NSIS_242_unicode + NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode PCLEAN_PATH %SOL_TMP%$/r$/etw PERL %SOL_TMP%$/r$/%PERLDIR% PSDK %COMPATH%$/PlatformSDK$/V6.1 @@ -2940,7 +2939,6 @@ wntmsci12 *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl *z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl BIG_SVX - BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl @@ -3225,17 +3223,17 @@ wntmsci13 } cap { - BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% + BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR% COMPATH %SOL_TMP%$/r$/msvc9p COMPROOT %SOL_TMP%$/r$/msvc9p COPYALL TRUE COPY_PACKED TRUE DEVROOT %SOL_TMP%$/r DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK - ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP% + ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP% FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5 F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0 - NSIS_PATH %SOL_TMP%$/NSIS_242_unicode + NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode PCLEAN_PATH %SOLARROOT%$/etw PERL %SOL_TMP%$/r$/%PERLDIR% PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1 @@ -3250,15 +3248,15 @@ wntmsci13 } cax { - BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% + BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR% COMPATH %SOL_TMP%$/r$/msvc9p COMPROOT %SOL_TMP%$/r$/msvc9p COPYALL FALSE DSDK %COMPATH%$/DirectXSDK - ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP% + ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP% FSDK %COMPATH%$/Sdk$/v3.5 F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0 - NSIS_PATH %SOL_TMP%$/NSIS_242_unicode + NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode PCLEAN_PATH %SOL_TMP%$/r$/etw PERL %SOL_TMP%$/r$/%PERLDIR% PSDK %COMPATH%$/PlatformSDK$/V6.1 @@ -3284,7 +3282,6 @@ wntmsci13 *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl *z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl BIG_SVX - BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl |