Commits

hjs  committed 88e0145

CWS-TOOLING: integrate CWS cygwin03
2009-03-19 13:36:29 +0100 hjs r269742 : #i100180# - fix one remaining problem with zip dependencies
2009-03-18 17:05:51 +0100 kz r269691 : #i100180# improvements for setsolar on cygwin
2009-03-18 16:54:08 +0100 kz r269690 : #i100180# improvements for setsolar on cygwin
2009-03-13 15:29:53 +0100 kz r269486 : #i100180# improvements for setsolar on cygwin
2009-03-13 15:28:56 +0100 kz r269485 : #i100180# improvements for setsolar on cygwin
2009-03-13 15:28:29 +0100 kz r269484 : #i100180# improvements for setsolar on cygwin

  • Participants
  • Parent commits a2bb344

Comments (0)

Files changed (10)

File helpcontent2/makefile.pmk

 
 $(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES)
 .IF "$(WITH_LANG)"!=""
-	@$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) helpex -QQ -p helpcontent2 -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m localize.sdf && $(TOUCH) $@
+	@$(AUGMENT_LIBRARY_PATH) helpex -QQ -p helpcontent2 -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m localize.sdf && $(TOUCH) $@
 .ELSE			# "$(WITH_LANG)"!=""
 .IF "$(USE_SHELL)"=="4nt"
 # it's getting real ugly...

File solenv/config/sdev300.ini

 		HOMEPATH 
 		JAVAHOME 
 		JAVA_HOME 
