mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

start to use instdir for subsequentcheck tests; avoid make dev-install

Browse Source 
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
This commit is contained in:
Matúš Kukan 2013-06-19 14:50:02 +02:00 committed by Michael Stahl
parent 3cc8feff1b
commit 573b8543cb
15 changed files with 10 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.in
View File

@ -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

4
desktop/Module_desktop.mk
View File

@ -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 \

2
instsetoo_native/Module_instsetoo_native.mk
View File

@ -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:

7
postprocess/Module_postprocess.mk
View File

@ -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:

2
solenv/Module_solenv.mk
View File

@ -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

2
solenv/gbuild/AllLangResTarget.mk
View File

@ -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)

2
solenv/gbuild/Executable.mk
View File

@ -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))

6
solenv/gbuild/ExternalPackage.mk
View File

@ -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

2
solenv/gbuild/Jar.mk
View File

@ -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

4
solenv/gbuild/Library.mk
View File

@ -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

2
solenv/gbuild/Pagein.mk
View File

@ -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

6
solenv/gbuild/gbuild.mk
View File

@ -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))

2
solenv/gbuild/platform/macosx.mk
View File

@ -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

2
solenv/gbuild/platform/solaris.mk
View File

@ -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}

2
solenv/gbuild/platform/unxgcc.mk
View File

@ -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