strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test-install: get rid of opt/

Browse source 
Change-Id: Ie390749c0b28e47848c361d874bb447f39cfeb12
This commit is contained in:
Michael Stahl 2013-10-01 17:39:52 +02:00
parent f1d0889058
commit b81f49ce0f
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile.in
View file

@ -283,13 +283,13 @@ endif
test-install: build
@rm -rf $(TESTINSTALLDIR)
@mkdir $(TESTINSTALLDIR)
@mkdir -p $(TESTINSTALLDIR)
ifeq ($(OS_FOR_BUILD),WNT)
cd $(SRCDIR)/instsetoo_native && $(GNUMAKE) LIBO_TEST_INSTALL=TRUE $(GMAKE_OPTIONS)
else
@ooinstall $(TESTINSTALLDIR)/opt
@ooinstall $(TESTINSTALLDIR)
ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
@macosx-codesign-app-bundle $(TESTINSTALLDIR)/opt/LibreOffice.app
@macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice.app
endif
ifneq ($(OS),MACOSX)
@install-gdb-printers -L
@ -298,7 +298,7 @@ endif
@echo
@echo "If you want to edit the .ui files with glade first execute:"
@echo
@echo "export GLADE_CATALOG_SEARCH_PATH=$(SRCDIR)/install/share/glade"
@echo "export GLADE_CATALOG_SEARCH_PATH=$(TESTINSTALLDIR)/share/glade"
ifeq ($(OS),LINUX)
@echo
@echo "Test installation finished, you can now execute:"

4
instsetoo_native/CustomTarget_install.mk
View file

@ -98,13 +98,13 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony:
ifeq (TRUE,$(LIBO_TEST_INSTALL))
$(call instsetoo_native_install_command,openoffice,en-US,,,archive)
unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)/archive/install/en-US/LibreOffice*_archive.zip
mv $(TESTINSTALLDIR)/LibreOffice*_archive/* $(TESTINSTALLDIR)/opt
mv $(TESTINSTALLDIR)/LibreOffice*_archive/* $(TESTINSTALLDIR)/
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive
ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive)
unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip
mv $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \
$(TESTINSTALLDIR)/opt/
$(TESTINSTALLDIR)/
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk
endif

2
solenv/bin/install-gdb-printers
View file

@ -9,7 +9,7 @@
GDBDIR="${SOLARENV}/gdb"
SOLVERLIBDIR="${SOLARVER}/${INPATH}/lib"
INSTALLDIR="${TESTINSTALLDIR}/opt"
INSTALLDIR="${TESTINSTALLDIR}"
DYLIB=so
if [ "$(uname)" = Darwin ]; then
INSTALLDIR=$INSTALLDIR/LibreOffice.app/Contents