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/14 23:35:01 UTC
svn commit: r1409482 - in /incubator/ooo/branches/gbuild/main/solenv/gbuild:
JavaClassSet.mk TargetLocations.mk gbuild.mk
Author: arist
Date: Wed Nov 14 22:35:00 2012
New Revision: 1409482
URL: http://svn.apache.org/viewvc?rev=1409482&view=rev
Log:
gnumake4_001_fe9439d524ff.patch
# HG changeset patch
# User mba
# Date 1298363591 -3600
# Node ID fe9439d524ff71df9122398fefd218ec7b6559db
# Parent d94c8aff8f54303b631002cdf43b074acb0d22f3
CWS gnumake4: add support for zip and jar files
Modified:
incubator/ooo/branches/gbuild/main/solenv/gbuild/JavaClassSet.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/gbuild.mk
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/JavaClassSet.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/JavaClassSet.mk?rev=1409482&r1=1409481&r2=1409482&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/JavaClassSet.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/JavaClassSet.mk Wed Nov 14 22:35:00 2012
@@ -48,9 +48,9 @@ $(call gb_JavaClassSet_get_clean_target,
$(call gb_Helper_abbreviate_dirs,\
rm -rf $(dir $(call gb_JavaClassSet_get_target,$*)))
-
$(foreach reponame,$(gb_JavaClassSet_REPOSITORYNAMES),$(eval $(call gb_JavaClassSet__rules,$(reponame))))
+# no initialization of scoped variable CLASSPATH as it is "inherited" from controlling instance (e.g. JUnitTest, Jar)
define gb_JavaClassSet_JavaClassSet
endef
@@ -61,16 +61,21 @@ endef
define gb_JavaClassSet_add_sourcefile
$(foreach reponame,$(gb_JavaClassSet_REPOSITORYNAMES),\
$(eval $(call gb_JavaClassSet_get_repo_target,$(reponame),$(1)) : $(call gb_JavaClassSet__get_sourcefile,$($(reponame)),$(2))))
-
endef
define gb_JavaClassSet_add_sourcefiles
$(foreach sourcefile,$(2),$(call gb_JavaClassSet_add_sourcefile,$(1),$(sourcefile)))
-
endef
define gb_JavaClassSet_set_classpath
$(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $(2)
+endef
+
+# problem: currently we can't get these dependencies to work
+# build order dependency is a hack to get these prerequisites out of the way in the build command
+define gb_JavaClassSet_add_jar
+$(foreach reponame,$(gb_JavaClassSet_REPOSITORYNAMES),\
+ $(eval $(call gb_JavaClassSet_get_repo_target,$(reponame),$(1)) :| $(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=1409482&r1=1409481&r2=1409482&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk Wed Nov 14 22:35:00 2012
@@ -29,6 +29,8 @@ gb_PackagePart_get_destinations = $(OUTD
gb_PackagePart_get_target = $(OUTDIR)/$(1)
gb_ResTarget_get_outdir_imagelist_target = $(OUTDIR)/res/img/$(1).ilst
gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res
+gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar
+gb_Zip_get_outdir_target = $(OUTDIR)/pck/$(1).zip
define gb_Library_get_target
$(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(filter $(1),$(gb_Library_TARGETS)):%,$(gb_Library_FILENAMES)))
@@ -52,6 +54,9 @@ gb_CxxObject_get_target = $(WORKDIR)/Cxx
gb_GenCxxObject_get_target = $(WORKDIR)/GenCxxObject/$(1).o
gb_Executable_get_external_headers_target = $(WORKDIR)/ExternalHeaders/Executable/$(1)
gb_Executable_get_headers_target = $(WORKDIR)/Headers/Executable/$(1)
+gb_Jar_get_target = $(WORKDIR)/Jar/$(1)/$(1).jar
+gb_Jar_get_final_target = $(WORKDIR)/Jar/$(1).done
+gb_Jar_get_classsetname = Jar/$(1)
gb_JavaClassSet_get_classdir = $(WORKDIR)/JavaClassSet/$(1)
gb_JavaClassSet_get_repo_target = $(WORKDIR)/JavaClassSet/$(2)/$(1).done
gb_JavaClassSet_get_target = $(WORKDIR)/JavaClassSet/$(1)/done
@@ -82,6 +87,8 @@ gb_SrsPartMergeTarget_get_target = $(WOR
gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1)
gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs
gb_WinResTarget_get_target = $(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX)
+gb_Zip_get_target = $(WORKDIR)/Zip/$(1)/$(1).zip
+gb_Zip_get_final_target = $(WORKDIR)/Zip/$(1).done
define gb_Library_get_external_headers_target
$(patsubst $(1):%,$(WORKDIR)/ExternalHeaders/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES)))
@@ -103,6 +110,7 @@ $(eval $(call gb_Helper_make_clean_targe
AllLangResTarget \
ComponentTarget \
JavaClassSet \
+ Jar \
JunitTest \
LinkTarget \
Module \
@@ -116,6 +124,7 @@ $(eval $(call gb_Helper_make_clean_targe
CppunitTest \
CustomTarget \
UnoApiTarget \
+ Zip \
))
$(eval $(call gb_Helper_make_outdir_clean_targets,\
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/gbuild.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/gbuild.mk?rev=1409482&r1=1409481&r2=1409482&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/gbuild.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/gbuild.mk Wed Nov 14 22:35:00 2012
@@ -212,6 +212,8 @@ $(eval $(call gb_Deliver_init))
include $(SOLARENV)/inc/minor.mk
+include $(SOLARENV)/inc/minor.mk
+
# We are using a set of scopes that we might as well call classes.
# It is important to include them in the right order as that is
@@ -242,10 +244,12 @@ include $(foreach class, \
CustomTarget \
PrecompiledHeaders \
CppunitTest \
+ Jar \
JavaClassSet \
JunitTest \
Module \
UnoApiTarget \
+ Zip \
,$(GBUILDDIR)/$(class).mk)
# optional extensions that should never be essential