Makefile | 11 ++++++-----
clucene/Module_clucene.mk | 4 ++++
config_host.mk.in | 1 +
configure.in | 5 +++++
smoketest/CppunitTest_smoketest.mk | 4 ++--
solenv/bin/install-gdb-printers | 2 +-
solenv/gbuild/Module.mk | 2 +-
solenv/gbuild/platform/macosx.mk | 2 +-
solenv/gbuild/platform/solaris.mk | 8 ++++----
solenv/gbuild/platform/unxgcc.mk | 8 ++++----
solenv/inc/installationtest.mk | 2 +-
11 files changed, 30 insertions(+), 19 deletions(-)
New commits:
commit 77f19d6e024006dac4434f60a377543314dbf261
Author: LuboÅ¡ LuÅák <l.lu...@suse.cz>
Date: Tue Apr 24 08:57:49 2012 +0200
specific variable for where dev-install installs
diff --git a/Makefile b/Makefile
index 79f39aa..eb800e4 100644
--- a/Makefile
+++ b/Makefile
@@ -302,6 +302,7 @@ $(eval $(call dmake_modules_rules,$(dmake_modules)))
clean: clean-host clean-build
clean-host:
+ rm -fr $(DEVINSTALLDIR)
rm -fr $(SRCDIR)/*/$(INPATH)
rm -fr install
@@ -431,15 +432,15 @@ install:
echo "$(INSTALLDIR)/program/soffice"
dev-install: build
- @rm -rf $(OUTDIR)/installation
- @mkdir $(OUTDIR)/installation
+ @rm -rf $(DEVINSTALLDIR)
+ @mkdir $(DEVINSTALLDIR)
ifeq ($(DISABLE_LINKOO),TRUE)
- @ooinstall $(OUTDIR)/installation/opt
+ @ooinstall $(DEVINSTALLDIR)/opt
@install-gdb-printers -L
else
- @ooinstall -l $(OUTDIR)/installation/opt
+ @ooinstall -l $(DEVINSTALLDIR)/opt
endif
- @rm -f $(SRCDIR)/install && ln -s $(OUTDIR)/installation/opt/
$(SRCDIR)/install
+ @rm -f $(SRCDIR)/install && ln -s $(DEVINSTALLDIR)/opt/
$(SRCDIR)/install
distro-pack-install: install
$(SRCDIR)/bin/distro-install-clean-up
diff --git a/config_host.mk.in b/config_host.mk.in
index 0357ffb..9a6b09c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -76,6 +76,7 @@ export DB_LIB=@DB_LIB@
export debug=@ENABLE_DEBUG@
export DEFAULT_MOZILLA_TOOLKIT=@MOZILLA_TOOLKIT@
export DEFAULT_TO_ENGLISH_FOR_PACKING=yes
+export DEVINSTALLDIR=@DEVINSTALLDIR@
export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@
export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@
export DIRECTXSDK_LIB=@DIRECTXSDK_LIB@
diff --git a/configure.in b/configure.in
index eb300c9..d8a1611 100644
--- a/configure.in
+++ b/configure.in
@@ -11135,6 +11135,11 @@ INSTALLDIR="$LIBDIR/$INSTALLDIRNAME"
AC_MSG_RESULT([$INSTALLDIR])
AC_SUBST(INSTALLDIR)
+AC_MSG_CHECKING([for dev-install dir])
+DEVINSTALLDIR="$OUTDIR/installation"
+AC_MSG_RESULT([$DEVINSTALLDIR])
+AC_SUBST(DEVINSTALLDIR)
+
# ===================================================================
# De- or increase default verbosity of build process
# ===================================================================
diff --git a/smoketest/CppunitTest_smoketest.mk
b/smoketest/CppunitTest_smoketest.mk
index cbfc3d3..71a7bce 100644
--- a/smoketest/CppunitTest_smoketest.mk
+++ b/smoketest/CppunitTest_smoketest.mk
@@ -39,9 +39,9 @@ $(eval $(call gb_CppunitTest_use_libraries,smoketest,\
))
ifeq ($(OS),MACOSX)
-my_soffice:=path:$(OUTDIR)/installation/opt/LibreOffice.app/Contents/MacOS/soffice
+my_soffice:=path:$(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/MacOS/soffice
else
-my_soffice:=path:$(OUTDIR)/installation/opt/program/soffice
+my_soffice:=path:$(DEVINSTALLDIR)/opt/program/soffice
endif
$(eval $(call gb_CppunitTest_use_ure,smoketest))
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index df327a0..c478929 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -27,7 +27,7 @@
GDBDIR="${SOLARENV}/gdb"
SOLVERLIBDIR="${SOLARVER}/${INPATH}/lib"
-INSTALLDIR="${SOLARVER}/${INPATH}/installation/opt"
+INSTALLDIR="${DEVINSTALLDIR}/opt"
DYLIB=so
if [ "$(uname)" = Darwin ]; then
INSTALLDIR=$INSTALLDIR/LibreOffice.app/Contents
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 15237eb..4d55916 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -171,7 +171,7 @@ debugrun :
dev-install :
@rm -f $(SRCDIR)/install && \
- ln -s $(OUTDIR)/installation/opt/ $(SRCDIR)/install
+ ln -s $(DEVINSTALLDIR)/opt/ $(SRCDIR)/install
$(info $(gb_Module_DEVINSTALLHINT))
define gb_Module_Module
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 819fbef..6e4a741 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -388,7 +388,7 @@ endef
define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-
-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/LibreOffice.app/Contents/MacOS/soffice}"
\
+
-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/MacOS/soffice}"
\
-Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH \
-Dorg.openoffice.test.arg.user=file://$(call
gb_JunitTest_get_userdir,$(1)) \
-Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1))
\
diff --git a/solenv/gbuild/platform/solaris.mk
b/solenv/gbuild/platform/solaris.mk
index 1152c68..779ccf5 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -376,7 +376,7 @@ else
ifneq ($(gb_JunitTest_DEBUGRUN),)
gb_JunitTest_SOFFICEARG:=connect:pipe,name=$(USER)
else
-gb_JunitTest_SOFFICEARG:=path:$(OUTDIR)/installation/opt/program/soffice
+gb_JunitTest_SOFFICEARG:=path:$(DEVINSTALLDIR)/opt/program/soffice
endif
endif
@@ -394,9 +394,9 @@ endef
define gb_Module_DEBUGRUNCOMMAND
OFFICESCRIPT=`mktemp` && \
-printf ". $(OUTDIR)/installation/opt/program/ooenv\\n" > $${OFFICESCRIPT} && \
-printf "gdb --tui $(OUTDIR)/installation/opt/program/soffice.bin" >>
$${OFFICESCRIPT} && \
-printf " -ex \"set args --norestore --nologo '--accept=pipe,name=$(USER);urp;'
-env:UserInstallation=file://$(OUTDIR)/installation/\"" >> $${OFFICESCRIPT} && \
+printf ". $(DEVINSTALLDIR)/opt/program/ooenv\\n" > $${OFFICESCRIPT} && \
+printf "gdb --tui $(DEVINSTALLDIR)/opt/program/soffice.bin" >>
$${OFFICESCRIPT} && \
+printf " -ex \"set args --norestore --nologo '--accept=pipe,name=$(USER);urp;'
-env:UserInstallation=file://$(DEVINSTALLDIR)/\"" >> $${OFFICESCRIPT} && \
printf " -ex \"r\"\\n" >> $${OFFICESCRIPT} && \
$(SHELL) $${OFFICESCRIPT} && \
rm $${OFFICESCRIPT}
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 2681a33..387b583 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -372,7 +372,7 @@ else
ifneq ($(gb_JunitTest_DEBUGRUN),)
gb_JunitTest_SOFFICEARG:=connect:pipe,name=$(USER)
else
-gb_JunitTest_SOFFICEARG:=path:$(OUTDIR)/installation/opt/program/soffice
+gb_JunitTest_SOFFICEARG:=path:$(DEVINSTALLDIR)/opt/program/soffice
endif
endif
@@ -390,9 +390,9 @@ endef
define gb_Module_DEBUGRUNCOMMAND
OFFICESCRIPT=`mktemp` && \
-printf 'if [ -e $(OUTDIR)/installation/opt/program/ooenv ]; then .
$(OUTDIR)/installation/opt/program/ooenv; fi\n' > $${OFFICESCRIPT} && \
-printf "gdb --tui $(OUTDIR)/installation/opt/program/soffice.bin" >>
$${OFFICESCRIPT} && \
-printf " -ex \"set args --norestore --nologo '--accept=pipe,name=$(USER);urp;'
-env:UserInstallation=file://$(OUTDIR)/installation/\"" >> $${OFFICESCRIPT} && \
+printf 'if [ -e $(DEVINSTALLDIR)/opt/program/ooenv ]; then .
$(DEVINSTALLDIR)/opt/program/ooenv; fi\n' > $${OFFICESCRIPT} && \
+printf "gdb --tui $(DEVINSTALLDIR)/opt/program/soffice.bin" >>
$${OFFICESCRIPT} && \
+printf " -ex \"set args --norestore --nologo '--accept=pipe,name=$(USER);urp;'
-env:UserInstallation=file://$(DEVINSTALLDIR)/\"" >> $${OFFICESCRIPT} && \
printf " -ex \"r\"\\n" >> $${OFFICESCRIPT} && \
$(SHELL) $${OFFICESCRIPT} && \
rm $${OFFICESCRIPT}
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
index 2ddedb6..fcfb520 100644
--- a/solenv/inc/installationtest.mk
+++ b/solenv/inc/installationtest.mk
@@ -61,7 +61,7 @@ installationtest_instset = \
.IF "$(OS)" == "WNT" && "$(CROSS_COMPILING)" != "YES"
installationtest_instpath = `cat $(MISC)/$(TARGET)/installation.flag`
.ELSE
-installationtest_instpath = $(SOLARVERSION)/$(INPATH)/installation
+installationtest_instpath = $(DEVINSTALLDIR)
.END
.IF "$(OS)" == "MACOSX"
commit 4af5efaaffba264d00109723e3ae33876bac4ae8
Author: LuboÅ¡ LuÅák <l.lu...@suse.cz>
Date: Tue Apr 24 08:57:07 2012 +0200
do not use internal clucene if building with an external one
diff --git a/clucene/Module_clucene.mk b/clucene/Module_clucene.mk
index 2a72ef8..564e838 100644
--- a/clucene/Module_clucene.mk
+++ b/clucene/Module_clucene.mk
@@ -27,10 +27,14 @@
$(eval $(call gb_Module_Module,clucene))
+ifeq ($(SYSTEM_CLUCENE),NO)
+
$(eval $(call gb_Module_add_targets,clucene,\
CustomTarget_source \
Library_clucene \
Package_source \
))
+endif
+
# vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
