Commits

Anonymous committed 3ba7520

CWS-TOOLING: integrate CWS ause104
2009-06-24 15:58:35 +0200 hjs r273351 : #i103061# dicard HOMEPATH and HOMEDIR; use matching perl
2009-06-24 13:57:45 +0200 hjs r273342 : #i103062# - use according dmake var

  • Participants
  • Parent commits d9732fd

Comments (0)

Files changed (2)

File solenv/config/sdev300.ini

 		SOLARSRC 
 		SOLAR_JAVA 
 		SPEW 
-		STLPORT4 
-		WITH_FONTOOO 
-		WITH_LANG 
+		STLPORT4
+		WITH_FONTOOO
+		WITH_LANG
 	}
 	restore 
 	{
 			SOLAR_SOURCE_ROOT o:
 			USE_SHELL 4nt
 			BTOOLDIR %WORK_STAMP%
-			PERLDIR btw\perl\bin\perl
+			PERLDIR btw\%WORK_STAMP%\perl\bin\perl
+		}
+		common02:0 IF %OSTYPE% == cygwin
+		{
+			PERL perl
 		}
 		common1 
 		{
 		}
 		jdk13 
 		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk131
+#			HOMEDRIVE %DEVROOT%
+#			HOMEPATH $/jdk131
 			JAVAHOME %JDK13PATH%
 			JAVA_HOME %JDK13PATH%
 			JDKINC %JDK13PATH%$/include;%JDK13PATH%$/include$/win32
 		}
 		jdk14 
 		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk141
+#			HOMEDRIVE %DEVROOT%
+#			HOMEPATH $/jdk141
 			JAVAHOME %JDK14PATH%
 			JAVA_HOME %JDK14PATH%
 			JDKINC %JDK14PATH%$/include$/win32;%JDK14PATH%$/include
 		}
 		jdk15 
 		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk151
+#			HOMEDRIVE %DEVROOT%
+#			HOMEPATH $/jdk151
 			JAVAHOME %JDK15PATH%
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%$/include$/win32;%JDK15PATH%$/include
 		}
 		ojdk16 
 		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/openjdk-6-b08-windows-i586
+#			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
 		$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
+	order nojava common0:0 common01:0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax common02:0 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 

File unoil/climaker/makefile.mk

 EXTRA_RDB = $(SOLARBINDIR)$/udkapi.rdb
 
 $(BIN)/cli_oootypes.dll : $(RDB) $(EXTRA_RDB) version.txt
-	$(WRAPCMD) $(SOLARBINDIR)$/climaker.exe $(CLIMAKERFLAGS) \
+		$(CLIMAKER) $(CLIMAKERFLAGS) \
 		--out $@ \
  		--assembly-version $(CLI_OOOTYPES_NEW_VERSION) \
 		--assembly-company "OpenOffice.org" \