Makefile.in | 64 ++++++++++++++++++++++++++----------------------
solenv/gbuild/Module.mk | 38 ++++++++++++++++++----------
solenv/gbuild/gbuild.mk | 7 +++--
3 files changed, 63 insertions(+), 46 deletions(-)
New commits:
commit 94f6df2cf7f2a3a08e5923287a28711d62898059
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Fri Sep 16 18:50:26 2011 +0200
update gbuild help
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 546c4dc..e704eca 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -381,10 +381,11 @@ IMPORTANT OPTIONS
(descriptions from GNU make man page)
AVAILABLE TARGETS
- allandcheck build product and run unit tests (default goal)
- all build product
- check run unit tests
+ all build product and run unit tests (default goal)
+ build build product
+ unitcheck run unit tests
subsequentcheck run system tests (requires full installation)
+ check run unit tests and if in toplevel subsequentcheck
clean remove all generated files
INTERACTIVE VARIABLES:
commit 581089e9f18ee5886e981b6c2ccb6a91ad7e5bed
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Fri Sep 16 18:48:08 2011 +0200
adjust toplevel makefile
diff --git a/Makefile.in b/Makefile.in
index 93fba1e..960f7d1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,17 +8,45 @@ else
CROSS_TOOLSET_RULE:=
endif
+.PHONY : build dev-install check allcheck unitcheck subsequentcheck all
cross-build-toolset install distro-pack-install clean distclean findunusedcode
+
build: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded
$(CROSS_TOOLSET_RULE)
@. ./Env.Host.sh && \
cd instsetoo_native && \
- build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
+ gb_MAKETARGET=build build.pl -P@BUILD_NCPUS@ --all --
-P@BUILD_MAX_JOBS@
+
+dev-install: build
+ @. ./Env.Host.sh && \
+ cd smoketestoo_native && \
+ build.pl -P@BUILD_NCPUS@ --all:instsetoo_native --
-P@BUILD_MAX_JOBS@ && \
+ cd @abs_builddir@ && ln -s
$$SOLARVER/$$INPATH/installation/opt/ install && \
+ echo "" && \
+ $$SOLARENV/bin/linkoo $$SRC_ROOT/install $$SRC_ROOT && \
+ install-gdb-printers -a "$$SOLARVER/$$INPATH/installation/opt" -L && \
+ echo && echo "Developer installation finished, you can now execute:" &&
echo && \
+ if test `uname -s` = Darwin; then \
+ echo open install/LibreOffice.app; \
+ else \
+ echo "cd @abs_builddir@/install/program" && \
+ echo ". ./ooenv" && \
+ echo "./soffice.bin"; \
+ fi
+
+check : allcheck
+%check:
+ @. ./Env.Host.sh && $(GNUMAKE) -f "$$SRC_ROOT"/GNUmakefile.mk -r \
+ $(if @VERBOSE@,,-s) --jobs="$(if \
+ $(CHECK_PARALLELISM),$(CHECK_PARALLELISM),@GMAKE_PARALLELISM@)"
\
+ $(patsubst allcheck,check,$@)
+
+all: build unitcheck
cross-build-toolset:
@. ./Env.Build.sh && \
cd cross_toolset && \
build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
-install:|build
+install: build
@. ./Env.Host.sh && \
echo "Installing in @PREFIXDIR@..." && \
ooinstall "@PREFIXDIR@" && \
@@ -33,23 +61,6 @@ distro-pack-install: install
./bin/distro-install-sdk
./bin/distro-install-file-lists
-dev-install:|build
- @. ./Env.Host.sh && \
- cd smoketestoo_native && \
- build.pl -P@BUILD_NCPUS@ --all:instsetoo_native --
-P@BUILD_MAX_JOBS@ && \
- cd @abs_builddir@ && ln -s
$$SOLARVER/$$INPATH/installation/opt/ install && \
- echo "" && \
- $$SOLARENV/bin/linkoo $$SRC_ROOT/install $$SRC_ROOT && \
- install-gdb-printers -a "$$SOLARVER/$$INPATH/installation/opt" -L && \
- echo && echo "Developer installation finished, you can now execute:" &&
echo && \
- if test `uname -s` = Darwin; then \
- echo open install/LibreOffice.app; \
- else \
- echo "cd @abs_builddir@/install/program" && \
- echo ". ./ooenv" && \
- echo "./soffice.bin"; \
- fi
-
distclean:
-rm config.cache
-rm config.log
@@ -90,15 +101,6 @@ fetch: src.downloaded
Makefile: autogen.lastrun configure.in ooo.lst.in set_soenv.in Makefile.in
./autogen.sh
-check: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ fetch | dev-install
- @. ./Env.Host.sh && \
- cd smoketestoo_native && \
- build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
- @. ./Env.Host.sh && $(MAKE) -f "$$SRC_ROOT"/GNUmakefile.mk -r \
- $(if @VERBOSE@,,-s) --jobs="$(if \
- $(CHECK_PARALLELISM),$(CHECK_PARALLELISM),@GMAKE_PARALLELISM@)"
\
- subsequentcheck
-
id:
@. ./Env.Host.sh && \
create-ids
@@ -131,3 +133,7 @@ findunusedcode:
#unused methods which don't require much effort to determine if they need
#to be just removed, or put behind appropiate platform or debug level ifdefs
@grep ::.*\( unusedcode.all | grep -v ^cppu:: > unusedcode.easy
+
+#as long as we are not completely gbuildified we need to explicitly depend on
the build/install
+unitcheck: build
+subsequentcheck: dev-install
commit 980fdaf40de49deee842d902ea00ef466da8a53c
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Fri Sep 16 16:57:42 2011 +0200
rename all to build in top-level makefile
diff --git a/Makefile.in b/Makefile.in
index eb15908..93fba1e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,7 +8,7 @@ else
CROSS_TOOLSET_RULE:=
endif
-all: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded
$(CROSS_TOOLSET_RULE)
+build: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded
$(CROSS_TOOLSET_RULE)
@. ./Env.Host.sh && \
cd instsetoo_native && \
build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
@@ -18,7 +18,7 @@ cross-build-toolset:
cd cross_toolset && \
build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
-install:|all
+install:|build
@. ./Env.Host.sh && \
echo "Installing in @PREFIXDIR@..." && \
ooinstall "@PREFIXDIR@" && \
@@ -33,7 +33,7 @@ distro-pack-install: install
./bin/distro-install-sdk
./bin/distro-install-file-lists
-dev-install:|all
+dev-install:|build
@. ./Env.Host.sh && \
cd smoketestoo_native && \
build.pl -P@BUILD_NCPUS@ --all:instsetoo_native --
-P@BUILD_MAX_JOBS@ && \
commit d621f927aa1c2a7aaeeb74f235911907b2cdbd37
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Fri Sep 16 16:39:34 2011 +0200
reintroduce check target with new meaning
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 57214a2..cac27a4 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -97,7 +97,7 @@ build :
unitcheck :
$(call gb_Output_announce,loaded modules: $(sort
$(gb_Module_ALLMODULES)),$(true),CHK,6)
- $(call gb_Output_announce_title,all tests checked.)
+ $(call gb_Output_announce_title,all unittests checked.)
$(call gb_Output_announce_bell)
# removing the dependency on build for now until we can make a full build with
gbuild
@@ -113,6 +113,16 @@ clean :
$(call gb_Output_announce_title,all cleared.)
$(call gb_Output_announce_bell)
+check : unitcheck
+ $(call gb_Output_announce_title,all tests checked.)
+ $(call gb_Output_announce_bell)
+
+
+ifeq ($(strip$(gb_PARTIALBUILD)),)
+check : subsequentcheck
+endif
+
+
define gb_Module_Module
gb_Module_ALLMODULES += $(1)
gb_Module_MODULELOCATIONS += $(1):$(dir $(realpath $(lastword
$(MAKEFILE_LIST))))
commit 1c3f8795b5dd1f066f15cf5d160142013e7756ac
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Fri Sep 16 16:31:02 2011 +0200
fix whitespace
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 73739c3..57214a2 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -32,14 +32,14 @@
# target task depends on
# Module build the product all product targets
# excluding tests recursive Modules
-# Module/unitcheck run unit tests all unit tests
+# Module/unitcheck run unit tests all unit tests
# recursive
Module/checks
# Module/subsequentcheck run system tests all system tests
# recursive
Module/subsequentchecks
-# build (global) build the product top-level Module
-# unitcheck (global) run unit tests top-level
Module/unitcheck
+# build (global) build the product top-level Module
+# unitcheck (global) run unit tests top-level
Module/unitcheck
# subsequentcheck (global) run system tests top-level
Module/subsequentcheck
-# all (global) default goal build unitcheck
+# all (global) default goal build unitcheck
# Module class
commit 60939ada0ae907dc84ade19762eee52b24e05e88
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Fri Sep 16 16:29:28 2011 +0200
rename allandcheck target to all in gbuild
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 340e642..73739c3 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -39,7 +39,7 @@
# build (global) build the product top-level Module
# unitcheck (global) run unit tests top-level
Module/unitcheck
# subsequentcheck (global) run system tests top-level
Module/subsequentcheck
-# allandcheck (global) default goal build unitcheck
+# all (global) default goal build unitcheck
# Module class
@@ -79,10 +79,10 @@ $(call gb_Module_get_target,%) :
mkdir -p $(dir $@) && \
touch $@)
-.PHONY : build allandcheck clean unitcheck subsequentcheck
-.DEFAULT_GOAL := allandcheck
+.PHONY : build all clean unitcheck subsequentcheck
+.DEFAULT_GOAL := all
-allandcheck : build unitcheck
+all : build unitcheck
# compatibility with the old build system
ifneq ($(strip $(OOO_SUBSEQUENT_TESTS)),)
commit b78be49613f121beb776026a69a274e4dc248494
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Fri Sep 16 16:28:26 2011 +0200
rename all target to build in gbuild
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index eed4012..340e642 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -36,10 +36,10 @@
# recursive
Module/checks
# Module/subsequentcheck run system tests all system tests
# recursive
Module/subsequentchecks
-# all (global) build the product top-level Module
+# build (global) build the product top-level Module
# unitcheck (global) run unit tests top-level
Module/unitcheck
# subsequentcheck (global) run system tests top-level
Module/subsequentcheck
-# allandcheck (global) default goal all unitcheck
+# allandcheck (global) default goal build unitcheck
# Module class
@@ -79,20 +79,20 @@ $(call gb_Module_get_target,%) :
mkdir -p $(dir $@) && \
touch $@)
-.PHONY : all allandcheck clean unitcheck subsequentcheck
+.PHONY : build allandcheck clean unitcheck subsequentcheck
.DEFAULT_GOAL := allandcheck
-allandcheck : all unitcheck
+allandcheck : build unitcheck
# compatibility with the old build system
ifneq ($(strip $(OOO_SUBSEQUENT_TESTS)),)
.DEFAULT_GOAL := subsequentcheck
endif
-all :
+build :
$(call gb_Output_announce,top level modules: $(foreach
module,$(filter-out deliverlog,$^),$(notdir $(module))),$(true),ALL,6)
$(call gb_Output_announce,loaded modules: $(sort
$(gb_Module_ALLMODULES)),$(true),ALL,6)
- $(call gb_Output_announce_title,all done.)
+ $(call gb_Output_announce_title,build done.)
$(call gb_Output_announce_bell)
unitcheck :
@@ -100,7 +100,7 @@ unitcheck :
$(call gb_Output_announce_title,all tests checked.)
$(call gb_Output_announce_bell)
-# removing the dependency on all for now until we can make a full build with
gbuild
+# removing the dependency on build for now until we can make a full build with
gbuild
#subsequentcheck : all
subsequentcheck :
$(call gb_Output_announce,loaded modules: $(sort
$(gb_Module_ALLMODULES)),$(true),SCK,6)
@@ -221,7 +221,7 @@ endif
include $(1)
-all : $$(firstword $$(gb_Module_TARGETSTACK))
+build : $$(firstword $$(gb_Module_TARGETSTACK))
unitcheck : $$(firstword $$(gb_Module_CHECKTARGETSTACK))
subsequentcheck : $$(firstword $$(gb_Module_SUBSEQUENTCHECKTARGETSTACK))
clean : $$(firstword $$(gb_Module_CLEANTARGETSTACK))
commit a11a94997a99cc45d31112287ca4540ff73c4bb9
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Fri Sep 16 16:25:14 2011 +0200
rename check target to unitcheck in gbuild
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 2bc078b..eed4012 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -32,14 +32,14 @@
# target task depends on
# Module build the product all product targets
# excluding tests recursive Modules
-# Module/check run unit tests all unit tests
+# Module/unitcheck run unit tests all unit tests
# recursive
Module/checks
# Module/subsequentcheck run system tests all system tests
# recursive
Module/subsequentchecks
# all (global) build the product top-level Module
-# check (global) run unit tests top-level
Module/check
+# unitcheck (global) run unit tests top-level
Module/unitcheck
# subsequentcheck (global) run system tests top-level
Module/subsequentcheck
-# allandcheck (global) default goal all check
+# allandcheck (global) default goal all unitcheck
# Module class
@@ -79,10 +79,10 @@ $(call gb_Module_get_target,%) :
mkdir -p $(dir $@) && \
touch $@)
-.PHONY : all allandcheck clean check subsequentcheck
+.PHONY : all allandcheck clean unitcheck subsequentcheck
.DEFAULT_GOAL := allandcheck
-allandcheck : all check
+allandcheck : all unitcheck
# compatibility with the old build system
ifneq ($(strip $(OOO_SUBSEQUENT_TESTS)),)
@@ -95,7 +95,7 @@ all :
$(call gb_Output_announce_title,all done.)
$(call gb_Output_announce_bell)
-check :
+unitcheck :
$(call gb_Output_announce,loaded modules: $(sort
$(gb_Module_ALLMODULES)),$(true),CHK,6)
$(call gb_Output_announce_title,all tests checked.)
$(call gb_Output_announce_bell)
@@ -222,7 +222,7 @@ endif
include $(1)
all : $$(firstword $$(gb_Module_TARGETSTACK))
-check : $$(firstword $$(gb_Module_CHECKTARGETSTACK))
+unitcheck : $$(firstword $$(gb_Module_CHECKTARGETSTACK))
subsequentcheck : $$(firstword $$(gb_Module_SUBSEQUENTCHECKTARGETSTACK))
clean : $$(firstword $$(gb_Module_CLEANTARGETSTACK))
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
