diff options
| -rw-r--r-- | solenv/config/sdev300.ini | 510 | ||||
| -rw-r--r-- | solenv/inc/_tg_zip.mk | 20 | ||||
| -rw-r--r-- | solenv/inc/antsettings.mk | 10 | ||||
| -rw-r--r-- | solenv/inc/target.mk | 5 | ||||
| -rw-r--r-- | solenv/inc/tg_config.mk | 16 | ||||
| -rw-r--r-- | solenv/inc/tg_zip.mk | 2 | ||||
| -rw-r--r-- | solenv/inc/unitools.mk | 4 | ||||
| -rw-r--r-- | solenv/inc/wnt.mk | 4 |
8 files changed, 102 insertions, 469 deletions
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index ab0754973dae..1398d02884e5 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -124,6 +124,7 @@ common HOMEPATH JAVAHOME JAVA_HOME + MKDIRHIER PROEXT PROFULLSWITCH SHIPDRIVE @@ -3113,7 +3114,6 @@ wntmsci11 JDK14PATH %SOLAR_JDK14PATH% JDK15PATH %SOLAR_JDK15PATH% LIB .$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/vc$/lib$:%PSDK%$/lib$:%FSDK%$/lib$:%DSDK%$/lib$/x86$:%SOLAR_STLLIBPATH% - MKDIRHIER +mkdir /sn MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%/mwscommit.pl PATH %PATH%$:%SHARED_COM_SDK_PATH%$:%PSDK%$/vc$/bin$:%PSDK%$/bin$:%FSDK%$/bin$:%DSDK%$/bin$/Utilities$/bin$/x86$:%PACKMS% @@ -3345,421 +3345,35 @@ wntmsci12 { bs_sourceroot { - SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% - SOURCE_ROOT %SOURCE_ROOT_TMP% - SOURCE_ROOT_USED TRUE - } - ca - { - BUILD_TOOLS %SOL_TMP%\btw\%WORK_STAMP% - COMPATH %SOL_TMP%\r\msvc9p - COMPROOT %SOL_TMP%\r\msvc9p - COPYALL TRUE - DEVROOT %SOL_TMP%\r - DSDK %SOL_TMP%\r\msvc9p\DirectXSDK - ENV_TOOLS %SOL_TMP%\etw\%WORK_STAMP% - FSDK %SOL_TMP%\r\msvc9p\Sdk\v3.5 - F20SDK %SOL_TMP%\r\msvc9p\Sdk\v2.0 - PCLEAN_PATH %SOLARROOT%\etw - PERL %SOL_TMP%\r\btw\perl\bin\perl - PSDK %SOL_TMP%\r\msvc9p\PlatformSDK\V6.1 - SHARED_COM_SDK_PATH %SOL_TMP%\r\msvc9p\Common7\ide - SOLARENV %SOL_TMP%\o%CWS_WORK_STAMP_EXT%\%WORK_STAMP%\src%UPDMINOREXT%\solenv - SOLARROOT %SOL_TMP%\r - SOLARVER %SOL_TMP%\o%CWS_WORK_STAMP_EXT%\%WORK_STAMP% - SOLARVERSION %SOL_TMP%\o%CWS_WORK_STAMP_EXT%\%WORK_STAMP% - } - cap - { - BUILD_TOOLS %SOL_TMP%\btw\%WORK_STAMP% - 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% - FSDK %SOL_TMP%\r\msvc9p\Sdk\v3.5 - F20SDK %SOL_TMP%\r\msvc9p\Sdk\v2.0 - PCLEAN_PATH %SOLARROOT%\etw - PERL %SOL_TMP%\r\btw\perl\bin\perl - PSDK %SOL_TMP%\r\msvc9p\PlatformSDK\V6.1 - SHARED_COM_SDK_PATH %SOL_TMP%\r\msvc9p\Common7\ide - SOLARENV %SOL_TMP%\o%CWS_WORK_STAMP_EXT%\%WORK_STAMP%\src%UPDMINOREXT%\solenv - SOLARROOT %SOL_TMP%\r - SOLARVER %SOL_TMP%\o%CWS_WORK_STAMP_EXT%\%WORK_STAMP% - SOLARVERSION %SOL_TMP%\o%CWS_WORK_STAMP_EXT%\%WORK_STAMP% - SO_PACK %SOL_TMP%\r\pack\%WORK_STAMP% - } - cax - { - BUILD_TOOLS %SOL_TMP%\btw\%WORK_STAMP% - COMPATH %SOL_TMP%\r\msvc9p - COMPROOT %SOL_TMP%\r\msvc9p - COPYALL FALSE - DSDK %COMPATH%\DirectXSDK - ENV_TOOLS %SOL_TMP%\etw\%WORK_STAMP% - FSDK %COMPATH%\Sdk\v3.5 - F20SDK %COMPATH%\Sdk\v2.0 - PCLEAN_PATH %SOL_TMP%\r\etw - PERL %SOL_TMP%\r\btw\perl\bin\perl - PSDK %COMPATH%\PlatformSDK\V6.1 - SHARED_COM_SDK_PATH %COMPATH%\Common7\ide - SOLARENV %SOL_TMP%\o%CWS_WORK_STAMP_EXT%\%WORK_STAMP%\src%UPDMINOREXT%\solenv - SOLARROOT %SOL_TMP%\r - SOLARVER %SOL_TMP%\o%CWS_WORK_STAMP_EXT%\%WORK_STAMP% - SOLARVERSION %SOL_TMP%\o%CWS_WORK_STAMP_EXT%\%WORK_STAMP% - SO_PACK %SOL_TMP%\r\pack\%WORK_STAMP% - } - common - { - *build %PERL% %SOLARENV%\bin\build.pl %PROFULLSWITCH% - *build_client %PERL% %SOLARENV%\bin\build_client.pl - *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl - *deliver %PERL% %SOLARENV%\bin\deliver.pl - *mkout %PERL% %SOLARENV%\bin\mkout.pl - *mwscommit %PERL% %COMMON_ENV_TOOLS%/mwscommit.pl - *nm iff "@word[".",1,%INPATH%]"=="pro" then ^ call nmake product=full ^ else ^ call nmake optimize=t ^ endiff - *o cdd %SOLARENV%\.. - *r cdd %SOLARROOT% - *s cdd %SOLARVERSION% - *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 - DMAKEROOT %SOLARENV%\inc\startup - ENABLE_PCH TRUE - ILIB .;%SOLARVERSION%\%INPATH%\lib%UPDMINOREXT%;%COMPATH%\lib;%PSDK%\lib;%DSDK%\lib\x86 - JDK13PATH %SOLAR_JDK13PATH% - JDK14PATH %SOLAR_JDK14PATH% - JDK15PATH %SOLAR_JDK15PATH% - LIB .;%SOLARVERSION%\%INPATH%\lib%UPDMINOREXT%;%COMPATH%\lib;%PSDK%\lib;%DSDK%\lib\x86;%SOLAR_STLLIBPATH% - LIBMGR_X64_BINARY %COMPROOT%\bin\x86_amd64\lib.exe - LINK_X64_BINARY %COMPROOT%\bin\x86_amd64\link.exe - MKDIRHIER +mkdir /sn - MKOUT %PERL% %SOLARENV%\bin\mkout.pl - MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%/mwscommit.pl - OJDK16PATH %SOLAR_OJDK16PATH% - PATH %PATH%;%SHARED_COM_SDK_PATH%;%COMPATH%/bin;%PSDK%\bin;%FSDK%;%F20SDK%\bin;%DSDK%\Utilities\bin\x86;%PACKMS% - PROF_EDITION TRUE - PSDKINC -I%PSDK%\include - SOLAREXTRAINC -I%DSDK%\include - SOLAR_JAVA TRUE - TRUSTED_MANIFEST_LOCATION %SOLARENV%\inc - USE_DIRECTX5 TRUE - WINDOWS_VISTA_PSDK TRUE - WITH_VC_REDIST TRUE - XCLASSPATH . - ZIPDEP %PERL% %SOLARENV%\bin\zipdep.pl - } - common0 - { - BS_ROOT n: - SOLAR_ENV_ROOT r: - SOLAR_SOURCE_ROOT o: - USE_SHELL 4nt - } - common1 - { - COMPATH %SOLAR_ENV_ROOT%\msvc9p - COMPROOT %SOLAR_ENV_ROOT%\msvc9p - DEVROOT %SOLAR_ENV_ROOT% - DSDK %SOLAR_ENV_ROOT%\msvc9p\DirectXSDK - FSDK %SOLAR_ENV_ROOT%\msvc9p\Sdk\v3.5 - F20SDK %SOLAR_ENV_ROOT%\msvc9p\Sdk\v2.0 - NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode - PERL %SOLAR_ENV_ROOT%\btw\perl\bin\perl - PSDK %SOLAR_ENV_ROOT%\msvc9p\PlatformSDK\V6.1 - SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%\msvc9p\Common7\ide - SHARED_SOLARENV %SOLAR_SOURCE_ROOT%\%WORK_STAMP%\src%UPDMINOREXT%\solenv - SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%\%WORK_STAMP% - SOLARENV %SOLAR_SOURCE_ROOT%\%WORK_STAMP%\src%UPDMINOREXT%\solenv - SOLARROOT %SOLAR_ENV_ROOT% - SOLARVER %SOLAR_SOURCE_ROOT%\%WORK_STAMP% - SOLARVERSION %SOLAR_SOURCE_ROOT%\%WORK_STAMP% - SO_PACK %SOLAR_ENV_ROOT%\pack\%WORK_STAMP% - SRC_ROOT %SOLAR_SOURCE_ROOT%\%WORK_STAMP%\src%UPDMINOREXT% - } - common2 - { - BUILD_TOOLS %SOLARROOT%\btw\%WORK_STAMP% - CALL_CDECL TRUE - CDPATHx %CDPATH%;..;..\..;..\..\..;..\source;..\..\source;o:\%WORK_STAMP%\src%UPDMINOREXT% - COM MSC - COMEX 12 - COMMON_BUILD_TOOLS %SOLARROOT%$/btools - COMMON_ENV_TOOLS %SOLARROOT%$/etools - COMP_ENV wntmsci12 - CPU I - CPUNAME INTEL - CVER M1500 - DYNAMIC_CRT TRUE - ENV_TOOLS %SOLARROOT%\etw\%WORK_STAMP% - GUI WNT - GUIBASE WIN - GVER NT351 - INPATH wntmsci12%PROEXT% - OS WNT - OUTPATH wntmsci12 - PACKMS %SO_PACK%\wntmsci12\MS - SET_EXEPTIONS TRUE - SHIPDRIVE %SOLAR_ENV_ROOT%$/ship$/install - SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3 - SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11 - SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06 - SOLAR_OJDK16PATH %SOLARROOT%$/openjdk-6-b08-windows-i586 - SOLAR_STLPATH %SOLARVERSION%$/wntmsci12%PROEXT%$/inc%UPDMINOREXT%$/stl - SORT sort -T %TMP% - use_shl_versions TRUE - } - common:3 IF %UPDATER% == YES - { - SHIPDRIVE %BS_ROOT%$/ship$/install - } - compath - { - COMPATH %STAR_COMPATH% - } - distroot:0 if X%DIST_ROOT%X != XX - { - SHARED_SOLARVERSION %DIST_ROOT%\%WORK_STAMP% - SOLARVER %DIST_ROOT%\%WORK_STAMP% - SOLARVERSION %DIST_ROOT%\%WORK_STAMP% - } - envroot:0 IF X%ENV_ROOT%X != XX - { - SOLAR_ENV_ROOT %ENV_ROOT% - } - jdk13 - { - HOMEDRIVE %DEVROOT% - HOMEPATH \jdk131 - JAVAHOME %JDK13PATH% - JAVA_HOME %JDK13PATH% - JDKINC %JDK13PATH%\include;%JDK13PATH%\include\win32 - JDKINCS -I%JDK13PATH%\include -I%JDK13PATH%\include\win32 - JDKLIB %JDK13PATH%\lib - JDKLIBS %JDK13PATH%\lib - JDKPATH %JDK13PATH%\bin - JDK_VERSION 131 - JREPATH %JDK13PATH%\jre\bin\hotspot - XCLASSPATH .;%JDK13PATH%\jre\lib\rt.jar;%JDK13PATH%\lib\tools.jar - } - jdk13path:0 if X%JDK_PATH%X != XX - { - SOLAR_JDK13PATH %JDK_PATH% - } - jdk14 - { - HOMEDRIVE %DEVROOT% - HOMEPATH \jdk141 - JAVAHOME %JDK14PATH% - JAVA_HOME %JDK14PATH% - JDKINC %JDK14PATH%\include\win32;%JDK14PATH%\include - JDKINCS -I%JDK14PATH%\include -I%JDK14PATH%\include\win32 - JDKLIB %JDK14PATH%\lib - JDKLIBS %JDK14PATH%\lib - JDKPATH %JDK14PATH%\bin - JDK_VERSION 142 - JREPATH %JDK14PATH%\jre\bin\client - XCLASSPATH .;%JDK14PATH%\jre\lib\rt.jar - } - jdk14path:0 if X%JDK_PATH%X != XX - { - SOLAR_JDK14PATH %JDK_PATH% - } - jdk15 - { - HOMEDRIVE %DEVROOT% - HOMEPATH \jdk151 - JAVAHOME %JDK15PATH% - JAVA_HOME %JDK15PATH% - JDKINC %JDK15PATH%\include\win32;%JDK15PATH%\include - JDKINCS -I%JDK15PATH%\include -I%JDK15PATH%\include\win32 - JDKLIB %JDK15PATH%\lib - JDKLIBS %JDK15PATH%\lib - JDKPATH %JDK15PATH%\bin - JDK_VERSION 150 - JREPATH %JDK15PATH%\jre\bin\client - XCLASSPATH .;%JDK15PATH%\jre\lib\rt.jar - } - jdk15path:0 if X%JDK_PATH%X != XX - { - SOLAR_JDK15PATH %JDK_PATH% - } - nojava - { - DISABLE_JAVA TRUE - } - ojdk16 - { - HOMEDRIVE %DEVROOT% - HOMEPATH \openjdk-6-b08-windows-i586 - JAVA_HOME %OJDK16PATH% - JDKINC %OJDK16PATH%\include\win32;%OJDK16PATH%\include - JDKINCS -I%OJDK16PATH%\include -I%OJDK16PATH%\include\win32 - JDKLIB %OJDK16PATH%\lib - JDKLIBS %OJDK16PATH%\lib - JDKPATH %OJDK16PATH%\bin - JDK_VERSION 160 - JREPATH %OJDK16PATH%\jre\bin\client - XCLASSPATH .;%OJDK16PATH%\jre\lib\rt.jar - } - ojdk16path:0 if X%JDK_PATH%X != XX - { - SOLAR_OJDK16PATH %JDK_PATH% - } - pre - { - ILIB %PRE%\lib;%ILIB% - LIB %PRE%\lib;%LIB% - } - pro - { - RES_ENUS TRUE - } - product - { - *build set mk_tmp=#@unique[#tmp#] ^ set mk_tmp=#@path[#mk_tmp#]#@name[#mk_tmp#].bat ^ call perl5 #SOLARENV#\bin\build.pl -file #mk_tmp# #1& ^ call #mk_tmp# ^ del #@path[#mk_tmp#]#@name[#mk_tmp#].* >& NUL ^ unset mk_tmp - *dmake *dmake #PROFULLSWITCH genpid=#_pid #1& && call #TMP\gen#_pid.btm - } - psdk - { - PSDK %STAR_PSDK% - } - sourceroot:0 if X%SOURCE_ROOT%X != XX - { - SOLAR_SOURCE_ROOT %SOURCE_ROOT% - SOURCE_ROOT_USED TRUE - } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib - SOLAR_STLPATH %STL_ROOT% - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } - tmp - { - SOL_TMP %SOL_TMP_DIR% - } - } - extern - { - COMSPEC - DIST_ROOT - ENV_ROOT - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - } - order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common product jdk13 jdk14 jdk15 ojdk16 pre - reset - { - COPYALL - CXX_X64_BINARY - DB2IMP - GCRINC - GCRLIB - GCRPATH - LIBMGR_X64_BINARY - LINK_X64_BINARY - NSIS_PATH - OLD_CHAOS - SOLAR_ENV_ROOT - TFDEF - TFDIR - WST - } - script - { - post - { - 150: set MYENV_PATH=%PATH - 160: set PATH=%SSX_PATH - 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET% - 260: set PATH=%MYENV_PATH - 270: unset MYENV_PATH - 300: call pcleaner.btm - 400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR% - 401: if "%SO_GEN_ERROR2%" NE "" echo %SO_GEN_ERROR2% - } - } - switches - { - bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax - compath STAR_COMPATH - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path - l10n L10N_framework - nojava - ojdk16 - ojdk16path - pre PRE - pro - psdk STAR_PSDK - shell STAR_USE_SHELL - sourceroot - stl - tmp SOL_TMP_DIR - } -} -wntmsci13 -{ - environment - { - bs_sourceroot - { SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%) SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%) SOURCE_ROOT_USED TRUE } ca { - BUILD_TOOLS %SOL_TMP%$/btw$/cygtools + BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% COMPATH %SOL_TMP%$/r$/msvc9p COMPROOT %SOL_TMP%$/r$/msvc9p COPYALL TRUE DEVROOT %SOL_TMP%$/r DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP% - FIND %SOL_TMP%$/r$/btw$/cygtools$/find.exe FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5 - GNUCOPY %SOL_TMP%$/r$/btw$/cygtools$/cp.exe - GNUMAKE make - GREP %SOL_TMP%$/r$/btw$/cygtools$/grep.exe - LS %SOL_TMP%$/r$/btw$/cygtools$/ls.exe + F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0 PCLEAN_PATH %SOLARROOT%$/etw -# PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl + PERL %SOL_TMP%$/r$/%PERLDIR% PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1 - SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/ide + SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv SOLARROOT %SOL_TMP%$/r SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% - TOUCH %SOL_TMP%$/r$/btw$/cygtools$/touch.exe +# TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe } cap { - BUILD_TOOLS %SOL_TMP%$/btw$/cygtools + BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% COMPATH %SOL_TMP%$/r$/msvc9p COMPROOT %SOL_TMP%$/r$/msvc9p COPYALL TRUE @@ -3767,48 +3381,40 @@ wntmsci13 DEVROOT %SOL_TMP%$/r DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP% - FIND %SOL_TMP%$/r$/btw$/cygtools$/find.exe FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5 - GNUCOPY %SOL_TMP%$/r$/btw$/cygtools$/cp.exe - GNUMAKE make - GREP %SOL_TMP%$/r$/btw$/cygtools$/grep.exe - LS %SOL_TMP%$/r$/btw$/cygtools$/ls.exe + F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0 PCLEAN_PATH %SOLARROOT%$/etw -# PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl + PERL %SOL_TMP%$/r$/%PERLDIR% PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1 - SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/ide + SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv SOLARROOT %SOL_TMP%$/r SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% - TOUCH %SOL_TMP%$/r$/btw$/cygtools$/touch.exe +# TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe } cax { - BUILD_TOOLS %SOL_TMP%$/btw$/cygtools + BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% COMPATH %SOL_TMP%$/r$/msvc9p COMPROOT %SOL_TMP%$/r$/msvc9p COPYALL FALSE DSDK %COMPATH%$/DirectXSDK ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP% - FIND %SOL_TMP%$/r$/btw$/cygtools$/find.exe FSDK %COMPATH%$/Sdk$/v3.5 - GNUCOPY %SOL_TMP%$/r$/btw$/cygtools$/cp.exe - GNUMAKE make - GREP %SOL_TMP%$/r$/btw$/cygtools$/grep.exe - LS %SOL_TMP%$/r$/btw$/cygtools$/ls.exe + F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0 PCLEAN_PATH %SOL_TMP%$/r$/etw -# PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl + PERL %SOL_TMP%$/r$/%PERLDIR% PSDK %COMPATH%$/PlatformSDK$/V6.1 - SHARED_COM_SDK_PATH %COMPATH%$/Common7$/ide + SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv SOLARROOT %SOL_TMP%$/r SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% - TOUCH %SOL_TMP%$/r$/btw$/cygtools$/touch.exe +# TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe } common { @@ -3837,12 +3443,10 @@ wntmsci13 LIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86;%SOLAR_STLLIBPATH% LIBMGR_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/lib.exe LINK_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/link.exe - MKDIRHIER mkdir -p MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl OJDK16PATH %SOLAR_OJDK16PATH% - PATH $cp(%PSDK%$/bin):%PATH%:$cp(%SHARED_COM_SDK_PATH%):$cp(%COMPATH%$/bin):$cp(%FSDK%):$cp(%DSDK%$/Utilities$/bin$/x86):$cp(%PACKMS%) - + PATH $cp(%PSDK%$/bin)$:%PATH%$:$cp(%SHARED_COM_SDK_PATH%)$:$cp(%COMPATH%$/bin)$:$cp(%FSDK%)$:$cp(%F20SDK%)$/bin$:$cp(%DSDK%$/Utilities$/bin$/x86)$:$cp(%PACKMS%) PROF_EDITION TRUE PSDKINC -I%PSDK%$/include SOLAREXTRAINC -I%DSDK%$/include @@ -3850,15 +3454,28 @@ wntmsci13 TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc USE_DIRECTX5 TRUE WINDOWS_VISTA_PSDK TRUE + WITH_VC_REDIST TRUE XCLASSPATH . ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl } - common0 + common0:0 IF %OSTYPE% == cygwin { BS_ROOT n: SOLAR_ENV_ROOT r: SOLAR_SOURCE_ROOT o: USE_SHELL bash + STAR_USE_SHELL bash + BTOOLDIR %WORK_STAMP%$/cygtools + PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl + } + common01:0 IF %OSTYPE% != cygwin + { + BS_ROOT n: + SOLAR_ENV_ROOT r: + SOLAR_SOURCE_ROOT o: + USE_SHELL 4nt + BTOOLDIR %WORK_STAMP% + PERLDIR btw\perl\bin\perl } common1 { @@ -3867,8 +3484,9 @@ wntmsci13 DEVROOT %SOLAR_ENV_ROOT% DSDK %SOLAR_ENV_ROOT%$/msvc9p$/DirectXSDK FSDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v3.5 + F20SDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v2.0 NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode - PERL $/usr$/bin$/perl + PERL %SOLAR_ENV_ROOT%$/%PERLDIR% PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/V6.1 SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv @@ -3879,48 +3497,41 @@ wntmsci13 SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP% SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP% SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT% - TEMP $dp(%TEMP%) - TMP $dp(%TMP%) +# TEMP $dp(%TEMP%) +# TMP $dp(%TMP%) } common2 { - BUILD_TOOLS %SOLARROOT%$/btw$/cygtools + BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR% CALL_CDECL TRUE - CDPATHx %CDPATH%:..:..$/..:..$/..$/..:..$/source:..$/..$/source:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%) + CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%) COM MSC - COMEX 13 - COMMON_BUILD_TOOLS %SOLARROOT%$/btools + COMEX 12 + COMMON_BUILD_TOOLS $cp(%SOLARROOT%$/btools) COMMON_ENV_TOOLS %SOLARROOT%$/etools - COMP_ENV wntmsci13 + COMP_ENV wntmsci12 CPU I CPUNAME INTEL CVER M1500 DYNAMIC_CRT TRUE ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP% - FIND %SOLARROOT%$/btw$/cygtools$/find.exe - FLIPCMD slfl.pl - GNUCOPY %SOLARROOT%$/btw$/cygtools$/cp.exe - GNUMAKE make - GREP %SOLARROOT%$/btw$/cygtools$/grep.exe GUI WNT GUIBASE WIN GVER NT351 - INPATH wntmsci13%PROEXT% - LS %SOLARROOT%$/btw$/cygtools$/ls.exe + INPATH wntmsci12%PROEXT% OS WNT - OUTPATH wntmsci13 - PACKMS %SO_PACK%$/wntmsci13$/MS + OUTPATH wntmsci12 + PACKMS %SO_PACK%$/wntmsci12$/MS SET_EXEPTIONS TRUE SHIPDRIVE %SOLAR_ENV_ROOT%$/ship$/install SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3 SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11 SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06 SOLAR_OJDK16PATH %SOLARROOT%$/openjdk-6-b08-windows-i586 - SOLAR_STLPATH %SOLARVERSION%$/wntmsci13%PROEXT%$/inc%UPDMINOREXT%$/stl + SOLAR_STLPATH %SOLARVERSION%$/wntmsci12%PROEXT%$/inc%UPDMINOREXT%$/stl SORT sort -T %TMP% - TOUCH %SOLARROOT%$/btw$/cygtools$/touch.exe +# TOUCH %SOLARROOT%$/btw$/%BTOOLDIR%$/touch.exe use_shl_versions TRUE - } common:3 IF %UPDATER% == YES { @@ -4028,10 +3639,6 @@ wntmsci13 { RES_ENUS TRUE } - product - { - *dmake *dmake #PROFULLSWITCH genpid=#_pid #1& && call #TMP/gen#_pid.btm - } psdk { PSDK $dp(%STAR_PSDK%) @@ -4062,13 +3669,14 @@ wntmsci13 ENV_ROOT JDK_PATH LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - TMP - TEMP - } - order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common product jdk13 jdk14 jdk15 ojdk16 pre + OSTYPE + $dp(SOL_TMP) + $dp(SOURCE_ROOT) + $dp(STL_ROOT) + $dp(TMP) + $dp(TEMP) + } + order nojava common0:0 common01:0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre reset { COPYALL @@ -4081,6 +3689,7 @@ wntmsci13 LINK_X64_BINARY NSIS_PATH OLD_CHAOS + PERLDIR SOLAR_ENV_ROOT TFDEF TFDIR @@ -4088,6 +3697,17 @@ wntmsci13 } script { + 4nt + { + 150: set MYENV_PATH=%PATH + 160: set PATH=%SSX_PATH + 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET% + 260: set PATH=%MYENV_PATH + 270: unset MYENV_PATH + 300: call pcleaner.btm + 400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR% + 401: if "%SO_GEN_ERROR2%" NE "" echo %SO_GEN_ERROR2% + } sh { 400: if [ $COPYALL ]; then diff --git a/solenv/inc/_tg_zip.mk b/solenv/inc/_tg_zip.mk index cecc05a0ffaf..b1974ad10259 100644 --- a/solenv/inc/_tg_zip.mk +++ b/solenv/inc/_tg_zip.mk @@ -82,7 +82,7 @@ $(ZIP1DEPFILE) : -$(ZIPDEP) $(ZIP1FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP1EXT)/)) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP1TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) .ENDIF # "$(ZIP1DIR)" != "" .ENDIF # "$(common_build_zip)"!="" - @echo $@ : makefile.mk >> $(MISC)$/$(@:f) + @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f) $(ZIP1TARGETN) : delzip $(ZIP1DEPS) @@ -222,7 +222,7 @@ $(ZIP2DEPFILE) : -$(ZIPDEP) $(ZIP2FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP2EXT)/)) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP2TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) .ENDIF # "$(ZIP2DIR)" != "" .ENDIF # "$(common_build_zip)"!="" - @echo $@ : makefile.mk >> $(MISC)$/$(@:f) + @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f) $(ZIP2TARGETN) : delzip $(ZIP2DEPS) @@ -362,7 +362,7 @@ $(ZIP3DEPFILE) : -$(ZIPDEP) $(ZIP3FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP3EXT)/)) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP3TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) .ENDIF # "$(ZIP3DIR)" != "" .ENDIF # "$(common_build_zip)"!="" - @echo $@ : makefile.mk >> $(MISC)$/$(@:f) + @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f) $(ZIP3TARGETN) : delzip $(ZIP3DEPS) @@ -502,7 +502,7 @@ $(ZIP4DEPFILE) : -$(ZIPDEP) $(ZIP4FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP4EXT)/)) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP4TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) .ENDIF # "$(ZIP4DIR)" != "" .ENDIF # "$(common_build_zip)"!="" - @echo $@ : makefile.mk >> $(MISC)$/$(@:f) + @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f) $(ZIP4TARGETN) : delzip $(ZIP4DEPS) @@ -642,7 +642,7 @@ $(ZIP5DEPFILE) : -$(ZIPDEP) $(ZIP5FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP5EXT)/)) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP5TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) .ENDIF # "$(ZIP5DIR)" != "" .ENDIF # "$(common_build_zip)"!="" - @echo $@ : makefile.mk >> $(MISC)$/$(@:f) + @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f) $(ZIP5TARGETN) : delzip $(ZIP5DEPS) @@ -782,7 +782,7 @@ $(ZIP6DEPFILE) : -$(ZIPDEP) $(ZIP6FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP6EXT)/)) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP6TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) .ENDIF # "$(ZIP6DIR)" != "" .ENDIF # "$(common_build_zip)"!="" - @echo $@ : makefile.mk >> $(MISC)$/$(@:f) + @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f) $(ZIP6TARGETN) : delzip $(ZIP6DEPS) @@ -922,7 +922,7 @@ $(ZIP7DEPFILE) : -$(ZIPDEP) $(ZIP7FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP7EXT)/)) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP7TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) .ENDIF # "$(ZIP7DIR)" != "" .ENDIF # "$(common_build_zip)"!="" - @echo $@ : makefile.mk >> $(MISC)$/$(@:f) + @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f) $(ZIP7TARGETN) : delzip $(ZIP7DEPS) @@ -1062,7 +1062,7 @@ $(ZIP8DEPFILE) : -$(ZIPDEP) $(ZIP8FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP8EXT)/)) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP8TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) .ENDIF # "$(ZIP8DIR)" != "" .ENDIF # "$(common_build_zip)"!="" - @echo $@ : makefile.mk >> $(MISC)$/$(@:f) + @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f) $(ZIP8TARGETN) : delzip $(ZIP8DEPS) @@ -1202,7 +1202,7 @@ $(ZIP9DEPFILE) : -$(ZIPDEP) $(ZIP9FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP9EXT)/)) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP9TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) .ENDIF # "$(ZIP9DIR)" != "" .ENDIF # "$(common_build_zip)"!="" - @echo $@ : makefile.mk >> $(MISC)$/$(@:f) + @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f) $(ZIP9TARGETN) : delzip $(ZIP9DEPS) @@ -1342,7 +1342,7 @@ $(ZIP10DEPFILE) : -$(ZIPDEP) $(ZIP10FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP10EXT)/)) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP10TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) .ENDIF # "$(ZIP10DIR)" != "" .ENDIF # "$(common_build_zip)"!="" - @echo $@ : makefile.mk >> $(MISC)$/$(@:f) + @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f) $(ZIP10TARGETN) : delzip $(ZIP10DEPS) diff --git a/solenv/inc/antsettings.mk b/solenv/inc/antsettings.mk index 1153fabd5a16..aa240afe08fb 100644 --- a/solenv/inc/antsettings.mk +++ b/solenv/inc/antsettings.mk @@ -39,7 +39,15 @@ ANT_HOME*:=$(COMMON_BUILD_TOOLS)$/apache-ant-1.7.0 ANT_LIB*:=$(ANT_HOME)$/lib ANT_CLASSPATH:=$(ANT_LIB)$/xercesImpl.jar$(PATH_SEPERATOR)$(ANT_LIB)$/xml-apis.jar$(PATH_SEPERATOR)$(ANT_LIB)$/ant.jar -PATH!:=$(ANT_HOME)$/bin$(PATH_SEPERATOR)$(PATH) + +# PATH_SEPERATOR won't work here as it is defined +# as ; for wondows (all shells) +#PATH!:=$(ANT_HOME)$/bin$(PATH_SEPERATOR)$(PATH) +.IF "$(USE_SHELL)"=="4nt" +PATH!:=$(ANT_HOME)$/bin;$(PATH) +.ELSE # "$(USE_SHELL)"=="4nt" +PATH!:=$(ANT_HOME)$/bin:$(PATH) +.ENDIF # "$(USE_SHELL)"=="4nt" ANT*:=$(ANT_HOME)$/bin$/ant ANT_BUILDFILE*=build.xml diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 4912da41a026..dcd0269536fa 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -1676,8 +1676,9 @@ $(COMMONPRJHIDOTHERTARGET) : $(PRJHIDOTHERTARGET) .IF "$(ZIP1TARGET)" != "" || "$(ZIP2TARGET)" != "" || "$(ZIP3TARGET)" != "" .IF "$(nodep)"=="" .INCLUDE : $(MISC)$/$(TARGET).dpz -missing_zipdep_langs=$(alllangiso) -some_dummy_var:=$(foreach,i,$(zipdep_langs) $(assign missing_zipdep_langs:=$(strip $(subst,$i, $(missing_zipdep_langs))))) +# introduce separation char +missing_zipdep_langs=$(alllangiso:^"+":+"+") +some_dummy_var:=$(foreach,i,$(zipdep_langs) $(assign missing_zipdep_langs:=$(strip $(subst,+$(i)+, $(missing_zipdep_langs))))) .IF "$(missing_zipdep_langs)"!="" ZIPDEPPHONY=.PHONY .ENDIF # "$(missing_zipdep_langs)"!="" diff --git a/solenv/inc/tg_config.mk b/solenv/inc/tg_config.mk index fe5475800dfd..637efb8600f3 100644 --- a/solenv/inc/tg_config.mk +++ b/solenv/inc/tg_config.mk @@ -62,12 +62,12 @@ $(XCS_TRIM) : $(DTDDIR)$/registry$/component-schema.dtd \ $(PROCESSOUT)$/registry$/schema$/$(PACKAGEDIR)$/%.xcs : %.xcs @echo -------------+ validating and stripping schema files -$(MKDIRHIER) $(@:d) - $(XSLTPROC) --nonet -o $(normpath $(PWD)$/$(@:d)$*.val) \ + $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $(@:d))$*.val) \ --stringparam componentName $(PACKAGE).$* \ $(SYSXSLDIR)schema_val.xsl $< - $(XSLTPROC) --nonet -o $(normpath $(PWD)$/$(@:d)$*.san) \ + $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $(@:d))$*.san) \ $(SYSXSLDIR)sanity.xsl $< - $(XSLTPROC) --nonet -o $(normpath $(PWD)$/$@) \ + $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $@)) \ $(SYSXSLDIR)schema_trim.xsl $< +-$(RM) $(@:d)$*.val > $(NULLDEV) +-$(RM) $(@:d)$*.san > $(NULLDEV) @@ -85,7 +85,7 @@ $(XCS_RESOURCES) : $(XSLDIR)$/resource.xsl $(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.properties :| $(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcs @echo -------------+ creating locale dependent resource bundles -$(MKDIRHIER) $(@:d) - $(XSLTPROC) --nonet -o $(normpath $(PWD)$/$@) \ + $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $@)) \ --stringparam locale {$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} \ $(SYSXSLDIR)resource.xsl $< @@ -108,11 +108,11 @@ $(XCU_DEFAULT) : $(DTDDIR)$/registry$/component-update.dtd \ $(PROCESSOUT)$/registry$/data$/$(PACKAGEDIR)$/%.xcu : %.xcu @echo -------------+ validating and creating a locale independent file -$(MKDIRHIER) $(@:d) - $(XSLTPROC) --nonet -o $(normpath $(PWD)$/$(@:d)$*.val) \ + $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $(@:d))$*.val) \ --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \ --stringparam schemaRoot $(XCSROOTURL)/registry/schema \ $(SYSXSLDIR)data_val.xsl $< - $(XSLTPROC) --nonet -o $(normpath $(PWD)$/$@) \ + $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $@)) \ --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \ --stringparam schemaRoot $(XCSROOTURL)/registry/schema \ $(SYSXSLDIR)alllang.xsl $< @@ -138,7 +138,7 @@ $(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.xcu :| %.xcu .ENDIF # "$(WITH_LANG)"!="" @echo ------------- creating locale dependent entries -$(MKDIRHIER) $(@:d) - $(XSLTPROC) --nonet -o $(normpath $(PWD)$/$@) \ + $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $@)) \ --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \ --stringparam schemaRoot $(XCSROOTURL)/registry/schema \ --stringparam locale {$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} \ @@ -165,7 +165,7 @@ $(XCU_MODULES) : $(XSLDIR)$/alllang.xsl $(PROCESSOUT)$/registry$/spool$/$(PACKAGEDIR)$/%.xcu :| $$(@:b:s/-/./:b).xcu @echo -------------+ creating a module file -$(MKDIRHIER) $(@:d) - $(XSLTPROC) --nonet -o $(normpath $(PWD)$/$@) \ + $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $@)) \ --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$(<:b).xcs \ --stringparam schemaRoot $(XCSROOTURL)/registry/schema \ --stringparam module $(subst,$(<:b)-, $(*)) \ diff --git a/solenv/inc/tg_zip.mk b/solenv/inc/tg_zip.mk index cf8f6c3456e6..43ddc9d71281 100644 --- a/solenv/inc/tg_zip.mk +++ b/solenv/inc/tg_zip.mk @@ -114,7 +114,7 @@ $(ZIP$(TNR)DEPFILE) : -$(ZIPDEP) $(ZIP$(TNR)FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/)) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP$(TNR)TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) .ENDIF # "$(ZIP$(TNR)DIR)" != "" .ENDIF # "$(common_build_zip)"!="" - @echo $@ : makefile.mk >> $(MISC)$/$(@:f) + @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f) $(ZIP$(TNR)TARGETN) : delzip $(ZIP$(TNR)DEPS) diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk index 74b498f7f34a..4fff82ede315 100644 --- a/solenv/inc/unitools.mk +++ b/solenv/inc/unitools.mk @@ -100,7 +100,7 @@ CHECKZIPRESULT:=^ iff errorlevel == 12 .and. errorlevel == 12 then ( echo Nothin CHECKCOPYURESULT:=^ iff errorlevel == 2 then ( echo Nothing to update for copy ^ set somedummyvar=%somedummyvar) # tell makedepend to write windows native format -MKDEPFLAGS=-n +#MKDEPFLAGS=-n .ENDIF # "$(USE_SHELL)"!="4nt" @@ -120,6 +120,7 @@ COPYUPDATE=-u ECHON=echo -n ECHONL=echo FIND*=find +FLIPCMD*=slfl.pl GNUCOPY*=cp GNUMAKE*=make GREP*=grep @@ -145,6 +146,7 @@ GNUCOPY*=$(BUILD_TOOLS)$/cp.exe GNUMAKE*=$(BUILD_TOOLS)$/gnumake.exe GREP*=$(BUILD_TOOLS)$/grep.exe LS*=$(BUILD_TOOLS)$/ls.exe +MKDIRHIER=+mkdir /sn #wraper for solenv\bin\mkdir.pl to fix mkdir /p problem PERL*:=+call perl5.btm .EXPORT : PERL diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk index 4fb4ed62edcd..b59ecaf24bad 100644 --- a/solenv/inc/wnt.mk +++ b/solenv/inc/wnt.mk @@ -53,6 +53,9 @@ STARDEP=javadep JAVAC=javac JAVA=java JAVAI!:=java +PATH_SEPERATOR*=: +.ELSE # "$(USE_SHELL)"!="4nt" +PATH_SEPERATOR*=; .ENDIF # "$(USE_SHELL)"!="4nt" # --- general WNT settings --- @@ -60,7 +63,6 @@ CLIMAKER*=climaker HC=hc HCFLAGS= -PATH_SEPERATOR*=; DLLPRE= DLLPOST=.dll EXECPOST=.exe |