diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-01-30 13:41:53 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-01-30 13:47:12 +0100 |
| commit | e63bfb3035cd01983600a23ab289601dd9b2cf11 (patch) | |
| tree | 1b5bbeb8e827eb0fc7d3ba52040cf2233954ec95 /solenv | |
| parent | 53927349241643abc2a083f1983c46ec793e6ff1 (diff) | |
Get rid of STAR_RESOURCEPATH
...the only remaining use was for CppunitTest to find the .res files in
$(OUTDIR)/bin/. Get that solved by delivering the .res files also to
$(OUTDIR)/unittest/install/program/resource/ (new
gb_ResTarget_get_unittest_target).
Change-Id: I370e7cab4223256356c7511b88ae63d9c0dbf215
Diffstat (limited to 'solenv')
| -rwxr-xr-x | solenv/bin/linkoo | 1 | ||||
| -rw-r--r-- | solenv/gbuild/AllLangResTarget.mk | 11 | ||||
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo index 6f6e096f4d76..61726f4bc17c 100755 --- a/solenv/bin/linkoo +++ b/solenv/bin/linkoo @@ -41,7 +41,6 @@ export LD_LIBRARY_PATH="$thisdir:$java_path:' . $moz_lib . '$LD_LIBRARY_PATH" ulimit -c unlimited export PATH="$thisdir:$thisdir/../ure-link/bin:$PATH" export GNOME_DISABLE_CRASH_DIALOG=1 -export STAR_RESOURCEPATH=$thisdir/resource # debugging assistance export SAL_DISABLE_FLOATGRAB=1 export G_SLICE=always-malloc diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 9e348e732980..c211b1c391ed 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -359,7 +359,7 @@ gb_ResTarget_DEFIMAGESLOCATION := $(SRCDIR)/icon-themes/galaxy/ $(call gb_ResTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),RES,2) $(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_ResTarget_get_target,$*) $(call gb_ResTarget_get_imagelist_target,$*) $(call gb_ResTarget_get_outdir_target,$*)) + rm -f $(call gb_ResTarget_get_target,$*) $(call gb_ResTarget_get_imagelist_target,$*) $(call gb_ResTarget_get_outdir_target,$*) $(call gb_ResTarget_get_unittest_target,$*)) $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \ $(gb_ResTarget_RSCDEPS) @@ -390,17 +390,24 @@ $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \ $(call gb_ResTarget_get_outdir_target,%) : $(call gb_Deliver_deliver,$<,$@) +$(call gb_ResTarget_get_unittest_target,%) : + $(call gb_Helper_abbreviate_dirs,mkdir -p $(dir $@)) + $(call gb_Deliver_deliver,$<,$@) + define gb_ResTarget_ResTarget $(call gb_ResTarget_get_target,$(1)) : LIBRARY = $(2) $(call gb_ResTarget_get_target,$(1)) : LANGUAGE = $(3) $(call gb_ResTarget_get_target,$(1)) : RESLOCATION = $(2) -$(call gb_AllLangResTarget_get_target,$(2)) : $(call gb_ResTarget_get_outdir_target,$(1)) +$(call gb_AllLangResTarget_get_target,$(2)) : $(call gb_ResTarget_get_outdir_target,$(1)) $(call gb_ResTarget_get_unittest_target,$(1)) $(call gb_AllLangResTarget_get_clean_target,$(2)) : $(call gb_ResTarget_get_clean_target,$(1)) $(call gb_ResTarget_get_imagelist_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) $(call gb_ResTarget_get_outdir_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) $(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1)) +$(call gb_ResTarget_get_unittest_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) +$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_unittest_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1)) + endef define gb_ResTarget_add_file diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index e578dc034e01..e883adeef0e6 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -91,7 +91,6 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTDEPS) $(if $(DBGSV_ERROR_OUT),DBGSV_ERROR_OUT=$(DBGSV_ERROR_OUT)) \ DISABLE_SAL_DBGBOX=t \ $(if $(SAL_DIAGNOSE_ABORT),SAL_DIAGNOSE_ABORT=$(SAL_DIAGNOSE_ABORT)) \ - STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) \ $(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTCOMMAND) \ $(call gb_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) \ $(call gb_CppunitTest__make_args) \ diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index d24818e69560..3887b536fbc4 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -55,6 +55,8 @@ gb_PackagePart_get_target = $(OUTDIR)/$(1) gb_Rdb_get_outdir_target = $(OUTDIR)/xml/$(1).rdb gb_Rdb_get_outdir_target_for_build = $(OUTDIR_FOR_BUILD)/xml/$(1).rdb gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res +gb_ResTarget_get_unittest_target = \ + $(OUTDIR)/unittest/install/program/resource/$(1).res gb_UnoApi_get_target = $(OUTDIR)/bin/$(1).rdb gb_UnoApiMerge_get_target = $(OUTDIR)/bin/$(1).rdb gb_UnoApiMerge_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1).rdb |