[Libreoffice-commits] .: Branch 'feature/gnumake4' - 10 commits - Module_ooo.mk RepositoryFixes.mk Repository.mk scp2/source solenv/gbuild solenv/inc
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Thu Jun 16 17:07:20 PDT 2011
Module_ooo.mk | 4 +
Repository.mk | 16 +++++++
RepositoryFixes.mk | 74 +++++++++++++++-------------------
scp2/source/ooo/file_library_ooo.scp | 17 +------
scp2/source/ooo/module_hidden_ooo.scp | 2
solenv/gbuild/ComponentTarget.mk | 25 ++++++++---
solenv/gbuild/Library.mk | 2
solenv/gbuild/TargetLocations.mk | 2
solenv/gbuild/platform/linux.mk | 2
solenv/gbuild/platform/macosx.mk | 2
solenv/gbuild/platform/solaris.mk | 2
solenv/gbuild/platform/windows.mk | 3 -
solenv/gbuild/platform/winmingw.mk | 6 ++
solenv/inc/libs.mk | 4 +
14 files changed, 95 insertions(+), 66 deletions(-)
New commits:
commit 7e3dd3e4adf577d1b720253d80daf2b90a585280
Author: Mathias Bauer <mba at openoffice.org>
Date: Wed Mar 16 10:26:30 2011 +0100
CWS gnumake4: some fixes for mingw and windows libs [hg:ebe3fa7a4ce7]
diff --git a/Module_ooo.mk b/Module_ooo.mk
index b8f9a40..fa59217 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -38,6 +38,8 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
idl \
linguistic \
padmin \
+ regexp \
+ sax \
sfx2 \
sot \
starmath \
@@ -52,7 +54,8 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
unoxml \
vcl \
xmloff \
-+ xmlscript \
+ xmlreader \
+ xmlscript \
vbahelper \
))
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index b501e85..7286f27 100755
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -29,6 +29,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))
@@ -43,10 +44,21 @@ gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES
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))
@@ -58,11 +70,12 @@ gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.dylib,$(gb_Library_FILENA
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))
@@ -78,19 +91,26 @@ gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT)
gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt$(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:=\
icuuc \
- sot \
uwinapi \
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:=\
unicows \
uuid \
@@ -110,7 +130,8 @@ gb_Library_FILENAMES := $(patsubst stl:%,stl:$(gb_Library_IARCSYSPRE)stdc++_s$(g
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))
@@ -125,46 +146,25 @@ gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES
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))
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 \
+
+# 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
graphite_dll \
- gnu_getopt \
- icuuc \
icule \
imm32\
- kernel32 \
msimg32 \
- msvcrt \
- mpr \
- oldnames \
- ole32 \
- oleaut32 \
- shell32 \
- sot \
- unicows \
- user32 \
- uuid \
- uwinapi \
- winmm \
winspool \
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
@@ -174,19 +174,9 @@ gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_D
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
-
-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
+endif # ifeq ($(OS),WNT)
# we do not require a known rule for these, when using system libs
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index ccf9359..dfe7ade 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -469,7 +469,12 @@ gb_Library_PLAINLIBS_NONE += \
$(gb_MINGW_LIBSTDCPP) \
$(gb_MINGW_LIBGCC) \
advapi32 \
+ cairo \
+ d3d9 \
+ d3dx \
+ ddraw \
gdi32 \
+ gdiplus \
kernel32 \
msvcrt \
mpr \
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index c0781a9..6533a61 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -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
commit 4e3e5211d38beb5d6b5e0ea308f82d3b8a3c0cfc
Author: Michael Stahl <mst at openoffice.org>
Date: Mon Mar 14 17:45:57 2011 +0100
gnumake4: ComponentTarget: [hg:d5e93bd62dfc]
some components, such as those in module sax, are used during the build,
and thus need a special second component file for that purpose.
one way of providing this is to just always build a foo.inbuild.component
for every foo.component.
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 5fc15ba..b0f5071 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -37,19 +37,27 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(gb_XSLTPROC) --nonet --stringparam uri \
'$(subst \d,$$,$(COMPONENTPREFIX))$(LIBFILENAME)' -o $(1) \
$(gb_ComponentTarget_XSLTCOMMANDFILE) $(2))
-
endef
+# creates 2 componentfiles: the first is for the installation set,
+# the second is for using the component during the build.
+# bit of a hack, hopefully inbuild can be removed when solver layout is fixed.
define gb_ComponentTarget__rules
-$$(call gb_ComponentTarget_get_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_XSLTPROCTARGET)
- $$(call gb_ComponentTarget__command,$$@,$$<,$$*)
+$$(call gb_ComponentTarget_get_inbuild_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_XSLTPROCTARGET)
+ $$(call gb_ComponentTarget__command,$$@,$$<,$$*)
-$$(call gb_ComponentTarget_get_clean_target,%) :
- $$(call gb_Output_announce,$$*,$(false),CMP,1)
- rm -f $$(call gb_ComponentTarget_get_outdir_target,$$*) $$(call gb_ComponentTarget_get_target,$$*)
+$$(call gb_ComponentTarget_get_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_XSLTPROCTARGET)
+ $$(call gb_ComponentTarget__command,$$@,$$<,$$*)
endef
+$(call gb_ComponentTarget_get_clean_target,%) :
+ $(call gb_Output_announce,$$*,$(false),CMP,1)
+ rm -f $(call gb_ComponentTarget_get_outdir_target,$*) \
+ $(call gb_ComponentTarget_get_target,$*) \
+ $(call gb_ComponentTarget_get_outdir_inbuild_target,$*) \
+ $(call gb_ComponentTarget_get_inbuild_target,$*) \
+
$(foreach repo,$(gb_ComponentTarget_REPOS),$(eval $(call gb_ComponentTarget__rules,$(repo))))
$(call gb_ComponentTarget_get_target,%) :
@@ -60,9 +68,14 @@ $(call gb_ComponentTarget_get_external_target,%) :
define gb_ComponentTarget_ComponentTarget
$(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3)
+$(call gb_ComponentTarget_get_inbuild_target,$(1)) : LIBFILENAME := $(3)
$(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2)
+$(call gb_ComponentTarget_get_inbuild_target,$(1)) : \
+ COMPONENTPREFIX := $(call gb_Library__get_layer_componentprefix,NONE)
$(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(1))
+$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)) : $(call gb_ComponentTarget_get_inbuild_target,$(1))
$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)))
+$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)),$(call gb_ComponentTarget_get_inbuild_target,$(1)))
endef
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 0ce56ce..9efdea7 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -82,7 +82,7 @@ endef
define gb_Library_set_componentfile
$(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Library__get_componentprefix,$(1)),$(call gb_Library_get_runtime_filename,$(1)))
-$(call gb_Library_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2))
+$(call gb_Library_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2)) $(call gb_ComponentTarget_get_outdir_inbuild_target,$(2))
$(call gb_Library_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(2))
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 2c84b7c..4fa8221 100755
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -28,6 +28,7 @@
# outdir target pattern
gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).component
+gb_ComponentTarget_get_outdir_inbuild_target = $(OUTDIR)/xml/component/$(1).inbuild.component
gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT)
gb_PackagePart_get_destinations = $(OUTDIR)/xml $(OUTDIR)/inc $(OUTDIR)/bin $(OUTDIR)/pck
gb_PackagePart_get_target = $(OUTDIR)/$(1)
@@ -50,6 +51,7 @@ endef
gb_AllLangResTarget_get_target = $(WORKDIR)/AllLangRes/$(1)
gb_CObject_get_target = $(WORKDIR)/CObject/$(1).o
gb_ComponentTarget_get_target = $(WORKDIR)/ComponentTarget/$(1).component
+gb_ComponentTarget_get_inbuild_target = $(WORKDIR)/ComponentTarget/$(1).inbuild.component
gb_CppunitTest_get_target = $(WORKDIR)/CppunitTest/$(1).test
gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done
gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index d4d7dcc..9268951 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -416,6 +416,6 @@ gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
-
+ NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 0611d20..dfa6d9a 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -456,6 +456,6 @@ gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
-
+ NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 30ba135..6e7129e 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -398,6 +398,6 @@ gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
-
+ NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 3716c5d..f42e500 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -760,5 +760,6 @@ gb_XSLTPROCPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+ NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index e730501..ccf9359 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -688,5 +688,6 @@ gb_XSLTPROCPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+ NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
# vim: set noet sw=4 ts=4:
commit b95474217a6278d4e2ce97b6949f543847132de4
Author: Michael Stahl <mst at openoffice.org>
Date: Mon Mar 14 15:09:39 2011 +0100
gnumake4: expat libraries are static [hg:3daa2bed1277]
diff --git a/Repository.mk b/Repository.mk
index f1bd8e3..0ea7d9b 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -169,4 +169,15 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
vclmain \
))
+ifeq ($(SYSTEM_EXPAT),YES)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
+ expat \
+))
+else
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+ expat_xmlparse \
+ expat_xmltok \
+))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 20a7d6d..d4d7dcc 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -277,9 +277,6 @@ endif
gb_Library_PLAINLIBS_NONE += \
cairo \
- expat \
- expat_xmltok \
- expat_xmlparse \
fontconfig \
Xrender \
pixman-1 \
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index ab1059b..3716c5d 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -452,9 +452,6 @@ gb_Library_PLAINLIBS_NONE += \
d3d9 \
d3dx \
ddraw \
- expat \
- expat_xmltok \
- expat_xmlparse \
gdi32 \
gdiplus \
gnu_getopt \
commit f1b50e55460236f6a1c7c8ed85f32a7e723718da
Author: Mathias Bauer <mba at openoffice.org>
Date: Wed Mar 2 18:41:59 2011 +0100
CWS gnumake4: convert xmlreader to new build system [hg:751b4a1bff7b]
diff --git a/Repository.mk b/Repository.mk
index 646ffc9..f1bd8e3 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -101,6 +101,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
xml2 \
+ xmlreader \
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
commit bb1c7fcaeadb8d33bcca6abe12ef99676b4dd5e4
Author: Mathias Bauer <mba at openoffice.org>
Date: Wed Mar 2 14:38:51 2011 +0100
CWS gnumake4: some fixes for Windows [hg:9eb9b5d5181e]
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index a94605e..b501e85 100755
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -137,6 +137,9 @@ gb_Library_NOILIBFILENAMES:=\
d3d9 \
d3dx \
ddraw \
+ expat \
+ expat_xmltok\
+ expat_xmlparse \
gdi32 \
gdiplus \
graphite_dll \
@@ -212,9 +215,4 @@ gb_Library_TARGETS := $(filter-out cairo,$(gb_Library_TARGETS))
gb_Library_TARGETS := $(filter-out pixman-1,$(gb_Library_TARGETS))
endif
-ifeq ($(SYSTEM_EXPAT),YES)
-gb_Library_TARGETS := $(filter-out expat,$(gb_Library_TARGETS))
-endif
-
-
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 8b27cc4..20a7d6d 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -278,6 +278,8 @@ endif
gb_Library_PLAINLIBS_NONE += \
cairo \
expat \
+ expat_xmltok \
+ expat_xmlparse \
fontconfig \
Xrender \
pixman-1 \
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 472f080..ab1059b 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -453,6 +453,8 @@ gb_Library_PLAINLIBS_NONE += \
d3dx \
ddraw \
expat \
+ expat_xmltok \
+ expat_xmlparse \
gdi32 \
gdiplus \
gnu_getopt \
commit 6cd6ab872bf0721ec8b8c760b318825ba7b80ca5
Author: Mathias Bauer <mba at openoffice.org>
Date: Wed Mar 2 13:22:42 2011 +0100
CWS gnumake4: convert sax to new build system [hg:389d236eb6b2]
diff --git a/Repository.mk b/Repository.mk
index d4e0fce..646ffc9 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -137,6 +137,8 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
canvasfactory \
directx5canvas \
directx9canvas \
+ expwrap \
+ fastsax \
fsstorage \
gdipluscanvas \
hatchwindowfactory \
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index bec225e..a94605e 100755
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -212,4 +212,9 @@ gb_Library_TARGETS := $(filter-out cairo,$(gb_Library_TARGETS))
gb_Library_TARGETS := $(filter-out pixman-1,$(gb_Library_TARGETS))
endif
+ifeq ($(SYSTEM_EXPAT),YES)
+gb_Library_TARGETS := $(filter-out expat,$(gb_Library_TARGETS))
+endif
+
+
# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 94f42dc..6c96df0 100755
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1186,14 +1186,14 @@ File gid_File_Lib_Res
Dir = SCP2_OOO_BIN_DIR;
End
-File gid_File_Lib_Sax_Uno
+File gid_File_Lib_Expwrap_Uno
TXT_FILE_BODY;
Styles = (PACKED,DONT_OVERWRITE);
Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
- Name = STRING(CONCAT2(sax.uno,UNXSUFFIX));
+ Name = STRING(CONCAT2(expwrap.uno,UNXSUFFIX));
#else
- Name = "sax.uno.dll";
+ Name = "expwrap.uno.dll";
#endif
End
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index ee7b91e..bba74c8 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -344,7 +344,7 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Package2,
gid_File_Lib_Deployment,
gid_File_Lib_DeploymentGui,
- gid_File_Lib_Sax_Uno,
+ gid_File_Lib_Expwrap_Uno,
gid_File_Lib_Fastsax_Uno,
gid_File_Lib_Slideshow,
gid_File_Lib_Recentfile,
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index d4d7dcc..8b27cc4 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -277,6 +277,7 @@ endif
gb_Library_PLAINLIBS_NONE += \
cairo \
+ expat \
fontconfig \
Xrender \
pixman-1 \
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 3716c5d..472f080 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -452,6 +452,7 @@ gb_Library_PLAINLIBS_NONE += \
d3d9 \
d3dx \
ddraw \
+ expat \
gdi32 \
gdiplus \
gnu_getopt \
commit 280cc8be04489f61fd93a1413e6a280fa9403c41
Author: Mathias Bauer <mba at openoffice.org>
Date: Wed Mar 2 11:54:18 2011 +0100
CWS gnumake4: convert xmlscript to new build system [hg:d4df54d61f2a]
diff --git a/Module_ooo.mk b/Module_ooo.mk
index a4828c0..b8f9a40 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
unoxml \
vcl \
xmloff \
++ xmlscript \
vbahelper \
))
commit 0158e63df25f4f3c257231c56412642d24d62310
Author: Mathias Bauer <mba at openoffice.org>
Date: Tue Mar 1 23:32:15 2011 +0100
CWS gnumake4: fixes for building with ENABLE_CAIRO on windows [hg:824c8caeaf61]
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 5339956..bec225e 100755
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -133,6 +133,7 @@ gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Lib
endif
gb_Library_NOILIBFILENAMES:=\
advapi32 \
+ cairo \
d3d9 \
d3dx \
ddraw \
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index eff8999..3716c5d 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -80,7 +80,6 @@ gb_CFLAGS := \
-GR \
-Gs \
-GS \
- -Gy \
-nologo \
-Wall \
-wd4005 \
@@ -449,6 +448,7 @@ gb_Library_PLAINEXT := .lib
gb_Library_PLAINLIBS_NONE += \
advapi32 \
+ cairo \
d3d9 \
d3dx \
ddraw \
commit a3db2a449d53b750fb85b31c1e3e729fb08d03ff
Author: Mathias Bauer <mba at openoffice.org>
Date: Tue Mar 1 21:09:50 2011 +0100
CWS gnumake4: reimplement basegfx_s hack for new build system [hg:c943ed591aff]
diff --git a/Repository.mk b/Repository.mk
index 922eae6..d4e0fce 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -157,6 +157,7 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
))
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+ basegfx_s \
jpeglib \
ooopathutils \
salcpprt \
commit b7a68ea014f6f5921b5ee4b0b1131748ef529091
Author: Mathias Bauer <mba at openoffice.org>
Date: Mon Feb 28 17:35:51 2011 +0100
CWS gnumake4: convert regexp to new build system [hg:56e4316f8d74]
diff --git a/Repository.mk b/Repository.mk
index 32799fa..922eae6 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -62,6 +62,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
fwl \
fwm \
i18npaper \
+ i18nregexp \
lng \
msfilter \
msword \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 6f2905f..94f42dc 100755
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -645,16 +645,7 @@ File gid_File_Lib_I18npool
#endif
End
-File gid_File_Lib_I18nregexp
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- #ifdef UNX
- Name = STRING(CONCAT3(libi18nregexp,COMID,UNXSUFFIX));
- #else
- Name = STRING(CONCAT3(i18nregexp,COMID,.dll));
- #endif
-End
+STD_LIB_FILE( gid_File_I18nregexp, i18nregexp )
File gid_File_Lib_I18nsearch
TXT_FILE_BODY;
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index d7f9cb1..c0781a9 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -53,6 +53,7 @@ I18NUTILLIB=-li18nutil$(COMID)
.INCLUDE .IGNORE : i18npool/version.mk
I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID)
I18NPAPERLIB=-li18npaper$(DLLPOSTFIX)
+I18NREGEXPLIB=-li18nregexp$(DLLPOSTFIX)
.IF "$(GUI)$(COM)"=="WNTGCC"
SALHELPERLIB=-lsalhelper$(UDK_MAJOR)$(COMID)
.ELSE # "$(GUI)$(COM)"=="WNTGCC"
@@ -368,6 +369,7 @@ ICUDATALIB=icudata.lib
I18NUTILLIB=ii18nutil.lib
I18NISOLANGLIB=ii18nisolang.lib
I18NPAPERLIB=ii18npaper.lib
+I18NREGEXPLIB=ii18nregexp.lib
SALHELPERLIB=isalhelper.lib
XMLSCRIPTLIB=ixcr.lib
COMPHELPERLIB=icomphelp.lib
More information about the Libreoffice-commits
mailing list