diff options
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | smoketest/CppunitTest_smoketest.mk | 4 | ||||
| -rwxr-xr-x | solenv/bin/install-gdb-printers | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Module.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 8 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 8 | ||||
| -rw-r--r-- | solenv/inc/installationtest.mk | 2 |
10 files changed, 26 insertions, 19 deletions
@@ -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 0357ffb760f1..9a6b09c06f61 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 eb300c9ddd62..d8a1611c98f8 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 cbfc3d30e609..71a7bcef2980 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 df327a06ecdb..c478929796fc 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 15237eb2fc67..4d559162c688 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 819fbefc532d..6e4a741aaa7e 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 1152c687a3e9..779ccf58f45c 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 2681a33d6178..387b583f8f73 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 2ddedb6af3d2..fcfb5202da99 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" |