From 573b8543cb41b88dd6e255a3c566a31a881a3e7e Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Wed, 19 Jun 2013 14:50:02 +0200 Subject: start to use instdir for subsequentcheck tests; avoid make dev-install This commit breaks linkoo. make dev-install continues to work as before but it's not necessary to use it anymore. make check now uses files copied into instdir by gbuild. TODO: fix remaining issues so that instdir is the same as install/. Change-Id: I66836170f0922ee9ba204a61ffacc30d9e9a5d98 --- Makefile.in | 4 ++-- desktop/Module_desktop.mk | 4 +--- instsetoo_native/Module_instsetoo_native.mk | 2 -- postprocess/Module_postprocess.mk | 7 +------ solenv/Module_solenv.mk | 2 +- solenv/gbuild/AllLangResTarget.mk | 2 -- solenv/gbuild/Executable.mk | 2 -- solenv/gbuild/ExternalPackage.mk | 6 ------ solenv/gbuild/Jar.mk | 2 -- solenv/gbuild/Library.mk | 4 ---- solenv/gbuild/Pagein.mk | 2 -- solenv/gbuild/gbuild.mk | 6 ++---- solenv/gbuild/platform/macosx.mk | 2 +- solenv/gbuild/platform/solaris.mk | 2 +- solenv/gbuild/platform/unxgcc.mk | 2 +- 15 files changed, 10 insertions(+), 39 deletions(-) diff --git a/Makefile.in b/Makefile.in index eef1aecf3d62..f1d5b37e4468 100644 --- a/Makefile.in +++ b/Makefile.in @@ -381,7 +381,7 @@ findunusedcode: | grep -v ^WSObject \ > unusedcode.easy -check: dev-install subsequentcheck +check: build subsequentcheck dump-deps: @$(SRCDIR)/bin/module-deps.pl $(GNUMAKE) $(SRCDIR)/Makefile.gbuild @@ -389,7 +389,7 @@ dump-deps: dump-deps-png: @$(SRCDIR)/bin/module-deps.pl $(GNUMAKE) $(SRCDIR)/Makefile.gbuild | dot -Tpng -o lo.png -subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install) +subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),build) $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ .PHONY : debugrun help slowcheck translations unitcheck diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index 1deb99af307b..68acf4104f47 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -36,10 +36,8 @@ $(eval $(call gb_Module_add_targets,desktop,\ Library_migrationoo2 \ Library_migrationoo3 \ Library_unopkgapp \ - $(if $(gb_RUNNABLE_INSTDIR),\ - Package_scripts_install \ - ) \ Package_scripts \ + Package_scripts_install \ Pagein_calc \ Pagein_common \ Pagein_draw \ diff --git a/instsetoo_native/Module_instsetoo_native.mk b/instsetoo_native/Module_instsetoo_native.mk index 2ee18e586a77..dc9e4a5493d9 100644 --- a/instsetoo_native/Module_instsetoo_native.mk +++ b/instsetoo_native/Module_instsetoo_native.mk @@ -17,11 +17,9 @@ $(eval $(call gb_Module_add_targets,instsetoo_native,\ endif -ifneq ($(gb_RUNNABLE_INSTDIR),) $(eval $(call gb_Module_add_targets,instsetoo_native,\ CustomTarget_setup \ Package_setup \ )) -endif # vim: set noet sw=4 ts=4: diff --git a/postprocess/Module_postprocess.mk b/postprocess/Module_postprocess.mk index 4baeb6197559..15e7b5875534 100644 --- a/postprocess/Module_postprocess.mk +++ b/postprocess/Module_postprocess.mk @@ -17,6 +17,7 @@ $(eval $(call gb_Module_add_targets,postprocess,\ CustomTarget_registry \ Package_images \ Package_registry \ + Package_registry_install \ Rdb_services \ )) @@ -26,10 +27,4 @@ $(eval $(call gb_Module_add_targets,postprocess,\ )) endif -ifneq ($(gb_RUNNABLE_INSTDIR),) -$(eval $(call gb_Module_add_targets,postprocess,\ - Package_registry_install \ -)) -endif - # vim: set noet sw=4 ts=4: diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk index ef63bead491f..c3c1386282a8 100644 --- a/solenv/Module_solenv.mk +++ b/solenv/Module_solenv.mk @@ -26,7 +26,7 @@ ifneq ($(filter-out WNT IOS ANDROID,$(OS)),) $(eval $(call gb_Module_add_targets,solenv,\ CustomTarget_gdb \ Package_gdb \ - $(if $(gb_RUNNABLE_INSTDIR),Package_gdb_install) \ + Package_gdb_install \ )) endif diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index a63ce428ce99..fef707e79623 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -473,12 +473,10 @@ define gb_AllLangResTarget_AllLangResTarget $(foreach lang,$(gb_AllLangResTarget_LANGS),\ $(call gb_ResTarget_ResTarget,$(1)$(lang),$(1),$(lang))) -ifneq ($(gb_RUNNABLE_INSTDIR),) $(foreach lang,$(gb_AllLangResTarget_LANGS),\ $(call gb_Helper_install,$(call gb_AllLangResTarget_get_target,$(1)), \ $(call gb_ResTarget_get_install_target,$(1)$(lang)), \ $(call gb_ResTarget_get_target,$(1)$(lang)))) -endif $$(eval $$(call gb_Module_register_target,$(call gb_AllLangResTarget_get_target,$(1)),$(call gb_AllLangResTarget_get_clean_target,$(1)))) $(call gb_Helper_make_userfriendly_targets,$(1),AllLangResTarget) diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 0450c6f89c63..1640cece276d 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -69,13 +69,11 @@ $(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_tar $(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS := $(call gb_Executable_Executable_platform,$(1),$(2)) -ifneq ($(gb_RUNNABLE_INSTDIR),) $(if $(call gb_Executable__get_dir_for_exe,$(1)), \ $(call gb_Helper_install,$(call gb_Executable_get_target,$(1)), \ $(call gb_Executable_get_install_target,$(1)), \ $(call gb_LinkTarget_get_target,$(2))) \ ) -endif $$(eval $$(call gb_Module_register_target,$(call gb_Executable_get_target,$(1)),$(call gb_Executable_get_clean_target,$(1)))) $(call gb_Helper_make_userfriendly_targets,$(1),Executable) $(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1)) diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk index 1a2abefaf664..4491b887fb95 100644 --- a/solenv/gbuild/ExternalPackage.mk +++ b/solenv/gbuild/ExternalPackage.mk @@ -63,9 +63,7 @@ define gb_ExternalPackage_ExternalPackage_internal $(call gb_Package_Package_internal,$(1),$(call gb_UnpackedTarball_get_dir,$(2))) $(call gb_Package_use_unpacked,$(1),$(2)) -ifneq ($(gb_RUNNABLE_INSTDIR),) $(call gb_ExternalPackage__ExternalPackage_package,$(1),$(call gb_ExternalPackage_get_packagename,$(1)),$(2)) -endif $(call gb_ExternalPackage_get_target,$(1)) : $(call gb_Package_get_target,$(1)) $(call gb_ExternalPackage_get_target,$(1)) :| $(dir $(call gb_ExternalPackage_get_target,$(1))).dir @@ -199,9 +197,7 @@ endef define gb_ExternalPackage_use_external_project $(call gb_Package_use_external_project,$(1),$(2)) -ifneq ($(gb_RUNNABLE_INSTDIR),) $(call gb_Package_use_external_project,$(call gb_ExternalPackage_get_packagename,$(1)),$(2)) -endif $(if $(gb_ExternalPackage_PROJECT_$(1)),$(call gb_Output_error,gb_ExternalPackage_use_external_project: only one project allowed)) gb_ExternalPackage_PROJECT_$(1) := $(2) @@ -212,11 +208,9 @@ endef define gb_ExternalPackage__add_file_for_install $(call gb_ExternalPackage_add_file,$(1),$(3),$(5)) -ifneq ($(gb_RUNNABLE_INSTDIR),) $(call gb_ExternalPackage_add_file,$(2),$(4),$(5)) $(call gb_ExternalPackage_get_target,$(1)) : $(call gb_Package_get_target,$(2)) $(call gb_ExternalPackage_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(2)) -endif endef diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index dff27062ce7a..d904301ba7f7 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -101,13 +101,11 @@ $(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call g $(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1)) $(call gb_Jar_get_outdir_target,$(1)) :| $(dir $(call gb_Jar_get_outdir_target,$(1))).dir -ifneq ($(gb_RUNNABLE_INSTDIR),) $(if $(filter OOO URE,$(call gb_Jar__get_layer,$(1))),\ $(call gb_Helper_install,$(call gb_Jar_get_outdir_target,$(1)), \ $(call gb_Jar_get_install_target,$(1)), \ $(call gb_Jar_get_target,$(1))) \ ) -endif endef diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index fb0ff64296b9..2fd559ab70ea 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -86,13 +86,11 @@ $(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_Library_get_dllname,$(1))) -ifneq ($(gb_RUNNABLE_INSTDIR),) $(if $(call gb_Library_get_instdir,$(1)),\ $(call gb_Helper_install,$(call gb_Library__get_final_target,$(1)), \ $(call gb_Library_get_install_target,$(1)), \ $(call gb_LinkTarget_get_target,$(2))) \ ) -endif $$(eval $$(call gb_Module_register_target,$(call gb_Library__get_final_target,$(1)),$(call gb_Library_get_clean_target,$(1)))) @@ -129,11 +127,9 @@ define gb_Library__set_soversion_script $(call gb_LinkTarget_set_soversion_script,$(call gb_Library_get_linktargetname,$(1)),$(2),$(3)) $(call gb_Library_get_target,$(1)) : SOVERSION := $(2) $(call gb_Library__add_soversion_link,$(1),$(call gb_Library_get_target,$(1)).$(2)) -ifneq ($(gb_RUNNABLE_INSTDIR),) $(call gb_Helper_install,$(call gb_Library__get_final_target,$(1)), \ $(call gb_Library_get_install_target,$(1)).$(2), \ $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))).$(2)) -endif endef diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk index aa6a98a82b24..e0ce2424c5df 100644 --- a/solenv/gbuild/Pagein.mk +++ b/solenv/gbuild/Pagein.mk @@ -47,11 +47,9 @@ $(call gb_Deliver_add_deliverable,$(call gb_Pagein_get_outdir_target,$(1)),$(cal $(call gb_Pagein_get_outdir_target,$(1)) : $(call gb_Pagein_get_target,$(1)) $(call gb_Pagein_get_outdir_target,$(1)) :| $(dir $(call gb_Pagein_get_outdir_target,$(1))).dir -ifneq ($(gb_RUNNABLE_INSTDIR),) $(call gb_Helper_install,$(call gb_Pagein_get_outdir_target,$(1)), \ $(call gb_Pagein_get_install_target,$(1)), \ $(call gb_Pagein_get_target,$(1))) -endif endef diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 9d5c1d7b35b0..d95585839c87 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -18,6 +18,8 @@ # GBUILDDIR:=$(SRCDIR)/solenv/gbuild +gb_DEVINSTALLROOT := $(INSTDIR) +gb_USER_INSTALLATION = $(call gb_Helper_make_url,$(DEVINSTALLDIR)/) # vars needed from the env/calling makefile @@ -264,10 +266,6 @@ gb_GLOBALDEFS += \ gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) -ifeq ($(origin gb_RUNNABLE_INSTDIR),undefined) -gb_RUNNABLE_INSTDIR := -endif - include $(GBUILDDIR)/Deliver.mk $(eval $(call gb_Deliver_init)) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index d5d7d48ea3a2..fa412cc86949 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -327,7 +327,7 @@ gb_PythonTest_PRECOMMAND := $(gb_PythonTest_PRECOMMAND):$(OUTDIR)/lib define gb_Module_DEBUGRUNCOMMAND OFFICESCRIPT=$$($(gb_MKTEMP)) && \ -printf '%s\n' "set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' -env:UserInstallation=$(call gb_Helper_make_url,$(DEVINSTALLDIR)/)" > $${OFFICESCRIPT} && \ +printf '%s\n' "set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' -env:UserInstallation=$(gb_USER_INSTALLATION)" > $${OFFICESCRIPT} && \ gdb -x $${OFFICESCRIPT} $(gb_DEVINSTALLROOT)/MacOS/soffice && \ rm $${OFFICESCRIPT} endef diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index d9c1bb5206f8..e3ada70ccf93 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -352,7 +352,7 @@ define gb_Module_DEBUGRUNCOMMAND OFFICESCRIPT=`mktemp` && \ printf ". $(gb_DEVINSTALLROOT)/program/ooenv\\n" > $${OFFICESCRIPT} && \ printf "gdb --tui $(gb_DEVINSTALLROOT)/program/soffice.bin" >> $${OFFICESCRIPT} && \ -printf " -ex \"set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' -env:UserInstallation=$(call gb_Helper_make_url,$(DEVINSTALLDIR)/)\"" >> $${OFFICESCRIPT} && \ +printf " -ex \"set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' -env:UserInstallation=$(gb_USER_INSTALLATION)\"" >> $${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 02ecb6cad204..d349a7cc93b9 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -347,7 +347,7 @@ define gb_Module_DEBUGRUNCOMMAND OFFICESCRIPT=`mktemp` && \ printf 'if [ -e $(gb_DEVINSTALLROOT)/program/ooenv ]; then . $(gb_DEVINSTALLROOT)/program/ooenv; fi\n' > $${OFFICESCRIPT} && \ printf "gdb $(gb_DEVINSTALLROOT)/program/soffice.bin" >> $${OFFICESCRIPT} && \ -printf " -ex \"set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' -env:UserInstallation=$(call gb_Helper_make_url,$(DEVINSTALLDIR)/)\"" >> $${OFFICESCRIPT} && \ +printf " -ex \"set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' -env:UserInstallation=$(gb_USER_INSTALLATION)\"" >> $${OFFICESCRIPT} && \ $(SHELL) $${OFFICESCRIPT} && \ rm $${OFFICESCRIPT} endef -- cgit