summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Ostrovsky <David.Ostrovsky@gmx.de>2012-05-06 17:17:22 +0200
committerDavid Tardon <dtardon@redhat.com>2012-05-29 07:34:41 +0200
commit91c5b22706243c72ff269025bf03c518cd067f7d (patch)
tree7a6565bcc00ae3bed1c0184d070a9f1c4e7d6bd3
parentcc63f2e9b27248c316b166d08bc4c2f4577f470f (diff)
gbuild conversion: store module
Change-Id: Idbab17b87d042079a8fa6ded7a7424a745761b2f
-rw-r--r--.src_root0
-rw-r--r--Makefile522
-rw-r--r--extensions/source/update/feed/test/makefile.mk58
-rw-r--r--extensions/test/ole/OleClient/makefile.mk72
-rw-r--r--store/Package_inc.mk1
5 files changed, 523 insertions, 130 deletions
diff --git a/.src_root b/.src_root
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/.src_root
+++ /dev/null
diff --git a/Makefile b/Makefile
index 8b275453d8b9..622c94068452 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,361 @@ SRCDIR:=$(patsubst %/,%,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))
.PHONY : $(filter-out $(SRCDIR)/config_host.mk,$(MAKECMDGOALS))
+ifeq ($(gb_Side),)
+gb_Side:=host
+endif
+
+include $(SRCDIR)/config_$(gb_Side).mk
+
+ifeq ($(GMAKE_OPTIONS),)
+ifeq ($(verbose),)
+export GMAKE_OPTIONS:=-rs
+else
+export GMAKE_OPTIONS:=-r
+endif
+endif
+
+gbuild_modules:= \
+MathMLDTD\
+Mesa\
+UnoControls\
+accessibility\
+animations\
+apple_remote\
+avmedia\
+basctl\
+basebmp\
+basegfx\
+basic\
+bean\
+binaryurp\
+canvas\
+chart2\
+clucene\
+codemaker\
+comphelper\
+configmgr\
+cppcanvas\
+cppu\
+cppuhelper\
+cpputools\
+cui\
+dbaccess\
+desktop\
+drawinglayer\
+dtrans\
+editeng\
+embeddedobj\
+embedserv\
+eventattacher\
+extensions\
+fileaccess\
+filter\
+forms\
+formula\
+fpicker\
+framework\
+hwpfilter\
+i18npool\
+i18nutil\
+idl\
+idlc\
+io\
+javaunohelper\
+jurt\
+jvmaccess\
+jvmfwk\
+l10ntools\
+lingucomponent\
+linguistic\
+lotuswordpro\
+nlpsolver\
+np_sdk\
+o3tl\
+offapi\
+officecfg\
+oovbaapi\
+oox\
+package\
+packimages\
+padmin\
+psprint_config\
+qadevOOo\
+regexp\
+registry\
+reportdesign\
+rdbmaker\
+ridljar\
+rsc\
+sal\
+salhelper\
+sane\
+sax\
+sc\
+scaddins\
+sccomp\
+scripting\
+sd\
+sdext\
+sfx2\
+slideshow\
+smoketest\
+sot\
+starmath\
+stoc\
+store\
+svl\
+svtools\
+svx\
+sw\
+swext\
+tail_build\
+test\
+toolkit\
+tools\
+translations\
+twain\
+ucb\
+ucbhelper\
+udkapi\
+unixODBC\
+unodevtools\
+unoil\
+unotest\
+unotools\
+unoxml\
+ure\
+uui\
+vbahelper\
+vcl\
+wizards\
+writerfilter\
+writerperfect\
+xmerge\
+xml2cmp\
+xmlhelp\
+xmloff\
+xmlreader\
+xmlscript\
+xmlsecurity\
+
+dmake_modules:=\
+afms\
+apache-commons\
+autodoc\
+beanshell\
+berkeleydb\
+binfilter \
+boost\
+bridges\
+cairo\
+cli_ure\
+connectivity\
+cosv\
+cppunit\
+crashrep\
+ct2n\
+curl\
+dictionaries \
+epm\
+expat\
+external\
+extras\
+fontconfig\
+freetype\
+gdk-pixbuf\
+gettext\
+glib\
+graphite\
+helpcontent2 \
+hsqldb\
+hunspell\
+hyphen\
+icc\
+icu\
+instsetoo_native\
+jfreereport\
+jpeg\
+languagetool\
+libcdr\
+libcmis\
+libcroco\
+libexttextcat\
+libgsf\
+libpng\
+librsvg\
+libvisio\
+libwpd\
+libwpg\
+libwps\
+libxml2\
+libxmlsec\
+libxslt\
+lcms2\
+lpsolve\
+lucene\
+mdds\
+migrationanalysis\
+more_fonts\
+moz\
+mysqlc\
+mysqlcppconn\
+mythes\
+neon\
+nss\
+odk\
+openssl\
+pango\
+postgresql\
+postprocess\
+python\
+pyuno\
+readlicense_oo\
+redland\
+remotebridges\
+reportbuilder\
+rhino\
+saxon\
+scp2\
+setup_native\
+shell\
+solenv\
+soltools\
+stax\
+stlport\
+sysui\
+testtools\
+tomcat\
+udm\
+vigra\
+x11_extensions\
+xpdf\
+xsltml\
+zlib\
+
+gb_TAILBUILDMODULES := $(shell make -f $(SRCDIR)/tail_build/Makefile showmodules)
+
+define gbuild_module_rules
+.PHONY: $(1) $(1).all $(1).clean $(1).deliver
+
+$(1): bootstrap fetch
+ cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) gb_PARTIALBUILD=T
+
+ifeq ($(filter $(1),$(gb_TAILBUILDMODULES)),)
+$(1).all: bootstrap fetch
+ cd $(1) && unset MAKEFLAGS && \
+ $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
+else
+$(1).all: bootstrap fetch
+ cd tail_build && unset MAKEFLAGS && export gb_TAILBUILDTARGET="$(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1)" && \
+ $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
+endif
+
+$(1).clean:
+ cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) clean gb_PARTIALBUILD=T
+
+$(1).subsequentcheck:
+ cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) subsequentcheck gb_PARTIALBUILD=T
+
+$(1).deliver:
+ @true
+
+endef
+
+define gbuild_modules_rules
+$(foreach m,$(1),$(call gbuild_module_rules,$(m)))
+endef
+
+define dmake_module_rules
+.PHONY: $(1) $(1).all $(1).deliver $(1).clean
+
+$(1): bootstrap fetch
+ cd $(1) && unset MAKEFLAGS && \
+ $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM)
+
+$(1).all: bootstrap fetch
+ cd $(1) && unset MAKEFLAGS && \
+ $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
+
+$(1).deliver: $(1)
+ cd $(1) && $(SOLARENV)/bin/deliver.pl
+
+$(1).clean:
+ cd $(1) && $(SOLARENV)/bin/deliver.pl -delete
+ rm -fr $(1)/$(INPATH)
+
+endef
+
+define dmake_modules_rules
+$(foreach m,$(1),$(call dmake_module_rules,$(m)))
+endef
+
+#
+# Partial Build
+#
+$(eval $(call gbuild_modules_rules,$(gbuild_modules)))
+
+$(eval $(call dmake_modules_rules,$(dmake_modules)))
+
+#
+# Clean
+#
+clean: clean-host clean-build
+
+clean-host:
+ rm -fr $(DEVINSTALLDIR)
+ rm -fr $(SOLARVER)/$(INPATH) # not necessarily below SRCDIR
+ rm -fr $(SRCDIR)/*/$(INPATH)
+ rm -fr install
+
+clean-build:
+ifeq ($(CROSS_COMPILING),YES)
+ rm -rf $(SOLARVER)/$(INPATH_FOR_BUILD) # not necessarily below SRCDIR
+ rm -rf $(SRCDIR)/*/$(INPATH_FOR_BUILD)
+endif
+
+#
+# Distclean
+#
+distclean : clean
+ifeq ($(BUILD_DMAKE),YES)
+ (if [ -f dmake/Makefile ] ; then $(GNUMAKE) -j $(GMAKE_PARALLELISM) -C dmake distclean; fi) && \
+ rm -f solenv/*/bin/dmake*
+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
+ find $(SOLARENV)/gdb -name "*.pyc" -exec rm {} \;
+
+#
+# custom command
+#
+ifneq ( $(MAKECMDGOALS),cmd)
+cmd:
+ echo "custom cmd" && ( $(cmd) )
+
+endif
+
+ifneq ($(filter-out clean distclean,$(MAKECMDGOALS)),)
+#
+# Makefile
+#
+
+# I don't like to touch stuff that are supposed to be
+# in the source tree, hence read-only
+# but I couldn't find a way to get make to
+# restart after an autogen. and we _have_ to
+# restart since autogen can have changed
+# config_host.mk which is included in this
+# Makefile
+
+ifeq ($(OS_FOR_BUILD),WNT)
+CONFIG_HOST_MK=$(shell cygpath -u $(SRCDIR))/config_host.mk
+else
+CONFIG_HOST_MK=$(SRCDIR)/config_host.mk
+endif
+
# recursively invoke Makefile.top, which includes config_host.mk
$(firstword $(MAKECMDGOALS)) : $(SRCDIR)/config_host.mk
$(MAKE) -r -f $(SRCDIR)/Makefile.top $(MAKECMDGOALS)
@@ -34,4 +389,171 @@ $(SRCDIR)/config_host.mk : \
$(SRCDIR)/autogen.lastrun:
@true
+#
+# Fetch
+#
+fetch: src.downloaded
+
+src.downloaded : Makefile ooo.lst download
+ifeq ($(DO_FETCH_TARBALLS),YES)
+ @./download $(SRCDIR)/ooo.lst && touch $@
+else
+ @echo "Automatic fetching of external tarballs is disabled."
+endif
+
+#
+# Bootstap
+#
+ifeq ($(OS_FOR_BUILD),WNT)
+WORKDIR_BOOTSTRAP=$(shell cygpath -u $(WORKDIR))/bootstrap
+else
+WORKDIR_BOOTSTRAP=$(WORKDIR)/bootstrap
+endif
+
+$(WORKDIR_BOOTSTRAP):
+ @cd $(SRCDIR) && ./bootstrap
+ @mkdir -p $(dir $@) && touch $@
+
+bootstrap: $(WORKDIR_BOOTSTRAP)
+
+#
+# Build
+#
+build-packimages: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
+ifeq ($(DISABLE_SCRIPTING),TRUE)
+# We must get the headers from vbahelper "delivered" because
+# as we don't link to any libs from there they won't otherwise be, or
+# something. And we still do include those headers always even if the
+# libs aren't built in the --disable-scripting case. (Ifdefs for
+# DISABLE_SCRIPTING will be added to the code later as necessary.)
+ $(GNUMAKE) vbahelper
+endif
+ifeq ($(DISABLE_DBCONNECTIVITY),TRUE)
+# Ditto for dbconnectivity in the --disable-database-connectivity case
+ cd connectivity && sed -e 's/^\(export [A-Z0-9_]*=\)\(.*\)$$/\1"\2"/' <../config_host.mk >conftmp.sh && . conftmp.sh && rm conftmp.sh && $(SOLARENV)/bin/deliver.pl
+endif
+ cd packimages && unset MAKEFLAGS && \
+ $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) && \
+ make
+
+build: build-packimages
+ifeq ($(OS_FOR_BUILD),WNT)
+ cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl
+else
+ cd instsetoo_native && unset MAKEFLAGS && \
+ $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM)
+endif
+
+cross-toolset: bootstrap fetch
+ cd cross_toolset && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS)
+
+
+#
+# Install
+#
+
+install:
+ echo "Installing in $(INSTALLDIR)..." && \
+ ooinstall "$(INSTALLDIR)" && \
+ echo "" && \
+ echo "Installation finished, you can now execute:" && \
+ echo "$(INSTALLDIR)/program/soffice"
+
+install-strip:
+ echo "Installing and stripping binaries in $(INSTALLDIR)..." && \
+ ooinstall --strip "$(INSTALLDIR)" && \
+ echo "" && \
+ echo "Installation finished, you can now execute:" && \
+ echo "$(INSTALLDIR)/program/soffice"
+
+dev-install: build
+ @rm -rf $(DEVINSTALLDIR)
+ @mkdir $(DEVINSTALLDIR)
+ifeq ($(DISABLE_LINKOO),TRUE)
+ @ooinstall $(DEVINSTALLDIR)/opt
+ @install-gdb-printers -L
+else
+ @ooinstall -l $(DEVINSTALLDIR)/opt
+endif
+ @rm -f $(SRCDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(SRCDIR)/install
+
+distro-pack-install: install
+ $(SRCDIR)/bin/distro-install-clean-up
+ $(SRCDIR)/bin/distro-install-desktop-integration
+ $(SRCDIR)/bin/distro-install-sdk
+ $(SRCDIR)/bin/distro-install-file-lists
+
+id:
+ @create-ids
+
+tags:
+ @create-tags
+
+docs:
+ @mkdocs.sh $(SRCDIR)/docs $(SOLARENV)/inc/doxygen.cfg
+
+findunusedcode:
+ @which callcatcher > /dev/null 2>&1 || \
+ (echo "callcatcher not installed" && false)
+ @sed -e s,$$INPATH,callcatcher,g $(SRCDIR)/config_host.mk | sed -e s,"export OOO_JUNIT_JAR=.*","export OOO_JUNIT_JAR=",g > $(SRCDIR)/config_host_callcatcher.mk
+ @mkdir -p $(SRCDIR)/solenv/callcatcher/bin && \
+ ln -sf $(SRCDIR)/solenv/$(INPATH)/bin/dmake \
+ $(SRCDIR)/solenv/callcatcher/bin/dmake
+ @$(GNUMAKE) -f $(SOLARENV)/bin/callcatcher.Makefile findunusedcode
+ @grep ::.*\( unusedcode.all \
+ | grep -v ^Atom \
+ | grep -v ^boost:: \
+ | grep -v ^CIcc \
+ | grep -v ^CLuceneError:: \
+ | grep -v ^cppu:: \
+ | grep -v ^Dde \
+ | grep -v ^graphite2:: \
+ | grep -v ^jvmaccess:: \
+ | grep -v ^libcdr:: \
+ | grep -v ^libcmis:: \
+ | grep -v ^libvisio:: \
+ | grep -v ^libwpg:: \
+ | grep -v ^lucene:: \
+ | grep -v ^Matrix3d:: \
+ | grep -v ^salhelper:: \
+ | grep -v ^WP1 \
+ | grep -v ^WP3 \
+ | grep -v ^WP42 \
+ | grep -v ^WP6 \
+ | grep -v ^WPG \
+ | grep -v ^WPS \
+ | grep -v WPX \
+ > unusedcode.easy
+
+check: dev-install subsequentcheck
+
+subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install)
+ $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
+
+debugrun:
+ $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
+
+endif # not clean or distclean
+
+
+#########################
+# help
+#
+.PHONY: help
+help:
+ @cat $(SRCDIR)/solenv/gbuild/gbuild.help.txt
+ @true
+
+#########################
+# fun
+#
+.PHONY: fun
+dmake_modules_count := $(words $(dmake_modules))
+gbuild_modules_count := $(words $(gbuild_modules))
+all_modules_count := $(words $(dmake_modules) $(gbuild_modules))
+fun:
+ @echo Oh dear - you have still $(dmake_modules_count) dmake modules to convert [from $(all_modules_count)]
+ @echo but wait you have already converted $(gbuild_modules_count) - congrats and keep going ...
+ @true
+
# vim: set noet sw=4 ts=4:
diff --git a/extensions/source/update/feed/test/makefile.mk b/extensions/source/update/feed/test/makefile.mk
deleted file mode 100644
index 3d972a761233..000000000000
--- a/extensions/source/update/feed/test/makefile.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..$/..
-
-PRJNAME=extensions
-TARGET=updatefeedtest
-
-TARGETTYPE=CUI
-ENABLE_EXCEPTIONS=TRUE
-
-INCPRE=$(OUT)$/inc$/updatefeed
-
-# --- Settings ---
-
-.INCLUDE : settings.mk
-
-# --- Files ---
-
-
-SLOFILES=\
- $(SLO)$/updatefeedtest.obj \
-
-APP1TARGET=$(TARGET)
-APP1OBJS=$(SLOFILES)
-
-APP1STDLIBS= \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-# --- Targets ---
-
-.INCLUDE : target.mk
-
diff --git a/extensions/test/ole/OleClient/makefile.mk b/extensions/test/ole/OleClient/makefile.mk
deleted file mode 100644
index 0587038d05f7..000000000000
--- a/extensions/test/ole/OleClient/makefile.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/
-
-PRJNAME=extensions
-TARGET=clientTest
-TARGETTYPE=CUI
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ---
-
-.INCLUDE : settings.mk
-
-# --- Files ---
-
-INCPRE+= $(OUT)$/inc -I$(ATL_INCLUDE)
-
-
-
-APP1TARGET= $(TARGET)
-APP1OBJS= \
- $(OBJ)$/clientTest.obj \
- $(OBJ)$/axhost.obj \
- $(OBJ)$/funcs.obj
-
-APP1STDLIBS= \
- $(SALLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(USER32LIB) \
- $(COMPATH)$/atlmfc$/lib$/atls.lib \
- $(KERNEL32LIB) \
- $(OLE32LIB) \
- $(OLEAUT32LIB) \
- $(UUIDLIB) \
- $(GDI32LIB) \
- $(ADVAPI32LIB)
-
-APP1DEF= $(MISC)\$(APP1TARGET).def
-
-# --- Targets ---
-
-.INCLUDE : target.mk
-
-
diff --git a/store/Package_inc.mk b/store/Package_inc.mk
index 11c3e15c7411..aa458bc80af3 100644
--- a/store/Package_inc.mk
+++ b/store/Package_inc.mk
@@ -30,5 +30,6 @@ $(eval $(call gb_Package_add_file,store_inc,inc/store/store.h,inc/store/store.h)
$(eval $(call gb_Package_add_file,store_inc,inc/store/store.hxx,inc/store/store.hxx))
$(eval $(call gb_Package_add_file,store_inc,inc/store/storedllapi.h,inc/store/storedllapi.h))
$(eval $(call gb_Package_add_file,store_inc,inc/store/types.h,inc/store/types.h))
+$(eval $(call gb_Package_add_file,store_inc,xml/store.xml,util/store.xml))
# vim: set noet sw=4 ts=4: