[Libreoffice-commits] .: Makefile.in
Makefile.in |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 24a29a1348357ed055c4ec04b7f19873e60909ac Author: Tor Lillqvist t...@iki.fi Date: Sun Feb 3 11:52:13 2013 +0200 Undo temporary change accidentally committed Change-Id: Iec24cb165009d4769ee3068739c6edc222799017 diff --git a/Makefile.in b/Makefile.in index 6565ab8..52df78f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -328,9 +328,7 @@ ifeq ($(ENABLE_MACOSX_SANDBOX),YES) entitlements:=--entitlements $(SRC_ROOT)/lo.xcent endif -dev-install: build do-dev-install - -do-dev-install: +dev-install: build @rm -rf $(DEVINSTALLDIR) @mkdir $(DEVINSTALLDIR) ifeq ($(OS_FOR_BUILD),WNT) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile.in solenv/gbuild
Makefile.in | 17 +
solenv/gbuild/platform/macosx.mk |3 +++
2 files changed, 16 insertions(+), 4 deletions(-)
New commits:
commit 3dfd5c926848b336be34a34fe04d8da60912998b
Author: Tor Lillqvist t...@iki.fi
Date: Sat Feb 2 10:07:10 2013 +0200
Sign executables right after linking
Change-Id: I27c929deffeb803e103609634b501622e04da033
diff --git a/Makefile.in b/Makefile.in
index f9e38dd7..2b43f04 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -337,13 +337,21 @@ ifeq ($(DISABLE_LINKOO),TRUE)
ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
#
# Sign dylibs
- find $(DEVINSTALLDIR)/opt/LibreOffice.app \( -name '*.dylib' -or -name
'*.dylib.*' \) ! -type l | \
+#
+# Executables get signed right after linking, see
+# solenv/gbuild/platform/macosx.mk. But many of our dylibs are built
+# by ad-hoc or 3rd-party mechanisms, so we can't easily sign them
+# right after linking. So do it here.
+#
+# The dylibs in the Python framework are called *.so. Go figure
+#
+ find $(DEVINSTALLDIR)/opt/LibreOffice.app \( -name '*.dylib' -or -name
'*.dylib.*' -or -name '*.so' \) ! -type l | \
while read dylib; do \
id=`basename $$dylib`; \
case $$id in \
-*.dylib) \
+*.dylib|*.so) \
;; \
-*) \
+*.dylib.*) \
id=`echo $$id | sed -e 's/dylib.*/dylib/'`; \
;; \
esac; \
@@ -362,7 +370,8 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
done
#
# Sign the app bundle as a whole (will sign the soffice binary)
- codesign --verbose --sign $(MACOSX_CODESIGNING_IDENTITY)
$(DEVINSTALLDIR)/opt/LibreOffice.app
+# Not necessary as the soffice binary will have been signed after linking.
+# codesign --verbose --sign $(MACOSX_CODESIGNING_IDENTITY)
$(DEVINSTALLDIR)/opt/LibreOffice.app
#
endif
@install-gdb-printers -L
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 8ac274a..29e3549 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -174,6 +174,9 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter Library Bundle CppunitTest,$(TARGETTYPE)),\
$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl shl
$(LAYER) $(if $(SOVERSION),$(1).$(SOVERSION),$(1)) \
ln -sf $(notdir $(1)) $(basename $(1)).jnilib ) \
+ $(if $(MACOSX_CODESIGNING_IDENTITY), \
+ $(if $(filter Executable,$(TARGETTYPE)), \
+ codesign
--identifier=$(MACOSX_BUNDLE_IDENTIFIER).$(notdir $(1)) --sign
$(MACOSX_CODESIGNING_IDENTITY) $(1) )) \
rm -f $${DYLIB_FILE})
endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile.in
Makefile.in |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit dc6fda0795cc9401423a7f9f88e50336e050b75e Author: Tor Lillqvist t...@iki.fi Date: Sat Feb 2 10:36:28 2013 +0200 Do re-sign the bundle as a whole as soffice has been modified and/or renamed Change-Id: I5e798fb94594ef4f91db7b57058f1c5cfb021d8e diff --git a/Makefile.in b/Makefile.in index 2b43f04..5e5d29b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -370,8 +370,11 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),) done # # Sign the app bundle as a whole (will sign the soffice binary) -# Not necessary as the soffice binary will have been signed after linking. -# codesign --verbose --sign $(MACOSX_CODESIGNING_IDENTITY) $(DEVINSTALLDIR)/opt/LibreOffice.app +# +# The soffice binary will have been signed after linking but it needs +# to be re-signed as it has been renamed, or modified, or something +# after linking. + codesign --force --verbose --sign $(MACOSX_CODESIGNING_IDENTITY) $(DEVINSTALLDIR)/opt/LibreOffice.app # endif @install-gdb-printers -L ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile.in
Makefile.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1f04735705bcca35b2893fe6a835d91cf715ff19 Author: Tor Lillqvist t...@iki.fi Date: Sat Feb 2 10:39:32 2013 +0200 Cosmetics Change-Id: Idbc7bd8ac3bca6b0a2d5e893de9a41cba8110c54 diff --git a/Makefile.in b/Makefile.in index 5e5d29b..c0425f8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -371,7 +371,7 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),) # # Sign the app bundle as a whole (will sign the soffice binary) # -# The soffice binary will have been signed after linking but it needs +# The soffice binary will have been signed after linking but it needs # to be re-signed as it has been renamed, or modified, or something # after linking. codesign --force --verbose --sign $(MACOSX_CODESIGNING_IDENTITY) $(DEVINSTALLDIR)/opt/LibreOffice.app ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile.in
Makefile.in |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 568e489be45bb57c344326beec96a8b708d7e654 Author: Petr Mladek pmla...@suse.cz Date: Mon Jan 7 21:10:12 2013 +0100 another fix of install test to work with LibreOffice installer name It is done by gbuild these days. Change-Id: I5a01d42f8e25eacc3f1c63d6f52e4144c7312cff diff --git a/Makefile.in b/Makefile.in index f0b5ce1..af83e64 100644 --- a/Makefile.in +++ b/Makefile.in @@ -325,8 +325,8 @@ dev-install: build @mkdir $(DEVINSTALLDIR) ifeq ($(OS_FOR_BUILD),WNT) cd $(SRC_ROOT)/instsetoo_native unset MAKEFLAGS $(SOLARENV)/bin/build.pl LIBO_DEV_INSTALL=TRUE - unzip -q -d $(DEVINSTALLDIR) $(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibO*_install-arc_en-US.zip - mv $(DEVINSTALLDIR)/LibO*_install-arc_en-US/* $(DEVINSTALLDIR)/opt + unzip -q -d $(DEVINSTALLDIR) $(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibreOffice*_install-arc_en-US.zip + mv $(DEVINSTALLDIR)/LibreOffice*_install-arc_en-US/* $(DEVINSTALLDIR)/opt else ifeq ($(DISABLE_LINKOO),TRUE) @ooinstall $(DEVINSTALLDIR)/opt @@ -352,8 +352,8 @@ install-tb: @mkdir $(DEVINSTALLDIR) ifeq ($(OS_FOR_BUILD),WNT) cd $(SRC_ROOT)/instsetoo_native unset MAKEFLAGS $(SOLARENV)/bin/build.pl LIBO_DEV_INSTALL=TRUE - unzip -q -d $(DEVINSTALLDIR) $(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibO*_install-arc_en-US.zip - mv $(DEVINSTALLDIR)/LibO*_install-arc_en-US/* $(DEVINSTALLDIR)/opt + unzip -q -d $(DEVINSTALLDIR) $(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibreOffice*_install-arc_en-US.zip + mv $(DEVINSTALLDIR)/LibreOffice*_install-arc_en-US/* $(DEVINSTALLDIR)/opt else @ooinstall $(DEVINSTALLDIR)/opt @install-gdb-printers ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile.in
Makefile.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 149277ba2f630261ab9880523bf742318a7a7f12 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Jan 4 21:09:17 2013 +0100 fix the if filter-expression Let's use the orginal patch from https://gerrit.libreoffice.org/#/c/1479/ There is difference, visible e.g. by 'make help testtools' Change-Id: Iaf929ed1d315f038eb29fca1b4ba37e2143c6294 diff --git a/Makefile.in b/Makefile.in index b5a0428..fb00c38 100644 --- a/Makefile.in +++ b/Makefile.in @@ -21,7 +21,7 @@ BUILDDIR := @BUILDDIR@ # If you want to make something more than help clean distclean, # and make has not yet restarted itself.. # ..run autogen.sh if needed and force make to restart itself. -ifeq (,$(MAKE_RESTARTS)$(if $(filter help clean distclean,$(MAKECMDGOALS)),T)) +ifeq (,$(MAKE_RESTARTS)$(if $(filter-out help clean distclean,$(MAKECMDGOALS)),,T)) .PHONY : force-restart Makefile: $(BUILDDIR)/config_host.mk force-restart ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile.in
Makefile.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 11199dd01b909d75e97df9617cc5bbb71c43fe3c Author: Michael Stahl mst...@redhat.com Date: Thu Jan 3 16:16:50 2013 +0100 Makefile.in: un-break make accessibility ... caused by missing new-line after \ Change-Id: Ibdccf7f18e909308fbc1e58b6ddd3301e08a2223 diff --git a/Makefile.in b/Makefile.in index 2a56db0..8f7dc97 100644 --- a/Makefile.in +++ b/Makefile.in @@ -62,7 +62,7 @@ endif # by the module being mentioned in postprocess/prj/build.lst, etc, recursively. $(WORKDIR)/modules.mk: $(wildcard */Module_*.mk) $(wildcard */prj/dmake) $(BUILDDIR)/config_host.mk mkdir -p $(dir $@) - echo -n gbuild_modules:= tail_build \\ $@ + echo gbuild_modules:= tail_build \\ $@ for m in */Module_*.mk; do echo $$m | sed -e 's/\/.*$$/ \\/'; done $@ echo $@ echo -n dmake_modules:= $@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile.in
Makefile.in |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 01402f9d4ba0bc8bf8634ced4bfd6d41060d6913 Author: Peter Foley pefol...@verizon.net Date: Wed Dec 26 16:38:49 2012 -0500 dont build postprocess twice Change-Id: I344030d48c3f872cc63b5c1f444d18075fd160f5 diff --git a/Makefile.in b/Makefile.in index 8c5f060..d4d4b9f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -275,8 +275,7 @@ ifeq ($(DISABLE_DBCONNECTIVITY),TRUE) $(GNUMAKE) connectivity endif cd $(SRC_ROOT)/postprocess unset MAKEFLAGS \ - $(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM) \ - $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) + $(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM) build: build-postprocess ifeq ($(OS_FOR_BUILD),WNT) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile.in Makefile.top
Makefile.in | 403 +-- Makefile.top | 390 - 2 files changed, 394 insertions(+), 399 deletions(-) New commits: commit 0e6212c81a837180db5b8ea29d0d2a529b4b1924 Author: Matúš Kukan matus.ku...@gmail.com Date: Sun Dec 23 19:27:28 2012 +0100 merge Makefile and Makefile.top again Using MAKE_RESTARTS as indicator whether to source environment. 'make foo -o bar' should work again. Change-Id: I6086b661559b39897f1d5378919541fb786bdf0e Reviewed-on: https://gerrit.libreoffice.org/1478 Reviewed-by: Peter Foley pefol...@verizon.net Tested-by: Peter Foley pefol...@verizon.net diff --git a/Makefile.in b/Makefile.in index fd66058..fce 100644 --- a/Makefile.in +++ b/Makefile.in @@ -7,20 +7,21 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# must not be empty so we can have a target for it +.PHONY : all bootstrap build check clean clean-build clean-host dev-install distclean distro-pack-install docs download fetch findunusedcode get-submodules help id install install-strip install-tb subsequentcheck tags + ifeq ($(MAKECMDGOALS),) MAKECMDGOALS:=all endif SHELL=/usr/bin/env bash -export SRCDIR:=@SRC_ROOT@ -export BUILDDIR:=@BUILDDIR@ +SRCDIR := @SRC_ROOT@ +BUILDDIR := @BUILDDIR@ -.PHONY : $(filter-out $(BUILDDIR)/config_host.mk,$(MAKECMDGOALS)) +ifeq (,$(MAKE_RESTARTS)) -# recursively invoke Makefile.top, which includes config_host.mk -$(filter-out help,$(firstword $(MAKECMDGOALS))) : $(BUILDDIR)/config_host.mk - $(MAKE) -r -f $(SRCDIR)/Makefile.top $(MAKECMDGOALS) +.PHONY : force-restart +Makefile: $(BUILDDIR)/config_host.mk force-restart + @touch $@ # run configure in an environment not polluted by config_host.mk $(BUILDDIR)/config_host.mk : \ @@ -34,9 +35,393 @@ $(BUILDDIR)/config_host.mk : \ $(BUILDDIR)/autogen.lastrun: @true +else # MAKE_RESTARTS + +all: build + +ifeq ($(gb_Side),) +gb_Side:=host +endif + +include $(BUILDDIR)/config_$(gb_Side).mk +SRCDIR:=$(SRC_ROOT) + +ifeq ($(GMAKE_OPTIONS),) +ifeq ($(verbose)$(VERBOSE),) +export GMAKE_OPTIONS:=-rs +else +export GMAKE_OPTIONS:=-r +endif +endif + +# This list tells which modules are gbuild ones. It does *not* tell which modules to build. That is directed +# by the module being mentioned in postprocess/prj/build.lst, etc, recursively. +$(WORKDIR)/modules.mk: $(wildcard */Module_*.mk) $(wildcard */prj/dmake) $(BUILDDIR)/config_host.mk + mkdir -p $(dir $@) + echo -n gbuild_modules:= tail_build \\ $@ + for m in */Module_*.mk; do echo $$m | sed -e 's/\/.*$$/ \\/'; done $@ + echo $@ + echo -n dmake_modules:= $@ + for m in */prj/dmake; do echo $$m | sed -e 's/\/.*$$/ \\/'; done $@ + echo $@ + +-include $(WORKDIR)/modules.mk +include $(SRCDIR)/solenv/gbuild/Output.mk +$(if $(filter $(gbuild_modules),$(dmake_modules)),$(eval $(call gb_Output_warn,The following modules claim to be both dmake and gbuild: $(filter $(gbuild_modules),$(dmake_modules) + +export gb_TAILBUILDTARGET=all slowcheck + +define gbuild_module_rules +.PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).subsequentcheck $(1).deliver + +$(1): bootstrap fetch + cd $(1) $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) gb_PARTIALBUILD=T + +$(1).all: bootstrap fetch + $$(if $$(filter $(1),$$(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules)), \ + cd $(SRC_ROOT)/tail_build unset MAKEFLAGS \ + export gb_TAILBUILDTARGET=$(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1) \ + , \ + cd $(SRC_ROOT)/$(1) unset MAKEFLAGS \ + ) \ + $(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM) + +$(1).build $(1).check $(1).clean: + cd $(1) $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@) gb_PARTIALBUILD=T + +$(1).subsequentcheck: + cd $(1) $(GNUMAKE) -j $(CHECK_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 $(SRC_ROOT)/$(1) unset MAKEFLAGS \ +$(SOLARENV)/bin/build.pl -P$(PARALLELISM) -- -P$(PARALLELISM) + +$(1).all: bootstrap fetch + cd $(SRC_ROOT)/$(1) unset MAKEFLAGS \ +$(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM) + +$(1).deliver: $(1) + cd $(SRC_ROOT)/$(1) $(SOLARENV)/bin/deliver.pl + +$(1).clean: + cd $(SRC_ROOT)/$(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
[Libreoffice-commits] .: Makefile.in
Makefile.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6763a59564c3b34c46e4acd8ea9f5feb42f35969 Author: Peter Foley pefol...@verizon.net Date: Mon Dec 24 17:39:09 2012 -0500 connectivity is now a gbuild module Change-Id: I2c0b387aed6ae229f9ebe4e8b30abea37884a657 diff --git a/Makefile.in b/Makefile.in index fce..b80ad4a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -268,7 +268,7 @@ ifeq ($(DISABLE_SCRIPTING),TRUE) 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 + $(GNUMAKE) connectivity endif cd $(SRC_ROOT)/postprocess unset MAKEFLAGS \ $(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile.in
Makefile.in |2 -- 1 file changed, 2 deletions(-) New commits: commit 55da6a0907fe3679dd09de4c9f29ad32cb2a5ab5 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Tue Nov 29 13:18:15 2011 +0100 these deps are already handled in gbuild diff --git a/Makefile.in b/Makefile.in index 1375db4..2df1863 100644 --- a/Makefile.in +++ b/Makefile.in @@ -102,6 +102,4 @@ findunusedcode: @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 #debugrun : dev-install # disabled for now, this dep seems to poison the debugrun !? ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile.in
Makefile.in |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 19b5d81f92363f1448dcf41930d973b8b04db11b Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Fri Nov 25 15:24:49 2011 +0100 move workaround for old build system to other workarounds diff --git a/Makefile.in b/Makefile.in index 443305b..82dca9a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -55,7 +55,7 @@ dev-install: build @abs_builddir@; \ fi -debugrun : dev-install +debugrun: @. ./Env.Host.sh $$GNUMAKE -f $$SRC_ROOT/GNUmakefile.mk debugrun check : allcheck @@ -173,3 +173,4 @@ findunusedcode: unitcheck: build subsequentcheck: dev-install allcheck : dev-install +debugrun : dev-install ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile.in
Makefile.in | 11 +++ 1 file changed, 11 insertions(+) New commits: commit 683cd8d86febeb28d1cb79ec9fb4c7cef45042ef Author: Jan Holesovsky ke...@suse.cz Date: Fri Oct 7 10:48:12 2011 +0200 Indicate that the build was successful, and what to do next. diff --git a/Makefile.in b/Makefile.in index b7fd5f5..c2f6288 100644 --- a/Makefile.in +++ b/Makefile.in @@ -18,6 +18,17 @@ endif .PHONY : build dev-install all cross-build-toolset install distro-pack-install clean distclean findunusedcode all: build unitcheck + @echo + @echo LibreOffice build succesfully finished :-) + @echo +ifeq (@CROSS_COMPILING@,YES) + @echo Please consult README.cross how to install it. +else + @echo To install, issue: @GNUMAKE@ install + @echo Developers might prefer this way: @GNUMAKE@ dev-install + @echo To run smoketest, issue: @GNUMAKE@ check +endif + @echo build: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded $(CROSS_TOOLSET_RULE) @. ./Env.Host.sh \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile.in
Makefile.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6fb32f4f3861b64c93fed9bebfd37b672fcc9939 Author: Jan Holesovsky ke...@suse.cz Date: Fri Oct 7 13:03:00 2011 +0200 Advise how to save yourself a rebuild with make dev-install. diff --git a/Makefile.in b/Makefile.in index c2f6288..a7d884c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -25,7 +25,7 @@ ifeq (@CROSS_COMPILING@,YES) @echo Please consult README.cross how to install it. else @echo To install, issue: @GNUMAKE@ install - @echo Developers might prefer this way: @GNUMAKE@ dev-install + @echo Developers might prefer this way: @GNUMAKE@ dev-install -o build @echo To run smoketest, issue: @GNUMAKE@ check endif @echo ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile.in solenv/bin
Makefile.in |1 -
solenv/bin/install-gdb-printers | 16 ++--
solenv/bin/linkoo |2 +-
3 files changed, 11 insertions(+), 8 deletions(-)
New commits:
commit 23af3341322143f2edde5a6c6668294c915c3ae5
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 4 23:32:39 2011 +0200
Some fixes for linkoo and install-gdb-printers.
- Adapted linkoo's link_gdb_py to libs moved from basis to brand layer.
- Fixed install-gdb-printers's handling of Mac OS X .dylib suffix.
- No need to call install-gdb-printers from top-level make dev-install;
linkoo's link_gdb_py already does that.
diff --git a/Makefile.in b/Makefile.in
index 2b5eb5c..b7fd5f5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,7 +32,6 @@ dev-install: build
ln -s $$SOLARVER/$$INPATH/installation/opt/ \
@abs_builddir@/install \
printf '\n' \
-install-gdb-printers -L \
printf \
'\nDeveloper installation finished, you can now execute:\n\n' \
\
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index b4dcd0d..eaab2e8 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -29,7 +29,11 @@
GDBDIR=${SOLARENV}/gdb
SOLVERLIBDIR=${SOLARVER}/${INPATH}/lib
INSTALLDIR=${SOLARVER}/${INPATH}/installation/opt
-[ $(uname) = Darwin ] INSTALLDIR=$INSTALLDIR/LibreOffice.app/Contents
+DYLIB=so
+if [ $(uname) = Darwin ]; then
+INSTALLDIR=$INSTALLDIR/LibreOffice.app/Contents
+DYLIB=dylib
+fi
die() {
echo $1 2
@@ -165,10 +169,10 @@ if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then
cp -r ${GDBDIR}/libreoffice ${DESTDIR}${pythondir}
fi
-make_autoload cppu basis-link/ure-link/lib libuno_cppu.{dylib,so}.3
-make_autoload sal basis-link/ure-link/lib libuno_sal.{dylib,so}.3
-make_autoload svl program libsvllo.{dylib,so}
-make_autoload sw program libswlo.{dylib,so}
-make_autoload tl program libtllo.{dylib,so}
+make_autoload cppu basis-link/ure-link/lib libuno_cppu.$DYLIB.3
+make_autoload sal basis-link/ure-link/lib libuno_sal.$DYLIB.3
+make_autoload svl program libsvllo.$DYLIB
+make_autoload sw program libswlo.$DYLIB
+make_autoload tl program libtllo.$DYLIB
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 5da680c..14b595b 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -374,7 +374,7 @@ sub link_gdb_py()
print STDERR Warning: missing helpful python debug helpers\n;
} else {
for my $c (@basis) {
- do_link ($src, $OOO_INSTALL/basis-link/program, $c, $c, 1);
+ do_link ($src, $OOO_INSTALL/program, $c, $c, 1);
}
for my $c (@ure) {
do_link ($src, $OOO_INSTALL/ure/lib, $c, $c, 1);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile.in solenv/bin
Makefile.in |3 +--
solenv/bin/install-gdb-printers | 14 --
2 files changed, 9 insertions(+), 8 deletions(-)
New commits:
commit 235a5e6c323432bf44db8de6cd05d1a5cc526022
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Sep 29 20:55:27 2011 +0200
Make install-gdb-printers work on Mac OS X.
diff --git a/Makefile.in b/Makefile.in
index ec38633..2b5eb5c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,8 +32,7 @@ dev-install: build
ln -s $$SOLARVER/$$INPATH/installation/opt/ \
@abs_builddir@/install \
printf '\n' \
-install-gdb-printers -a $$SOLARVER/$$INPATH/installation/opt \
--L \
+install-gdb-printers -L \
printf \
'\nDeveloper installation finished, you can now execute:\n\n' \
\
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index 3606dca..b4dcd0d 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -29,6 +29,7 @@
GDBDIR=${SOLARENV}/gdb
SOLVERLIBDIR=${SOLARVER}/${INPATH}/lib
INSTALLDIR=${SOLARVER}/${INPATH}/installation/opt
+[ $(uname) = Darwin ] INSTALLDIR=$INSTALLDIR/LibreOffice.app/Contents
die() {
echo $1 2
@@ -82,7 +83,8 @@ make_autoload() {
local lib=${dir}/$3
if ! ${flat}; then
-lib=$(readlink -f ${DESTDIR}${installdir}/$2/$3)
+local resolved=$(readlink ${DESTDIR}${installdir}/$2/$3)
+[ -n $resolved ] lib=$resolved
dir=${lib%/*}
fi
@@ -163,10 +165,10 @@ if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then
cp -r ${GDBDIR}/libreoffice ${DESTDIR}${pythondir}
fi
-make_autoload cppu basis-link/ure-link/lib libuno_cppu.so.3
-make_autoload sal basis-link/ure-link/lib libuno_sal.so.3
-make_autoload svl basis-link/program libsvllo.so
-make_autoload sw basis-link/program libswlo.so
-make_autoload tl basis-link/program libtllo.so
+make_autoload cppu basis-link/ure-link/lib libuno_cppu.{dylib,so}.3
+make_autoload sal basis-link/ure-link/lib libuno_sal.{dylib,so}.3
+make_autoload svl program libsvllo.{dylib,so}
+make_autoload sw program libswlo.{dylib,so}
+make_autoload tl program libtllo.{dylib,so}
# vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
