Kaydet (Commit) e5ce011c authored tarafından Andras Timar's avatar Andras Timar

Merge branch 'master' into feature/killsdf

Conflicts:
	Makefile.top
	Module_tail_build.mk
	RepositoryExternal.mk
	RepositoryFixes.mk
	accessibility/source/standard/vclxaccessibletoolbox.cxx
	basic/source/uno/dlgcont.cxx
	connectivity/Library_ado.mk
	cross_tail_build/prj/build.lst
	desktop/source/offacc/acceptor.cxx
	filter/Library_PptImporter.mk
	filter/source/t602/filterenv.cxx
	i18npool/Library_textconv_dict.mk
	ooo.lst.in
	saxon/ExternalProject_saxon.mk
	saxon/build.xml
	sc/sdi/scalc.sdi
	sc/source/filter/xml/xmlstyli.cxx
	sc/source/ui/condformat/condformatdlg.cxx
	sc/source/ui/condformat/condformatmgr.cxx
	sc/source/ui/view/cellsh1.cxx
	sdext/source/pdfimport/misc/pwdinteract.cxx
	shell/qa/zip/makefile.mk
	shell/qa/zip/testimpl/makefile.mk
	solenv/gbuild/CppunitTest.mk
	solenv/gbuild/gbuild.mk
	solenv/gbuild/platform/android.mk
	solenv/gbuild/platform/com_GCC_defs.mk
	solenv/gbuild/platform/macosx.mk
	soltools/Executable_adjustvisibility.mk
	soltools/Executable_checkdll.mk
	soltools/Executable_cpp.mk
	soltools/Executable_javadep.mk
	soltools/Executable_makedepend.mk
	sw/qa/extras/rtfimport/rtfimport.cxx
	tail_build/prj/build.lst
	tomcat/ExternalProject_tomcat.mk
	ucb/source/ucp/webdav/webdavcontent.cxx
	xml2cmp/Executable_xml2cmp.mk

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -45,7 +45,6 @@ $(eval $(call gb_Library_use_libraries,merged,\
$(eval $(call gb_Library_use_externals,merged,\
cups \
icui18n \
icule \
icuuc \
jpeg \
......@@ -117,11 +116,24 @@ $(eval $(call gb_Library_use_system_win32_libs,merged,\
oleaut32 \
shell32 \
user32 \
usp10 \
uuid \
version \
winmm \
winspool \
))
# prevent warning spamming
$(eval $(call gb_Library_add_ldflags,merged,\
/ignore:4049 \
/ignore:4217 \
))
$(eval $(call gb_Library_use_externals,merged,\
icuin \
))
else
$(eval $(call gb_Library_use_externals,merged,\
icui18n \
))
endif
ifeq ($(OS),MACOSX)
......
......@@ -44,6 +44,7 @@ basebmp\
basegfx\
basic\
bean\
beanshell\
binaryurp\
bluez_bluetooth\
boost\
......@@ -88,15 +89,19 @@ idl\
idlc\
io\
javaunohelper\
jfreereport\
jpeg\
jurt\
jvmaccess\
jvmfwk\
l10ntools\
languagetool\
libcdr\
libcmis\
libmspub\
liborcus\
libpng\
librsvg\
libvisio\
libwpd\
libwpg\
......@@ -120,13 +125,14 @@ padmin\
psprint_config\
pyuno\
qadevOOo\
rdbmaker\
readlicense_oo\
regexp\
registry\
remotebridges\
reportbuilder\
reportdesign\
rdbmaker\
rhino\
ridljar\
rsc\
sal\
......@@ -187,7 +193,6 @@ writerfilter\
writerperfect\
x11_extensions\
xmerge\
xml2cmp\
xmlhelp\
xmloff\
xmlreader\
......@@ -196,7 +201,6 @@ xmlsecurity\
xsltml\
dmake_modules:=\
beanshell\
berkeleydb\
binfilter \
cairo\
......@@ -218,14 +222,10 @@ hunspell\
hyphen\
icu\
instsetoo_native\
jfreereport\
jpeg\
languagetool\
libcroco\
libexttextcat\
libgsf\
liblangtag\
librsvg\
libxml2\
libxmlsec\
libxslt\
......@@ -245,7 +245,6 @@ postgresql\
postprocess\
python\
redland\
rhino\
setup_native\
stax\
stlport\
......@@ -256,7 +255,7 @@ zlib\
export gb_TAILBUILDTARGET=all slowcheck
define gbuild_module_rules
.PHONY: $(1) $(1).all $(1).clean $(1).deliver
.PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).subsequentcheck $(1).deliver
$(1): bootstrap fetch
cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) gb_PARTIALBUILD=T
......@@ -270,6 +269,12 @@ $(1).all: bootstrap fetch
) \
$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
$(1).build:
cd $(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) build gb_PARTIALBUILD=T
$(1).check:
cd $(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) check gb_PARTIALBUILD=T
$(1).clean:
cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) clean gb_PARTIALBUILD=T
......@@ -337,6 +342,7 @@ endif
rm -fr $(OUTDIR)
rm -fr $(WORKDIR)
rm -fr $(SRCDIR)/*/$(INPATH)
rm -fr $(SRCDIR)/solenv/$(OUTPATH)
rm -fr install
clean-build:
......@@ -345,10 +351,12 @@ ifeq ($(CROSS_COMPILING),YES)
rm -rf $(SRCDIR)/*/$(INPATH_FOR_BUILD)
endif
include $(SRCDIR)/compilerplugins/Makefile.mk
#
# Distclean
#
distclean : clean
distclean : clean compilerplugins-clean
ifeq ($(BUILD_DMAKE),YES)
(if [ -f dmake/Makefile ] ; then $(GNUMAKE) -j $(GMAKE_PARALLELISM) -C dmake distclean; fi) && \
rm -f solenv/*/bin/dmake*
......@@ -356,7 +364,8 @@ endif
rm -fr config_host.mk config_build.mk aclocal.m4 autom4te.cache \
bin/repo-list config.log config.status configure \
ooo.lst post_download post_download.log \
config_host.mk.last set_soenv.stamp src.downloaded warn
config_host.mk.last set_soenv.stamp src.downloaded warn \
solenv/bin/concat-deps.exe solenv/bin/concat-deps
find $(SOLARENV)/gdb -name "*.pyc" -exec rm {} \;
#
......@@ -384,7 +393,7 @@ endif
#
# Bootstap
#
bootstrap: $(WORKDIR)/bootstrap
bootstrap: $(WORKDIR)/bootstrap compilerplugins
$(WORKDIR)/bootstrap: solenv/bin/concat-deps.c
@cd $(SRCDIR) && ./bootstrap
......
......@@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
basegfx \
basic \
bean \
$(call gb_Helper_optional,BSH,beanshell) \
binaryurp \
$(call gb_Helper_optional,BLUEZ,bluez_bluetooth) \
bridges \
......@@ -80,6 +81,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
$(call gb_Helper_optional,DESKTOP,idlc) \
io \
javaunohelper \
$(call gb_Helper_optional,JFREEREPORT,jfreereport) \
jurt \
jvmaccess \
jvmfwk \
......@@ -87,6 +89,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
libcmis \
libmspub \
liborcus \
$(call gb_Helper_optional,LIBRSVG,librsvg) \
libvisio \
libwpd \
libwpg \
......@@ -119,6 +122,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
remotebridges \
reportbuilder \
reportdesign \
$(call gb_Helper_optional,RHINO,rhino) \
ridljar \
rsc \
salhelper \
......
......@@ -76,7 +76,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
uiex \
ulfconv \
ulfex \
xml2cmp \
xpdfimport \
xrmex \
))
......@@ -219,7 +218,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
endif
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
PptImporter \
abp \
acc \
adabas \
......@@ -469,6 +467,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
pyuno \
pyuno_wrapper \
recentfile \
librsvg-2-2 \
scriptframe \
sdbc2 \
smoketest \
......@@ -523,12 +522,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
))
endif
ifeq ($(OS),IOS)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
gcc3_uno \
))
endif
$(eval $(call gb_Helper_register_libraries,RTLIBS, \
comphelper \
i18nisolang1 \
......@@ -661,6 +654,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
codemaker_java \
cosv \
dtobj \
findsofficepath \
headless \
libeay32 \
npsoenv \
......
......@@ -200,7 +200,7 @@ endef
else # !SYSTEM_JPEG
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
jpeglib \
jpeg \
))
define gb_LinkTarget__use_jpeg
......@@ -210,7 +210,7 @@ $(call gb_LinkTarget_set_include,$(1),\
)
$(call gb_LinkTarget_use_static_libraries,$(1),\
jpeglib \
jpeg \
)
endef
......@@ -940,12 +940,15 @@ endef
else # !SYSTEM_LIBCDR
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
cdrlib \
cdr-0.0 \
))
define gb_LinkTarget__use_cdr
$(call gb_LinkTarget_use_package,$(1),\
libcdr \