Author: arist
Date: Wed Nov 14 23:15:04 2012
New Revision: 1409536
URL: http://svn.apache.org/viewvc?rev=1409536&view=rev
Log:
gnumake4_038_ebe3fa7a4ce7.patch
# HG changeset patch
# User mba
# Date 1300267590 -3600
# Node ID ebe3fa7a4ce7f5650020debf03278807e8013098
# Parent b595941132a1599358a4c2f5ec343c9b23f8af2b
CWS gnumake4: some fixes for mingw and windows libs
Modified:
incubator/ooo/branches/gbuild/main/Module_ooo.mk
incubator/ooo/branches/gbuild/main/RepositoryFixes.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk
incubator/ooo/branches/gbuild/main/solenv/inc/libs.mk
Modified: incubator/ooo/branches/gbuild/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/Module_ooo.mk?rev=1409536&r1=1409535&r2=1409536&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/Module_ooo.mk (original)
+++ incubator/ooo/branches/gbuild/main/Module_ooo.mk Wed Nov 14 23:15:04 2012
@@ -38,6 +38,7 @@ $(eval $(call gb_Module_add_moduledirs,o
oovbaapi \
oox \
padmin \
+ sax \
sfx2 \
sot \
starmath \
@@ -57,6 +58,7 @@ $(eval $(call gb_Module_add_moduledirs,o
wizards \
writerfilter \
xmloff \
+ xmlreader \
xmlscript \
))
Modified: incubator/ooo/branches/gbuild/main/RepositoryFixes.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/RepositoryFixes.mk?rev=1409536&r1=1409535&r2=1409536&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/RepositoryFixes.mk (original)
+++ incubator/ooo/branches/gbuild/main/RepositoryFixes.mk Wed Nov 14 23:15:04
2012
@@ -25,6 +25,7 @@
# not follow any of the established nameschemes
ifeq ($(OS),LINUX)
+
gb_Library_FILENAMES := $(patsubst
comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
@@ -39,10 +40,21 @@ gb_Library_FILENAMES := $(patsubst stl:%
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
endif
-endif
+endif # ifeq ($(OS),LINUX)
+
+ifeq ($(OS),SOLARIS)
+
+gb_Library_FILENAMES := $(patsubst
comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
+#$(info libnames: $(gb_Library_FILENAMES))
+endif
ifeq ($(OS),MACOSX)
+
gb_Library_FILENAMES := $(patsubst
comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
@@ -54,11 +66,12 @@ gb_Library_FILENAMES := $(patsubst stl:%
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
endif
-endif
-
+endif # ifeq ($(OS),MACOSX)
ifeq ($(OS),WNT)
+
ifneq ($(USE_MINGW),)
+
gb_Library_FILENAMES := $(patsubst
comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
cppunit:icppunit%,cppunit:libcppunit.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
@@ -76,21 +89,28 @@ gb_Library_FILENAMES := $(patsubst xml2:
gb_Library_FILENAMES := $(patsubst
xslt:ixslt%,xslt:libxslt.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
+
ifeq ($(gb_PRODUCT),$(true))
gb_Library_FILENAMES := $(patsubst
stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
else
gb_Library_FILENAMES := $(patsubst
stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
endif
+
+# handle libraries in msvc format that don't use an "i" prefix for their
import library
+# these are libraries built by OOo, but only a few of them
+# all other libraries built by OOo and all platform libraries (exceptions see
below) are used without an import library
+# we link against their dlls in gcc format directly
gb_Library_NOILIBFILENAMES:=\
icule \
icuuc \
- sot \
uwinapi \
winmm \
gb_Library_FILENAMES := $(filter-out $(foreach
lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
gb_Library_FILENAMES += $(foreach
lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
+# some Windows platform libraries are missing in mingw library set
+# we have to use them from the PSDK by linking against their ilibs
gb_Library_ILIBFILENAMES:=\
gdiplus \
uuid \
@@ -111,7 +131,8 @@ gb_Library_FILENAMES := $(patsubst stl:%
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
endif
-else
+else #ifneq ($(USE_MINGW),)
+
gb_Library_FILENAMES := $(patsubst
comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
cppunit:icppunit%,cppunit:icppunit_dll%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
@@ -128,44 +149,22 @@ gb_Library_FILENAMES := $(patsubst ssl:i
gb_Library_FILENAMES := $(patsubst
xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
gb_StaticLibrary_FILENAMES := $(patsubst
graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
+
ifeq ($(gb_PRODUCT),$(true))
gb_Library_FILENAMES := $(patsubst
stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
else
gb_Library_FILENAMES := $(patsubst
stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
endif
-gb_Library_NOILIBFILENAMES:=\
- advapi32 \
- cairo \
- d3d9 \
- d3dx \
- ddraw \
- expat \
- expat_xmltok\
- expat_xmlparse \
- gdi32 \
- gdiplus \
- gnu_getopt \
- icuuc \
- icule \
- imm32\
- kernel32 \
- msimg32 \
- msvcrt \
- mpr \
- oldnames \
- ole32 \
- oleaut32 \
- shell32 \
- sot \
- user32 \
- uuid \
- uwinapi \
- winspool \
+
+# change the names of all import libraries that don't have an "i" prefix as in
our standard naming schema
+gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE)
+gb_Library_NOILIBFILENAMES += icuuc icule
gb_Library_FILENAMES := $(filter-out $(foreach
lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
gb_Library_FILENAMES += $(foreach
lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
+gb_Library_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES))
+
ifneq ($(gb_PRODUCT),$(true))
gb_Library_FILENAMES := $(patsubst
msvcrt:msvcrt%,msvcrt:msvcrtd%,$(gb_Library_FILENAMES))
endif
@@ -175,9 +174,9 @@ gb_Library_DLLFILENAMES := $(patsubst ic
gb_Library_DLLFILENAMES := $(patsubst
ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
-endif
+endif # ifneq ($(USE_MINGW),)
-endif
+endif # ifeq ($(OS),WNT)
ifeq ($(OS),OS2)
gb_Library_FILENAMES := $(patsubst
comphelper:comphelper%,comphelper:comphelpgcc3%,$(gb_Library_FILENAMES))
@@ -231,16 +230,6 @@ gb_Library_ILIBFILENAMES:=\
endif
-ifeq ($(OS),SOLARIS)
-gb_Library_FILENAMES := $(patsubst
comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
-#$(info libnames: $(gb_Library_FILENAMES))
-
-endif
-
ifeq ($(OS),FREEBSD)
gb_Library_FILENAMES := $(patsubst
comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk?rev=1409536&r1=1409535&r2=1409536&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk
(original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk Wed
Nov 14 23:15:04 2012
@@ -481,6 +481,10 @@ gb_Library_PLAINLIBS_NONE += \
$(gb_MINGW_LIBSTDCPP) \
$(gb_MINGW_LIBGCC) \
advapi32 \
+ cairo \
+ d3d9 \
+ d3dx \
+ ddraw \
gdi32 \
gdiplus \
gnu_getopt \
Modified: incubator/ooo/branches/gbuild/main/solenv/inc/libs.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/inc/libs.mk?rev=1409536&r1=1409535&r2=1409536&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/inc/libs.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/inc/libs.mk Wed Nov 14 23:15:04
2012
@@ -400,7 +400,7 @@ OTXLIB=otx_ind.lib
OSXLIB=osx.lib
REGLIB=ireg.lib
EXTLIB=iext.lib
-SOTLIB=sot.lib
+SOTLIB=isot.lib
MOZBASELIBST=nspr4_s.lib xpcombase_s.lib
MOZBASELIB=nspr4.lib xpcom.lib
LDAPSDKLIB=nsldap32v50.lib
