[csw-devel] SF.net SVN: gar:[11593] csw/mgar/gar/v2-noexternals

[skayser at users.sourceforge.net]

Revision: 11593
          http://gar.svn.sourceforge.net/gar/?rev=11593&view=rev
Author:   skayser
Date:     2010-11-12 21:24:05 +0000 (Fri, 12 Nov 2010)

Log Message:
-----------
gar/v2-noexternals: make GARDIR absolute, propagate GARDIR and MAKEFLAGS to remote build hosts

Modified Paths:
--------------
    csw/mgar/gar/v2-noexternals/category.mk
    csw/mgar/gar/v2-noexternals/gar.mk
    csw/mgar/gar/v2-noexternals/gar.pkg.mk

Modified: csw/mgar/gar/v2-noexternals/category.mk
===================================================================
--- csw/mgar/gar/v2-noexternals/category.mk	2010-11-12 18:17:13 UTC (rev 11592)
+++ csw/mgar/gar/v2-noexternals/category.mk	2010-11-12 21:24:05 UTC (rev 11593)
@@ -2,7 +2,12 @@
 # This makefile is to be included from Makefiles in each category
 # directory.
 
-GARDIR ?= gar/
+# This is needed by the pkg build approach with gar/ in each pkg build
+# directory and is overriden by the "mgar" wrapper which pre-sets GARDIR
+# with an absolute path. If we could determine the full path of
+# _this_ file's directory, we could use it for both approaches and
+# there would be no need to pre-set it for "mgar".
+GARDIR ?= $(CURDIR)/gar
 
 ifeq (,$(wildcard $(GARDIR)/categories/$(CATEGORIES)/category.mk))
   $(error The category '$(CATEGORIES)' is invalid. Valid categories are: $(patsubst $(GARDIR)/categories/%,%,$(wildcard $(GARDIR)/categories/*)))

Modified: csw/mgar/gar/v2-noexternals/gar.mk
===================================================================
--- csw/mgar/gar/v2-noexternals/gar.mk	2010-11-12 18:17:13 UTC (rev 11592)
+++ csw/mgar/gar/v2-noexternals/gar.mk	2010-11-12 21:24:05 UTC (rev 11593)
@@ -24,6 +24,7 @@
 $(error Your version of 'make' is too old: $(MAKE_VERSION). Please make sure you are using at least 3.81)
 endif
 
+# Still required? GARDIR should be pre-set by the top-level category.mk
 GARDIR ?= gar
 GARBIN  = $(GARDIR)/bin
 
@@ -135,7 +136,7 @@
 merge-$(2):
 	@echo "[===== Building modulation '$(2)' on host '$$(BUILDHOST)' =====]"
 	$$(if $$(and $$(BUILDHOST),$$(filter-out $$(THISHOST),$$(BUILDHOST))),\
-		$(SSH) $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(GAR_PLATFORM),GAR_PLATFORM=$(GAR_PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\
+		$(SSH) $$(BUILDHOST) "PATH=$$(PATH) GARDIR=$(GARDIR) MAKEFLAGS=\"$(MAKEFLAGS)\" $(MAKE) -C $$(CURDIR) $(if $(GAR_PLATFORM),GAR_PLATFORM=$(GAR_PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\
 		$(MAKE) $(if $(GAR_PLATFORM),GAR_PLATFORM=$(GAR_PLATFORM)) MODULATION=$(2) $(3) merge-modulated\
 	)
 	@# The next line has intentionally been left blank to explicitly terminate this make rule

Modified: csw/mgar/gar/v2-noexternals/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2-noexternals/gar.pkg.mk	2010-11-12 18:17:13 UTC (rev 11592)
+++ csw/mgar/gar/v2-noexternals/gar.pkg.mk	2010-11-12 21:24:05 UTC (rev 11593)
@@ -247,7 +247,7 @@
 endif
 
 # Where we find our mkpackage global templates
-PKGLIB = $(CURDIR)/$(GARDIR)/pkglib
+PKGLIB = $(GARDIR)/pkglib
 
 PKG_EXPORTS  = GARNAME GARVERSION DESCRIPTION CATEGORIES GARCH GARDIR GARBIN
 PKG_EXPORTS += CURDIR WORKDIR WORKDIR_FIRSTMOD WORKSRC WORKSRC_FIRSTMOD PKGROOT
@@ -866,7 +866,7 @@
 		$(if $(PACKAGING_HOST_$P),\
 			$(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\
 				$(MAKE) GAR_PLATFORM=$P _package && ,\
-				$(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) GAR_PLATFORM=$P _package" && \
+				$(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin GARDIR=$(GARDIR) MAKEFLAGS=\"$(MAKEFLAGS)\" $(MAKE) -C $(CURDIR) GAR_PLATFORM=$P _package" && \
 			),\
 			$(error *** No host has been defined for platform $P)\
 		)\
@@ -881,7 +881,7 @@
 			echo " (built on this host)";\
 			  $(MAKE) -s GAR_PLATFORM=$P _pkgshow;echo;,\
 			echo " (built on host '$(PACKAGING_HOST_$P)')";\
-			  $(SSH) $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) -s GAR_PLATFORM=$P _pkgshow";echo;\
+			  $(SSH) $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin GARDIR=$(GARDIR) MAKEFLAGS=\"$(MAKEFLAGS)\" $(MAKE) -C $(CURDIR) -s GAR_PLATFORM=$P _pkgshow";echo;\
 		)\
 	)
 	@$(MAKECOOKIE)
@@ -892,7 +892,7 @@
 		$(if $(PACKAGING_HOST_$P),\
 			$(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\
 				$(MAKE) -s GAR_PLATFORM=$P $* && ,\
-				$(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) GAR_PLATFORM=$P $*" && \
+				$(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin GARDIR=$(GARDIR) MAKEFLAGS=\"$(MAKEFLAGS)\" $(MAKE) -C $(CURDIR) GAR_PLATFORM=$P $*" && \
 			),\
 			$(error *** No host has been defined for platform $P)\
 		)\


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.