+        MKDIRHIER
 		PROEXT 
 		PROFULLSWITCH 
 		SHIPDRIVE 
 			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%
 	{
 		bs_sourceroot 
 		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
+			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
+			SOURCE_ROOT $dp(%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
+			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%
-			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%
+			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$/%PERLDIR%
+			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%
+#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
+
 		}
 		cap 
 		{
-			BUILD_TOOLS %SOL_TMP%\btw\%WORK_STAMP%
-			COMPATH %SOL_TMP%\r\msvc9p
-			COMPROOT %SOL_TMP%\r\msvc9p
+			BUILD_TOOLS %SOL_TMP%$/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%
-			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%
+			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$/%PERLDIR%
+			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%
+#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
+
 		}
 		cax 
 		{
-			BUILD_TOOLS %SOL_TMP%\btw\%WORK_STAMP%
-			COMPATH %SOL_TMP%\r\msvc9p
-			COMPROOT %SOL_TMP%\r\msvc9p
+			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%
-			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%
+			DSDK %COMPATH%$/DirectXSDK
+			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
+			FSDK %COMPATH%$/Sdk$/v3.5
+			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+			PCLEAN_PATH %SOL_TMP%$/r$/etw
+			PERL %SOL_TMP%$/r$/%PERLDIR%
+			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%
+#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
 		}
 		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
+			*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
+			*o cd %SOLARENV%$/..
+			*r cd %SOLARROOT%
+			*s cd %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
+			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
+			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
+			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
+			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%
+			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
+			PSDKINC -I%PSDK%$/include
+			SOLAREXTRAINC -I%DSDK%$/include
 			SOLAR_JAVA TRUE
-			TRUSTED_MANIFEST_LOCATION %SOLARENV%\inc
+			TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
 			USE_DIRECTX5 TRUE
 			WINDOWS_VISTA_PSDK TRUE
             WITH_VC_REDIST TRUE
 			XCLASSPATH .
-			ZIPDEP %PERL% %SOLARENV%\bin\zipdep.pl
-		}
-		common0 
+			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
+		}
+		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 
 		{
-			COMPATH %SOLAR_ENV_ROOT%\msvc9p
-			COMPROOT %SOLAR_ENV_ROOT%\msvc9p
+			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
+			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%$/%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
+			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%
+			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%
+#			TEMP $dp(%TEMP%)
+#			TMP $dp(%TMP%)
 		}
 		common2 
 		{
-			BUILD_TOOLS %SOLARROOT%\btw\%WORK_STAMP%
+			BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR%
 			CALL_CDECL TRUE
-			CDPATHx %CDPATH%;..;..\..;..\..\..;..\source;..\..\source;o:\%WORK_STAMP%\src%UPDMINOREXT%
+			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%)
 			COM MSC
 			COMEX 12
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+			COMMON_BUILD_TOOLS $cp(%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%
+			ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
 			GUI WNT
 			GUIBASE WIN
 			GVER NT351
 			INPATH wntmsci12%PROEXT%
 			OS WNT
 			OUTPATH wntmsci12
-			PACKMS %SO_PACK%\wntmsci12\MS
+			PACKMS %SO_PACK%$/wntmsci12$/MS
 			SET_EXEPTIONS TRUE
 			SHIPDRIVE %SOLAR_ENV_ROOT%$/ship$/install
 			SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
 			SOLAR_OJDK16PATH %SOLARROOT%$/openjdk-6-b08-windows-i586
 			SOLAR_STLPATH %SOLARVERSION%$/wntmsci12%PROEXT%$/inc%UPDMINOREXT%$/stl
 			SORT sort -T %TMP%
+#			TOUCH %SOLARROOT%$/btw$/%BTOOLDIR%$/touch.exe
 			use_shl_versions TRUE
 		}
 		common:3 IF %UPDATER% == YES
 		}
 		compath 
 		{
-			COMPATH %STAR_COMPATH%
+			COMPATH $dp(%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%
+			SHARED_SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
+			SOLARVER $dp(%DIST_ROOT%$/%WORK_STAMP%)
+			SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
 		}
 		envroot:0 IF X%ENV_ROOT%X != XX
 		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
+			SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
 		}
 		jdk13 
 		{
 			HOMEDRIVE %DEVROOT%
-			HOMEPATH \jdk131
+			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
+			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
+			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%
+			SOLAR_JDK13PATH $dp(%JDK_PATH%)
 		}
 		jdk14 
 		{
 			HOMEDRIVE %DEVROOT%
-			HOMEPATH \jdk141
+			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
+			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
+			JREPATH %JDK14PATH%$/jre$/bin$/client
+			XCLASSPATH .;%JDK14PATH%$/jre$/lib$/rt.jar
 		}
 		jdk14path:0 if X%JDK_PATH%X != XX
 		{
-			SOLAR_JDK14PATH %JDK_PATH%
+			SOLAR_JDK14PATH $dp(%JDK_PATH%)
 		}
 		jdk15 
 		{
 			HOMEDRIVE %DEVROOT%
-			HOMEPATH \jdk151
+			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
+			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
+			JREPATH %JDK15PATH%$/jre$/bin$/client
+			XCLASSPATH .;%JDK15PATH%$/jre$/lib$/rt.jar
 		}
 		jdk15path:0 if X%JDK_PATH%X != XX
 		{
-			SOLAR_JDK15PATH %JDK_PATH%
+			SOLAR_JDK15PATH $dp(%JDK_PATH%)
 		}
 		nojava 
 		{
 		ojdk16 
 		{
 			HOMEDRIVE %DEVROOT%
-			HOMEPATH \openjdk-6-b08-windows-i586
+			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
+			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
+			JREPATH %OJDK16PATH%$/jre$/bin$/client
+			XCLASSPATH .;%OJDK16PATH%$/jre$/lib$/rt.jar
 		}
 		ojdk16path:0 if X%JDK_PATH%X != XX
 		{
-			SOLAR_OJDK16PATH %JDK_PATH%
+			SOLAR_OJDK16PATH $dp(%JDK_PATH%)
 		}
 		pre 
 		{
-			ILIB %PRE%\lib;%ILIB%
-			LIB %PRE%\lib;%LIB%
+			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%
+			PSDK $dp(%STAR_PSDK%)
 		}
 		sourceroot:0 if X%SOURCE_ROOT%X != XX
 		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
 			SOURCE_ROOT_USED TRUE
 		}
 		stl:0 IF X%STL_ROOT%X != XX
 		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
