You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/15 00:10:25 UTC
svn commit: r1409533 - in /incubator/ooo/branches/gbuild/main/solenv/gbuild:
ComponentTarget.mk Library.mk TargetLocations.mk platform/linux.mk
platform/macosx.mk platform/solaris.mk platform/windows.mk
platform/winmingw.mk
Author: arist
Date: Wed Nov 14 23:10:24 2012
New Revision: 1409533
URL: http://svn.apache.org/viewvc?rev=1409533&view=rev
Log:
gnumake4_035_d5e93bd62dfc.patch
# HG changeset patch
# User Michael Stahl <ms...@openoffice.org>
# Date 1300121157 -3600
# Node ID d5e93bd62dfc8cec1eebb7a425986b67a97e6233
# Parent acbb15b7f8069bba42d700bb8a3c9c170edd5e83
gnumake4: ComponentTarget:
some components, such as those in module sax, are used during the build,
Modified:
incubator/ooo/branches/gbuild/main/solenv/gbuild/ComponentTarget.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/ComponentTarget.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/ComponentTarget.mk?rev=1409533&r1=1409532&r2=1409533&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/ComponentTarget.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/ComponentTarget.mk Wed Nov 14 23:10:24 2012
@@ -33,19 +33,27 @@ $(call gb_Helper_abbreviate_dirs_native,
$(gb_XSLTPROC) --nonet --stringparam uri \
'$(subst \d,$$,$(COMPONENTPREFIX))$(LIBFILENAME)' -o $(1) \
$(gb_ComponentTarget_XSLTCOMMANDFILE) $(2))
-
endef
+# creates 2 componentfiles: the first is for the installation set,
+# the second is for using the component during the build.
+# bit of a hack, hopefully inbuild can be removed when solver layout is fixed.
define gb_ComponentTarget__rules
-$$(call gb_ComponentTarget_get_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_XSLTPROCTARGET)
+$$(call gb_ComponentTarget_get_inbuild_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_XSLTPROCTARGET)
$$(call gb_ComponentTarget__command,$$@,$$<,$$*)
-$$(call gb_ComponentTarget_get_clean_target,%) :
- $$(call gb_Output_announce,$$*,$(false),CMP,1)
- rm -f $$(call gb_ComponentTarget_get_outdir_target,$$*) $$(call gb_ComponentTarget_get_target,$$*)
+$$(call gb_ComponentTarget_get_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_XSLTPROCTARGET)
+ $$(call gb_ComponentTarget__command,$$@,$$<,$$*)
endef
+$(call gb_ComponentTarget_get_clean_target,%) :
+ $(call gb_Output_announce,$$*,$(false),CMP,1)
+ rm -f $(call gb_ComponentTarget_get_outdir_target,$*) \
+ $(call gb_ComponentTarget_get_target,$*) \
+ $(call gb_ComponentTarget_get_outdir_inbuild_target,$*) \
+ $(call gb_ComponentTarget_get_inbuild_target,$*) \
+
$(foreach repo,$(gb_ComponentTarget_REPOS),$(eval $(call gb_ComponentTarget__rules,$(repo))))
$(call gb_ComponentTarget_get_target,%) :
@@ -56,9 +64,15 @@ $(call gb_ComponentTarget_get_external_t
define gb_ComponentTarget_ComponentTarget
$(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3)
+$(call gb_ComponentTarget_get_inbuild_target,$(1)) : LIBFILENAME := $(3)
$(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2)
+$(call gb_ComponentTarget_get_inbuild_target,$(1)) : \
+ COMPONENTPREFIX := $(call gb_Library__get_layer_componentprefix,NONE)
$(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(1))
+$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)) : \
+ $(call gb_ComponentTarget_get_inbuild_target,$(1))
$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)),$(1))
+$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)),$(call gb_ComponentTarget_get_inbuild_target,$(1)),$(1))
endef
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk?rev=1409533&r1=1409532&r2=1409533&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk Wed Nov 14 23:10:24 2012
@@ -78,7 +78,7 @@ endef
define gb_Library_set_componentfile
$(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Library__get_componentprefix,$(1)),$(call gb_Library_get_runtime_filename,$(1)))
-$(call gb_Library_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2))
+$(call gb_Library_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2)) $(call gb_ComponentTarget_get_outdir_inbuild_target,$(2))
$(call gb_Library_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(2))
endef
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk?rev=1409533&r1=1409532&r2=1409533&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk Wed Nov 14 23:10:24 2012
@@ -24,6 +24,7 @@
# outdir target pattern
gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).component
+gb_ComponentTarget_get_outdir_inbuild_target = $(OUTDIR)/xml/component/$(1).inbuild.component
gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT)
gb_PackagePart_get_destinations = $(OUTDIR)/xml $(OUTDIR)/inc $(OUTDIR)/bin $(OUTDIR)/idl $(OUTDIR)/pck
gb_PackagePart_get_target = $(OUTDIR)/$(1)
@@ -46,6 +47,7 @@ endef
gb_AllLangResTarget_get_target = $(WORKDIR)/AllLangRes/$(1)
gb_CObject_get_target = $(WORKDIR)/CObject/$(1).o
gb_ComponentTarget_get_target = $(WORKDIR)/ComponentTarget/$(1).component
+gb_ComponentTarget_get_inbuild_target = $(WORKDIR)/ComponentTarget/$(1).inbuild.component
gb_CppunitTest_get_target = $(WORKDIR)/CppunitTest/$(1).test
gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done
gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk?rev=1409533&r1=1409532&r2=1409533&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk Wed Nov 14 23:10:24 2012
@@ -420,6 +420,7 @@ gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH
gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+ NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
# UnoApiTarget
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk?rev=1409533&r1=1409532&r2=1409533&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk Wed Nov 14 23:10:24 2012
@@ -462,6 +462,7 @@ gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PA
gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+ NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
# UnoApiTarget
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk?rev=1409533&r1=1409532&r2=1409533&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk Wed Nov 14 23:10:24 2012
@@ -405,6 +405,7 @@ gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH
gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+ NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
# UnoApiTarget
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk?rev=1409533&r1=1409532&r2=1409533&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk Wed Nov 14 23:10:24 2012
@@ -771,6 +771,7 @@ gb_XSLTPROCPRECOMMAND := PATH="$${PATH}:
gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+ NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
# UnoApiTarget
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk?rev=1409533&r1=1409532&r2=1409533&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk Wed Nov 14 23:10:24 2012
@@ -706,6 +706,7 @@ gb_XSLTPROCPRECOMMAND := PATH="$${PATH}:
gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+ NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
# UnoApiTarget