You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/03/11 23:01:48 UTC
svn commit: r1734636 - in /openoffice/branches/gbuild-reintegration: ./
main/ main/i18npool/source/localedata/data/
main/postprocess/packcomponents/ main/sax/ main/sax/prj/
main/sax/source/expatwrap/ main/sax/source/fastparser/
main/scp2/source/ooo/ ma...
Author: damjan
Date: Fri Mar 11 22:01:47 2016
New Revision: 1734636
URL: http://svn.apache.org/viewvc?rev=1734636&view=rev
Log:
Merge sax-related patches from branches/gbuild:
* r1409518: CWS gnumake4: convert sax to new build system
* r1409519: CWS gnumake4: some fixes for Windows
* r1409531: gnumake4: expat libraries are static
* r1409533: gnumake4: ComponentTarget: some components, such as those in module sax,
are used during the build,
* r1409535: gnumake4: fix uses of sax components
* r1409536: CWS gnumake4: some fixes for mingw and windows libs
* r1409537: gnumake4: sax: add missing package dependency
Also had to add filter-out expat from gb_Library_TARGETS when SYSTEM_EXPAT=YES
in main/RepositoryFixes.mk, and rename main/sax/source/expatwrap/sax.component
to main/sax/source/expatwrap/expwrap.component like is expected in 2 places.
BUILDS
Build updates by: me
Added:
openoffice/branches/gbuild-reintegration/main/sax/Library_expwrap.mk
- copied, changed from r1409519, incubator/ooo/branches/gbuild/main/sax/Library_expwrap.mk
openoffice/branches/gbuild-reintegration/main/sax/Library_fastsax.mk
- copied, changed from r1409519, incubator/ooo/branches/gbuild/main/sax/Library_fastsax.mk
openoffice/branches/gbuild-reintegration/main/sax/Library_sax.mk
- copied, changed from r1409519, incubator/ooo/branches/gbuild/main/sax/Library_sax.mk
openoffice/branches/gbuild-reintegration/main/sax/Makefile
- copied unchanged from r1409519, incubator/ooo/branches/gbuild/main/sax/Makefile
openoffice/branches/gbuild-reintegration/main/sax/Module_sax.mk
- copied, changed from r1409519, incubator/ooo/branches/gbuild/main/sax/Module_sax.mk
openoffice/branches/gbuild-reintegration/main/sax/Package_inc.mk
- copied unchanged from r1409519, incubator/ooo/branches/gbuild/main/sax/Package_inc.mk
openoffice/branches/gbuild-reintegration/main/sax/prj/makefile.mk
- copied unchanged from r1409519, incubator/ooo/branches/gbuild/main/sax/prj/makefile.mk
openoffice/branches/gbuild-reintegration/main/sax/source/expatwrap/expwrap.component
- copied unchanged from r1734635, openoffice/branches/gbuild-reintegration/main/sax/source/expatwrap/sax.component
Removed:
openoffice/branches/gbuild-reintegration/main/sax/source/expatwrap/sax.component
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/Module_ooo.mk
openoffice/branches/gbuild-reintegration/main/Repository.mk
openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk
openoffice/branches/gbuild-reintegration/main/i18npool/source/localedata/data/makefile.mk
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
openoffice/branches/gbuild-reintegration/main/sax/prj/build.lst
openoffice/branches/gbuild-reintegration/main/sax/prj/d.lst
openoffice/branches/gbuild-reintegration/main/sax/source/expatwrap/attrlistimpl.hxx
openoffice/branches/gbuild-reintegration/main/sax/source/expatwrap/sax_expat.cxx
openoffice/branches/gbuild-reintegration/main/sax/source/fastparser/facreg.cxx
openoffice/branches/gbuild-reintegration/main/scp2/source/ooo/file_library_ooo.scp
openoffice/branches/gbuild-reintegration/main/scp2/source/ooo/module_hidden_ooo.scp
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/ComponentTarget.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Library.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/TargetLocations.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/macosx.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/os2.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk
openoffice/branches/gbuild-reintegration/main/solenv/inc/libs.mk
openoffice/branches/gbuild-reintegration/main/xmlscript/Library_xcr.mk
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 11 22:01:47 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409495,1409497-1409515,1409523-1409524,1409526,1409529-1409530,1409538-1409541,1409543-1409544,1409546-1409547
+/incubator/ooo/branches/gbuild:1409313-1409495,1409497-1409515,1409518-1409519,1409523-1409524,1409526,1409529-1409531,1409533,1409535-1409541,1409543-1409544,1409546-1409547
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified: openoffice/branches/gbuild-reintegration/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/Module_ooo.mk?rev=1734636&r1=1734635&r2=1734636&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/Module_ooo.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/Module_ooo.mk Fri Mar 11 22:01:47 2016
@@ -39,6 +39,7 @@ $(eval $(call gb_Module_add_moduledirs,o
oovbaapi \
oox \
padmin \
+ sax \
sfx2 \
sot \
starmath \
@@ -58,6 +59,7 @@ $(eval $(call gb_Module_add_moduledirs,o
wizards \
writerfilter \
xmloff \
+ xmlreader \
xmlscript \
))
Modified: openoffice/branches/gbuild-reintegration/main/Repository.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/Repository.mk?rev=1734636&r1=1734635&r2=1734636&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/Repository.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/Repository.mk Fri Mar 11 22:01:47 2016
@@ -134,6 +134,8 @@ $(eval $(call gb_Helper_register_librari
canvasfactory \
directx5canvas \
directx9canvas \
+ expwrap \
+ fastsax \
fsstorage \
gdipluscanvas \
hatchwindowfactory \
@@ -182,4 +184,15 @@ $(eval $(call gb_Helper_register_librari
))
endif
+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:
Modified: openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk?rev=1734636&r1=1734635&r2=1734636&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk Fri Mar 11 22:01:47 2016
@@ -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))
@@ -36,10 +37,20 @@ gb_Library_FILENAMES := $(patsubst salhe
gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES))
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-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 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))
@@ -52,11 +63,12 @@ gb_Library_FILENAMES := $(patsubst stl:%
endif
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-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 cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
@@ -76,16 +88,21 @@ gb_Library_FILENAMES := $(patsubst z:iz%
gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES))
+# 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 \
@@ -103,7 +120,8 @@ gb_Library_DLLFILENAMES := $(patsubst z:
gb_Library_FILENAMES := $(patsubst stl:%,stl:$(gb_Library_IARCSYSPRE)stdc++_s$(gb_Library_IARCSYSPRE),$(gb_Library_FILENAMES))
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-else
+else #ifneq ($(USE_MINGW),)
+
gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
@@ -119,39 +137,18 @@ 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))
gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES))
-gb_Library_NOILIBFILENAMES:=\
- advapi32 \
- cairo \
- d3d9 \
- d3dx \
- ddraw \
- 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
@@ -160,9 +157,9 @@ gb_Library_DLLFILENAMES := $(patsubst co
gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(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))
@@ -212,15 +209,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 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))
@@ -267,4 +255,8 @@ gb_Library_TARGETS := $(filter-out cairo
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:
Modified: openoffice/branches/gbuild-reintegration/main/i18npool/source/localedata/data/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/i18npool/source/localedata/data/makefile.mk?rev=1734636&r1=1734635&r2=1734636&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/i18npool/source/localedata/data/makefile.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/i18npool/source/localedata/data/makefile.mk Fri Mar 11 22:01:47 2016
@@ -38,7 +38,7 @@ my_file = file:///
my_file = file://
.END
-my_components = sax.inbuild
+my_components = component/sax/source/expatwrap/expwrap.inbuild
# --- Settings -----------------------------------------------------
Modified: openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk?rev=1734636&r1=1734635&r2=1734636&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk Fri Mar 11 22:01:47 2016
@@ -80,6 +80,8 @@ my_components = \
component/linguistic/source/lng \
component/oox/util/oox \
component/vbahelper/util/msforms \
+ component/sax/source/expatwrap/expwrap \
+ component/sax/source/fastparser/fastsax \
component/sfx2/util/sfx \
component/sot/util/sot \
component/svgio/svgio \
@@ -121,7 +123,6 @@ my_components = \
dlgprov \
embobj \
evtatt \
- fastsax \
fileacc \
filterconfig1 \
flash \
@@ -155,7 +156,6 @@ my_components = \
rpt \
rptui \
rptxml \
- sax \
sb \
sc \
scd \
Copied: openoffice/branches/gbuild-reintegration/main/sax/Library_expwrap.mk (from r1409519, incubator/ooo/branches/gbuild/main/sax/Library_expwrap.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sax/Library_expwrap.mk?p2=openoffice/branches/gbuild-reintegration/main/sax/Library_expwrap.mk&p1=incubator/ooo/branches/gbuild/main/sax/Library_expwrap.mk&r1=1409519&r2=1734636&rev=1734636&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/Library_expwrap.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sax/Library_expwrap.mk Fri Mar 11 22:01:47 2016
@@ -71,7 +71,7 @@ $(eval $(call gb_Library_set_defs,expwra
$$(DEFS) \
-DXML_UNICODE \
))
-$(eval $(call gb_Library_add_linked_libs,expwrap,\
+$(eval $(call gb_Library_add_linked_static_libs,expwrap,\
expat_xmlparse \
expat_xmltok \
))
Copied: openoffice/branches/gbuild-reintegration/main/sax/Library_fastsax.mk (from r1409519, incubator/ooo/branches/gbuild/main/sax/Library_fastsax.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sax/Library_fastsax.mk?p2=openoffice/branches/gbuild-reintegration/main/sax/Library_fastsax.mk&p1=incubator/ooo/branches/gbuild/main/sax/Library_fastsax.mk&r1=1409519&r2=1734636&rev=1734636&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/Library_fastsax.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sax/Library_fastsax.mk Fri Mar 11 22:01:47 2016
@@ -68,7 +68,7 @@ $(eval $(call gb_Library_add_linked_libs
expat \
))
else
-$(eval $(call gb_Library_add_linked_libs,fastsax,\
+$(eval $(call gb_Library_add_linked_static_libs,fastsax,\
expat_xmlparse \
expat_xmltok \
))
Copied: openoffice/branches/gbuild-reintegration/main/sax/Library_sax.mk (from r1409519, incubator/ooo/branches/gbuild/main/sax/Library_sax.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sax/Library_sax.mk?p2=openoffice/branches/gbuild-reintegration/main/sax/Library_sax.mk&p1=incubator/ooo/branches/gbuild/main/sax/Library_sax.mk&r1=1409519&r2=1734636&rev=1734636&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/Library_sax.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sax/Library_sax.mk Fri Mar 11 22:01:47 2016
@@ -32,6 +32,10 @@ $(eval $(call gb_Library_add_api,sax,\
offapi \
))
+$(eval $(call gb_Library_add_package_headers,sax,\
+ sax_inc \
+))
+
$(eval $(call gb_Library_set_include,sax,\
$$(INCLUDE) \
-I$(SRCDIR)/sax/inc \
Copied: openoffice/branches/gbuild-reintegration/main/sax/Module_sax.mk (from r1409519, incubator/ooo/branches/gbuild/main/sax/Module_sax.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sax/Module_sax.mk?p2=openoffice/branches/gbuild-reintegration/main/sax/Module_sax.mk&p1=incubator/ooo/branches/gbuild/main/sax/Module_sax.mk&r1=1409519&r2=1734636&rev=1734636&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sax/Module_sax.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sax/Module_sax.mk Fri Mar 11 22:01:47 2016
@@ -34,9 +34,9 @@ $(eval $(call gb_Module_add_targets,sax,
Package_inc \
))
-ifeq ($(WITH_CPPUNIT),YES)
+ifeq ($(ENABLE_UNIT_TESTS),YES)
$(eval $(call gb_Module_add_check_targets,sax,\
- CppunitTest_sax \
+ GoogleTest_sax \
))
endif
Modified: openoffice/branches/gbuild-reintegration/main/sax/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sax/prj/build.lst?rev=1734636&r1=1734635&r2=1734636&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sax/prj/build.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/sax/prj/build.lst Fri Mar 11 22:01:47 2016
@@ -1,6 +1,3 @@
ax sax : offapi cppuhelper EXPAT:expat comphelper LIBXSLT:libxslt NULL
-ax sax usr1 - all ax_mkout NULL
-ax sax\source\expatwrap nmake - all ax_expatwrap NULL
-ax sax\source\tools nmake - all ax_tools NULL
-ax sax\source\fastparser nmake - all ax_fastparser ax_expatwrap ax_tools NULL
-ax sax\qa\gtest nmake - all ax_qa_gtest ax_tools NULL
+ax sax\prj nmake - all ax_prj NULL
+
Modified: openoffice/branches/gbuild-reintegration/main/sax/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sax/prj/d.lst?rev=1734636&r1=1734635&r2=1734636&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sax/prj/d.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/sax/prj/d.lst Fri Mar 11 22:01:47 2016
@@ -1,16 +0,0 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\misc\fastsax.component %_DEST%\xml%_EXT%\fastsax.component
-..\%__SRC%\misc\sax.component %_DEST%\xml%_EXT%\sax.component
-..\%__SRC%\misc\sax.inbuild.component %_DEST%\xml%_EXT%\sax.inbuild.component
-
-mkdir: %_DEST%\inc%_EXT%\sax
-mkdir: %_DEST%\inc%_EXT%\sax\tools
-..\inc\sax\dllapi.h %_DEST%\inc%_EXT%\sax\dllapi.h
-..\inc\sax\fshelper.hxx %_DEST%\inc%_EXT%\sax\fshelper.hxx
-..\inc\sax\fastattribs.hxx %_DEST%\inc%_EXT%\sax\fastattribs.hxx
-..\inc\sax\tools\converter.hxx %_DEST%\inc%_EXT%\sax\tools\converter.hxx
-
-dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"
Modified: openoffice/branches/gbuild-reintegration/main/sax/source/expatwrap/attrlistimpl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sax/source/expatwrap/attrlistimpl.hxx?rev=1734636&r1=1734635&r2=1734636&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sax/source/expatwrap/attrlistimpl.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sax/source/expatwrap/attrlistimpl.hxx Fri Mar 11 22:01:47 2016
@@ -25,10 +25,7 @@
#define _SAX_ATTRLISTIMPL_HXX
#include "sal/config.h"
-//#include "sax/saxdllapi.h"
-
#include <cppuhelper/implbase2.hxx>
-
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/util/XCloneable.hpp>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
Modified: openoffice/branches/gbuild-reintegration/main/sax/source/expatwrap/sax_expat.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sax/source/expatwrap/sax_expat.cxx?rev=1734636&r1=1734635&r2=1734636&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sax/source/expatwrap/sax_expat.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sax/source/expatwrap/sax_expat.cxx Fri Mar 11 22:01:47 2016
@@ -1024,13 +1024,13 @@ using namespace sax_expatwrap;
extern "C"
{
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;
Modified: openoffice/branches/gbuild-reintegration/main/sax/source/fastparser/facreg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sax/source/fastparser/facreg.cxx?rev=1734636&r1=1734635&r2=1734636&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sax/source/fastparser/facreg.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/sax/source/fastparser/facreg.cxx Fri Mar 11 22:01:47 2016
@@ -55,13 +55,13 @@ Reference< XInterface > SAL_CALL FastSax
extern "C"
{
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;
Modified: openoffice/branches/gbuild-reintegration/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/scp2/source/ooo/file_library_ooo.scp?rev=1734636&r1=1734635&r2=1734636&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/branches/gbuild-reintegration/main/scp2/source/ooo/file_library_ooo.scp Fri Mar 11 22:01:47 2016
@@ -1226,16 +1226,16 @@ 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));
#elif defined(OS2)
- Name = "sax_uno.dll";
+ Name = "expwrap_uno.dll";
#else
- Name = "sax.uno.dll";
+ Name = "expwrap.uno.dll";
#endif
End
Modified: openoffice/branches/gbuild-reintegration/main/scp2/source/ooo/module_hidden_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/scp2/source/ooo/module_hidden_ooo.scp?rev=1734636&r1=1734635&r2=1734636&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/scp2/source/ooo/module_hidden_ooo.scp (original)
+++ openoffice/branches/gbuild-reintegration/main/scp2/source/ooo/module_hidden_ooo.scp Fri Mar 11 22:01:47 2016
@@ -332,7 +332,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_PresentationMinimizer
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/ComponentTarget.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/ComponentTarget.mk?rev=1734636&r1=1734635&r2=1734636&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/ComponentTarget.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/ComponentTarget.mk Fri Mar 11 22:01:47 2016
@@ -33,19 +33,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_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,%) :
@@ -56,9 +64,15 @@ $(call gb_ComponentTarget_get_external_t
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)),$(1))
+$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)),$(call gb_ComponentTarget_get_inbuild_target,$(1)),$(1))
endef
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Library.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Library.mk?rev=1734636&r1=1734635&r2=1734636&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Library.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Library.mk Fri Mar 11 22:01:47 2016
@@ -78,7 +78,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
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/TargetLocations.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/TargetLocations.mk?rev=1734636&r1=1734635&r2=1734636&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/TargetLocations.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/TargetLocations.mk Fri Mar 11 22:01:47 2016
@@ -24,6 +24,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)/idl $(OUTDIR)/pck
gb_PackagePart_get_target = $(OUTDIR)/$(1)
@@ -46,6 +47,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_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done
gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done
gb_CustomTarget_get_workdir = $(WORKDIR)/CustomTarget/$(1)
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk?rev=1734636&r1=1734635&r2=1734636&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk Fri Mar 11 22:01:47 2016
@@ -415,6 +415,7 @@ gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH
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/ \
# UnoApiTarget
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/macosx.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/macosx.mk?rev=1734636&r1=1734635&r2=1734636&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/macosx.mk Fri Mar 11 22:01:47 2016
@@ -457,6 +457,7 @@ gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PA
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/ \
# UnoApiTarget
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/os2.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/os2.mk?rev=1734636&r1=1734635&r2=1734636&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/os2.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/os2.mk Fri Mar 11 22:01:47 2016
@@ -638,6 +638,7 @@ gb_XSLTPROCPRECOMMAND := PATH="$${PATH}:
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/ \
# UnoApiTarget
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk?rev=1734636&r1=1734635&r2=1734636&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk Fri Mar 11 22:01:47 2016
@@ -400,6 +400,7 @@ gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH
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/ \
# UnoApiTarget
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk?rev=1734636&r1=1734635&r2=1734636&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk Fri Mar 11 22:01:47 2016
@@ -759,6 +759,7 @@ gb_XSLTPROCPRECOMMAND := PATH="$${PATH}:
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/ \
# UnoApiTarget
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk?rev=1734636&r1=1734635&r2=1734636&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk Fri Mar 11 22:01:47 2016
@@ -481,6 +481,10 @@ gb_Library_PLAINLIBS_NONE += \
$(gb_MINGW_LIBSTDCPP) \
$(gb_MINGW_LIBGCC) \
advapi32 \
+ cairo \
+ d3d9 \
+ d3dx \
+ ddraw \
gdi32 \
gdiplus \
gnu_getopt \
@@ -695,6 +699,7 @@ gb_XSLTPROCPRECOMMAND := PATH="$${PATH}:
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/ \
# UnoApiTarget
Modified: openoffice/branches/gbuild-reintegration/main/solenv/inc/libs.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/inc/libs.mk?rev=1734636&r1=1734635&r2=1734636&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/inc/libs.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/inc/libs.mk Fri Mar 11 22:01:47 2016
@@ -381,7 +381,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
Modified: openoffice/branches/gbuild-reintegration/main/xmlscript/Library_xcr.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmlscript/Library_xcr.mk?rev=1734636&r1=1734635&r2=1734636&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/xmlscript/Library_xcr.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/xmlscript/Library_xcr.mk Fri Mar 11 22:01:47 2016
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_add_linked_libs
sal \
cppu \
cppuhelper \
+ stl \
$(gb_STDLIBS) \
))