+			SOLAR_STLLIBPATH $dp(%STL_ROOT%$/..$/lib)
+			SOLAR_STLPATH $dp(%STL_ROOT%)
 		}
 		stl:1 IF X%STL_ROOT%X == XX
 		{
 		}
 		tmp 
 		{
-			SOL_TMP %SOL_TMP_DIR%
+			SOL_TMP $dp(%SOL_TMP_DIR%)
 		}
 	}
 	extern 
 		ENV_ROOT 
 		JDK_PATH 
 		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
+		OSTYPE
+		$dp(SOL_TMP) 
+		$dp(SOURCE_ROOT) 
+		$dp(STL_ROOT) 
+		$dp(TMP)
+		$dp(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
+	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 
 		LINK_X64_BINARY 
 		NSIS_PATH 
 		OLD_CHAOS 
+		PERLDIR
 		SOLAR_ENV_ROOT 
 		TFDEF 
 		TFDIR 
 	}
 	script 
 	{
-		post 
+		4nt 
 		{
 			150: set MYENV_PATH=%PATH
 			160: set PATH=%SSX_PATH
 			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
+            410:    perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+            415: fi
+            600: umask 002
+            800: hash -r
+            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+            851:       export SO_GEN_ERROR
+            852: fi
+            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+            861:       export SO_GEN_ERROR2
+            862: fi
+            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+            871:       echo $SO_GEN_ERROR
+            872: fi
+            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+            881:       echo $SO_GEN_ERROR2
+            882: fi
+        }
+		csh
+		{
+			400: if ( ${?COPYALL} ) perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+            600: umask 002
+			800: rehash
+			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+		}
 	}
 	switches 
 	{
 		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
-			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
-			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%
-			TOUCH %SOL_TMP%$/r$/btw$/cygtools$/touch.exe
-
-		}
-		cap 
-		{
-			BUILD_TOOLS %SOL_TMP%$/btw$/cygtools
-			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%
-			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
-			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%
-			TOUCH %SOL_TMP%$/r$/btw$/cygtools$/touch.exe
-
-		}
-		cax 
-		{
-			BUILD_TOOLS %SOL_TMP%$/btw$/cygtools
-			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
-			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%
-			TOUCH %SOL_TMP%$/r$/btw$/cygtools$/touch.exe
-		}
-		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
-			*o cd %SOLARENV%$/..
-			*r cd %SOLARROOT%
-			*s cd %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 -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%)
-
-			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
-			XCLASSPATH .
-			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
-		}
-		common0 
-		{
-			BS_ROOT n:
-			SOLAR_ENV_ROOT r:
-			SOLAR_SOURCE_ROOT o:
-			USE_SHELL bash
-		}
-		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
-			NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
-			PERL $/usr$/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%
-			TEMP $dp(%TEMP%)
-			TMP $dp(%TMP%)
-		}
-		common2 
-		{
-			BUILD_TOOLS %SOLARROOT%$/btw$/cygtools
-			CALL_CDECL TRUE
-			CDPATHx %CDPATH%:..:..$/..:..$/..$/..:..$/source:..$/..$/source:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%)
-			COM MSC
-			COMEX 13
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			COMP_ENV wntmsci13
-			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
-			OS WNT
-			OUTPATH wntmsci13
-			PACKMS %SO_PACK%$/wntmsci13$/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
-			SORT sort -T %TMP%
-			TOUCH %SOLARROOT%$/btw$/cygtools$/touch.exe
-			use_shl_versions TRUE
-
-		}
-		common:3 IF %UPDATER% == YES
-		{
-			SHIPDRIVE %BS_ROOT%$/ship$/install
-		}
-		compath 
-		{
-			COMPATH $dp(%STAR_COMPATH%)
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
-			SOLARVER $dp(%DIST_ROOT%$/%WORK_STAMP%)
-			SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT $dp(%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 $dp(%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 $dp(%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 $dp(%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 $dp(%JDK_PATH%)
-		}
-		pre 
-		{
-			ILIB %PRE%$/lib;%ILIB%
-			LIB %PRE%$/lib;%LIB%
-		}
-		pro 
-		{
-			RES_ENUS TRUE
-		}
-		product 
-		{
-			*dmake *dmake #PROFULLSWITCH genpid=#_pid #1& && call #TMP/gen#_pid.btm
-		}
-		psdk 
-		{
-			PSDK $dp(%STAR_PSDK%)
-		}
-		sourceroot:0 if X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
-			SOURCE_ROOT_USED TRUE
-		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH $dp(%STL_ROOT%$/..$/lib)
-			SOLAR_STLPATH $dp(%STL_ROOT%)
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
-		tmp 
-		{
-			SOL_TMP $dp(%SOL_TMP_DIR%)
-		}
-	}
-	extern 
-	{
-		COMSPEC 
-		DIST_ROOT 
-		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
-	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 
-	{
-         sh
-            {
-            400: if [ $COPYALL ]; then
-            410:    perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
-            415: fi
-            600: umask 002
-            800: hash -r
-            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-            851:       export SO_GEN_ERROR
-            852: fi
-            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-            861:       export SO_GEN_ERROR2
-            862: fi
-            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-            871:       echo $SO_GEN_ERROR
-            872: fi
-            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-            881:       echo $SO_GEN_ERROR2
-            882: fi
-        }
-		csh
-		{
-			400: if ( ${?COPYALL} ) perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
-            600: umask 002
-			800: rehash
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) 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
-	}
-}

File solenv/inc/_tg_zip.mk

 	-$(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)
 	-$(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)
 	-$(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)
 	-$(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)
 	-$(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)
 	-$(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)
 	-$(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)
 	-$(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)
 	-$(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)
 	-$(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)

File solenv/inc/antsettings.mk

 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

File solenv/inc/target.mk

 .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)"!=""

File solenv/inc/tg_config.mk

 $(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)
 $(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 $<
 
 $(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 $<
 .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$/, $@))} \
 $(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)-, $(*)) \

