[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] /srv/bzr/gsrc/trunk r2250: replace echo -e with printf and
|
From: |
Brandon Invergo |
|
Subject: |
[Gsrc-commit] /srv/bzr/gsrc/trunk r2250: replace echo -e with printf and remove silencing symbols |
|
Date: |
Mon, 01 Apr 2013 23:09:06 +0200 |
|
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 2250
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Mon 2013-04-01 23:09:06 +0200
message:
replace echo -e with printf and remove silencing symbols
modified:
gar.lib.mk
=== modified file 'gar.lib.mk'
--- a/gar.lib.mk 2013-01-23 22:54:28 +0000
+++ b/gar.lib.mk 2013-04-01 21:09:06 +0000
@@ -1,9 +1,9 @@
# Standard rules for GARStow ports.
#
+# Copyright (C) 2012, 2013 Brandon Invergo
+# Copyright (C) 2010, 2011 Brian Gough
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Adam Sampson
# Copyright (C) 2001 Nick Moffitt
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Adam Sampson
-# Copyright (C) 2010, 2011 Brian Gough
-# Copyright (C) 2012 Brandon Invergo
#
# Redistribution and/or use, with or without modification, is
# permitted. This software is without warranty of any kind. The
@@ -63,15 +63,15 @@
# checksum file. Loop through available URLs and stop when you
# get one that doesn't return an error code.
$(DOWNLOADDIR)/%:
- @if test -f $(COOKIEDIR)/checksum-$*; then : ; else \
- echo -e "[$(OK)fetch$(OFF)] $(MSG)Grabbing $(OFF)$@"; \
+ if test -f $(COOKIEDIR)/checksum-$*; then : ; else \
+ printf "[$(OK)fetch$(OFF)] $(MSG)Grabbing
$(OFF)address@hidden"; \
for i in $(filter %/$*,$(URLS)); do \
- echo -e "[$(OK)fetch$(OFF)] $(MSG)Trying $(OFF)$$i"; \
+ printf "[$(OK)fetch$(OFF)] $(MSG)Trying $(OFF)$$i\n"; \
$(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; \
+ printf "[$(ERR)fetch$(OFF)] $(MSG)Failed to download
$(OFF)address@hidden(MSG)!$(OFF)\n" 1>&2; \
false; \
fi; \
fi
@@ -87,22 +87,22 @@
# 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)
file///%:
- @if test -f /$*; then \
+ if test -f /$*; then \
ln -sf "/$*" $(DOWNLOADDIR)/$(notdir $*); \
else \
false; \
@@ -111,7 +111,7 @@
# link to a local copy of the file
# (relative path)
file//%:
- @if test -f $*; then \
+ if test -f $*; then \
ln -sf $(CURDIR)/$* $(DOWNLOADDIR)/$(notdir $*); \
else \
false; \
@@ -126,21 +126,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)
@@ -149,24 +149,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)
@@ -175,8 +175,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)
@@ -184,8 +184,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)
@@ -195,23 +195,23 @@
# error out if it mentions the file without an "OK".
sha256sums:
- @echo -e "[$(ERR)sha256sums$(OFF)] $(MSG)No checksum file available!"
- @echo -e "$(MSG)If you trust the downloaded files you can generate the
checksums with"
- @echo -e "make -C $(shell pwd) makesums GPGV=true$(OFF)"
+ @printf "[$(ERR)sha256sums$(OFF)] $(MSG)No checksum file available!\n"
+ @printf "$(MSG)If you trust the downloaded files you can generate the
checksums with\n"
+ @printf "make -C $(shell pwd) makesums GPGV=true$(OFF)\n"
@exit 1
checksum-%: $(CHECKSUM_FILE)
- @echo -e "[$(OK)checksum$(OFF)] $(MSG)Running $(CHECKSUM_CMD) on
$(OFF)$*"
- @if grep -- ' $(DOWNLOADDIR)/$*$$' $(CHECKSUM_FILE); then \
+ @printf "[$(OK)checksum$(OFF)] $(MSG)Running $(CHECKSUM_CMD) on
$(OFF)$*\n"
+ if grep -- ' $(DOWNLOADDIR)/$*$$' $(CHECKSUM_FILE); then \
if LC_ALL="C" LANG="C" grep -- ' $(DOWNLOADDIR)/$*$$'
$(CHECKSUM_FILE) | $(CHECKSUM_CMD) -c | grep ':[ ]\+OK'; then \
- echo -e "[$(OK)checksum$(OFF)] $(MSG)$(CHECKSUM_FILE)
is OK$(OFF)"; \
+ printf "[$(OK)checksum$(OFF)] $(MSG)$(CHECKSUM_FILE) is
OK$(OFF)\n"; \
$(DOMAKECOOKIE); \
else \
- echo -e "[$(ERR)checksum$(OFF)] $(MSG)$* failed
checksum test!$(OFF)" 1>&2; \
+ printf "[$(ERR)checksum$(OFF)] $(MSG)$* failed checksum
test!$(OFF)\n" 1>&2; \
false; \
fi \
else \
- echo -e "[$(ERR)checksum$(OFF)] $(MSG)$* not in
$(CHECKSUM_FILE) file!$(OFF)" 1>&2; \
+ printf "[$(ERR)checksum$(OFF)] $(MSG)$* not in $(CHECKSUM_FILE)
file!$(OFF)\n" 1>&2; \
false; \
fi $(OUTPUT)
@@ -219,48 +219,48 @@
GPGV ?= gpgv --keyring $(GPG_KEYRING)
checksig-%.sig.asc:
- @echo -e "[$(OK)checksig$(OFF)] $(MSG)Checking GPG signature $(OFF)$*"
- @$(GPGV) $(DOWNLOADDIR)/$*.sig.asc $(DOWNLOADDIR)/$*
+ @printf "[$(OK)checksig$(OFF)] $(MSG)Checking GPG signature $(OFF)$*\n"
+ $(GPGV) $(DOWNLOADDIR)/$*.sig.asc $(DOWNLOADDIR)/$*
$(MAKECOOKIE)
checksig-%.asc.txt:
- @echo -e "[$(OK)checksig$(OFF)] $(MSG)Checking GPG signature $(OFF)$*"
- @$(GPGV) $(DOWNLOADDIR)/$*.asc.txt $(DOWNLOADDIR)/$*
+ @printf "[$(OK)checksig$(OFF)] $(MSG)Checking GPG signature $(OFF)$*\n"
+ $(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.,$*)
+ @printf "[$(OK)checksig$(OFF)] $(MSG)Checking GPG signature $(OFF)$*\n"
+ $(GPGV) $(DOWNLOADDIR)/$*-asc.txt $(DOWNLOADDIR)/$(subst -tar-,.tar.,$*)
$(MAKECOOKIE)
checksig-%.sig:
- @echo -e "[$(OK)checksig$(OFF)] $(MSG)Checking GPG signature $(OFF)$*"
- @$(GPGV) $(DOWNLOADDIR)/$*.sig
+ @printf "[$(OK)checksig$(OFF)] $(MSG)Checking GPG signature $(OFF)$*\n"
+ $(GPGV) $(DOWNLOADDIR)/$*.sig
$(MAKECOOKIE)
checksig-%.sign:
- @echo -e "[$(OK)checksig$(OFF)] $(MSG)Checking GPG signature $(OFF)$*"
- @$(GPGV) $(DOWNLOADDIR)/$*.sign
+ @printf "[$(OK)checksig$(OFF)] $(MSG)Checking GPG signature $(OFF)$*\n"
+ $(GPGV) $(DOWNLOADDIR)/$*.sign
$(MAKECOOKIE)
checksig-%.asc:
- @echo -e "[$(OK)checksig$(OFF)] $(MSG)Checking GPG signature $(OFF)$*"
- @$(GPGV) $(DOWNLOADDIR)/$*.asc
+ @printf "[$(OK)checksig$(OFF)] $(MSG)Checking GPG signature $(OFF)$*\n"
+ $(GPGV) $(DOWNLOADDIR)/$*.asc
$(MAKECOOKIE)
checksig-%.md5sum:
- @echo -e "[$(OK)checksig$(OFF)] $(MSG)Checking MD5 checksums $(OFF)$*"
- @cd $(DOWNLOADDIR) && md5sum -c $*.md5sum
+ @printf "[$(OK)checksig$(OFF)] $(MSG)Checking MD5 checksums $(OFF)$*\n"
+ cd $(DOWNLOADDIR) && md5sum -c $*.md5sum
$(MAKECOOKIE)
checksig-%.sha1:
- @echo -e "[$(OK)checksig$(OFF)] $(MSG)Checking SHA1 checksums $(OFF)$*"
- @cd $(DOWNLOADDIR) && sha1sum -c $*.sha1
+ @printf "[$(OK)checksig$(OFF)] $(MSG)Checking SHA1 checksums $(OFF)$*\n"
+ cd $(DOWNLOADDIR) && sha1sum -c $*.sha1
$(MAKECOOKIE)
checksig-%.sha256:
- @echo -e "[$(OK)checksig$(OFF)] $(MSG)Checking SHA256 checksums
$(OFF)$*"
- @cd $(DOWNLOADDIR) && sha256sum -c $*.sha256
+ @printf "[$(OK)checksig$(OFF)] $(MSG)Checking SHA256 checksums
$(OFF)$*\n"
+ cd $(DOWNLOADDIR) && sha256sum -c $*.sha256
$(MAKECOOKIE)
#################### GARCHIVE RULES ####################
@@ -269,8 +269,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,59 +284,59 @@
# 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)
+ @printf "[$(OK)extract$(OFF)] $(MSG)Extracting $(OFF)$(patsubst
extract-%,$(DOWNLOADDIR)/%,$@)\n"
+ 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)
+ @printf "[$(OK)extract$(OFF)] $(MSG)Extracting $(OFF)$(patsubst
extract-%,$(DOWNLOADDIR)/%,$@)\n"
+ 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)
+ @printf "[$(OK)extract$(OFF)] $(MSG)Extracting $(OFF)$(patsubst
extract-%,$(DOWNLOADDIR)/%,$@)\n"
+ 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)
+ @printf "[$(OK)extract$(OFF)] $(MSG)Extracting $(OFF)$(patsubst
extract-%,$(DOWNLOADDIR)/%,$@)\n"
+ 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)
+ @printf "[$(OK)extract$(OFF)] $(MSG)Extracting $(OFF)$(patsubst
extract-%,$(DOWNLOADDIR)/%,$@)\n"
+ 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))
+ @printf "[$(OK)extract$(OFF)] $(MSG)Extracting $(OFF)$(patsubst
extract-%,$(DOWNLOADDIR)/%,$@)\n"
+ 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)
+ @printf "[$(OK)extract$(OFF)] $(MSG)Extracting $(OFF)$(patsubst
extract-%,$(DOWNLOADDIR)/%,$@)\n"
+ 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))
+ @printf "[$(OK)extract$(OFF)] $(MSG)Extracting $(OFF)$(patsubst
extract-%,$(DOWNLOADDIR)/%,$@)\n"
+ rpm2cpio $(patsubst extract-%,$(DOWNLOADDIR)/%,$@) | (cd $(EXTRACTDIR)
&& cpio -mid $(CPIO_OPTS))
$(MAKECOOKIE)
# Unmatched files should just be copied.
# This is a bit of a kludge -- it's to allow us to have packages that are built
# 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)
+ @printf "[$(OK)extract$(OFF)] $(MSG)Copying $(OFF)$(patsubst
extract-%,$(DOWNLOADDIR)/%,$@)\n"
+ mkdir -p $(WORKSRC)
+ cp $(patsubst extract-%,$(DOWNLOADDIR)/%,$@) $(WORKSRC)
$(MAKECOOKIE)
#################### PATCH RULES ####################
@@ -347,27 +347,27 @@
# 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)
+ @printf "[$(OK)patch$(OFF)] $(MSG)Applying patch $(OFF)$(patsubst
patch-%,$(DOWNLOADDIR)/%,$@)\n"
+ 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)
+ @printf "[$(OK)patch$(OFF)] $(MSG)Applying patch $(OFF)$(patsubst
patch-%,$(DOWNLOADDIR)/%,$@)\n"
+ 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)/%,$@)
+ @printf "[$(OK)patch$(OFF)] $(MSG)Applying patch $(OFF)$(patsubst
patch-%,$(DOWNLOADDIR)/%,$@)\n"
+ $(PATCH) < $(patsubst patch-%,$(DOWNLOADDIR)/%,$@)
$(MAKECOOKIE)
# This is used by makepatch
%/gar-base.diff:
- @echo -e "[$(OK)makepatch$(OFF)] $(MSG)Creating patch $(OFF)$@"
- @EXTRACTDIR=$(SCRATCHDIR) COOKIEDIR=$(SCRATCHDIR)-$(COOKIEDIR) $(MAKE)
extract
- @if diff -x 'config.log' -x 'config.status' -ru $(SCRATCHDIR)
$(WORKDIR) | grep -v '^Only in' > $@; then :; else \
+ @printf "[$(OK)makepatch$(OFF)] $(MSG)Creating patch
$(OFF)address@hidden"
+ 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 $(OUTPUT)
@@ -375,12 +375,12 @@
####################### HELP RULES ######################
help-%/configure:
- @echo -e "[$(OK)help$(OFF)] $(MSG)Running configure --help in $(OFF)$*"
- @cd $* && $(CONFIGURE_ENV) ./configure --help
+ @printf "[$(OK)help$(OFF)] $(MSG)Running configure --help in $(OFF)$*\n"
+ 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
+ @printf "[$(OK)help$(OFF)] $(MSG)Running python setup.py --help in
$(OFF)$*\n"
+ cd $* && $(PYTHON) setup.py --help
#################### CONFIGURE RULES ####################
@@ -405,24 +405,24 @@
# 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) $(OUTPUT)
+ @printf "[$(OK)configure$(OFF)] $(MSG)Running autoreconf in $(OFF)$*\n"
+ cd $* && $(AUTORECONF_ENV) autoreconf $(AUTORECONF_ARGS) $(OUTPUT)
$(MAKECOOKIE)
LIBTOOLIZE_ARGS ?= -vfi
# 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) $(OUTPUT)
+ @printf "[$(OK)configure$(OFF)] $(MSG)Running libtoolize in $(OFF)$*\n"
+ 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)
$(OUTPUT)
+ @printf "[$(OK)configure$(OFF)] $(MSG)Running $(CONFIGURE_NAME) in
$(OFF)$*\n"
+ 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,8 +431,8 @@
# FIXME: untested and likely not the right way to handle the
# arguments
configure-%/Imakefile:
- @echo -e "[$(OK)configure$(OFF)] $(MSG)Running xmkmf in $(OFF)$*"
- @cd $* && $(CONFIGURE_ENV) xmkmf $(XMKMF_ARGS) $(OUTPUT)
+ @printf "[$(OK)configure$(OFF)] $(MSG)Running xmkmf in $(OFF)$*\n"
+ cd $* && $(CONFIGURE_ENV) xmkmf $(XMKMF_ARGS) $(OUTPUT)
$(MAKECOOKIE)
# CMake doesn't respect many of the standard environment variables, so we have
@@ -446,15 +446,15 @@
# configure a package that uses CMake
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)
$(OUTPUT)
+ @printf "[$(OK)configure$(OFF)] $(MSG)Running cmake in $(OFF)$*\n"
+ mkdir -p $(WORKOBJ)
+ 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)
$(OUTPUT)
+ @printf "[$(OK)configure$(OFF)] $(MSG)Running setup.py config in
$(OFF)$*\n"
+ cd $* && $(BUILD_ENV) $(PYTHON) setup.py config $(PY_BUILD_ARGS)
$(OUTPUT)
$(MAKECOOKIE)
RUBY_DIRPATHS = --prefix=$(packageprefix)
@@ -462,20 +462,20 @@
# 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)
$(OUTPUT)
+ @printf "[$(OK)configure$(OFF)] $(MSG)Running extconf.rb in $(OFF)$*\n"
+ 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)
$(OUTPUT)
+ @printf "[$(OK)configure$(OFF)] $(MSG)Running setup.rb config in
$(OFF)$*\n"
+ 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) $(OUTPUT)
+ @printf "[$(OK)configure$(OFF)] $(MSG)Running install.rb config in
$(OFF)$*\n"
+ 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,92 +486,92 @@
# 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)
$(OUTPUT)
+ @printf "[$(OK)configure$(OFF)] $(MSG)Running scons configure in
$(OFF)$*\n"
+ cd $* && $(CONFIGURE_ENV) scons configure $(SCONS_DEBUG) $(SCONS_ARGS)
$(OUTPUT)
$(MAKECOOKIE)
CABAL_CONFIGURE_ARGS ?= --prefix=$(prefix)
# configure using Cabal
configure-%/Setup.hs:
- @echo -e "[$(OK)configure$(OFF)] $(MSG)Compiling Setup in $(OFF)$*"
- @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)
$(OUTPUT)
+ @printf "[$(OK)configure$(OFF)] $(MSG)Compiling Setup in $(OFF)$*\n"
+ cd $* && ghc --make Setup -o Setup $(OUTPUT)
+ @printf "[$(OK)configure$(OFF)] $(MSG)Running Setup configure in
$(OFF)$*\n"
+ cd $* && $(CONFIGURE_ENV) ./Setup configure $(CABAL_CONFIGURE_ARGS)
$(OUTPUT)
$(MAKECOOKIE)
WAF_CONFIGURE_ARGS ?= $(DIRPATHS)
# configure using waf
configure-%/waf:
- @echo -e "[$(OK)configure$(OFF)] $(MSG)Running waf configure in
$(OFF)$*"
- @cd $* && $(CONFIGURE_ENV) ./waf configure $(WAF_CONFIGURE_ARGS)
$(OUTPUT)
+ @printf "[$(OK)configure$(OFF)] $(MSG)Running waf configure in
$(OFF)$*\n"
+ cd $* && $(CONFIGURE_ENV) ./waf configure $(WAF_CONFIGURE_ARGS)
$(OUTPUT)
$(MAKECOOKIE)
#################### BUILD RULES ####################
BUILD_ARGS += $(BUILD_OPTS)
-BUILD_FAIL = (echo -e "[$(ERR)build$(OFF)] $(MSG)Build failed. Exiting.$(OFF)"
&& exit 1)
+BUILD_FAIL = (printf "[$(ERR)build$(OFF)] $(MSG)Build failed.
Exiting.$(OFF)\n" && exit 1)
# 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) $(OUTPUT) || \
+ @printf "[$(OK)build$(OFF)] $(MSG)Running make in $(OFF)$*\n"
+ $(BUILD_ENV) $(MAKE) -C $* $(MAKE_ARGS) $(BUILD_ARGS) $(OUTPUT) || \
$(BUILD_FAIL)
$(MAKECOOKIE)
build-%/Makefile-BSD:
- @echo -e "[$(OK)build$(OFF)] $(MSG)Running make in $(OFF)$*"
- @cd $* && $(BUILD_ENV) pmake $(BUILD_ARGS) $(OUTPUT) || $(BUILD_FAIL)
+ @printf "[$(OK)build$(OFF)] $(MSG)Running make in $(OFF)$*\n"
+ cd $* && $(BUILD_ENV) pmake $(BUILD_ARGS) $(OUTPUT) || $(BUILD_FAIL)
$(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)
$(OUTPUT) \
+ @printf "[$(OK)build$(OFF)] $(MSG)Running setup.py build in $(OFF)$*\n"
+ cd $* && $(BUILD_ENV) $(PYTHON) setup.py build $(PY_BUILD_ARGS)
$(OUTPUT) \
|| $(BUILD_FAIL)
$(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) $(OUTPUT)
\
+ @printf "[$(OK)build$(OFF)] $(MSG)Running setup.rb setup in $(OFF)$*\n"
+ cd $* && $(BUILD_ENV) ruby setup.rb setup $(RUBY_BUILD_ARGS) $(OUTPUT) \
|| $(BUILD_FAIL)
$(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)
$(OUTPUT) \
+ @printf "[$(OK)build$(OFF)] $(MSG)Running install.rb setup in
$(OFF)$*\n"
+ cd $* && $(BUILD_ENV) ruby install.rb setup $(RUBY_BUILD_ARGS)
$(OUTPUT) \
|| $(BUILD_FAIL)
$(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) $(OUTPUT) \
+ @printf "[$(OK)build$(OFF)] $(MSG)Running scons in $(OFF)$*\n"
+ cd $* && $(BUILD_ENV) scons $(SCONS_DEBUG) $(SCONS_ARGS) $(OUTPUT) \
|| $(BUILD_FAIL)
$(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) $(OUTPUT) \
+ @printf "[$(OK)build$(OFF)] $(MSG)Running Setup build in $(OFF)$*\n"
+ cd $* && $(BUILD_ENV) ./Setup build $(CABAL_BUILD_ARGS) $(OUTPUT) \
|| $(BUILD_FAIL)
$(MAKECOOKIE)
# build using waf
build-%/waf:
- @echo -e "[$(OK)build$(OFF)] $(MSG)Running waf in $(OFF)$*"
- @cd $* && $(BUILD_ENV) ./waf $(WAF_BUILD_ARGS) $(OUTPUT) ||
$(BUILD_FAIL)
+ @printf "[$(OK)build$(OFF)] $(MSG)Running waf in $(OFF)$*\n"
+ cd $* && $(BUILD_ENV) ./waf $(WAF_BUILD_ARGS) $(OUTPUT) || $(BUILD_FAIL)
$(MAKECOOKIE)
# build using ant (java)
build-%/build.xml:
- @echo -e "[$(OK)build$(OFF)] $(MSG)Running ant in $(OFF)$*"
- @cd $* && $(BUILD_ENV) ant $(ANT_BUILD_ARGS) build $(OUTPUT) ||
$(BUILD_FAIL)
+ @printf "[$(OK)build$(OFF)] $(MSG)Running ant in $(OFF)$*\n"
+ cd $* && $(BUILD_ENV) ant $(ANT_BUILD_ARGS) build $(OUTPUT) ||
$(BUILD_FAIL)
$(MAKECOOKIE)
#################### TEST RULES ####################
@@ -580,32 +580,32 @@
# 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) $(OUTPUT)
+ @printf "[$(OK)test$(OFF)] $(MSG)Testing in $(OFF)$*\n"
+ $(TEST_ENV) $(MAKE) -C $* $(MAKE_ARGS) $(TEST_ARGS) $(OUTPUT)
$(MAKECOOKIE)
# Test a program using Python distutils.
# Not all setup.py instances have a test command...
test-%/setup.py:
- @set -e; cd $* && \
+ 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)$*"; \
+ printf "[$(OK)test$(OFF)] $(MSG)Running setup.py test
in $(OFF)$*\n"; \
$(TEST_ENV) $(PYTHON) setup.py test $(PY_TEST_ARGS)
$(OUTPUT); \
else \
- echo -e "[$(ERR)test$(OFF)] $(MSG)No test support in
$(OFF)$*"; \
+ printf "[$(ERR)test$(OFF)] $(MSG)No test support in
$(OFF)$*\n"; \
fi
$(MAKECOOKIE)
# 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) $(OUTPUT)
+ @printf "[$(OK)test$(OFF)] $(MSG)Running Setup test in $(OFF)$*\n"
+ 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) $(OUTPUT)
+ @printf "[$(OK)test$(OFF)] $(MSG)Running waf check in $(OFF)$*\n"
+ cd $* && $(TEST_ENV) ./waf check $(WAF_TEST_ARGS) $(OUTPUT)
$(MAKECOOKIE)
#################### INSTALL RULES ####################
@@ -643,10 +643,10 @@
root /
prepare-install:
- @echo -e "[$(OK)install$(OFF)] $(MSG)Preparing staging area$(OFF)"
- @rm -fr $(packageDESTDIR)
- @mkdir -p $(packageDESTDIR)$(prefix)
- @set -e; \
+ @printf "[$(OK)install$(OFF)] $(MSG)Preparing staging area$(OFF)\n"
+ rm -fr $(packageDESTDIR)
+ mkdir -p $(packageDESTDIR)$(prefix)
+ set -e; \
set -- $(CREATED_MERGE_DIRS); \
while [ "$$1" != "" ]; do \
src=$(packagedotgardir)/$$1; \
@@ -659,17 +659,17 @@
$(MAKECOOKIE)
finish-install:
- @echo -e "[$(OK)install$(OFF)] $(MSG)Moving files from staging
area$(OFF)"
- @set -e; \
+ @printf "[$(OK)install$(OFF)] $(MSG)Moving files from staging
area$(OFF)\n"
+ set -e; \
set -- $(CREATED_MERGE_DIRS); \
while [ "$$1" != "" ]; do \
rmdir -v $(packagedotgardir)/$$1 $(OUTPUT) || true; \
rm -v $(packageDESTDIR)$$2 $(OUTPUT); \
shift; shift; \
done $(OUTPUT)
- @rm -rvf $(packagedir) $(OUTPUT)
- @mv $(packageDESTDIR)$(prefix) $(packagedir)
- @rm -rv $(packageDESTDIR) $(OUTPUT)
+ rm -rvf $(packagedir) $(OUTPUT)
+ mv $(packageDESTDIR)$(prefix) $(packagedir)
+ rm -rv $(packageDESTDIR) $(OUTPUT)
$(MAKECOOKIE)
GNU_INSTALL_ARGS = \
@@ -683,20 +683,20 @@
# 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) $(OUTPUT)
+ @printf "[$(OK)install$(OFF)] $(MSG)Running make $(INSTALL_TARGET) in
$(OFF)$*\n"
+ $(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) $(OUTPUT)
+ @printf "[$(OK)install$(OFF)] $(MSG)Running make $(INSTALL_TARGET) with
DESTDIR in $(OFF)$*\n"
+ $(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)
$(OUTPUT)
+ @printf "[$(OK)install$(OFF)] $(MSG)Running pmake $(INSTALL_TARGET) in
$(OFF)$*\n"
+ cd $* && $(INSTALL_ENV) pmake $(INSTALL_ARGS) $(INSTALL_TARGET)
$(OUTPUT)
$(MAKECOOKIE)
# install using Python distutils
@@ -707,21 +707,21 @@
# We have to create the installation directory first because otherwise
# 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) $(OUTPUT)
+ @printf "[$(OK)install$(OFF)] $(MSG)Running setup.py install in
$(OFF)$*\n"
+ 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)
$(OUTPUT)
+ @printf "[$(OK)install$(OFF)] $(MSG)Running setup.rb install in
$(OFF)$*\n"
+ 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)
$(OUTPUT)
+ @printf "[$(OK)install$(OFF)] $(MSG)Running install.rb install in
$(OFF)$*\n"
+ cd $* && $(INSTALL_ENV) ruby install.rb install $(RUBY_INSTALL_ARGS)
$(OUTPUT)
$(MAKECOOKIE)
SCONS_INSTALL_ARGS = \
@@ -730,19 +730,19 @@
# 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) $(OUTPUT)
+ @printf "[$(OK)install$(OFF)] $(MSG)Running scons in $(OFF)$*\n"
+ cd $* && $(INSTALL_ENV) scons install $(SCONS_ARGS)
$(SCONS_INSTALL_ARGS) $(OUTPUT)
$(MAKECOOKIE)
CABAL_INSTALL_ARGS ?= --copy-prefix=$(packageDESTDIR)$(prefix)
# 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) $(OUTPUT)
- echo " $(MSG)Generating Haskell package config in $(OFF)$*"
- @cd $* && $(INSTALL_ENV) ./Setup register --gen-pkg-config=package.conf
$(OUTPUT)
- @if [ -e $*/package.conf ]; then \
+ @printf "[$(OK)install$(OFF)] $(MSG)Running Setup copy in $(OFF)$*\n"
+ cd $* && $(INSTALL_ENV) ./Setup copy $(CABAL_INSTALL_ARGS) $(OUTPUT)
+ @printf " $(MSG)Generating Haskell package config in $(OFF)$*\n"
+ 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 $(OUTPUT)
@@ -750,14 +750,14 @@
# 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 $(OUTPUT)
+ @printf "[$(OK)install$(OFF)] $(MSG)Running cmake in $(OFF)$*\n"
+ 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) $(OUTPUT)
+ @printf "[$(OK)install$(OFF)] $(MSG)Running waf install in $(OFF)$*\n"
+ cd $* && $(INSTALL_ENV) env DESTDIR=$(packageDESTDIR) ./waf install
$(WAF_INSTALL_ARGS) $(OUTPUT)
$(MAKECOOKIE)
######################################
@@ -806,7 +806,7 @@
# FIXME: using -D may not be the right thing to do!
install-$(MANIFEST_FILE):
- @echo -e "[$(OK)install$(OFF)] $(MSG)Installing from
$(MANIFEST_FILE)$(OFF)"
+ @printf "[$(OK)install$(OFF)] $(MSG)Installing from
$(MANIFEST_FILE)$(OFF)\n"
WORKSRC=$(WORKSRC) ; $(foreach ZORCH,$(shell cat $(MANIFEST_FILE)),
install -Dc $(join $(wordlist 3,$(MANIFEST_SIZE),$(MANIFEST_FLAGS)),$(wordlist
3,$(MANIFEST_SIZE),$(MANIFEST_LINE))) $(word 1,$(MANIFEST_LINE))
$(packageprefix)/$(word 2,$(MANIFEST_LINE)) ;)
$(MAKECOOKIE)
@@ -820,10 +820,10 @@
# BBC, we set the includedir to the build tree and the libdir to
# the install tree. Most dependencies work this way.
dep-$(GARDIR)/%:
- @if [ "$(filter $*,$(IGNORE_DEPS))" != "" ] ; then \
- echo -e "[$(OK)install-deps$(OFF)] $(MSG)Ignoring dependency
$(OFF)$*" ; \
+ if [ "$(filter $*,$(IGNORE_DEPS))" != "" ] ; then \
+ printf "[$(OK)install-deps$(OFF)] $(MSG)Ignoring dependency
$(OFF)$*\n" ; \
else \
- echo -e "[$(OK)install-deps$(OFF)] $(MSG)Building $* as a
dependency$(OFF)" ; \
+ printf "[$(OK)install-deps$(OFF)] $(MSG)Building $* as a
dependency$(OFF)\n" ; \
$(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
@@ -897,14 +897,14 @@
NEED_GROUPS ?=
depcheck-users:
- @set -e; for user in $(NEED_USERS) -; do \
+ set -e; for user in $(NEED_USERS) -; do \
[ "$$user" = "-" ] && continue; \
- echo -e "[$(OK)depcheck-users$(OFF)] $(MSG)Checking user"
$$user "exists"; \
+ printf "[$(OK)depcheck-users$(OFF)] $(MSG)Checking user\n"
$$user "exists"; \
$(PYTHON) -c "import pwd; pwd.getpwnam('$$user')" 2>/dev/null; \
done $(OUTPUT)
- @set -e; for group in $(NEED_GROUPS) -; do \
+ set -e; for group in $(NEED_GROUPS) -; do \
[ "$$group" = "-" ] && continue; \
- echo "[$(OK)depcheck-users$(OFF)] $(MSG)Checking group" $$group
"exists"; \
+ printf "[$(OK)depcheck-users$(OFF)] $(MSG)Checking group\n"
$$group "exists"; \
$(PYTHON) -c "import grp; grp.getgrnam('$$group')" 2>/dev/null;
\
done $(OUTPUT)
$(MAKECOOKIE)
@@ -986,11 +986,11 @@
Makefile
sysinstall-check:
- @echo -e "[$(OK)sysinstall$(OFF)] $(MSG)Checking status of DESTDIR
install$(OFF)"
- @if [ "`ls $(packagedir)`" ]; then \
- echo -e "[$(OK)sysinstall$(OFF)] $(MSG)Successful DESTDIR
install$(OFF)"; \
+ @printf "[$(OK)sysinstall$(OFF)] $(MSG)Checking status of DESTDIR
install$(OFF)\n"
+ if [ "`ls $(packagedir)`" ]; then \
+ printf "[$(OK)sysinstall$(OFF)] $(MSG)Successful DESTDIR
install$(OFF)\n"; \
else \
- echo -e "[$(ERR)sysinstall$(OFF)] $(MSG)DESTDIR install failed,
uninstalling$(OFF)"; \
+ printf "[$(ERR)sysinstall$(OFF)] $(MSG)DESTDIR install failed,
uninstalling$(OFF)\n"; \
$(MAKE) -C $(WORKOBJ) uninstall $(OUTPUT); \
exit 1; \
fi
@@ -998,17 +998,17 @@
sysinstall-collisions:
- @echo -e "[$(OK)sysinstall$(OFF)] $(MSG)Removing collisions$(OFF)"
- @rm -rf $(foreach FILE,$(COLLISIONS),$(packagedir)/$(FILE))
+ @printf "[$(OK)sysinstall$(OFF)] $(MSG)Removing collisions$(OFF)\n"
+ rm -rf $(foreach FILE,$(COLLISIONS),$(packagedir)/$(FILE))
$(MAKECOOKIE)
sysinstall-normalise:
- @echo -e "[$(OK)sysinstall$(OFF)] $(MSG)Normalising directory
layout$(OFF)"
- @set -e; \
+ @printf "[$(OK)sysinstall$(OFF)] $(MSG)Normalising directory
layout$(OFF)\n"
+ set -e; \
normalise () { \
rmdir $$1 2>/dev/null || true; \
if [ -d $$1 ]; then \
- echo -e "[$(OK)sysinstall$(OFF)] $(MSG)Moving contents
of $$1 to $$2$(OFF)"; \
+ printf "[$(OK)sysinstall$(OFF)] $(MSG)Moving contents
of $$1 to $$2$(OFF)\n"; \
mkdir -p $$2; \
cp -a $$1/* $$2; \
rm -fr $$1; \
@@ -1021,34 +1021,34 @@
$(MAKECOOKIE)
sysinstall-packagevars:
- @echo -e "[$(OK)sysinstall$(OFF)] $(MSG)Writing package metadata$(OFF)"
- @test -d $(dotgardir) || mkdir -p $(dotgardir);
- @(cd $(packagedir) \
+ @printf "[$(OK)sysinstall$(OFF)] $(MSG)Writing package metadata$(OFF)\n"
+ 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
$(OUTPUT)
+ cat Makefile $(CHECKSUM_FILE) | sha256sum > $(dotgardir)/BUILD $(OUTPUT)
SYSINSTALL_FAIL = (rm -f $(packagesdir)/$(GARNAME) $(COOKIEDIR)/sysinstall-*;
false)
sysinstall-install:
- @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)
+ @printf "[$(OK)sysinstall$(OFF)] $(MSG)Installing to $(prefix)$(OFF)\n"
+ (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 -e "[$(ERR)sysinstall$(OFF)]
$(MSG)$(GARNAME) is not installed$(OFF)" && exit 1)) && \
+ rm -f $(COOKIEDIR)/sysinstall-*
+ (test -d $(dotgardir) || (printf "[$(ERR)sysinstall$(OFF)]
$(MSG)$(GARNAME) is not installed$(OFF)\n" && exit 1)) && \
( cd $(prefix) ; \
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)
+ rm -f $(packagesdir)/$(GARNAME)
sysinstall-uninstall-pkg:
- @rm -rvf $(packagedir) $(OUTPUT)
- @rm -f $(COOKIEDIR)/sysinstall-* $(COOKIEDIR)/*-install $(OUTPUT)
- @rm -rf $(COOKIEDIR)/install-* $(OUTPUT)
+ 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 r2250: replace echo -e with printf and remove silencing symbols,
Brandon Invergo <=