[Libreoffice-commits] .: Makefile.in

2011-11-29 Thread Bjoern Michaelsen 
 Makefile.in |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 55da6a0907fe3679dd09de4c9f29ad32cb2a5ab5
Author: Bjoern Michaelsen 
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 solenv/gbuild

2011-11-28 Thread Bjoern Michaelsen 
 Makefile.in |   10 ++
 solenv/gbuild/extensions/post_BuildplTargets.mk |6 +++---
 2 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit cb4dbf934a2095422289723ed73a4d7cacb56afe
Author: Bjoern Michaelsen 
Date:   Mon Nov 28 19:22:48 2011 +0100

some consistent naming cant hurt: cross-build-toolset -> cross_toolset

diff --git a/Makefile.in b/Makefile.in
index b6d06e6..5ae3d96 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,13 +2,7 @@
 
 SHELL=/usr/bin/env bash
 
-ifeq (@CROSS_COMPILING@,YES)
-CROSS_TOOLSET_RULE:=cross-build-toolset
-else
-CROSS_TOOLSET_RULE:=
-endif
-
-.PHONY : build dev-install all cross-build-toolset install distro-pack-install 
clean clean-host clean-build distclean findunusedcode bootstrap
+.PHONY : build dev-install all cross_toolset install distro-pack-install clean 
clean-host clean-build distclean findunusedcode bootstrap
 
 define forward_to_gbuild
 @GNUMAKE@ -f $(dir $(realpath $(firstword $(MAKEFILE_LIST/GNUmakefile.mk \
@@ -50,7 +44,7 @@ build: Makefile
 dev-install: Makefile
@$(call forward_to_gbuild,$@)
 
-cross-build-toolset:
+cross_toolset:
@$(call forward_to_gbuild,$@)
 
 clean:
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 1fa6a2b..cba5b33 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -55,13 +55,13 @@ endef
 
 .PHONY: smoketestoo_native instsetoo_native cross-build-toolset dev-install 
all build
 
-smoketestoo_native: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if 
$(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset)
+smoketestoo_native: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if 
$(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
$(call gb_BuildplTarget_command,$@)
 
-instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset)
+instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
$(call gb_BuildplTarget_command,$@)
 
-cross-build-toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
+cross_toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
$(call gb_BuildplTarget_command,$@)
 
 dev-install: smoketestoo_native
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Makefile.in

2011-11-25 Thread Stephan Bergmann 
 Makefile.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8fc420f4fa18a92eedd6bb7b34c8bc36ee2bac41
Author: Stephan Bergmann 
Date:   Fri Nov 25 17:17:19 2011 +0100

typo

diff --git a/Makefile.in b/Makefile.in
index 86acb64..8ea483d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -62,7 +62,7 @@ check : allcheck
@true
 
 %check:
-   @ @GNUMAKE@ -f $(dir $(realpath $(firstword 
$)MAKEFILE_LIST/GNUmakefile.mk -r \
+   @ @GNUMAKE@ -f $(dir $(realpath $(firstword 
$(MAKEFILE_LIST/GNUmakefile.mk -r \
$(if @VERBOSE@,,-s) --jobs="$(if \
   
$(CHECK_PARALLELISM),$(CHECK_PARALLELISM),@GMAKE_PARALLELISM@)" \
$(patsubst allcheck,check,$@)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Makefile.in

2011-11-25 Thread Bjoern Michaelsen 
 Makefile.in |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 19b5d81f92363f1448dcf41930d973b8b04db11b
Author: Bjoern Michaelsen 
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

2011-10-07 Thread Jan Holesovsky 
 Makefile.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6fb32f4f3861b64c93fed9bebfd37b672fcc9939
Author: Jan Holesovsky 
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

2011-10-07 Thread Jan Holesovsky 
 Makefile.in |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 683cd8d86febeb28d1cb79ec9fb4c7cef45042ef
Author: Jan Holesovsky 
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 solenv/bin

2011-10-04 Thread Stephan Bergmann 
 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 
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

2011-09-29 Thread Stephan Bergmann 
 Makefile.in |3 +--
 solenv/bin/install-gdb-printers |   14 --
 2 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 235a5e6c323432bf44db8de6cd05d1a5cc526022
Author: Stephan Bergmann 
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

[Libreoffice-commits] .: Makefile.in

2011-09-28 Thread Norbert Thiebaud 
 Makefile.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 422b71e32bf0881cc643cee76b596f6031511829
Author: Norbert Thiebaud 
Date:   Wed Sep 28 15:54:44 2011 -0500

target 'all' should be the first one to make it the default one.

diff --git a/Makefile.in b/Makefile.in
index 9c4ebf9..99d9af1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,6 +17,8 @@ endif
 
 .PHONY : build dev-install all cross-build-toolset install distro-pack-install 
clean distclean findunusedcode
 
+all: build unitcheck
+
 build: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded 
$(CROSS_TOOLSET_RULE)
@. ./Env.Host.sh && \
cd instsetoo_native && \
@@ -51,8 +53,6 @@ check : allcheck
   
$(CHECK_PARALLELISM),$(CHECK_PARALLELISM),@GMAKE_PARALLELISM@)" \
$(patsubst allcheck,check,$@)
 
-all: build unitcheck
-
 cross-build-toolset:
@. ./Env.Build.sh && \
cd cross_toolset && \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Makefile.in

2011-09-23 Thread Stephan Bergmann 
 Makefile.in |   31 +--
 1 file changed, 17 insertions(+), 14 deletions(-)

New commits:
commit 611913d4a696f709e2dfd6279438bbf2a48ad4e3
Author: Stephan Bergmann 
Date:   Fri Sep 23 17:44:53 2011 +0200

Improved Makefile.in dev-install recipe.

diff --git a/Makefile.in b/Makefile.in
index 1f69b07..9c4ebf9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,20 +24,23 @@ build: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ 
src.downloaded $(CROSS_TOOLSET_RUL
 
 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
+cd smoketestoo_native && \
+build.pl -P@BUILD_NCPUS@ -- -P@BUILD_MAX_JOBS@ && \
+rm -f "@abs_builddir@"/install && \
+ln -s "$$SOLARVER/$$INPATH"/installation/opt/ \
+"@abs_builddir@"/install && \
+printf '\n' && \
+install-gdb-printers -a "$$SOLARVER/$$INPATH/installation/opt" \
+-L && \
+printf \
+'\nDeveloper installation finished, you can now execute:\n\n' \
+&& \
+if test `uname -s` = Darwin; then \
+printf 'open %s/install/LibreOffice.app\n' "@abs_builddir@"; \
+else \
+printf 'cd %s/install/program\n. ./ooenv\n./soffice.bin\n' \
+"@abs_builddir@"; \
+fi
 
 check : allcheck
@true
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Makefile.in

2011-09-16 Thread Bjoern Michaelsen 
 Makefile.in |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 206938c82366030412dc20598addfcc1148d329c
Author: Bjoern Michaelsen 
Date:   Sat Sep 17 04:46:30 2011 +0200

another dep needed until we are gbuild-only

diff --git a/Makefile.in b/Makefile.in
index 67cf587..1cad501 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -146,3 +146,4 @@ findunusedcode:
 #as long as we are not completely gbuildified we need to explicitly depend on 
the build/install
 unitcheck: build
 subsequentcheck: dev-install
+allcheck : dev-install
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits