[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] /srv/bzr/gsrc/trunk r1341: add optional output redirection
|
From: |
Brandon Invergo |
|
Subject: |
[Gsrc-commit] /srv/bzr/gsrc/trunk r1341: add optional output redirection |
|
Date: |
Fri, 07 Dec 2012 20:09:00 +0100 |
|
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 1341
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Fri 2012-12-07 20:09:00 +0100
message:
add optional output redirection
modified:
gar.conf.mk
gar.lib.mk
=== modified file 'gar.conf.mk'
--- a/gar.conf.mk 2012-12-07 17:21:11 +0000
+++ b/gar.conf.mk 2012-12-07 19:09:00 +0000
@@ -18,17 +18,28 @@
# output.
USE_COLOR = y
ifeq ($(USE_COLOR),y)
- OFF="\\e[00m"
- MSG="\\e[01\;37m"
- ERR="\\e[01\;31m"
- OK="\\e[00\;32m"
+ OFF ="\\e[00m"
+ MSG ="\\e[01\;37m"
+ ERR ="\\e[01\;31m"
+ OK ="\\e[00\;32m"
else
- OFF=""
- MSG="==> "
- ERR="*** "
- OK=""
+ OFF =""
+ MSG ="==> "
+ ERR ="*** "
+ OK =""
endif
+# If you want to redirect the output of most of the build process elsewhere,
+# such as to a log, you can do it here. This is probably not a good idea, since
+# you won't be able to monitor the build process.
+# If you change REDIRECT_OUTPUT to anything other than n, the default is to
+# suppress normal output and only print errors.
+REDIRECT_OUTPUT = n
+ifeq ($(REDIRECT_OUTPUT),n)
+ OUTPUT =
+else
+ OUTPUT = 1>/dev/null 2>&1
+endif
# If you want rules to apply to all packages ("custom-pre-stow" etc.), then
# define them here.
=== modified file 'gar.lib.mk'
--- a/gar.lib.mk 2012-12-07 17:21:11 +0000
+++ b/gar.lib.mk 2012-12-07 19:09:00 +0000
@@ -66,14 +66,14 @@
echo -e "[$(OK)fetch$(OFF)] $(MSG)Grabbing $(OFF)$@"; \
for i in $(filter %/$*,$(URLS)); do \
echo -e "[$(OK)fetch$(OFF)] $(MSG)Trying $(OFF)$$i"; \
- $(MAKE) $$i || continue; \
+ $(MAKE) $$i $(OUTPUT) || continue; \
break; \
done; \
if test -r $@ ; then : ; else \
echo -e "[$(ERR)fetch$(OFF)] $(MSG)Failed to download
$(OFF)address@hidden(MSG)!$(OFF)" 1>&2; \
false; \
fi; \
- fi
+ fi
# We specify --passive-ftp for all protocols because it's possible for
# an HTTP URL to redirect to an FTP one -- download.kde.org works like
@@ -86,17 +86,17 @@
# download an http URL (colons omitted)
http//%:
wget $(WGET_OPTS) -O $(DOWNLOADDIR)/$(notdir $*).partial http://$*
- mv $(DOWNLOADDIR)/$(notdir $*).partial $(DOWNLOADDIR)/$(notdir $*)
+ @mv $(DOWNLOADDIR)/$(notdir $*).partial $(DOWNLOADDIR)/$(notdir $*)
# download an https URL (colons omitted)
https//%:
wget $(WGET_OPTS) -O $(DOWNLOADDIR)/$(notdir $*).partial https://$*
- mv $(DOWNLOADDIR)/$(notdir $*).partial $(DOWNLOADDIR)/$(notdir $*)
+ @mv $(DOWNLOADDIR)/$(notdir $*).partial $(DOWNLOADDIR)/$(notdir $*)
# download an ftp URL (colons omitted)
ftp//%:
wget $(WGET_OPTS) -O $(DOWNLOADDIR)/$(notdir $*).partial ftp://$*
- mv $(DOWNLOADDIR)/$(notdir $*).partial $(DOWNLOADDIR)/$(notdir $*)
+ @mv $(DOWNLOADDIR)/$(notdir $*).partial $(DOWNLOADDIR)/$(notdir $*)
# link to a local copy of the file
# (absolute path)
@@ -105,7 +105,7 @@
ln -sf "/$*" $(DOWNLOADDIR)/$(notdir $*); \
else \
false; \
- fi
+ fi $(OUTPUT)
# link to a local copy of the file
# (relative path)
@@ -114,7 +114,7 @@
ln -sf $(CURDIR)/$* $(DOWNLOADDIR)/$(notdir $*); \
else \
false; \
- fi
+ fi $(OUTPUT)
# Using Jeff Waugh's rsync rule.
# DOES NOT PRESERVE SYMLINKS!
@@ -125,21 +125,21 @@
RSYNC_OPTS ?= -az
RSYNC_PATH ?=
rsynctree//%:
- mkdir -p $(DOWNLOADDIR)/rsync
+ @mkdir -p $(DOWNLOADDIR)/rsync
rsync -v --progress $(RSYNC_OPTS) $(RSYNC_PATH) $(DOWNLOADDIR)/rsync
- cd $(DOWNLOADDIR)/rsync && tar -czvf ../out *
- mv $(DOWNLOADDIR)/out $(DOWNLOADDIR)/$*
+ @cd $(DOWNLOADDIR)/rsync && tar -czvf ../out *
+ @mv $(DOWNLOADDIR)/out $(DOWNLOADDIR)/$*
# Using Jeff Waugh's scp rule
scp//%:
- scp -C $* $(DOWNLOADDIR)/
+ @scp -C $* $(DOWNLOADDIR)/
# Check out source from CVS.
CVS_CO_OPTS ?= -D$(GARVERSION) -P
CVS_MODULE ?= $(GARNAME)
cvs//%:
- mkdir -p $(DOWNLOADDIR)/cvs
- cd $(DOWNLOADDIR)/cvs && \
+ @mkdir -p $(DOWNLOADDIR)/cvs
+ @cd $(DOWNLOADDIR)/cvs && \
cvs -d$(CVS_ROOT) login && \
cvs -d$(CVS_ROOT) co -d $(DISTNAME) $(CVS_CO_OPTS)
$(CVS_MODULE) && \
tar czvf ../$(notdir $*) $(DISTNAME)
@@ -148,24 +148,24 @@
SVN_REVISION ?= "{$(GARVERSION)}"
SVN_CO_OPTS ?= -r $(SVN_REVISION)
svnco//%:
- mkdir -p $(DOWNLOADDIR)/svn
- cd $(DOWNLOADDIR)/svn && \
+ @mkdir -p $(DOWNLOADDIR)/svn
+ @cd $(DOWNLOADDIR)/svn && \
svn co $(SVN_CO_OPTS) $(SVN_PATH) $(DISTNAME) && \
tar czvf ../$(notdir $*) $(DISTNAME)
# Check out source from Darcs.
DARCS_GET_OPTS ?= --partial --to-match "date $(GARVERSION)"
darcs//%:
- mkdir -p $(DOWNLOADDIR)/darcs
- cd $(DOWNLOADDIR)/darcs && \
+ @mkdir -p $(DOWNLOADDIR)/darcs
+ @cd $(DOWNLOADDIR)/darcs && \
darcs get $(DARCS_GET_OPTS) $(DARCS_PATH) $(DISTNAME) && \
tar -czvf ../$(notdir $*) $(DISTNAME)
# Check out source from Git.
GIT_REVISION ?= v$(GARVERSION)
git//%:
- mkdir -p $(DOWNLOADDIR)/git
- cd $(DOWNLOADDIR)/git && \
+ @mkdir -p $(DOWNLOADDIR)/git
+ @cd $(DOWNLOADDIR)/git && \
git clone $(GIT_PATH) $(DISTNAME) && \
(cd $(DISTNAME) && git checkout $(GIT_REVISION)) && \
tar czvf ../$(notdir $*) $(DISTNAME)
@@ -174,8 +174,8 @@
HG_REVISION ?= $(GARVERSION)
HG_CLONE_OPTS ?= -r "$(HG_REVISION)"
hg//%:
- mkdir -p $(DOWNLOADDIR)/hg
- cd $(DOWNLOADDIR)/hg && \
+ @mkdir -p $(DOWNLOADDIR)/hg
+ @cd $(DOWNLOADDIR)/hg && \
hg clone $(HG_CLONE_OPTS) $(HG_PATH) $(DISTNAME) && \
tar czvf ../$(notdir $*) $(DISTNAME)
@@ -183,8 +183,8 @@
BZR_REVISION ?= before:date:$(GARVERSION)
BZR_CHECKOUT_OPTS ?= -r "$(BZR_REVISION)" --lightweight
bzr//%:
- mkdir -p $(DOWNLOADDIR)/bzr
- cd $(DOWNLOADDIR)/bzr && \
+ @mkdir -p $(DOWNLOADDIR)/bzr
+ @cd $(DOWNLOADDIR)/bzr && \
bzr checkout $(BZR_CHECKOUT_OPTS) $(BZR_PATH) $(DISTNAME) && \
tar czvf ../$(notdir $*) $(DISTNAME)
@@ -212,54 +212,54 @@
else \
echo -e "[$(ERR)checksum$(OFF)] $(MSG)$* not in
$(CHECKSUM_FILE) file!$(OFF)" 1>&2; \
false; \
- fi
+ fi $(OUTPUT)
# use a signature file to check the file it refers to
GPGV ?= gpgv --keyring $(GPG_KEYRING)
checksig-%.sig.asc:
@echo -e "[$(OK)checksig$(OFF)] $(MSG)Checking GPG signature $(OFF)$*"
- $(GPGV) $(DOWNLOADDIR)/$*.sig.asc $(DOWNLOADDIR)/$*
+ @$(GPGV) $(DOWNLOADDIR)/$*.sig.asc $(DOWNLOADDIR)/$*
$(MAKECOOKIE)
checksig-%.asc.txt:
@echo -e "[$(OK)checksig$(OFF)] $(MSG)Checking GPG signature $(OFF)$*"
- $(GPGV) $(DOWNLOADDIR)/$*.asc.txt $(DOWNLOADDIR)/$*
+ @$(GPGV) $(DOWNLOADDIR)/$*.asc.txt $(DOWNLOADDIR)/$*
$(MAKECOOKIE)
checksig-%-asc.txt:
@echo -e "[$(OK)checksig$(OFF)] $(MSG)Checking GPG signature $(OFF)$*"
- $(GPGV) $(DOWNLOADDIR)/$*-asc.txt $(DOWNLOADDIR)/$(subst -tar-,.tar.,$*)
+ @$(GPGV) $(DOWNLOADDIR)/$*-asc.txt $(DOWNLOADDIR)/$(subst
-tar-,.tar.,$*)
$(MAKECOOKIE)
checksig-%.sig:
@echo -e "[$(OK)checksig$(OFF)] $(MSG)Checking GPG signature $(OFF)$*"
- $(GPGV) $(DOWNLOADDIR)/$*.sig
+ @$(GPGV) $(DOWNLOADDIR)/$*.sig
$(MAKECOOKIE)
checksig-%.sign:
@echo -e "[$(OK)checksig$(OFF)] $(MSG)Checking GPG signature $(OFF)$*"
- $(GPGV) $(DOWNLOADDIR)/$*.sign
+ @$(GPGV) $(DOWNLOADDIR)/$*.sign
$(MAKECOOKIE)
checksig-%.asc:
@echo -e "[$(OK)checksig$(OFF)] $(MSG)Checking GPG signature $(OFF)$*"
- $(GPGV) $(DOWNLOADDIR)/$*.asc
+ @$(GPGV) $(DOWNLOADDIR)/$*.asc
$(MAKECOOKIE)
checksig-%.md5sum:
@echo -e "[$(OK)checksig$(OFF)] $(MSG)Checking MD5 checksums $(OFF)$*"
- cd $(DOWNLOADDIR) && md5sum -c $*.md5sum
+ @cd $(DOWNLOADDIR) && md5sum -c $*.md5sum
$(MAKECOOKIE)
checksig-%.sha1:
@echo -e "[$(OK)checksig$(OFF)] $(MSG)Checking SHA1 checksums $(OFF)$*"
- cd $(DOWNLOADDIR) && sha1sum -c $*.sha1
+ @cd $(DOWNLOADDIR) && sha1sum -c $*.sha1
$(MAKECOOKIE)
checksig-%.sha256:
@echo -e "[$(OK)checksig$(OFF)] $(MSG)Checking SHA256 checksums
$(OFF)$*"
- cd $(DOWNLOADDIR) && sha256sum -c $*.sha256
+ @cd $(DOWNLOADDIR) && sha256sum -c $*.sha256
$(MAKECOOKIE)
#################### GARCHIVE RULES ####################
@@ -268,8 +268,8 @@
# checksummed files
garchive-%:
- -test -d $(GARCHIVEDIR)/ || mkdir -p $(GARCHIVEDIR)
- -test -h $(DOWNLOADDIR)/$* || cp -f $(DOWNLOADDIR)/$* $(GARCHIVEDIR)/
+ @-test -d $(GARCHIVEDIR)/ || mkdir -p $(GARCHIVEDIR)
+ @-test -h $(DOWNLOADDIR)/$* || cp -f $(DOWNLOADDIR)/$* $(GARCHIVEDIR)/
$(MAKECOOKIE)
@@ -284,49 +284,49 @@
# rule to extract files with tar xzf
extract-%.tar.Z extract-%.tgz extract-%.tar.gz extract-%.taz:
@echo -e "[$(OK)extract$(OFF)] $(MSG)Extracting $(OFF)$(patsubst
extract-%,$(DOWNLOADDIR)/%,$@)"
- gzip -dc $(patsubst extract-%,$(DOWNLOADDIR)/%,$@) | tar xf -
$(TAR_OPTS) -C $(EXTRACTDIR)
+ @gzip -dc $(patsubst extract-%,$(DOWNLOADDIR)/%,$@) | tar xf -
$(TAR_OPTS) -C $(EXTRACTDIR)
$(MAKECOOKIE)
# rule to extract files with tar and bzip
extract-%.tar.bz extract-%.tar.bz2 extract-%.tbz:
@echo -e "[$(OK)extract$(OFF)] $(MSG)Extracting $(OFF)$(patsubst
extract-%,$(DOWNLOADDIR)/%,$@)"
- bzip2 -dc $(patsubst extract-%,$(DOWNLOADDIR)/%,$@) | tar xf -
$(TAR_OPTS) -C $(EXTRACTDIR)
+ @bzip2 -dc $(patsubst extract-%,$(DOWNLOADDIR)/%,$@) | tar xf -
$(TAR_OPTS) -C $(EXTRACTDIR)
$(MAKECOOKIE)
# rule to extract files with tar and lzip
extract-%.tar.lz:
@echo -e "[$(OK)extract$(OFF)] $(MSG)Extracting $(OFF)$(patsubst
extract-%,$(DOWNLOADDIR)/%,$@)"
- lzip -dc $(patsubst extract-%,$(DOWNLOADDIR)/%,$@) | tar xf -
$(TAR_OPTS) -C $(EXTRACTDIR)
+ @lzip -dc $(patsubst extract-%,$(DOWNLOADDIR)/%,$@) | tar xf -
$(TAR_OPTS) -C $(EXTRACTDIR)
$(MAKECOOKIE)
# rule to extract files with tar and xz
extract-%.tar.xz extract-%.tar.lzma:
@echo -e "[$(OK)extract$(OFF)] $(MSG)Extracting $(OFF)$(patsubst
extract-%,$(DOWNLOADDIR)/%,$@)"
- xz -dc $(patsubst extract-%,$(DOWNLOADDIR)/%,$@) | tar xf - $(TAR_OPTS)
-C $(EXTRACTDIR)
+ @xz -dc $(patsubst extract-%,$(DOWNLOADDIR)/%,$@) | tar xf -
$(TAR_OPTS) -C $(EXTRACTDIR)
$(MAKECOOKIE)
# rule to extract files with tar
extract-%.tar:
@echo -e "[$(OK)extract$(OFF)] $(MSG)Extracting $(OFF)$(patsubst
extract-%,$(DOWNLOADDIR)/%,$@)"
- tar xf $(patsubst extract-%,$(DOWNLOADDIR)/%,$@) $(TAR_OPTS) -C
$(EXTRACTDIR)
+ @tar xf $(patsubst extract-%,$(DOWNLOADDIR)/%,$@) $(TAR_OPTS) -C
$(EXTRACTDIR)
$(MAKECOOKIE)
# rule to extract files with cpio
extract-%.cpio.gz:
@echo -e "[$(OK)extract$(OFF)] $(MSG)Extracting $(OFF)$(patsubst
extract-%,$(DOWNLOADDIR)/%,$@)"
- gzip -dc $(patsubst extract-%,$(DOWNLOADDIR)/%,$@) | (cd $(EXTRACTDIR)
&& cpio -mid $(CPIO_OPTS))
+ @gzip -dc $(patsubst extract-%,$(DOWNLOADDIR)/%,$@) | (cd $(EXTRACTDIR)
&& cpio -mid $(CPIO_OPTS))
$(MAKECOOKIE)
# rule to extract files with zip
extract-%.zip:
@echo -e "[$(OK)extract$(OFF)] $(MSG)Extracting $(OFF)$(patsubst
extract-%,$(DOWNLOADDIR)/%,$@)"
- unzip -o $(patsubst extract-%,$(DOWNLOADDIR)/%,$@) -d $(EXTRACTDIR)
+ @unzip -o $(patsubst extract-%,$(DOWNLOADDIR)/%,$@) -d $(EXTRACTDIR)
$(MAKECOOKIE)
# rule to extract RPM files with rpm2cpio and cpio
extract-%.rpm:
@echo -e "[$(OK)extract$(OFF)] $(MSG)Extracting $(OFF)$(patsubst
extract-%,$(DOWNLOADDIR)/%,$@)"
- rpm2cpio $(patsubst extract-%,$(DOWNLOADDIR)/%,$@) | (cd $(EXTRACTDIR)
&& cpio -mid $(CPIO_OPTS))
+ @rpm2cpio $(patsubst extract-%,$(DOWNLOADDIR)/%,$@) | (cd $(EXTRACTDIR)
&& cpio -mid $(CPIO_OPTS))
$(MAKECOOKIE)
# Unmatched files should just be copied.
@@ -334,8 +334,8 @@
# from a load of downloaded files (i.e. cvsweb checkouts) and a patch.
extract-%:
@echo -e "[$(OK)extract$(OFF)] $(MSG)Copying $(OFF)$(patsubst
extract-%,$(DOWNLOADDIR)/%,$@)"
- mkdir -p $(WORKSRC)
- cp $(patsubst extract-%,$(DOWNLOADDIR)/%,$@) $(WORKSRC)
+ @mkdir -p $(WORKSRC)
+ @cp $(patsubst extract-%,$(DOWNLOADDIR)/%,$@) $(WORKSRC)
$(MAKECOOKIE)
#################### PATCH RULES ####################
@@ -347,19 +347,19 @@
# apply bzipped patches
patch-%.bz patch-%.bz2:
@echo -e "[$(OK)patch$(OFF)] $(MSG)Applying patch $(OFF)$(patsubst
patch-%,$(DOWNLOADDIR)/%,$@)"
- bzip2 -dc $(patsubst patch-%,$(DOWNLOADDIR)/%,$@) | $(PATCH)
+ @bzip2 -dc $(patsubst patch-%,$(DOWNLOADDIR)/%,$@) | $(PATCH)
$(MAKECOOKIE)
# apply gzipped patches
patch-%.gz:
@echo -e "[$(OK)patch$(OFF)] $(MSG)Applying patch $(OFF)$(patsubst
patch-%,$(DOWNLOADDIR)/%,$@)"
- gzip -dc $(patsubst patch-%,$(DOWNLOADDIR)/%,$@) | $(PATCH)
+ @gzip -dc $(patsubst patch-%,$(DOWNLOADDIR)/%,$@) | $(PATCH)
$(MAKECOOKIE)
# apply normal patches
patch-%:
@echo -e "[$(OK)patch$(OFF)] $(MSG)Applying patch $(OFF)$(patsubst
patch-%,$(DOWNLOADDIR)/%,$@)"
- $(PATCH) < $(patsubst patch-%,$(DOWNLOADDIR)/%,$@)
+ @$(PATCH) < $(patsubst patch-%,$(DOWNLOADDIR)/%,$@)
$(MAKECOOKIE)
# This is used by makepatch
@@ -368,18 +368,18 @@
@EXTRACTDIR=$(SCRATCHDIR) COOKIEDIR=$(SCRATCHDIR)-$(COOKIEDIR) $(MAKE)
extract
@if diff -x 'config.log' -x 'config.status' -ru $(SCRATCHDIR)
$(WORKDIR) | grep -v '^Only in' > $@; then :; else \
rm $@; \
- fi
+ fi $(OUTPUT)
####################### HELP RULES ######################
help-%/configure:
@echo -e "[$(OK)help$(OFF)] $(MSG)Running configure --help in $(OFF)$*"
- cd $* && $(CONFIGURE_ENV) ./configure --help
+ @cd $* && $(CONFIGURE_ENV) ./configure --help
help-%/setup.py:
@echo -e "[$(OK)help$(OFF)] $(MSG)Running python setup.py --help in
$(OFF)$*"
- cd $* && python setup.py --help
+ @cd $* && python setup.py --help
#################### CONFIGURE RULES ####################
@@ -405,7 +405,7 @@
# Rebuild autoconf files in a source directory.
configure-%/autoreconf:
@echo -e "[$(OK)configure$(OFF)] $(MSG)Running autoreconf in $(OFF)$*"
- cd $* && $(AUTORECONF_ENV) autoreconf $(AUTORECONF_ARGS)
+ @cd $* && $(AUTORECONF_ENV) autoreconf $(AUTORECONF_ARGS) $(OUTPUT)
$(MAKECOOKIE)
LIBTOOLIZE_ARGS ?= -vfi
@@ -413,15 +413,15 @@
# Rebuild libtool files in a source directory.
configure-%/libtoolize:
@echo -e "[$(OK)configure$(OFF)] $(MSG)Running libtoolize in $(OFF)$*"
- cd $* && $(LIBTOOLIZE_ENV) libtoolize $(LIBTOOLIZE_ARGS)
+ @cd $* && $(LIBTOOLIZE_ENV) libtoolize $(LIBTOOLIZE_ARGS) $(OUTPUT)
$(MAKECOOKIE)
# configure a package that has an autoconf-style configure script, coping
# correctly when WORKOBJ is set to something other than WORKDIR.
configure-%/configure:
@echo -e "[$(OK)configure$(OFF)] $(MSG)Running $(CONFIGURE_NAME) in
$(OFF)$*"
- mkdir -p $(WORKOBJ)
- cd $(if $(WORKOBJ_CHANGED_P),$(WORKOBJ),$*) && $(CONFIGURE_ENV) $(if
$(WORKOBJ_CHANGED_P),$(LEAVE_WORKOBJ)/$*,.)/$(CONFIGURE_NAME) $(CONFIGURE_ARGS)
+ @mkdir -p $(WORKOBJ)
+ @cd $(if $(WORKOBJ_CHANGED_P),$(WORKOBJ),$*) && $(CONFIGURE_ENV) $(if
$(WORKOBJ_CHANGED_P),$(LEAVE_WORKOBJ)/$*,.)/$(CONFIGURE_NAME) $(CONFIGURE_ARGS)
$(OUTPUT)
$(MAKECOOKIE)
XMKMF_ARGS ?= -a
@@ -431,7 +431,7 @@
# arguments
configure-%/Imakefile:
@echo -e "[$(OK)configure$(OFF)] $(MSG)Running xmkmf in $(OFF)$*"
- @cd $* && $(CONFIGURE_ENV) xmkmf $(XMKMF_ARGS)
+ @cd $* && $(CONFIGURE_ENV) xmkmf $(XMKMF_ARGS) $(OUTPUT)
$(MAKECOOKIE)
# CMake doesn't respect many of the standard environment variables, so we have
@@ -447,13 +447,13 @@
configure-%/CMakeLists.txt:
@echo -e "[$(OK)configure$(OFF)] $(MSG)Running cmake in $(OFF)$*"
@mkdir -p $(WORKOBJ)
- @cd $(if $(WORKOBJ_CHANGED_P),$(WORKOBJ),$*) && $(CONFIGURE_ENV) cmake
$(if $(WORKOBJ_CHANGED_P),$(LEAVE_WORKOBJ)/$* ,)$(CMAKE_CONFIGURE_ARGS)
+ @cd $(if $(WORKOBJ_CHANGED_P),$(WORKOBJ),$*) && $(CONFIGURE_ENV) cmake
$(if $(WORKOBJ_CHANGED_P),$(LEAVE_WORKOBJ)/$* ,)$(CMAKE_CONFIGURE_ARGS)
$(OUTPUT)
$(MAKECOOKIE)
# configure using Python distutils
configure-%/setup.py:
@echo -e "[$(OK)configure$(OFF)] $(MSG)Running setup.py config in
$(OFF)$*"
- @cd $* && $(BUILD_ENV) python setup.py config $(PY_BUILD_ARGS)
+ @cd $* && $(BUILD_ENV) python setup.py config $(PY_BUILD_ARGS) $(OUTPUT)
$(MAKECOOKIE)
RUBY_DIRPATHS = --prefix=$(packageprefix)
@@ -462,19 +462,19 @@
# configure a Ruby extension
configure-%/extconf.rb:
@echo -e "[$(OK)configure$(OFF)] $(MSG)Running extconf.rb in $(OFF)$*"
- @cd $* && $(CONFIGURE_ENV) ruby extconf.rb $(RUBY_CONFIGURE_ARGS)
+ @cd $* && $(CONFIGURE_ENV) ruby extconf.rb $(RUBY_CONFIGURE_ARGS)
$(OUTPUT)
$(MAKECOOKIE)
# configure the other sort of Ruby extension
configure-%/setup.rb:
@echo -e "[$(OK)configure$(OFF)] $(MSG)Running setup.rb config in
$(OFF)$*"
- @cd $* && $(CONFIGURE_ENV) ruby setup.rb config $(RUBY_CONFIGURE_ARGS)
+ @cd $* && $(CONFIGURE_ENV) ruby setup.rb config $(RUBY_CONFIGURE_ARGS)
$(OUTPUT)
$(MAKECOOKIE)
# configure a third sort of Ruby extension
configure-%/install.rb:
@echo -e "[$(OK)configure$(OFF)] $(MSG)Running install.rb config in
$(OFF)$*"
- @cd $* && $(CONFIGURE_ENV) ruby install.rb config $(RUBY_CONFIGURE_ARGS)
+ @cd $* && $(CONFIGURE_ENV) ruby install.rb config
$(RUBY_CONFIGURE_ARGS) $(OUTPUT)
$(MAKECOOKIE)
# There is no standardisation for SCons arguments; we have to try several
@@ -486,7 +486,7 @@
# configure using SCons (which is only needed by some packages...)
configure-%/SConstruct:
@echo -e "[$(OK)configure$(OFF)] $(MSG)Running scons configure in
$(OFF)$*"
- @cd $* && $(CONFIGURE_ENV) scons configure $(SCONS_DEBUG) $(SCONS_ARGS)
+ @cd $* && $(CONFIGURE_ENV) scons configure $(SCONS_DEBUG) $(SCONS_ARGS)
$(OUTPUT)
$(MAKECOOKIE)
CABAL_CONFIGURE_ARGS ?= --prefix=$(prefix)
@@ -494,9 +494,9 @@
# configure using Cabal
configure-%/Setup.hs:
@echo -e "[$(OK)configure$(OFF)] $(MSG)Compiling Setup in $(OFF)$*"
- @cd $* && ghc --make Setup -o Setup
+ @cd $* && ghc --make Setup -o Setup $(OUTPUT)
@echo -e "[$(OK)configure$(OFF)] $(MSG)Running Setup configure in
$(OFF)$*"
- @cd $* && $(CONFIGURE_ENV) ./Setup configure $(CABAL_CONFIGURE_ARGS)
+ @cd $* && $(CONFIGURE_ENV) ./Setup configure $(CABAL_CONFIGURE_ARGS)
$(OUTPUT)
$(MAKECOOKIE)
WAF_CONFIGURE_ARGS ?= $(DIRPATHS)
@@ -504,7 +504,7 @@
# configure using waf
configure-%/waf:
@echo -e "[$(OK)configure$(OFF)] $(MSG)Running waf configure in
$(OFF)$*"
- @cd $* && $(CONFIGURE_ENV) ./waf configure $(WAF_CONFIGURE_ARGS)
+ @cd $* && $(CONFIGURE_ENV) ./waf configure $(WAF_CONFIGURE_ARGS)
$(OUTPUT)
$(MAKECOOKIE)
#################### BUILD RULES ####################
@@ -514,49 +514,49 @@
# build from a standard gnu-style makefile's default rule.
build-%/Makefile build-%/makefile build-%/GNUmakefile:
@echo -e "[$(OK)build$(OFF)] $(MSG)Running make in $(OFF)$*"
- @$(BUILD_ENV) $(MAKE) -C $* $(MAKE_ARGS) $(BUILD_ARGS)
+ @$(BUILD_ENV) $(MAKE) -C $* $(MAKE_ARGS) $(BUILD_ARGS) $(OUTPUT)
$(MAKECOOKIE)
build-%/Makefile-BSD:
@echo -e "[$(OK)build$(OFF)] $(MSG)Running make in $(OFF)$*"
- @cd $* && $(BUILD_ENV) pmake $(BUILD_ARGS)
+ @cd $* && $(BUILD_ENV) pmake $(BUILD_ARGS) $(OUTPUT)
$(MAKECOOKIE)
# build using Python distutils
build-%/setup.py:
@echo -e "[$(OK)build$(OFF)] $(MSG)Running setup.py build in $(OFF)$*"
- @cd $* && $(BUILD_ENV) python setup.py build $(PY_BUILD_ARGS)
+ @cd $* && $(BUILD_ENV) python setup.py build $(PY_BUILD_ARGS) $(OUTPUT)
$(MAKECOOKIE)
# build using Ruby setup.rb
build-%/setup.rb:
@echo -e "[$(OK)build$(OFF)] $(MSG)Running setup.rb setup in $(OFF)$*"
- @cd $* && $(BUILD_ENV) ruby setup.rb setup $(RUBY_BUILD_ARGS)
+ @cd $* && $(BUILD_ENV) ruby setup.rb setup $(RUBY_BUILD_ARGS) $(OUTPUT)
$(MAKECOOKIE)
# build using Ruby install.rb
build-%/install.rb:
@echo -e "[$(OK)build$(OFF)] $(MSG)Running install.rb setup in $(OFF)$*"
- @cd $* && $(BUILD_ENV) ruby install.rb setup $(RUBY_BUILD_ARGS)
+ @cd $* && $(BUILD_ENV) ruby install.rb setup $(RUBY_BUILD_ARGS)
$(OUTPUT)
$(MAKECOOKIE)
# build using SCons (which pretends not to have a seperate configure step,
# having "sticky options" instead...)
build-%/SConstruct:
@echo -e "[$(OK)build$(OFF)] $(MSG)Running scons in $(OFF)$*"
- @cd $* && $(BUILD_ENV) scons $(SCONS_DEBUG) $(SCONS_ARGS)
+ @cd $* && $(BUILD_ENV) scons $(SCONS_DEBUG) $(SCONS_ARGS) $(OUTPUT)
$(MAKECOOKIE)
# build using Cabal
build-%/Setup.hs:
@echo -e "[$(OK)build$(OFF)] $(MSG)Running Setup build in $(OFF)$*"
- @cd $* && $(BUILD_ENV) ./Setup build $(CABAL_BUILD_ARGS)
+ @cd $* && $(BUILD_ENV) ./Setup build $(CABAL_BUILD_ARGS) $(OUTPUT)
$(MAKECOOKIE)
# build using waf
build-%/waf:
@echo -e "[$(OK)build$(OFF)] $(MSG)Running waf in $(OFF)$*"
- @cd $* && $(BUILD_ENV) ./waf $(WAF_BUILD_ARGS)
+ @cd $* && $(BUILD_ENV) ./waf $(WAF_BUILD_ARGS) $(OUTPUT)
$(MAKECOOKIE)
#################### TEST RULES ####################
@@ -566,7 +566,7 @@
# Test a program where "make check" (or similar) runs the test.
test-%/Makefile test-%/makefile test-%/GNUmakefile:
@echo -e "[$(OK)test$(OFF)] $(MSG)Testing in $(OFF)$*"
- @$(TEST_ENV) $(MAKE) -C $* $(MAKE_ARGS) $(TEST_ARGS)
+ @$(TEST_ENV) $(MAKE) -C $* $(MAKE_ARGS) $(TEST_ARGS) $(OUTPUT)
$(MAKECOOKIE)
# Test a program using Python distutils.
@@ -575,7 +575,7 @@
@set -e; cd $* && \
if python setup.py --help test >/dev/null 2>&1; then \
echo -e "[$(OK)test$(OFF)] $(MSG)Running setup.py test
in $(OFF)$*"; \
- $(TEST_ENV) python setup.py test $(PY_TEST_ARGS); \
+ $(TEST_ENV) python setup.py test $(PY_TEST_ARGS)
$(OUTPUT); \
else \
echo -e "[$(ERR)test$(OFF)] $(MSG)No test support in
$(OFF)$*"; \
fi
@@ -584,13 +584,13 @@
# Test a program using Cabal.
test-%/Setup.hs:
@echo -e "[$(OK)test$(OFF)] $(MSG)Running Setup test in $(OFF)$*"
- @cd $* && $(TEST_ENV) ./Setup test $(CABAL_TEST_ARGS)
+ @cd $* && $(TEST_ENV) ./Setup test $(CABAL_TEST_ARGS) $(OUTPUT)
$(MAKECOOKIE)
# Test using waf
test-%/waf:
@echo -e "[$(OK)test$(OFF)] $(MSG)Running waf check in $(OFF)$*"
- @cd $* && $(TEST_ENV) ./waf check $(WAF_TEST_ARGS)
+ @cd $* && $(TEST_ENV) ./waf check $(WAF_TEST_ARGS) $(OUTPUT)
$(MAKECOOKIE)
#################### INSTALL RULES ####################
@@ -629,9 +629,9 @@
prepare-install:
@echo -e "[$(OK)install$(OFF)] $(MSG)Preparing staging area$(OFF)"
- rm -fr $(packageDESTDIR)
- mkdir -p $(packageDESTDIR)$(prefix)
- set -e; \
+ @rm -fr $(packageDESTDIR)
+ @mkdir -p $(packageDESTDIR)$(prefix)
+ @set -e; \
set -- $(CREATED_MERGE_DIRS); \
while [ "$$1" != "" ]; do \
src=$(packagedotgardir)/$$1; \
@@ -640,21 +640,21 @@
rm -f $$dest; \
ln -sf $$src $$dest; \
shift; shift; \
- done
+ done $(OUTPUT)
$(MAKECOOKIE)
finish-install:
@echo -e "[$(OK)install$(OFF)] $(MSG)Moving files from staging
area$(OFF)"
- set -e; \
+ @set -e; \
set -- $(CREATED_MERGE_DIRS); \
while [ "$$1" != "" ]; do \
- rmdir -v 2>/dev/null $(packagedotgardir)/$$1 || true; \
- rm -v $(packageDESTDIR)$$2; \
+ rmdir -v $(packagedotgardir)/$$1 $(OUTPUT) || true; \
+ rm -v $(packageDESTDIR)$$2 $(OUTPUT); \
shift; shift; \
- done
- rm -rvf $(packagedir)
- mv $(packageDESTDIR)$(prefix) $(packagedir)
- rm -rv $(packageDESTDIR)
+ done $(OUTPUT)
+ @rm -rvf $(packagedir) $(OUTPUT)
+ @mv $(packageDESTDIR)$(prefix) $(packagedir)
+ @rm -rv $(packageDESTDIR) $(OUTPUT)
$(MAKECOOKIE)
GNU_INSTALL_ARGS = \
@@ -669,19 +669,19 @@
# Use "make install" with prefix-changing.
install-%/Makefile install-%/makefile install-%/GNUmakefile:
@echo -e "[$(OK)install$(OFF)] $(MSG)Running make $(INSTALL_TARGET) in
$(OFF)$*"
- $(INSTALL_ENV) $(MAKE) -C $* $(MAKE_ARGS) $(INSTALL_ARGS)
$(INSTALL_TARGET)
+ @$(INSTALL_ENV) $(MAKE) -C $* $(MAKE_ARGS) $(INSTALL_ARGS)
$(INSTALL_TARGET) $(OUTPUT)
$(MAKECOOKIE)
# Use "make install" with DESTDIR.
DESTDIR_INSTALL_ARGS ?=
install-%/Makefile-DESTDIR:
@echo -e "[$(OK)install$(OFF)] $(MSG)Running make $(INSTALL_TARGET)
with DESTDIR in $(OFF)$*"
- $(INSTALL_ENV) $(MAKE) -C $* $(MAKE_ARGS) $(DESTDIR_INSTALL_ARGS)
$(INSTALL_TARGET) DESTDIR=$(packageDESTDIR)
+ @$(INSTALL_ENV) $(MAKE) -C $* $(MAKE_ARGS) $(DESTDIR_INSTALL_ARGS)
$(INSTALL_TARGET) DESTDIR=$(packageDESTDIR) $(OUTPUT)
$(MAKECOOKIE)
install-%/Makefile-BSD:
@echo -e "[$(OK)install$(OFF)] $(MSG)Running pmake $(INSTALL_TARGET) in
$(OFF)$*"
- cd $* && $(INSTALL_ENV) pmake $(INSTALL_ARGS) $(INSTALL_TARGET)
+ @cd $* && $(INSTALL_ENV) pmake $(INSTALL_ARGS) $(INSTALL_TARGET)
$(OUTPUT)
$(MAKECOOKIE)
# install using Python distutils
@@ -693,20 +693,20 @@
# setuptools (spit) will complain.
install-%/setup.py:
@echo -e "[$(OK)install$(OFF)] $(MSG)Running setup.py install in
$(OFF)$*"
- mkdir -p $(packageDESTDIR)`python -c 'from distutils.sysconfig import
get_python_lib; print get_python_lib()'`
- cd $* && $(INSTALL_ENV) python setup.py install
--root=$(packageDESTDIR) $(PY_INSTALL_ARGS)
+ @mkdir -p $(packageDESTDIR)`python -c 'from distutils.sysconfig import
get_python_lib; print get_python_lib()'`
+ @cd $* && $(INSTALL_ENV) python setup.py install
--root=$(packageDESTDIR) $(PY_INSTALL_ARGS) $(OUTPUT)
$(MAKECOOKIE)
# install using Ruby setup.rb
install-%/setup.rb:
@echo -e "[$(OK)install$(OFF)] $(MSG)Running setup.rb install in
$(OFF)$*"
- cd $* && $(INSTALL_ENV) ruby setup.rb install $(RUBY_INSTALL_ARGS)
+ @cd $* && $(INSTALL_ENV) ruby setup.rb install $(RUBY_INSTALL_ARGS)
$(OUTPUT)
$(MAKECOOKIE)
# install using Ruby install.rb
install-%/install.rb:
@echo -e "[$(OK)install$(OFF)] $(MSG)Running install.rb install in
$(OFF)$*"
- cd $* && $(INSTALL_ENV) ruby install.rb install $(RUBY_INSTALL_ARGS)
+ @cd $* && $(INSTALL_ENV) ruby install.rb install $(RUBY_INSTALL_ARGS)
$(OUTPUT)
$(MAKECOOKIE)
SCONS_INSTALL_ARGS = \
@@ -716,7 +716,7 @@
# install using SCons
install-%/SConstruct:
@echo -e "[$(OK)install$(OFF)] $(MSG)Running scons in $(OFF)$*"
- cd $* && $(INSTALL_ENV) scons install $(SCONS_ARGS)
$(SCONS_INSTALL_ARGS)
+ @cd $* && $(INSTALL_ENV) scons install $(SCONS_ARGS)
$(SCONS_INSTALL_ARGS) $(OUTPUT)
$(MAKECOOKIE)
CABAL_INSTALL_ARGS ?= --copy-prefix=$(packageDESTDIR)$(prefix)
@@ -724,25 +724,25 @@
# install using Cabal
install-%/Setup.hs:
@echo -e "[$(OK)install$(OFF)] $(MSG)Running Setup copy in $(OFF)$*"
- cd $* && $(INSTALL_ENV) ./Setup copy $(CABAL_INSTALL_ARGS)
+ @cd $* && $(INSTALL_ENV) ./Setup copy $(CABAL_INSTALL_ARGS) $(OUTPUT)
echo " $(MSG)Generating Haskell package config in $(OFF)$*"
- cd $* && $(INSTALL_ENV) ./Setup register --gen-pkg-config=package.conf
- if [ -e $*/package.conf ]; then \
+ @cd $* && $(INSTALL_ENV) ./Setup register --gen-pkg-config=package.conf
$(OUTPUT)
+ @if [ -e $*/package.conf ]; then \
mkdir -p $(packagedotgardir)/haskell; \
install -m644 $*/package.conf $(packagedotgardir)/haskell; \
- fi
+ fi $(OUTPUT)
$(MAKECOOKIE)
# install using CMake
install-%/cmake_install.cmake:
@echo -e "[$(OK)install$(OFF)] $(MSG)Running cmake in $(OFF)$*"
- cd $* && $(INSTALL_ENV) env DESTDIR=$(packageDESTDIR) cmake -P
cmake_install.cmake
+ @cd $* && $(INSTALL_ENV) env DESTDIR=$(packageDESTDIR) cmake -P
cmake_install.cmake $(OUTPUT)
$(MAKECOOKIE)
# install using waf
install-%/waf:
@echo -e "[$(OK)install$(OFF)] $(MSG)Running waf install in $(OFF)$*"
- cd $* && $(INSTALL_ENV) env DESTDIR=$(packageDESTDIR) ./waf install
$(WAF_INSTALL_ARGS)
+ @cd $* && $(INSTALL_ENV) env DESTDIR=$(packageDESTDIR) ./waf install
$(WAF_INSTALL_ARGS) $(OUTPUT)
$(MAKECOOKIE)
######################################
@@ -808,9 +808,9 @@
@if [ "$(filter $*,$(IGNORE_DEPS))" != "" ] ; then \
echo -e "[$(OK)install-deps$(OFF)] $(MSG)Ignoring dependency
$(OFF)$*" ; \
else \
- echo -e "[$(OK)install-deps$(OFF)] $(MSG)Building $* as a
dependency" ; \
- $(if $(FORCE_REBUILD),,$(MAKE) -C $(DEP) install-p 2>/dev/null
|| ($(MAKE) -C $(DEP) reinstall-p && $(MAKE) -C $(DEP) reinstall 2>/dev/null) )
|| $(MAKE) -C $(DEP) install ; \
- fi
+ echo -e "[$(OK)install-deps$(OFF)] $(MSG)Building $* as a
dependency$(OFF)" ; \
+ $(if $(FORCE_REBUILD),,$(MAKE) -C $(DEP) install-p $(OUTPUT) ||
($(MAKE) -C $(DEP) reinstall-p && $(MAKE) -C $(DEP) reinstall $(OUTPUT)) ) ||
$(MAKE) -C $(DEP) install $(OUTPUT); \
+ fi
######################################
# Commands for installing different types of files
@@ -886,12 +886,12 @@
[ "$$user" = "-" ] && continue; \
echo -e "[$(OK)depcheck-users$(OFF)] $(MSG)Checking user"
$$user "exists"; \
python -c "import pwd; pwd.getpwnam('$$user')" 2>/dev/null; \
- done
+ done $(OUTPUT)
@set -e; for group in $(NEED_GROUPS) -; do \
[ "$$group" = "-" ] && continue; \
echo "[$(OK)depcheck-users$(OFF)] $(MSG)Checking group" $$group
"exists"; \
python -c "import grp; grp.getgrnam('$$group')" 2>/dev/null; \
- done
+ done $(OUTPUT)
$(MAKECOOKIE)
#################### SYS-INSTALL RULES ####################
@@ -972,12 +972,12 @@
sysinstall-collisions:
@echo -e "[$(OK)sysinstall$(OFF)] $(MSG)Removing collisions$(OFF)"
- rm -rf $(foreach FILE,$(COLLISIONS),$(packagedir)/$(FILE))
+ @rm -rf $(foreach FILE,$(COLLISIONS),$(packagedir)/$(FILE))
$(MAKECOOKIE)
sysinstall-normalise:
@echo -e "[$(OK)sysinstall$(OFF)] $(MSG)Normalising directory
layout$(OFF)"
- set -e; \
+ @set -e; \
normalise () { \
rmdir $$1 2>/dev/null || true; \
if [ -d $$1 ]; then \
@@ -990,37 +990,38 @@
normalise $(packagedir)/man $(packagedir)/share/man; \
normalise $(packagedir)/info $(packagedir)/share/info; \
normalise $(packagedir)/doc $(packagedir)/share/doc; \
- normalise $(packagedir)/games $(packagedir)/bin
+ normalise $(packagedir)/games $(packagedir)/bin $(OUTPUT)
$(MAKECOOKIE)
sysinstall-packagevars:
@echo -e "[$(OK)sysinstall$(OFF)] $(MSG)Writing package metadata$(OFF)"
- test -d $(dotgardir) || mkdir -p $(dotgardir);
- (cd $(packagedir) \
+ @test -d $(dotgardir) || mkdir -p $(dotgardir);
+ @(cd $(packagedir) \
&& find . -not -type d -print > $(dotgardir)/FILES \
&& find . -mindepth 2 -depth -type d -print > $(dotgardir)/DIRS ) \
|| $(SYSINSTALL_FAIL)
- cat Makefile $(CHECKSUM_FILE) | sha256sum > $(dotgardir)/BUILD
+ @cat Makefile $(CHECKSUM_FILE) | sha256sum > $(dotgardir)/BUILD
$(OUTPUT)
SYSINSTALL_FAIL = (rm -f $(packagesdir)/$(GARNAME) $(COOKIEDIR)/sysinstall-*;
false)
sysinstall-install:
- (cp -a -v -f --symbolic-link --target-directory=$(prefix)
$(packagedir)/* && ln -n -v -f -s $(PACKAGENAME) $(dotgardir)/VERSION ) ||
$(SYSINSTALL_FAIL)
+ @echo -e "[$(OK)sysinstall$(OFF)] $(MSG)Installing to $(prefix)$(OFF)"
+ @(cp -a -v -f --symbolic-link --target-directory=$(prefix)
$(packagedir)/* $(OUTPUT) && ln -n -v -f -s $(PACKAGENAME) $(dotgardir)/VERSION
$(OUTPUT)) || $(SYSINSTALL_FAIL) $(OUTPUT)
sysinstall-uninstall:
@rm -f $(COOKIEDIR)/sysinstall-*
- (test -d $(dotgardir) || (echo "[$(ERR)sysinstall$(OFF)]
$(MSG)$(GARNAME) is not installed$(OFF)" && exit 1)) && \
+ @(test -d $(dotgardir) || (echo "[$(ERR)sysinstall$(OFF)]
$(MSG)$(GARNAME) is not installed$(OFF)" && exit 1)) && \
( cd $(prefix) ; \
- test -f $(dotgardir)/FILES && rm -f -- `cat $(dotgardir)/FILES` ; \
- test -f $(dotgardir)/DIRS && rmdir --ignore-fail-on-non-empty -v --
`cat $(dotgardir)/DIRS` ; \
- rm -f $(dotgardir)/FILES $(dotgardir)/DIRS $(dotgardir)/VERSION
$(dotgardir)/BUILD ; \
- rmdir $(dotgardir) )
+ test -f $(dotgardir)/FILES && rm -f -- `cat $(dotgardir)/FILES`
$(OUTPUT); \
+ test -f $(dotgardir)/DIRS && rmdir --ignore-fail-on-non-empty -v --
`cat $(dotgardir)/DIRS` $(OUTPUT) ; \
+ rm -f $(dotgardir)/FILES $(dotgardir)/DIRS $(dotgardir)/VERSION
$(dotgardir)/BUILD $(OUTPUT); \
+ rmdir $(dotgardir) $(OUTPUT))
@rm -f $(packagesdir)/$(GARNAME)
sysinstall-uninstall-pkg:
- rm -rvf $(packagedir)
- @rm -f $(COOKIEDIR)/sysinstall-* $(COOKIEDIR)/*-install
- @rm -rf $(COOKIEDIR)/install-*
+ @rm -rvf $(packagedir) $(OUTPUT)
+ @rm -f $(COOKIEDIR)/sysinstall-* $(COOKIEDIR)/*-install $(OUTPUT)
+ @rm -rf $(COOKIEDIR)/install-* $(OUTPUT)
# Mmm, yesssss. cookies my preciousssss! Mmm, yes downloads it
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] /srv/bzr/gsrc/trunk r1341: add optional output redirection,
Brandon Invergo <=