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

make dev-install is obsolete

Browse source 
There is no need for developers to run it as part of the daily workflow
because instdir is much easier to use, so just let it print an error
message.  Also remove the "install" symlink.

Provide the previous dev-install functionality as "test-install" target
so that it is possible to quickly create some kind of actual
installation against which the subsequentchecks can run by
setting OOO_TEST_SOFFICE, to e.g. check that scp2 isn't missing files.

Change-Id: I8c0b05a87f55b1db8c1d1e76f64ab64b9cc695eb
This commit is contained in:
Michael Stahl 2013-10-01 15:08:15 +02:00
parent 9b92f21460
commit be59288ff4
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Makefile.in
View file

@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
.PHONY : all bootstrap build check clean clean-build clean-host dev-install distclean distro-pack-install docs download fetch findunusedcode get-submodules id install install-strip install-tb subsequentcheck tags
.PHONY : all bootstrap build check clean clean-build clean-host test-install distclean distro-pack-install docs download fetch findunusedcode get-submodules id install install-strip install-tb subsequentcheck tags
ifeq ($(MAKECMDGOALS),)
MAKECMDGOALS:=all
@ -266,7 +266,22 @@ install-strip:
endif # !MACOSX
dev-install: build
dev-install:
@echo
@echo "dev-install is obsolete! Just build with \"make check\" and run"
ifeq ($(OS),MACOSX)
@echo " open instdir/*/$(PRODUCTNAME).app"
@echo
@echo "To debug: gdb instdir/*/$(PRODUCTNAME).app/Contents/MacOS/soffice"
else
@echo " instdir/*/program/soffice"
endif
@echo
@echo "(only if you have good reason to test an actual installation: make test-install)"
@echo
@false
test-install: build
@rm -rf $(DEVINSTALLDIR)
@mkdir $(DEVINSTALLDIR)
ifeq ($(OS_FOR_BUILD),WNT)
@ -280,28 +295,24 @@ ifneq ($(OS),MACOSX)
@install-gdb-printers -L
endif
endif
@rm -f $(BUILDDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(BUILDDIR)/install
@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"
ifeq ($(OS),LINUX)
@echo
@echo "Developer installation finished, you can now execute:"
@echo "Test installation finished, you can now execute:"
@echo
@echo "$(BUILDDIR)/install/program/soffice"
@echo "$(DEVINSTALLDIR)/program/soffice"
else ifeq ($(OS),MACOSX)
@echo
@echo "Developer installation finished, you can now run:"
@echo
@echo " open $(BUILDDIR)/install/LibreOffice.app"
@echo " open $(DEVINSTALLDIR)/LibreOffice.app"
@echo
@echo "To debug: gdb install/LibreOffice.app/Contents/MacOS/soffice"
@echo "To debug: gdb $(DEVINSTALLDIR)/LibreOffice.app/Contents/MacOS/soffice"
endif
dev-install-nocheck: build-nocheck
$(MAKE) dev-install -o build
install-tb:
@rm -rf $(DEVINSTALLDIR)
@mkdir $(DEVINSTALLDIR)