[Libreoffice-commits] .: Makefile
Makefile |1 - 1 file changed, 1 deletion(-) New commits: commit 1f84379c5b99b8c67f9296a1bbd0a08f0fa31278 Author: David Tardon dtar...@redhat.com Date: Fri Apr 13 17:19:40 2012 +0200 Revert re-run bootstrap after make clean This reverts commit 7c489dc2ec5543c3481d0d5385f3a7a328276cff. diff --git a/Makefile b/Makefile index 338e620..4b5d025 100644 --- a/Makefile +++ b/Makefile @@ -304,7 +304,6 @@ clean: clean-host clean-build clean-host: rm -fr $(SRCDIR)/*/$(INPATH) rm -fr install - rm -f $(WORKDIR_BOOTSTRAP) clean-build: ifeq ($(CROSS_COMPILING),YES) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile rdbmaker/Executable_rdbmaker.mk rdbmaker/Makefile rdbmaker/Module_rdbmaker.mk rdbmaker/prj rdbmaker/source Repository.mk RepositoryModule_ooo.mk
Makefile |2 - Repository.mk |1 RepositoryModule_ooo.mk |1 rdbmaker/Executable_rdbmaker.mk | 58 +++ rdbmaker/Makefile |7 +++ rdbmaker/Module_rdbmaker.mk | 33 + rdbmaker/prj/build.lst|6 --- rdbmaker/prj/d.lst|3 - rdbmaker/prj/makefile.mk |1 rdbmaker/source/codemaker/makefile.mk | 55 - rdbmaker/source/rdbmaker/makefile.mk | 63 -- 11 files changed, 103 insertions(+), 127 deletions(-) New commits: commit f55eed29c68205f69dd263f8a9657ac407a73ee3 Author: David Ostrovsky david.ostrov...@gmx.de Date: Thu Apr 5 20:24:34 2012 +0200 gbuild conversion: rdbmaker module dmake stuff removed diff --git a/Makefile b/Makefile index 1bfb75b..adeb637 100644 --- a/Makefile +++ b/Makefile @@ -87,6 +87,7 @@ psprint_config\ qadevOOo\ regexp\ reportdesign\ +rdbmaker\ ridljar\ rsc\ sal\ @@ -214,7 +215,6 @@ postgresql\ postprocess\ python\ pyuno\ -rdbmaker\ readlicense_oo\ redland\ registry\ diff --git a/Repository.mk b/Repository.mk index 7775190..1fe0aa3 100644 --- a/Repository.mk +++ b/Repository.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ osl_process_child \ pdf2xml \ pdfunzip \ +rdbmaker \ rsc \ rscdep \ saxparser \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 2ad7f41..a79028c 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -86,6 +86,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ package \ padmin \ psprint_config \ +rdbmaker \ regexp \ reportdesign \ ridljar \ diff --git a/rdbmaker/Executable_rdbmaker.mk b/rdbmaker/Executable_rdbmaker.mk new file mode 100644 index 000..6e46d38 --- /dev/null +++ b/rdbmaker/Executable_rdbmaker.mk @@ -0,0 +1,58 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an AS IS basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 David Ostrovsky d.ostrov...@gmx.de (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the GPLv3+), or +# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Executable_Executable,rdbmaker)) + +$(eval $(call gb_Executable_use_api,rdbmaker,\ +udkapi \ +)) + +$(eval $(call gb_Executable_set_include,rdbmaker,\ +-I$(SRCDIR)/rdbmaker/inc \ +$$(INCLUDE) \ +)) + +$(eval $(call gb_Executable_use_libraries,rdbmaker,\ +sal \ +salhelper \ +reg \ +cppu \ +cppuhelper \ +)) + +$(eval $(call gb_Executable_add_exception_objects,rdbmaker,\ +rdbmaker/source/rdbmaker/rdbmaker \ +rdbmaker/source/rdbmaker/rdbtype \ +rdbmaker/source/rdbmaker/rdboptions \ +rdbmaker/source/rdbmaker/typeblop \ +rdbmaker/source/rdbmaker/specialtypemanager \ +rdbmaker/source/codemaker/global \ +rdbmaker/source/codemaker/options \ +rdbmaker/source/codemaker/typemanager \ +rdbmaker/source/codemaker/dependency \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/rdbmaker/Makefile b/rdbmaker/Makefile new file mode 100644 index 000..ccb1c85 --- /dev/null +++ b/rdbmaker/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/rdbmaker/Module_rdbmaker.mk b/rdbmaker/Module_rdbmaker.mk new file mode 100644 index 000..0145b23 --- /dev/null +++ b/rdbmaker/Module_rdbmaker.mk @@ -0,0 +1,33 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +#
[Libreoffice-commits] .: Makefile
Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ef5b4b577c407ab5dc1595a1865f710a14e1bdee Author: Stephan Bergmann sberg...@redhat.com Date: Tue Mar 27 08:16:19 2012 +0200 dev-install needs to depend on build after all ...as only build passes through instsetoo_native, where some files (pyuno.py etc.) are copied into places where ooinstall expects to find them. diff --git a/Makefile b/Makefile index 4386267..d29f244 100644 --- a/Makefile +++ b/Makefile @@ -430,7 +430,7 @@ install: echo Installation finished, you can now execute: \ echo $(INSTALLDIR)/program/soffice -dev-install: build-packimages +dev-install: build @rm -rf $(OUTDIR)/installation @mkdir $(OUTDIR)/installation ifeq ($(DISABLE_LINKOO),TRUE) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile
Makefile |1 + 1 file changed, 1 insertion(+) New commits: commit f55423d1d44173dec5705700e7ebddedf8f6d250 Author: Rene Engelhard r...@debian.org Date: Tue Mar 13 14:51:51 2012 +0100 remove *.pyc in solenv/gdb in make distclean diff --git a/Makefile b/Makefile index c9ff3b8..3b55e87 100644 --- a/Makefile +++ b/Makefile @@ -322,6 +322,7 @@ endif 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 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile
Makefile |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1c9408fde23f5091795a645b621dbdcaf6d71c72
Author: David Tardon dtar...@redhat.com
Date: Wed Mar 14 05:58:16 2012 +0100
fix typo
diff --git a/Makefile b/Makefile
index 3b55e87..79ccd2e 100644
--- a/Makefile
+++ b/Makefile
@@ -322,7 +322,7 @@ endif
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 [} \;
+ find $(SOLARENV)/gdb -name *.pyc -exec rm {} \;
#
# custom command
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile
Makefile |2 -- 1 file changed, 2 deletions(-) New commits: commit fa97b8ac234c34618d8dca4329bc13e8454b47b4 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Mar 9 11:21:39 2012 +0100 Do not remove the whole workdir/* on 'make clean' Also solver/$INPATH is subset of */$INPATH. diff --git a/Makefile b/Makefile index 84d8c46..df5b638 100644 --- a/Makefile +++ b/Makefile @@ -300,8 +300,6 @@ clean: clean-host clean-build clean-host: rm -fr $(SRCDIR)/*/$(INPATH) - rm -fr $(SRCDIR)/workdir/* - rm -fr $(SRCDIR)/solver/$(INPATH) rm -fr install clean-build: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile
Makefile | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) New commits: commit 5b2b793caeed16e5d7d63cb5ce8a07289051dca8 Author: Peter Foley pefol...@verizon.net Date: Tue Mar 6 17:43:07 2012 -0500 fix make dependencies for windows diff --git a/Makefile b/Makefile index 5da1387..905829b 100644 --- a/Makefile +++ b/Makefile @@ -341,12 +341,19 @@ ifneq ($(filter-out clean distclean,$(MAKECMDGOALS)),) # 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.k which is included in this +# config_host.mk which is included in this # Makefile -Makefile: $(SRCDIR)/config_host.mk + +ifeq ($(OS_FOR_BUILD),WNT) +CONFIG_HOST_MK=$(shell cygpath -u $(SRCDIR))/config_host.mk +else +CONFIG_HOST_MK=$(SRCDIR)/config_host.mk +endif + +Makefile: $(CONFIG_HOST_MK) touch $@ -$(SRCDIR)/config_host.mk : config_host.mk.in bin/repo-list.in ooo.lst.in configure.in autogen.lastrun +$(CONFIG_HOST_MK) : config_host.mk.in bin/repo-list.in ooo.lst.in configure.in autogen.lastrun ./autogen.sh autogen.lastrun: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile
Makefile |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit a75873dea15719b5216cfd0476d30003ffc76e80 Author: Peter Foley pefol...@verizon.net Date: Sun Feb 26 13:53:09 2012 -0500 allow autogen.sh to be run automatically diff --git a/Makefile b/Makefile index a37bca3..68bea91 100644 --- a/Makefile +++ b/Makefile @@ -342,12 +342,15 @@ ifneq ($(filter-out clean distclean,$(MAKECMDGOALS)),) # restart since autogen can have changed # config_host.k which is included in this # Makefile -Makefile: config_host.mk +Makefile: $(SRCDIR)/config_host.mk touch $@ -config_host.mk : config_host.mk.in bin/repo-list.in ooo.lst.in configure.in autogen.lastrun +$(SRCDIR)/config_host.mk : config_host.mk.in bin/repo-list.in ooo.lst.in configure.in autogen.lastrun ./autogen.sh +autogen.lastrun: + @true + # # Fetch # ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile
Makefile |1 + 1 file changed, 1 insertion(+) New commits: commit 284069dd0be5ecd700f61e7c5b7e6b3d78065aa6 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Feb 23 13:58:52 2012 +0100 clucene missing from gbuild_modules diff --git a/Makefile b/Makefile index 4899664..72f1174 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,7 @@ bean\ binaryurp\ canvas\ chart2\ +clucene\ comphelper\ configmgr\ cppcanvas\ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile
Makefile |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) New commits: commit a2ba4dcbd232c071bd69011a735bf9cd3001a15d Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Feb 20 12:17:22 2012 +0100 It's safer to run one job at a time in instsetoo_native on Windows diff --git a/Makefile b/Makefile index 8ebbe46..346e91c 100644 --- a/Makefile +++ b/Makefile @@ -378,8 +378,14 @@ bootstrap: $(WORKDIR_BOOTSTRAP) # Build # build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) + cd packimages unset MAKEFLAGS \ +$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) +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) --all -- -P$(GMAKE_PARALLELISM) +$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM) +endif cross-toolset: bootstrap fetch cd cross_toolset $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile
Makefile |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 41ad8739cba290a309bffe85aaf2088289054933 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Tue Feb 21 00:59:19 2012 +0100 make debugrun run debugrun and not subsequentcheck diff --git a/Makefile b/Makefile index 346e91c..4899664 100644 --- a/Makefile +++ b/Makefile @@ -448,10 +448,10 @@ findunusedcode: check: subsequentcheck subsequentcheck: dev-install - $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile subsequentcheck + $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile $@ debugrun: - $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile debugrun + $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile $@ endif # not clean or distclean ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile
Makefile | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 5b773eb58222109843814e48ace35fe9740a7d72 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Feb 17 11:26:15 2012 +0100 update Makefile diff --git a/Makefile b/Makefile index 7ef0842..d4dd3d9 100644 --- a/Makefile +++ b/Makefile @@ -62,6 +62,10 @@ hwpfilter\ i18npool\ i18nutil\ idl\ +javaunohelper\ +jurt\ +jvmaccess\ +jvmfwk\ lingucomponent\ linguistic\ lotuswordpro\ @@ -78,6 +82,7 @@ psprint_config\ qadevOOo\ regexp\ reportdesign\ +ridljar\ rsc\ sal\ salhelper\ @@ -106,6 +111,7 @@ ucb\ ucbhelper\ udkapi\ unixODBC\ +unoil\ unotest\ unotools\ unoxml\ @@ -164,12 +170,8 @@ icu\ idlc\ instsetoo_native\ io\ -javaunohelper\ jfreereport\ jpeg\ -jurt\ -jvmaccess\ -jvmfwk\ l10ntools\ languagetool\ libcdr\ @@ -212,7 +214,6 @@ registry\ remotebridges\ reportbuilder\ rhino\ -ridljar\ saxon\ scp2\ sdext\ @@ -232,7 +233,6 @@ tomcat\ translations\ udm\ unodevtools\ -unoil\ vigra\ x11_extensions\ xmlhelp\ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile
Makefile |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) New commits: commit ca9801809249dbc98b28d3a24325fa54f2e91724 Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Feb 16 17:39:26 2012 +0100 let src.downloaded not depend on phony target to avoid re-creating each time diff --git a/Makefile b/Makefile index 99cae26..7ef0842 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -.PHONY : all autogen bootstrap build check clean clean-build clean-host dev-install dev-install-link distclean distro-pack-install docs fetch findunusedcode id install subsequenttest tags +.PHONY : all bootstrap build check clean clean-build clean-host dev-install dev-install-link distclean distro-pack-install docs fetch findunusedcode id install subsequenttest tags ifeq ($(MAKECMDGOALS),) MAKECMDGOALS:=all @@ -332,9 +332,8 @@ endif ifneq ($(filter-out clean distclean,$(MAKECMDGOALS)),) # -# autogen +# Makefile # -autogen: Makefile # I don't like to touch stuff that are supposed to be # in the source tree, hence read-only @@ -354,7 +353,7 @@ config_host.mk : config_host.mk.in bin/repo-list.in ooo.lst.in configure.in auto # fetch: src.downloaded -src.downloaded : autogen ooo.lst download +src.downloaded : Makefile ooo.lst download ifeq ($(DO_FETCH_TARBALLS),YES) @./download $(SRCDIR)/ooo.lst touch $@ else ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile
Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 15a6211803a28fd88b33b89a3f13455665360ce9 Author: Michael Stahl mst...@redhat.com Date: Mon Feb 13 15:49:21 2012 +0100 Makefile: don't build everything twice on make check diff --git a/Makefile b/Makefile index 815959f..30f13b0 100644 --- a/Makefile +++ b/Makefile @@ -442,7 +442,7 @@ check: subsequentcheck_after_build subsequentcheck_after_build: build dev-install-link @cd smoketestoo_native unset MAKEFLAGS \ - $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) + $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM) $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile subsequentcheck subsequentcheck: smoketestoo_native ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile
Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f689658056a3473f9698c21edb3fb14a2541d3a7 Author: Miklos Vajna vmik...@suse.cz Date: Mon Feb 13 16:33:32 2012 +0100 make build a pre-req of deliver diff --git a/Makefile b/Makefile index 30f13b0..99cae26 100644 --- a/Makefile +++ b/Makefile @@ -273,7 +273,7 @@ $(1).all: bootstrap fetch cd $(1) unset MAKEFLAGS \ $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) -$(1).deliver: +$(1).deliver: $(1) cd $(1) $(SOLARENV)/bin/deliver.pl $(1).clean: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile
Makefile |1 - 1 file changed, 1 deletion(-) New commits: commit 659f381fe2e12c8125fbf529be47624deaad4a5d Author: Rene Engelhard r...@debian.org Date: Fri Feb 10 21:21:04 2012 +0100 remove accidentially committed pyuno-py3 module from Makefile... diff --git a/Makefile b/Makefile index fba7796..04c4c8e 100644 --- a/Makefile +++ b/Makefile @@ -205,7 +205,6 @@ postgresql\ postprocess\ python\ pyuno\ -pyuno-py3\ rdbmaker\ readlicense_oo\ redland\ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile
Makefile | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) New commits: commit 05bb5df2c520b41aba76fcf05097fd19d9550626 Author: Norbert Thiebaud nthieb...@gmail.com Date: Fri Feb 10 16:05:22 2012 -0600 add slowcheck target and make build a pre-req of check diff --git a/Makefile b/Makefile index 04c4c8e..815959f 100644 --- a/Makefile +++ b/Makefile @@ -438,13 +438,21 @@ findunusedcode: | grep -v ^salhelper:: \ unusedcode.easy -check: subsequentcheck +check: subsequentcheck_after_build + +subsequentcheck_after_build: build dev-install-link + @cd smoketestoo_native unset MAKEFLAGS \ + $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) + $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile subsequentcheck subsequentcheck: smoketestoo_native $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile subsequentcheck debugrun: - $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile subsequentcheck + $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile debugrun + +slowcheck: + $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile slowcheck endif # not clean or distclean ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile solenv/gbuild
Makefile |9 solenv/gbuild/gbuild.help.txt | 76 +++ solenv/gbuild/gbuild.mk | 81 -- 3 files changed, 86 insertions(+), 80 deletions(-) New commits: commit d85a108a1b37b9dbaf151d4141e21674ab53f569 Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Feb 8 10:16:23 2012 -0600 re-enable make help from the top-level make diff --git a/Makefile b/Makefile index 45b7053..24b2a5b 100644 --- a/Makefile +++ b/Makefile @@ -440,4 +440,13 @@ debugrun: endif # not clean or distclean +# +# help +# +.PHONY: help +help: + @cat $(SRCDIR)/solenv/gbuild/gbuild.help.txt + @true + + # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt new file mode 100644 index 000..d93285f --- /dev/null +++ b/solenv/gbuild/gbuild.help.txt @@ -0,0 +1,76 @@ +NAME + gbuild - GNU make based build system for LibreOffice + +SYNOPSIS + make [ -f makefile ] [ options ] [ variable=value ... ] [ targets ] ... + +IMPORTANT OPTIONS + -s Silent operation; do not print the commands as they are executed. + + -n Print the commands that would be executed, but do not execute them. + -k Continue as much as possible after an error. + + -j Specifies the number of jobs (commands) to run simultaneously. + -l Specifies that no new jobs (commands) should be started if there are + others jobs running and the load average is at least load. + + -t Touch files (mark them up to date without really changing them) + instead of running their commands. + -W Pretend that the target file has just been modified. + -o Do not remake the file file even if it is older than its + dependencies, and do not remake anything on account of changes in file. + + -p Print the data base (rules and variable values) that results from + reading the makefiles. + --debug=b debug make run, see GNU make man page for details + + (descriptions from GNU make man page) + +AVAILABLE TARGETS + all build product and run unit tests (default goal) + buildbuild product + unitcheckrun unit tests + subsequentcheck run system tests (requires full installation) + checkrun unit tests and if in toplevel subsequentcheck + cleanremove all generated files + showdeliverables show the targets delivered to OUTDIR and their source + debugrun starts the dev-install instance and allows tests to be run +against it + module build the named module + module.clean clean the named module + module.all for dmake modules only, build the named module and +the pre-requisite modules for this module + module.deliver for dmake modules only, deliver the named module + cmd execute the command contained in the variable cmd= +in a shell with config_host.mk or config_build.mk +environement set. (see gb_SIDE) + +INTERACTIVE VARIABLES: + DEBUG / debug If not empty, build with DBGLEVEL=1 (see below). + ENABLE_SYMBOLS / enable_symbols + If not empty, build with debug symbols. Automatically + enabled by DEBUG/debug. + DBGLEVEL / dbglevel + If not empty, force the debug level to the specified value. The + debug level is passed to the source code through OSL_DEBUG_LEVEL + macro. + 0 = no debug + 1 = symbols + no optimizations + 2 = symbols + no optimizations + extra debug output. OSL_TRACE + starts being active on this level. + 3... = symbols + no optimizations + extra debug output (usually + extremely verbose). Levels 2 are not used very much. + + YACCFLAGS Add as flags for YACC parser generator invocation. + CPPFLAGSAdd as preprocessor flags for C/C++/ObjC/ObjC++ compilation. + CFLAGS Add as compiler flags for plain C compilation. + CXXFLAGSAdd as compiler flags for C++ compilation. + OBJCFLAGS Add as compiler flags for Objective C compilation. + OBJCXXFLAGS Add as compiler flags for Objective C++ compilation. + LDFLAGS Add as linker flags. + gb_FULLDEPS Generate and use dependencies (on by default, handle with care). + gb_COLORUse ASCII color output. + gb_TITLES Show progress in terminal title. + gb_Side Either host of build (default to host). + determine if config_host.mk or config_build.mk is used to +
[Libreoffice-commits] .: Makefile
Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9045503c46818bacc2a13b1db65e709633e7c6cb Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 7 14:55:19 2012 +0100 soffice.sh is no longer generated at configure time diff --git a/Makefile b/Makefile index 3eeb510..08054d5 100644 --- a/Makefile +++ b/Makefile @@ -312,7 +312,7 @@ ifeq ($(BUILD_DMAKE),YES) endif rm -fr config_host.mk config_build.mk aclocal.m4 autom4te.cache \ bin/repo-list config.log config.status configure \ - desktop/scripts/soffice.sh ooo.lst post_download post_download.log \ + ooo.lst post_download post_download.log \ config_host.mk.last set_soenv.stamp src.downloaded warn # ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile
Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 993cdce1f0194433cfa5bfa1a88d38b52e8a9240 Author: Norbert Thiebaud nthieb...@gmail.com Date: Sun Feb 5 20:43:10 2012 -0600 again do not use WORKDIR prematurely due to windows diff --git a/Makefile b/Makefile index 3cab806..a701b50 100644 --- a/Makefile +++ b/Makefile @@ -353,7 +353,7 @@ config_host.mk : config_host.mk.in bin/repo-list.in ooo.lst.in configure.in auto # Bootstap # -bootstrap: $(WORKDIR)/bootstrap +bootstrap: $(SRCDIR)/workdir/$(INPATH)/bootstrap # # Fetch ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