File solenv/inc/tg_zip.mk

 	-$(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)

File solenv/inc/unitools.mk

 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"
 
 ECHON=echo -n
 ECHONL=echo
 FIND*=find
+FLIPCMD*=slfl.pl
 GNUCOPY*=cp
 GNUMAKE*=make
 GREP*=grep
 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

File solenv/inc/wnt.mk

 JAVAC=javac
 JAVA=java
 JAVAI!:=java
+PATH_SEPERATOR*=:
+.ELSE # "$(USE_SHELL)"!="4nt"
+PATH_SEPERATOR*=;
 .ENDIF # "$(USE_SHELL)"!="4nt"
 
 # --- general WNT settings ---
 
 HC=hc
 HCFLAGS=
-PATH_SEPERATOR*=;
 DLLPRE=
 DLLPOST=.dll
 EXECPOST=.exe

File tools/bootstrp/rscdep.cxx

 	String aSrsBaseName;
 	BOOL bSource = FALSE;
 	ByteString aRespArg;
-	String aDelim = String(DirEntry::GetAccessDelimiter());
+//  who needs anything but '/' ?
+//	String aDelim = String(DirEntry::GetAccessDelimiter());
+	String aDelim = '/';
 
 	RscHrcDep *pDep = new RscHrcDep;
     
 		printf("further arguments : ");
 #endif
 		aString = ByteString( pSrsFileName );
+		aString.SearchAndReplaceAll('\\', ByteString( aDelim,  RTL_TEXTENCODING_ASCII_US ));
 		aString += ByteString(" : " );
 
 		while ( optind < argc )
 	for ( ULONG j=0; j<nCount; j++ )
 	{
 		ByteString *pStr = pLst->GetObject(j);
-#ifdef UNX
 		pStr->SearchAndReplaceAll('\\', ByteString( aDelim,  RTL_TEXTENCODING_ASCII_US ));
-#endif
-#ifdef WNT
-		pStr->SearchAndReplaceAll('/', ByteString( aDelim,  RTL_TEXTENCODING_ASCII_US ));
-#endif
 		if ( j != (nCount-1) )
 			*pStr += ByteString( "\\" );
 		aOutStream.WriteLine( *pStr );