[Libreoffice-commits] core.git: 4 commits - Makefile.in
Bjoern Michaelsen
bjoern.michaelsen at canonical.com
Wed Nov 20 12:16:17 PST 2013
Makefile.in | 80 +++++++++++++++++++++++++++++-------------------------------
1 file changed, 39 insertions(+), 41 deletions(-)
New commits:
commit 1bd21f801626df6e0e73f81b9133de4799b8c7f6
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Nov 20 21:14:59 2013 +0100
install-gdb-printer -L fails with 'unknown option' anyway
Change-Id: I5927427264eaed86d2e93bee1cfc8f1ff55690c3
diff --git a/Makefile.in b/Makefile.in
index 7794b37..a7518b8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -312,9 +312,6 @@ else
ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
@macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice.app
endif
-ifneq ($(OS),MACOSX)
- @install-gdb-printers -L
-endif
endif
@$(call gb_Top_InstallFinished,Test Installation,$(TESTINSTALLDIR))
commit ac32aafc7bf4a3ccc960fdfe2a18d133a27213a8
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Nov 20 19:36:03 2013 +0100
clean up echo deserts, consolidate blurbs
Change-Id: If268d37e8e96adcb8902c8b3fc855ecddea69ba5
diff --git a/Makefile.in b/Makefile.in
index 07b811a..7794b37 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -249,31 +249,47 @@ build-nocheck check debugrun help slowcheck translations unitcheck subsequentche
cross-toolset: bootstrap fetch
$(GNUMAKE) gb_Side=build -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build-tools
-ifneq ($(OS),MACOSX)
#
# Install
#
+define gb_Top_DoInstall
+echo "$(1) in $(INSTALLDIR) ..." && \
+ooinstall $(2) "$(INSTALLDIR)"
+
+endef
+
+ifneq ($(OS),MACOSX)
+define gb_Top_InstallFinished
+echo && echo "If you want to edit the .ui files with glade first execute:" && \
+echo && echo "export GLADE_CATALOG_SEARCH_PATH=$(2)/share/glade" && \
+echo && echo "$(1) finished, you can now execute:" && \
+echo "$(2)/program/soffice"
+
+endef
+else
+define gb_Top_InstallFinished
+echo && echo "$(1) finished, you can now run: " && \
+echo "open $(2)/$(PRODUCTNAME).app" && \
+echo "" && \
+echo "To debug: gdb $(2)/$(PRODUCTNAME).app/Contents/MacOS/soffice"
+
+endef
+endif
+
+ifneq ($(OS),MACOSX)
install:
- echo "Installing in $(INSTALLDIR)..." && \
- ooinstall "$(INSTALLDIR)" && \
- echo "" && \
- echo "Installation finished, you can now execute:" && \
- echo "$(INSTALLDIR)/program/soffice"
+ @$(call gb_Top_DoInstall,Installing,)
+ @$(call gb_Top_InstallFinished,Installation,$(INSTALLDIR))
install-strip:
- echo "Installing and stripping binaries in $(INSTALLDIR)..." && \
- ooinstall --strip "$(INSTALLDIR)" && \
- echo "" && \
- echo "Installation finished, you can now execute:" && \
- echo "$(INSTALLDIR)/program/soffice"
-
+ @$(call gb_Top_DoInstall,Installing and stripping binaries,--strip)
+ @$(call gb_Top_InstallFinished,Installation,$(INSTALLDIR))
endif # !MACOSX
dev-install:
- @echo
- @echo "dev-install is obsolete! Just build with \"make check\" and run"
+ @echo && echo "dev-install is obsolete! Just build with \"make check\" and run"
ifeq ($(OS),MACOSX)
@echo " open instdir/$(PRODUCTNAME).app"
@echo
@@ -300,23 +316,7 @@ ifneq ($(OS),MACOSX)
@install-gdb-printers -L
endif
endif
- @echo
- @echo "If you want to edit the .ui files with glade first execute:"
- @echo
- @echo "export GLADE_CATALOG_SEARCH_PATH=$(TESTINSTALLDIR)/share/glade"
-ifneq ($(OS),MACOSX)
- @echo
- @echo "Test installation finished, you can now execute:"
- @echo
- @echo " $(TESTINSTALLDIR)/program/soffice"
-else
- @echo
- @echo "Test installation finished, you can now run:"
- @echo
- @echo " open $(TESTINSTALLDIR)/LibreOffice.app"
- @echo
- @echo "To debug: gdb $(TESTINSTALLDIR)/LibreOffice.app/Contents/MacOS/soffice"
-endif
+ @$(call gb_Top_InstallFinished,Test Installation,$(TESTINSTALLDIR))
distro-pack-install: install
$(SRCDIR)/bin/distro-install-clean-up
commit 60c64b437c6678dd1d3fa3a6fc2b7da0480890d4
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Nov 20 19:21:34 2013 +0100
some namespacing
Change-Id: I7f4fc456d7e9690443d94175e94b69db50c3e2b5
diff --git a/Makefile.in b/Makefile.in
index cafe312..07b811a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -73,7 +73,7 @@ endif
#
# Partial Build
#
-define gbuild_module_rules
+define gb_Top_GbuildModuleRules
.PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).showdeliverables $(1).subsequentcheck
$(1): bootstrap fetch
@@ -87,13 +87,13 @@ $(1).all: bootstrap fetch
endef
-define gbuild_modules_rules
-$(foreach m,$(1),$(call gbuild_module_rules,$(notdir $(m)),$(m)))
+define gb_Top_GbuildModulesRules
+$(foreach m,$(1),$(call gb_Top_GbuildModuleRules,$(notdir $(m)),$(m)))
endef
gbuild_modules := $(patsubst $(SRCDIR)/%/,%,$(dir $(wildcard $(SRCDIR)/*/Module_*.mk $(SRCDIR)/external/*/Module_*.mk)))
-$(eval $(call gbuild_modules_rules,$(gbuild_modules)))
+$(eval $(call gb_Top_GbuildModulesRules,$(gbuild_modules)))
gbuild_TARGETS := AllLangHelp \
AllLangPackage \
@@ -388,7 +388,7 @@ dump-deps:
dump-deps-png:
@$(SRCDIR)/bin/module-deps.pl $(GNUMAKE) $(SRCDIR)/Makefile.gbuild | dot -Tpng -o lo.png
-define GbuildToIdeIntegration
+define gb_Top_GbuildToIdeIntegration
$(1)-ide-integration:
cd $(SRCDIR) && (make cmd -npf Makefile.gbuild all || true) | $(SRCDIR)/bin/gbuild-to-ide --ide $(1)
@@ -396,7 +396,7 @@ endef
$(foreach ide,\
kdevelop, \
-$(eval $(call GbuildToIdeIntegration,$(ide))))
+$(eval $(call gb_Top_GbuildToIdeIntegration,$(ide))))
endif # MAKE_RESTARTS
commit 00e9a7a5571bb4bec49a2c0cbe39692bc37ea110
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Nov 20 19:09:24 2013 +0100
toplevel 'make check' should also do subsequentcheck
Change-Id: Ib41660a1fef332573ef1c477c12bc8fdfedfc4db
diff --git a/Makefile.in b/Makefile.in
index 76d4abf..cafe312 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -238,7 +238,8 @@ endif
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild \
$(if $(filter build,$(MAKECMDGOALS)),all) \
$(if $(filter build-nocheck,$(MAKECMDGOALS)),build) \
- $(filter all build-l10n-only build-non-l10n-only debugrun help slowcheck translations unitcheck subsequentcheck,$(MAKECMDGOALS))
+ $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck) \
+ $(filter all build-l10n-only build-non-l10n-only debugrun help slowcheck translations unitcheck subsequentcheck check,$(MAKECMDGOALS))
ifeq ($(OS),IOS)
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) ios
endif
More information about the Libreoffice-commits
mailing list