[csw-devel] SF.net SVN: gar:[6702] csw/mgar/gar/v2-pbuild
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Mon Oct 5 10:27:21 CEST 2009
Revision: 6702
http://gar.svn.sourceforge.net/gar/?rev=6702&view=rev
Author: dmichelsen
Date: 2009-10-05 08:27:21 +0000 (Mon, 05 Oct 2009)
Log Message:
-----------
mGAR v2-pbuild: More bugfixes towards release
Modified Paths:
--------------
csw/mgar/gar/v2-pbuild/gar.conf.mk
csw/mgar/gar/v2-pbuild/gar.mk
csw/mgar/gar/v2-pbuild/gar.pkg.mk
Modified: csw/mgar/gar/v2-pbuild/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2-pbuild/gar.conf.mk 2009-10-05 08:12:53 UTC (rev 6701)
+++ csw/mgar/gar/v2-pbuild/gar.conf.mk 2009-10-05 08:27:21 UTC (rev 6702)
@@ -294,24 +294,6 @@
# ISALIST_$(GARCOMPILER) contains all ISAs which are compilable with the selected compiler
$(foreach C,$(GARCOMPILERS),$(eval ISALIST_$(C) ?= $(foreach I,$(ISALIST),$(if $(filter-out ERROR,$(ARCHFLAGS_$C_$I)),$I))))
-# BUILDHOST_isa-$ISA is the name of the host where the compilation should take place
-# It defaults to the corresponding BUILD_(sparc|i386)-(32|64)
-# An empty string means "stay on the current host"
-define BUILDHOST
-$(strip
- $(if $(filter $1,$(ISALIST_sparcv9),
- $(if $(BUILDHOST_sparc-$(MEMORYMODEL_$1)),
- $(if $(eq $(BUILDHOST_sparc-$(MEMORYMODEL_$1)),$(THISHOST)),,$(BUILDHOST_sparc-$(MEMORYMODEL_$1))),
- ),
- $(if $(filter $1,$(ISALIST_amd64),
- $(if $(BUILDHOST_i386-$(MEMORYMODEL_$1)),
- $(if $(eq $(BUILDHOST_i386-$(MEMORYMODEL_$1)),$(THISHOST)),,$(BUILDHOST_i386-$(MEMORYMODEL_$1))),
- ),
- ),
- ),
-)
-endef
-
# This is the memory model of the currently compiled architecture
MEMORYMODEL = $(MEMORYMODEL_$(ISA))
Modified: csw/mgar/gar/v2-pbuild/gar.mk
===================================================================
--- csw/mgar/gar/v2-pbuild/gar.mk 2009-10-05 08:12:53 UTC (rev 6701)
+++ csw/mgar/gar/v2-pbuild/gar.mk 2009-10-05 08:27:21 UTC (rev 6702)
@@ -158,12 +158,7 @@
)
merge-$(2): BUILDHOST=$$(call modulation2host)
merge-$(2):
- echo modulation: $(2)
- echo vars: $(3)
- echo ISA: $$(ISA)
- echo BUILDHOST="$$(BUILDHOST)"
- echo THISHOST="$$(THISHOST)"
- echo "Building modulation on host '$$(BUILDHOST)'"
+ @echo "[===== Building modulation '$(2)' on host '$$(BUILDHOST)' =====]"
$$(if $$(and $$(BUILDHOST),$$(filter-out $$(THISHOST),$$(BUILDHOST))),\
$(SSH) $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\
gmake $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated\
@@ -663,17 +658,17 @@
$(_DBG_MERGE)trap "kill -9 `cat $(_PIDFILE) $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.pid) 2>/dev/null`;stty sane" INT;\
$(foreach M,$(MODULATIONS),($(MAKE) merge-$M >$(WORKROOTDIR)/build-$M/build.log 2>&1; echo $$? >$(WORKROOTDIR)/build-$M/build.ret) & echo $$! >$(WORKROOTDIR)/build-$M/build.pid; ) wait
$(_DBG_MERGE)if [ -f $(_PIDFILE) ]; then kill `cat $(_PIDFILE)`; stty sane; fi
- $(foreach M,$(MODULATIONS),if [ "`cat $(WORKROOTDIR)/build-$M/build.ret`" -ne 0 ]; then \
+ $(_DBG_MERGE)$(foreach M,$(MODULATIONS),if [ "`cat $(WORKROOTDIR)/build-$M/build.ret`" -ne 0 ]; then \
echo "Build error in modulation $M. Please see"; \
echo " $(WORKROOTDIR)/build-$M/build.log"; \
echo "for details:"; \
echo; \
tail -100 $(WORKROOTDIR)/build-$M/build.log; \
- exit `cat $(WORKROOTDIR)/build-$M/build.ret`; \
+ exit "Return code: `cat $(WORKROOTDIR)/build-$M/build.ret`"; \
fi;)
merge-watch: _USEMULTITAIL=$(shell test -x $(MULTITAIL) && test -x $(TTY) && $(TTY) >/dev/null 2>&1; if [ $$? -eq 0 ]; then echo yes; fi)
-merge-watch:
+merge-watch: $(addprefix $(WORKROOTDIR)/build-,global $(MODULATIONS))
$(_DBG_MERGE)$(if $(_USEMULTITAIL),\
$(MULTITAIL) --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -j & echo $$! > $(WORKROOTDIR)/build-global/multitail.pid,\
echo "Building all ISAs in parallel. Please see the individual logfiles for details:";$(foreach M,$(MODULATIONS),echo "- $(WORKROOTDIR)/build-$M/build.log";)\
Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-05 08:12:53 UTC (rev 6701)
+++ csw/mgar/gar/v2-pbuild/gar.pkg.mk 2009-10-05 08:27:21 UTC (rev 6702)
@@ -561,16 +561,14 @@
# hosts. If there are no platform hosts defined the test is skipped.
validateplatform:
$(if $(strip $(foreach P,$(PACKAGING_PLATFORMS),$(PACKAGING_HOST_$P))),\
- $(if $(filter $(THISHOST),$(foreach P,$(PACKAGING_PLATFORMS),$(PACKAGING_HOST_$P))),,\
- $(warning ***)\
+ $(if $(filter $(THISHOST),$(foreach P,$(PACKAGING_PLATFORMS),$(PACKAGING_HOST_$P))),\
+ @$(MAKECOOKIE),\
$(warning *** You are building this package on a non-requested platform host '$(THISHOST)'. The follow platforms were requested:)\
$(foreach P,$(PACKAGING_PLATFORMS),\
$(warning *** - $P $(if $(PACKAGING_HOST_$P),to be build on host '$(PACKAGING_HOST_$P)',with no suitable host available))\
)\
- $(warning *** You can execute '$(MAKE) platforms' to automatically build on all necessary platforms.)\
- $(warning ***)\
- ))
- @$(MAKECOOKIE)
+ $(error You can execute '$(MAKE) platforms' to automatically build on all necessary platforms.)\
+ ),@$(MAKECOOKIE))
# We depend on extract as the additional package files (like .gspec) must be
# unpacked to global/ for packaging. E. g. 'merge' depends only on the specific
@@ -635,12 +633,12 @@
$(foreach P,$(PACKAGING_PLATFORMS),\
$(if $(PACKAGING_HOST_$P),\
$(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\
- $(MAKE) PLATFORM=$P package;,\
- $(SSH) $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) PLATFORM=$P package";\
+ $(MAKE) PLATFORM=$P package && ,\
+ $(SSH) $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) PLATFORM=$P package" && \
),\
$(error *** No host has been defined for platform $P)\
)\
- )
+ ) true
# Print relecant informations about the platform
platformenv:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list