ooo-build r13839 - in trunk: . patches/test

From: jholesovsky svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13839 - in trunk: . patches/test
Date: Mon, 8 Sep 2008 14:55:37 +0000 (UTC)
Author: jholesovsky
Date: Mon Sep  8 14:55:37 2008
New Revision: 13839
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13839&view=rev

Log:
2009-09-08  Jan Holesovsky  <kendy suse cz>

        * patches/test/win32-crosscompilation.diff: 'sw' compiles [without
          signing the lib - mt.exe does not work under wine :-(]


Modified:
   trunk/ChangeLog
   trunk/patches/test/win32-crosscompilation.diff

Modified: trunk/patches/test/win32-crosscompilation.diff
==============================================================================
--- trunk/patches/test/win32-crosscompilation.diff	(original)
+++ trunk/patches/test/win32-crosscompilation.diff	Mon Sep  8 14:55:37 2008
@@ -1,3 +1,179 @@
+diff --git a/solenv/inc/_tg_rslb.mk b/solenv/inc/_tg_rslb.mk
+index 9f92278..1313ea1 100755
+--- a/solenv/inc/_tg_rslb.mk
++++ b/solenv/inc/_tg_rslb.mk
+@@ -19,6 +19,9 @@ ALLTAR : $(HIDRES1PARTICLE)
+ 
+ .ENDIF # "$(BUILDHIDS)"!=""
+ 
++COLON_HACK := :
++SOLARSRC_NATIVE := $(subst,z$(COLON_HACK), $(SOLARSRC))
++
+ $(RSC_MULTI1) : \
+ 		$(RESLIB1SRSFILES) \
+ 		$(RESLIB1TARGETN) \
+@@ -45,11 +48,11 @@ $(RSC_MULTI1) : \
+ 	$(foreach,i,$(alllangiso) -lg$i \
+ 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
+ 	-fs={$(BIN)$/$(RESLIB1NAME)$i.res} \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}$/$i \
++    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC_NATIVE)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}$/$i \
+     -lip={$j} ) \
+-    -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
+-	-subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
+-	-subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
++    -lip=$(SOLARSRC_NATIVE)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC_NATIVE)$/$(RSCDEFIMG)$/res ) \
++	-subMODULE=$(SOLARSRC_NATIVE)$/$(RSCDEFIMG) \
++	-subGLOBALRES=$(SOLARSRC_NATIVE)$/$(RSCDEFIMG)$/res \
+     -oil=$(BIN) \
+     -ft=$@ \
+ 	$(RSC1HEADER) $(RESLIB1SRSFILES) \
+diff --git a/solenv/inc/_tg_sdi.mk b/solenv/inc/_tg_sdi.mk
+index 238dc76..ab1911f 100755
+--- a/solenv/inc/_tg_sdi.mk
++++ b/solenv/inc/_tg_sdi.mk
+@@ -14,6 +14,8 @@ $(HIDSID1PARTICLE): $(SDI1TARGET)
+ 	@$(RENAME) $  $(ROUT).tmp $@
+ .ENDIF # "$(HIDSID1PARTICLE)"!=""
+ 
++COLON_HACK := :
++
+ .IF "$(SDI1TARGET)"!=""
+ $(SDI1TARGET): $(SVSDI1DEPEND) $(SDI1NAME).sdi
+ 	@echo ------------------------------
+@@ -26,7 +28,7 @@ $(SDI1TARGET): $(SVSDI1DEPEND) $(SDI1NAME).sdi
+ 	-fl$(MISC)$/$(SDI1NAME).lst         \
+ 	-fx$(SDI1EXPORT).sdi		\
+ 	-fz$(MISC)$/$(SDI1NAME).sid	\
+-	$(SDI1NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
++	$(SDI1NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(subst,-Iz$(COLON_HACK),-I $(INCLUDE)))
+ .ENDIF # "$(SDI1TARGET)"!=""
+ 
+ # Instruction for ???
+diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
+index 83dadeb..772c103 100755
+--- a/solenv/inc/_tg_shl.mk
++++ b/solenv/inc/_tg_shl.mk
+@@ -191,7 +191,7 @@ SHL1LINKRESO*=$(MISC)$/$(SHL1TARGET)_res.o
+ .ENDIF			# "$(SHL1RES)"!=""
+ 
+ .IF "$(SHL1DEFAULTRES)$(use_shl_versions)"!=""
+-SHL1DEFAULTRES*=$(MISC)$/$(SHL1TARGET)_def.res
++SHL1DEFAULTRES*=$(MISC)$/$(SHL1TARGET)_def.RES
+ SHL1ALLRES+=$(SHL1DEFAULTRES)
+ SHL1LINKRES*=$(MISC)$/$(SHL1TARGET).res
+ SHL1LINKRESO*=$(MISC)$/$(SHL1TARGET)_res.o
+@@ -382,7 +382,8 @@ $(SHL1TARGETN) : \
+ 	$(IFEXIST) $  manifest $(THEN) mt.exe -manifest $  manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$  tmanifest$(EMQ) $(FI)
+ 	$(IFEXIST) $  manifest $(THEN) mt.exe -manifest $  tmanifest -outputresource:$ $(EMQ);2 $(FI)
+ .ELSE
+-	$(IFEXIST) $  manifest $(THEN) mt.exe -manifest $  manifest -outputresource:$ $(EMQ);2 $(FI)
++	#mt.exe breaks in wine :-((
++	#$(IFEXIST) $  manifest $(THEN) mt.exe -manifest $  manifest -outputresource:$ $(EMQ);2 $(FI)
+ .ENDIF # "$(VISTA_MANIFEST)"!=""
+ 	$(IFEXIST) $  manifest $(THEN) $(RM:s/+//) $  manifest $(FI)
+ 	$(IFEXIST) $  tmanifest $(THEN) $(RM:s/+//) $  tmanifest $(FI)
+@@ -731,7 +732,7 @@ SHL2LINKRESO*=$(MISC)$/$(SHL2TARGET)_res.o
+ .ENDIF			# "$(SHL2RES)"!=""
+ 
+ .IF "$(SHL2DEFAULTRES)$(use_shl_versions)"!=""
+-SHL2DEFAULTRES*=$(MISC)$/$(SHL2TARGET)_def.res
++SHL2DEFAULTRES*=$(MISC)$/$(SHL2TARGET)_def.RES
+ SHL2ALLRES+=$(SHL2DEFAULTRES)
+ SHL2LINKRES*=$(MISC)$/$(SHL2TARGET).res
+ SHL2LINKRESO*=$(MISC)$/$(SHL2TARGET)_res.o
+@@ -875,7 +876,8 @@ $(SHL2TARGETN) : \
+ 	$(IFEXIST) $  manifest $(THEN) mt.exe -manifest $  manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$  tmanifest$(EMQ) $(FI)
+ 	$(IFEXIST) $  manifest $(THEN) mt.exe -manifest $  tmanifest -outputresource:$ $(EMQ);2 $(FI)
+ .ELSE
+-	$(IFEXIST) $  manifest $(THEN) mt.exe -manifest $  manifest -outputresource:$ $(EMQ);2 $(FI)
++	#mt.exe breaks in wine :-((
++	#$(IFEXIST) $  manifest $(THEN) mt.exe -manifest $  manifest -outputresource:$ $(EMQ);2 $(FI)
+ .ENDIF # "$(VISTA_MANIFEST)"!=""
+ 	$(IFEXIST) $  manifest $(THEN) $(RM:s/+//) $  manifest $(FI)
+ 	$(IFEXIST) $  tmanifest $(THEN) $(RM:s/+//) $  tmanifest $(FI)
+@@ -1271,7 +1273,7 @@ SHL3LINKRESO*=$(MISC)$/$(SHL3TARGET)_res.o
+ .ENDIF			# "$(SHL3RES)"!=""
+ 
+ .IF "$(SHL3DEFAULTRES)$(use_shl_versions)"!=""
+-SHL3DEFAULTRES*=$(MISC)$/$(SHL3TARGET)_def.res
++SHL3DEFAULTRES*=$(MISC)$/$(SHL3TARGET)_def.RES
+ SHL3ALLRES+=$(SHL3DEFAULTRES)
+ SHL3LINKRES*=$(MISC)$/$(SHL3TARGET).res
+ SHL3LINKRESO*=$(MISC)$/$(SHL3TARGET)_res.o
+@@ -1415,7 +1417,8 @@ $(SHL3TARGETN) : \
+ 	$(IFEXIST) $  manifest $(THEN) mt.exe -manifest $  manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$  tmanifest$(EMQ) $(FI)
+ 	$(IFEXIST) $  manifest $(THEN) mt.exe -manifest $  tmanifest -outputresource:$ $(EMQ);2 $(FI)
+ .ELSE
+-	$(IFEXIST) $  manifest $(THEN) mt.exe -manifest $  manifest -outputresource:$ $(EMQ);2 $(FI)
++	#mt.exe breaks in wine :-((
++	#$(IFEXIST) $  manifest $(THEN) mt.exe -manifest $  manifest -outputresource:$ $(EMQ);2 $(FI)
+ .ENDIF # "$(VISTA_MANIFEST)"!=""
+ 	$(IFEXIST) $  manifest $(THEN) $(RM:s/+//) $  manifest $(FI)
+ 	$(IFEXIST) $  tmanifest $(THEN) $(RM:s/+//) $  tmanifest $(FI)
+@@ -1811,7 +1814,7 @@ SHL4LINKRESO*=$(MISC)$/$(SHL4TARGET)_res.o
+ .ENDIF			# "$(SHL4RES)"!=""
+ 
+ .IF "$(SHL4DEFAULTRES)$(use_shl_versions)"!=""
+-SHL4DEFAULTRES*=$(MISC)$/$(SHL4TARGET)_def.res
++SHL4DEFAULTRES*=$(MISC)$/$(SHL4TARGET)_def.RES
+ SHL4ALLRES+=$(SHL4DEFAULTRES)
+ SHL4LINKRES*=$(MISC)$/$(SHL4TARGET).res
+ SHL4LINKRESO*=$(MISC)$/$(SHL4TARGET)_res.o
+@@ -2351,7 +2354,7 @@ SHL5LINKRESO*=$(MISC)$/$(SHL5TARGET)_res.o
+ .ENDIF			# "$(SHL5RES)"!=""
+ 
+ .IF "$(SHL5DEFAULTRES)$(use_shl_versions)"!=""
+-SHL5DEFAULTRES*=$(MISC)$/$(SHL5TARGET)_def.res
++SHL5DEFAULTRES*=$(MISC)$/$(SHL5TARGET)_def.RES
+ SHL5ALLRES+=$(SHL5DEFAULTRES)
+ SHL5LINKRES*=$(MISC)$/$(SHL5TARGET).res
+ SHL5LINKRESO*=$(MISC)$/$(SHL5TARGET)_res.o
+@@ -2891,7 +2894,7 @@ SHL6LINKRESO*=$(MISC)$/$(SHL6TARGET)_res.o
+ .ENDIF			# "$(SHL6RES)"!=""
+ 
+ .IF "$(SHL6DEFAULTRES)$(use_shl_versions)"!=""
+-SHL6DEFAULTRES*=$(MISC)$/$(SHL6TARGET)_def.res
++SHL6DEFAULTRES*=$(MISC)$/$(SHL6TARGET)_def.RES
+ SHL6ALLRES+=$(SHL6DEFAULTRES)
+ SHL6LINKRES*=$(MISC)$/$(SHL6TARGET).res
+ SHL6LINKRESO*=$(MISC)$/$(SHL6TARGET)_res.o
+@@ -3431,7 +3434,7 @@ SHL7LINKRESO*=$(MISC)$/$(SHL7TARGET)_res.o
+ .ENDIF			# "$(SHL7RES)"!=""
+ 
+ .IF "$(SHL7DEFAULTRES)$(use_shl_versions)"!=""
+-SHL7DEFAULTRES*=$(MISC)$/$(SHL7TARGET)_def.res
++SHL7DEFAULTRES*=$(MISC)$/$(SHL7TARGET)_def.RES
+ SHL7ALLRES+=$(SHL7DEFAULTRES)
+ SHL7LINKRES*=$(MISC)$/$(SHL7TARGET).res
+ SHL7LINKRESO*=$(MISC)$/$(SHL7TARGET)_res.o
+@@ -3971,7 +3974,7 @@ SHL8LINKRESO*=$(MISC)$/$(SHL8TARGET)_res.o
+ .ENDIF			# "$(SHL8RES)"!=""
+ 
+ .IF "$(SHL8DEFAULTRES)$(use_shl_versions)"!=""
+-SHL8DEFAULTRES*=$(MISC)$/$(SHL8TARGET)_def.res
++SHL8DEFAULTRES*=$(MISC)$/$(SHL8TARGET)_def.RES
+ SHL8ALLRES+=$(SHL8DEFAULTRES)
+ SHL8LINKRES*=$(MISC)$/$(SHL8TARGET).res
+ SHL8LINKRESO*=$(MISC)$/$(SHL8TARGET)_res.o
+@@ -4511,7 +4514,7 @@ SHL9LINKRESO*=$(MISC)$/$(SHL9TARGET)_res.o
+ .ENDIF			# "$(SHL9RES)"!=""
+ 
+ .IF "$(SHL9DEFAULTRES)$(use_shl_versions)"!=""
+-SHL9DEFAULTRES*=$(MISC)$/$(SHL9TARGET)_def.res
++SHL9DEFAULTRES*=$(MISC)$/$(SHL9TARGET)_def.RES
+ SHL9ALLRES+=$(SHL9DEFAULTRES)
+ SHL9LINKRES*=$(MISC)$/$(SHL9TARGET).res
+ SHL9LINKRESO*=$(MISC)$/$(SHL9TARGET)_res.o
+@@ -5051,7 +5054,7 @@ SHL10LINKRESO*=$(MISC)$/$(SHL10TARGET)_res.o
+ .ENDIF			# "$(SHL10RES)"!=""
+ 
+ .IF "$(SHL10DEFAULTRES)$(use_shl_versions)"!=""
+-SHL10DEFAULTRES*=$(MISC)$/$(SHL10TARGET)_def.res
++SHL10DEFAULTRES*=$(MISC)$/$(SHL10TARGET)_def.RES
+ SHL10ALLRES+=$(SHL10DEFAULTRES)
+ SHL10LINKRES*=$(MISC)$/$(SHL10TARGET).res
+ SHL10LINKRESO*=$(MISC)$/$(SHL10TARGET)_res.o
 diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk
 index 5ed60b2..eaea344 100755
 --- a/solenv/inc/_tg_srs.mk
@@ -34,9 +210,20 @@
  .ENDIF			# "$(GUI)"=="UNX"
  .IF "$(nodep)"==""
 diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
-index f44bc59..8b0c1ce 100755
+index f44bc59..e463115 100755
 --- a/solenv/inc/settings.mk
 +++ b/solenv/inc/settings.mk
+@@ -950,8 +950,8 @@ YACCFLAGS*=-d
+ 
+ SVIDL=svidl
+ 
+-LDUMP=ldump4
+-LDUMP2=ldump4
++LDUMP=wine "/local/ooo-build/ooo-build-win/build/ooo300-m3/solver/300/wntmsci12.pro/bin/ldump4.exe"
++LDUMP2=wine "/local/ooo-build/ooo-build-win/build/ooo300-m3/solver/300/wntmsci12.pro/bin/ldump4.exe"
+ 
+ ZIPUPDATE=-u -j
+ ZIPFLAGS=$(ZIPUPDATE)
 @@ -967,7 +967,7 @@ SCPLINKFLAGS+=-v $(SCPLINKVERSION)
  .IF "$(make_srs_deps)"!=""
  RSC=rscdep
@@ -46,6 +233,184 @@
  .ENDIF # "$(make_srs_deps)"!=""
  
  #new
+diff --git a/solenv/inc/startup/WNT/.macros.mk.swp b/solenv/inc/startup/WNT/.macros.mk.swp
+new file mode 100644
+index 0000000..38ce47f
+Binary files /dev/null and b/solenv/inc/startup/WNT/.macros.mk.swp differ
+diff --git a/solenv/inc/startup/WNT/CVS/Entries b/solenv/inc/startup/WNT/CVS/Entries
+new file mode 100755
+index 0000000..207dd3d
+--- /dev/null
++++ b/solenv/inc/startup/WNT/CVS/Entries
+@@ -0,0 +1,2 @@
++/macros.mk/1.25/Thu Mar  6 15:16:17 2008//TOOO300_m3
++D
+diff --git a/solenv/inc/startup/WNT/CVS/Repository b/solenv/inc/startup/WNT/CVS/Repository
+new file mode 100755
+index 0000000..c635f5b
+--- /dev/null
++++ b/solenv/inc/startup/WNT/CVS/Repository
+@@ -0,0 +1 @@
++tools/solenv/inc/startup/wnt
+diff --git a/solenv/inc/startup/WNT/CVS/Root b/solenv/inc/startup/WNT/CVS/Root
+new file mode 100755
+index 0000000..ab83a92
+--- /dev/null
++++ b/solenv/inc/startup/WNT/CVS/Root
+@@ -0,0 +1 @@
++:pserver:anoncvs anoncvs services openoffice org:/cvs
+diff --git a/solenv/inc/startup/WNT/CVS/Tag b/solenv/inc/startup/WNT/CVS/Tag
+new file mode 100755
+index 0000000..0156927
+--- /dev/null
++++ b/solenv/inc/startup/WNT/CVS/Tag
+@@ -0,0 +1 @@
++NOOO300_m3
+diff --git a/solenv/inc/startup/WNT/CVS/Template b/solenv/inc/startup/WNT/CVS/Template
+new file mode 100755
+index 0000000..eec9bab
+--- /dev/null
++++ b/solenv/inc/startup/WNT/CVS/Template
+@@ -0,0 +1,42 @@
++Issue number:  
++Submitted by:  
++Reviewed by:   
++CVS: ----------------------------------------------------------------------
++CVS: Issue number:
++CVS:   If this change addresses one or more issues,
++CVS:   then enter the issue number(s) here.
++CVS: Submitted by:
++CVS:   If this code has been contributed to the project by someone else; i.e.,
++CVS:   they sent us a patch or a set of diffs, then include their name/email
++CVS:   address here. If this is your work then delete this line.
++CVS: Reviewed by:
++CVS:   If we are doing pre-commit code reviews and someone else has
++CVS:   reviewed your changes, include their name(s) here.
++CVS:   If you have not had it reviewed then delete this line.
++CVS: ----------------------------------------------------------------------
++CVS: Committers, 
++CVS: 
++CVS: Please follow these protocols: 
++CVS: 
++CVS: * Please include in the log message 
++CVS: reference(s) by ID / number and/or URL 
++CVS: to any and all relevant OpenOffice.org issue(s). 
++CVS: 
++CVS: * If the code is contributed from outside Sun 
++CVS: then please verify using the list at the following URL 
++CVS: http://www.openoffice.org/copyright/copyrightapproved.html 
++CVS: that Sun has received a signed Copyright Assignment Form 
++CVS: from the submitter.
++CVS: 
++CVS: Otherwise, 
++CVS: please send an email TO: the submitter; and CC: OOCRequest eng sun com
++CVS: the letter (CopyRightRequest.txt) to request assignment of copyright to Sun 
++CVS: (http://www.openoffice.org/copyright/assign_copyright.html). 
++CVS: 
++CVS: Please do NOT commit code until you have verified (as detailed above) that 
++CVS: Sun has received a signed Copyright Assignment Form from the submitter.
++CVS: 
++CVS: * Please send an email TO: the submitter 
++CVS: (particularly, if from outside Sun) 
++CVS: advising that the code has been committed, 
++CVS: and gratefully recognizing the contribution. 
+diff --git a/solenv/inc/startup/WNT/macros.mk b/solenv/inc/startup/WNT/macros.mk
+new file mode 100755
+index 0000000..5b8e79c
+--- /dev/null
++++ b/solenv/inc/startup/WNT/macros.mk
+@@ -0,0 +1,91 @@
++# Define additional MSDOS specific settings.
++#
++
++# --- Set Wrapper command ---
++# Provide a macro that can be used to access the wrapper and to avoid
++# hardcoding the program name everywhere
++GUWCMD*=guw.exe
++
++# This is a no-op for native W32 dmake
++.WINPATH !:= yes
++
++# Directory cache configuration.
++.DIRCACHE  *:= no
++
++# Applicable suffix definitions
++#E *:= .exe	# Executables
++
++# Now set the remaining arguments depending on which SHELL we
++# are going to use.
++.IF $(USE_SHELL) == 4nt
++
++.IMPORT : COMSPEC
++
++SHELL *:= $(COMSPEC)
++
++   SHELLFLAGS       *:= $(SWITCHAR)c
++   GROUPFLAGS       *:= $(SHELLFLAGS)
++   SHELLMETAS       *:= "<>|&%^
++# Fix syntax highlighting: "
++   GROUPSUFFIX      *:= .bat
++   DIVFILE          *=  $(TMPFILE:s,/,\,)
++   RM               *=  +del
++   RMFLAGS          *= /y /E
++   MV	            *=  +rename
++   __.DIVSEP-sh-yes *:= \\
++   __.DIVSEP-sh-no  *:= \\
++   DIRSEPSTR        := \\
++
++.ELSE	# Non 4nt case
++
++.IF $(USE_SHELL) == bash
++   SHELLFLAGS       *:= -c
++.ELSE
++   # See iz50689 why -f is needed.
++   SHELLFLAGS       *:= -fc
++.ENDIF # $(USE_SHELL) == bash
++
++   GROUPFLAGS       *:=
++   SHELLMETAS       *:= *";?<>|()&][$$\#`'
++# Fix syntax highlighting: "
++   GROUPSUFFIX      *:= .csh
++# This is hopefully not used. Only in: dmake/msdos/spawn.c  
++#  .MKSARGS         *:= yes
++   DIVFILE          *=  $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}})
++   RM               *=  $/bin$/rm
++   RMFLAGS          *=  -f
++   MV	            *=  $/bin$/mv
++   __.DIVSEP-sh-yes *:= \\\
++   __.DIVSEP-sh-no  *:= \\
++   DIRSEPSTR :=/
++
++.ENDIF
++
++.EXPORT : GUWCMD
++
++.IF $(USE_SHELL) == 4nt
++
++my4ver:=$(shell @echo %_4ver)
++
++.IF "$(my4ver:s/.//:s/,//)" >= "400"
++.ELSE			# "$(my4ver:s/.//:s/,//)" >= "400"
++.ERROR : ; @echo Forced error: 4NT version too old! Version 4.0 or newer is required.
++4NT_version_too_old
++.ENDIF			# "$(my4ver:s/.//:s/,//)" >= "400"
++
++.ELSE # $(USE_SHELL) == 4nt
++
++.IF $(SHELL) == $(NULL)
++# SHELL has to be set in (non-4NT) OOobuild environment
++.ERROR : ; @echo Forced error: Environment variable SHELL has to be set for OOo build!
++SHELL_variable_needed
++.END
++
++.END # $(USE_SHELL) == 4nt
++
++GROUPSHELL *:= $(SHELL)
++
++# Does not respect case of filenames.
++.DIRCACHERESPCASE := no
++NAMEMAX	=	256
++
 diff --git a/solenv/inc/startup/wnt/CVS/Entries b/solenv/inc/startup/wnt/CVS/Entries
 deleted file mode 100755
 index 207dd3d..0000000
@@ -221,7 +586,7 @@
 -NAMEMAX	=	256
 -
 diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
-index 9ffeeac..46dd60b 100755
+index 9ffeeac..dabcd01 100755
 --- a/solenv/inc/unitools.mk
 +++ b/solenv/inc/unitools.mk
 @@ -39,7 +39,7 @@ XSLTPROC*=xsltproc
@@ -233,11 +598,63 @@
  
  SCP_CHECK_TOOL:=checkscp$E
  
+@@ -159,7 +159,7 @@ TYPE*=+type
+ XARGS*=tr -d "\015" | xargs
+ 4nt_force_shell:=+
+ .ENDIF  "$(USE_SHELL)"!="4nt"
+-DUMPBIN*=dumpbin
++DUMPBIN=wine "c:\\Program Files\\Microsoft Visual Studio 9.0\\VC\\bin\\dumpbin.exe"
+ 
+ .ELIF "$(GUI)"=="UNX"	# "$(GUI)"=="WNT"
+ SED*=sed
 diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk
-index 5d3bb44..dd8cd6b 100755
+index 5d3bb44..e5272c6 100755
 --- a/solenv/inc/wntmsci11.mk
 +++ b/solenv/inc/wntmsci11.mk
-@@ -305,7 +305,7 @@ MFC_INCLUDE*=$(COMPATH)$/atlmfc$/include
+@@ -212,7 +212,7 @@ CDEFS+=-DWINVER=0x0500 -D_WIN32_IE=0x0500
+ _VC_MANIFEST_BASENAME=__VC90
+ .ENDIF
+ 
+-LINK=link $(NOLOGO) /MACHINE:IX86
++LINK=wine "c:\\Program Files\\Microsoft Visual Studio 9.0\\VC\\bin\\link.exe" $(NOLOGO) /MACHINE:IX86
+ LINKOUTPUTFILTER= $(PIPEERROR) $(GREP) -v "LNK4197:"
+ .IF "$(PRODUCT)"!="full"
+ .ELSE
+@@ -228,7 +228,8 @@ _VC_MANIFEST_INC=0
+ .IF "$(PRODUCT)"!="full"
+ LINKFLAGS+= -NODEFAULTLIB -DEBUG
+ .ELSE # "$(PRODUCT)"!="full"
+-LINKFLAGS+= -NODEFAULTLIB -RELEASE -DEBUG -INCREMENTAL:NO
++#LINKFLAGS+= -NODEFAULTLIB -RELEASE -DEBUG -INCREMENTAL:NO #-DEBUG is broken, http://appdb.winehq.org/objectManager.php?sClass=version&iId=9569
++LINKFLAGS+= -NODEFAULTLIB -RELEASE -INCREMENTAL:NO
+ .ENDIF # "$(PRODUCT)"!="full"
+ MAPFILE=-out:$$@
+ .ENDIF # "$(linkinc)" != ""
+@@ -263,7 +264,7 @@ UWINAPILIB*=uwinapi.lib
+ .IF "$(USE_STLP_DEBUG)" != ""
+ LIBCMT=msvcrtd.lib
+ .ELSE  # "$(USE_STLP_DEBUG)" != ""
+-LIBCMT=msvcrt.lib
++LIBCMT="c:\\Program Files\\Microsoft Visual Studio 9.0\\VC\\lib\\msvcrt.lib"
+ .ENDIF # "$(USE_STLP_DEBUG)" != ""
+ .ELSE # "$(DYNAMIC_CRT)"!=""
+ .IF "$(USE_STLP_DEBUG)" != ""
+@@ -280,10 +281,10 @@ STDSLOGUI=
+ STDOBJCUI=
+ STDSLOCUI=
+ 
+-STDLIBGUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
+-STDLIBCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
+-STDSHLGUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
+-STDSHLCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
++STDLIBGUIMT=$(LIBCMT) $(UWINAPILIB) $(KERNEL32LIB) $(USER32LIB) $(OLDNAMESLIB)
++STDLIBCUIMT=$(LIBCMT) $(UWINAPILIB) $(KERNEL32LIB) $(USER32LIB) $(OLDNAMESLIB)
++STDSHLGUIMT=$(LIBCMT) $(UWINAPILIB) $(KERNEL32LIB) $(USER32LIB) $(OLDNAMESLIB)
++STDSHLCUIMT=$(LIBCMT) $(UWINAPILIB) $(KERNEL32LIB) $(USER32LIB) $(OLDNAMESLIB)
+ 
+ .IF "$(USE_STLP_DEBUG)" != ""
+ LIBSTLPORT=stlport_vc71_stldebug.lib
+@@ -305,7 +306,7 @@ MFC_INCLUDE*=$(COMPATH)$/atlmfc$/include
  MFC_LIB*=$(COMPATH)$/atlmfc$/lib
  .ENDIF
  
@@ -246,6 +663,117 @@
  IMPLIB=lib
  LIBFLAGS=
  
+@@ -314,7 +315,7 @@ IMPLIBFLAGS=-machine:IX86
+ MAPSYM=
+ MAPSYMFLAGS=
+ 
+-RC=rc
++RC=wine "c:\\Program Files\\Microsoft SDKs\\Windows\\v6.1\\Bin\\RC.Exe"
+ RCFLAGS=-r -DWIN32 -fo$@ $(RCFILES)
+ RCLINK=rc
+ RCLINKFLAGS=
+@@ -327,7 +328,7 @@ PCHPOST=.pch
+ CSC*=$(FLIPCMD) csc
+ VBC*=vbc
+ 
+-ADVAPI32LIB=advapi32.lib
++ADVAPI32LIB="c:\\Program Files\\Microsoft SDKs\\Windows\\v6.1\\Lib\\advapi32.lib"
+ SHELL32LIB=shell32.lib
+ GDI32LIB=gdi32.lib
+ OLE32LIB=ole32.lib
+@@ -340,8 +341,8 @@ WINMMLIB=winmm.lib
+ WSOCK32LIB=wsock32.lib
+ MPRLIB=mpr.lib
+ WS2_32LIB=ws2_32.lib
+-KERNEL32LIB=kernel32.lib
+-USER32LIB=user32.lib
++KERNEL32LIB="c:\\Program Files\\Microsoft SDKs\\Windows\\v6.1\\Lib\\kernel32.lib"
++USER32LIB="c:\\Program Files\\Microsoft SDKs\\Windows\\v6.1\\Lib\\user32.lib"
+ COMDLG32LIB=comdlg32.lib
+ COMCTL32LIB=comctl32.lib
+ CRYPT32LIB=crypt32.lib
+@@ -353,6 +354,6 @@ SHLWAPILIB=shlwapi.lib
+ URLMONLIB=urlmon.lib
+ UNICOWSLIB=unicows.lib
+ WININETLIB=wininet.lib
+-OLDNAMESLIB=oldnames.lib
++OLDNAMESLIB="c:\\Program Files\\Microsoft Visual Studio 9.0\\VC\\lib\\oldnames.lib"
+ MSIMG32LIB=msimg32.lib
+ 
+diff --git a/sw/source/ui/app/makefile.mk b/sw/source/ui/app/makefile.mk
+index 847a51b..12bed44 100755
+--- a/sw/source/ui/app/makefile.mk
++++ b/sw/source/ui/app/makefile.mk
+@@ -100,5 +100,7 @@ LIB1OBJFILES= \
+ 
+ .INCLUDE :  target.mk
+ 
+-$(SRS)$/app.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc
++COLON_HACK := :
++
++$(SRS)$/app.srs: $(subst,z$(COLON_HACK), $(SOLARINCDIR))$/svx$/globlmn.hrc
+ 
+diff --git a/sw/source/ui/ribbar/makefile.mk b/sw/source/ui/ribbar/makefile.mk
+index 2a64bcc..a55bd4e 100755
+--- a/sw/source/ui/ribbar/makefile.mk
++++ b/sw/source/ui/ribbar/makefile.mk
+@@ -67,5 +67,7 @@ SLOFILES =  \
+ 
+ .INCLUDE :  target.mk
+ 
+-$(SRS)$/ribbar.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc
++COLON_HACK := :
++
++$(SRS)$/ribbar.srs: $(subst,z$(COLON_HACK), $(SOLARINCDIR))$/svx$/globlmn.hrc
+ 
+diff --git a/sw/source/ui/shells/makefile.mk b/sw/source/ui/shells/makefile.mk
+index ad3f7fc..510a130 100755
+--- a/sw/source/ui/shells/makefile.mk
++++ b/sw/source/ui/shells/makefile.mk
+@@ -88,5 +88,7 @@ EXCEPTIONSFILES =  \
+ 
+ .INCLUDE :  target.mk
+ 
+-$(SRS)$/shells.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc
++COLON_HACK := :
++
++$(SRS)$/shells.srs: $(subst,z$(COLON_HACK), $(SOLARINCDIR))$/svx$/globlmn.hrc
+ 
+diff --git a/sw/source/ui/uiview/makefile.mk b/sw/source/ui/uiview/makefile.mk
+index 9647e32..ab2e772 100755
+--- a/sw/source/ui/uiview/makefile.mk
++++ b/sw/source/ui/uiview/makefile.mk
+@@ -83,5 +83,7 @@ SLOFILES =  \
+ 
+ .INCLUDE :  target.mk
+ 
+-$(SRS)$/uiview.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc
++COLON_HACK := :
++
++$(SRS)$/uiview.srs: $(subst,z$(COLON_HACK), $(SOLARINCDIR))$/svx$/globlmn.hrc
+ 
+diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk
+index 097824b..061dd24 100755
+--- a/sw/util/makefile.mk
++++ b/sw/util/makefile.mk
+@@ -47,6 +47,8 @@ USE_DEFFILE=TRUE
+ LINKFLAGS+=-Wl,-LD_LAYOUT:lgot_buffer=40
+ .ENDIF
+ 
++COLON_HACK := :
++
+ sw_res_files= \
+     $(SRS)$/app.srs          \
+     $(SRS)$/dialog.srs       \
+@@ -73,7 +75,7 @@ sw_res_files= \
+     $(SRS)$/utlui.srs        \
+     $(SRS)$/web.srs          \
+     $(SRS)$/wrtsh.srs        \
+-    $(SOLARCOMMONRESDIR)$/sfx.srs
++    $(subst,z$(COLON_HACK), $(SOLARCOMMONRESDIR))$/sfx.srs
+ 
+ RESLIB1NAME=sw
+ RESLIB1IMAGES=$(PRJ)$/imglst $(PRJ)$/res
 diff --git a/winenv.set.sh b/winenv.set.sh
 index 6ad392c..55163c0 100755
 --- a/winenv.set.sh
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]