[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] trunk r3082: strip trailing whitespace from GARNAME/PROFIL
From: |
Brandon Invergo |
Subject: |
[Gsrc-commit] trunk r3082: strip trailing whitespace from GARNAME/PROFILE/VERSION when building up directory names |
Date: |
Fri, 26 Sep 2014 12:41:25 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 3082
revision-id: address@hidden
parent: address@hidden
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Fri 2014-09-26 13:41:08 +0100
message:
strip trailing whitespace from GARNAME/PROFILE/VERSION when building up
directory names
modified:
ChangeLog changelog-20100709141706-qgja2j0qu34ekbcd-1
gar.lib.mk gar.lib.mk-20100602191336-d3df1ggfm1r56woa-4
gar.mk gar.mk-20100602191336-d3df1ggfm1r56woa-6
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-09-15 20:08:28 +0000
+++ b/ChangeLog 2014-09-26 12:41:08 +0000
@@ -1,3 +1,10 @@
+2014-09-26 Brandon Invergo <address@hidden>
+
+ * gar.mk: Strip trailing whitespace from GARNAME, GARPROFILE and
+ GARVERSION when building up directory names and such.
+ * gar.lib.mk: Strip trailing whitespace from GARNAME, GARPROFILE
+ and GARVERSION when building up directory names and such.
+
2014-09-15 Brandon Invergo <address@hidden>
* gar.lib/info.mk (pre-uninstall): Do not try to remove info files
=== modified file 'gar.lib.mk'
--- a/gar.lib.mk 2014-05-23 16:56:51 +0000
+++ b/gar.lib.mk 2014-09-26 12:41:08 +0000
@@ -137,7 +137,7 @@
scp -C $* $(DOWNLOADDIR)/
# Check out source from CVS.
-CVS_CO_OPTS ?= -D$(GARVERSION) -P
+CVS_CO_OPTS ?= -D$(strip $(GARVERSION)) -P
CVS_MODULE ?= $(GARNAME)
cvs//%:
mkdir -p $(DOWNLOADDIR)/cvs
@@ -146,7 +146,7 @@
tar czvf ../$(notdir $*) $(DISTNAME)
# Check out source from Subversion.
-SVN_REVISION ?= "{$(GARVERSION)}"
+SVN_REVISION ?= "{$(strip $(GARVERSION))}"
SVN_CO_OPTS ?= -r $(SVN_REVISION)
svnco//%:
mkdir -p $(DOWNLOADDIR)/svn
@@ -163,7 +163,7 @@
tar -czvf ../$(notdir $*) $(DISTNAME)
# Check out source from Git.
-GIT_REVISION ?= v$(GARVERSION)
+GIT_REVISION ?= v$(strip $(GARVERSION))
git//%:
mkdir -p $(DOWNLOADDIR)/git
cd $(DOWNLOADDIR)/git && \
@@ -172,7 +172,7 @@
tar czvf ../$(notdir $*) $(DISTNAME)
# Check out source from Mercurial.
-HG_REVISION ?= $(GARVERSION)
+HG_REVISION ?= $(strip $(GARVERSION))
HG_CLONE_OPTS ?= -r "$(HG_REVISION)"
hg//%:
mkdir -p $(DOWNLOADDIR)/hg
@@ -181,7 +181,7 @@
tar czvf ../$(notdir $*) $(DISTNAME)
# Check out source from Bazaar.
-BZR_REVISION ?= before:date:$(GARVERSION)
+BZR_REVISION ?= before:date:$(strip $(GARVERSION))
BZR_CHECKOUT_OPTS ?= -r "$(BZR_REVISION)" --lightweight
bzr//%:
mkdir -p $(DOWNLOADDIR)/bzr
@@ -611,13 +611,13 @@
#################### INSTALL RULES ####################
# The format of stow package names.
-PACKAGENAME ?= $(GARNAME)-$(GARVERSION)$(if $(PATCHNUM),-$(PATCHNUM))$(if
$(GARPROFILE),-$(GARPROFILE))
+PACKAGENAME ?= $(strip $(GARNAME))-$(strip $(GARVERSION))$(if
$(PATCHNUM),-$(strip $(PATCHNUM)))$(if $(GARPROFILE),-$(strip $(GARPROFILE)))
# The package home directory. This'll be stowed into $(prefix).
packagedir = $(packagesdir)/$(PACKAGENAME)
# Directory containing GARstow files for the package.
-dotgardir = $(prefix)/.gar/$(GARNAME)$(if $(GARPROFILE),-$(GARPROFILE))
+dotgardir = $(prefix)/.gar/$(strip $(GARNAME))$(if $(GARPROFILE),-$(strip
$(GARPROFILE)))
# Directories to use during installation.
packageDESTDIR = $(packagesdir)/$(PACKAGENAME)-DEST
@@ -625,8 +625,8 @@
packagedotgardir = $(packageDESTDIR)$(dotgardir)
packagesysconfdir = $(packageDESTDIR)$(sysconfdir)
packagevardir = $(packageDESTDIR)$(vardir)
-packagedocs = $(packageprefix)/share/doc/$(GARNAME)
-packageexamples = $(packageprefix)/share/examples/$(GARNAME)
+packagedocs = $(packageprefix)/share/doc/$(strip $(GARNAME))
+packageexamples = $(packageprefix)/share/examples/$(strip $(GARNAME))
# Directories that should have pristine versions stored to be merged upon
# installation.
@@ -838,7 +838,7 @@
INSTALL_CATMAN = install_catman () { for x in $$*; do v=`echo $$x | sed
's/.*\.//'`; mkdir -p $(packageprefix)/man/cat$$v && install -m644 $$x
$(packageprefix)/man/cat$$v; done; } && install_catman
INSTALL_INFO = install_info () { mkdir -p $(packageprefix)/share/info &&
install -m644 $$* $(packageprefix)/share/info; } && install_info
INSTALL_DOCS = install_docs () { mkdir -p $(packagedocs) && cp -R $$*
$(packagedocs); } && install_docs
-FONTSNAME ?= $(GARNAME)
+FONTSNAME ?= $(strip $(GARNAME))
INSTALL_FONTS = install_fonts () { mkdir -p
$(packageprefix)/share/fonts/$(FONTSNAME) && cp -R "$$@"
$(packageprefix)/share/fonts/$(FONTSNAME); } && install_fonts
INSTALL_SYSCONF = install_sysconf () { mkdir -p $(sysconfdir) && install -m644
$$* $(sysconfdir); } && install_sysconf
INSTALL_LADSPA = install_ladspa () { mkdir -p $(packageprefix)/lib/ladspa &&
install -m755 $$* $(packageprefix)/lib/ladspa; } && install_ladspa
@@ -1037,7 +1037,7 @@
|| $(SYSINSTALL_FAIL)
cat Makefile $(CHECKSUM_FILE) | sha256sum > $(dotgardir)/BUILD $(OUTPUT)
-SYSINSTALL_FAIL = (rm -f $(packagesdir)/$(GARNAME) $(COOKIEDIR)/sysinstall-*;
false)
+SYSINSTALL_FAIL = (rm -f $(packagesdir)/$(strip $(GARNAME))
$(COOKIEDIR)/sysinstall-*; false)
sysinstall-install:
@printf "[$(OK)sysinstall$(OFF)] $(MSG)Installing to $(prefix)$(OFF)\n"
@@ -1051,7 +1051,7 @@
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)/$(strip $(GARNAME))
sysinstall-uninstall-pkg:
rm -rvf $(packagedir) $(OUTPUT)
=== modified file 'gar.mk'
--- a/gar.mk 2014-05-23 16:49:28 +0000
+++ b/gar.mk 2014-09-26 12:41:08 +0000
@@ -37,7 +37,7 @@
TEMPDIR = $(GARDIR_ABSOLUTE)/gar.tmp
FILEDIR ?= files
DOWNLOADDIR ?= download
-COOKIEDIR ?= cookies/$(DISTNAME)$(GARPROFILE)
+COOKIEDIR ?= cookies/$(DISTNAME)$(strip $(GARPROFILE))
WORKDIR ?= work
LOGDIR ?= logs
WORKSRC ?= $(WORKDIR)/$(DISTNAME)
@@ -56,12 +56,12 @@
WORKOBJ_CHANGED_P = $(filter-out $(WORKSRC),$(WORKOBJ))
LEAVE_WORKOBJ = $(subst $(strip ) ,/,$(patsubst %,..,$(subst /, ,$(WORKOBJ))))
-UPSTREAMNAME ?= $(GARNAME)
-DISTNAME ?= $(UPSTREAMNAME)-$(GARVERSION)
+UPSTREAMNAME ?= $(strip $(GARNAME))
+DISTNAME ?= $(UPSTREAMNAME)-$(strip $(GARVERSION))
ALLFILES ?= $(DISTFILES) $(PATCHFILES) $(SIGFILES)
-OLDVERSIONS ?= $(subst $(GARNAME)-,,$(filter-out $(DISTNAME),$(notdir
$(wildcard $(packagesdir)/$(GARNAME)-*))))
+OLDVERSIONS ?= $(subst $(strip $(GARNAME))-,,$(filter-out $(DISTNAME),$(notdir
$(wildcard $(packagesdir)/$(strip $(GARNAME))-*))))
# For rules that do nothing, display what dependencies they
# successfully completed
@@ -137,7 +137,7 @@
pkg-info:
@printf "$(MSG)Name:$(OFF) $(NAME)\n"
- @printf "$(MSG)Version:$(OFF) $(GARVERSION)$(if
$(PATCHNUM),-$(PATCHNUM))\n"
+ @printf "$(MSG)Version:$(OFF) $(GARVERSION)$(if
$(PATCHNUM),-$(strip $(PATCHNUM)))\n"
@printf "$(MSG)URL:$(OFF) $(subst %,%%,$(HOME_URL))\n"
@printf "$(MSG)Description:$(OFF)\n"
@printf ' $(if $(BLURB),$(subst %,%%,$(subst $(newline),\n ,$(BLURB))),
$(DESCRIPTION))\n'
@@ -316,17 +316,17 @@
install-src: clean extract
@printf "[$(OK)install-src$(OK)] $(MSG)Installing
$(GARNAME)-$(GARVERSION) source code$(OFF)\n"
- mkdir -p $(SRCDIR)/$(GARNAME)-$(GARVERSION)
- cp -r $(WORKSRC)/* $(SRCDIR)/$(GARNAME)-$(GARVERSION)
+ mkdir -p $(SRCDIR)/$(strip $(GARNAME))-$(strip $(GARVERSION))
+ cp -r $(WORKSRC)/* $(SRCDIR)/$(strip $(GARNAME))-$(strip $(GARVERSION))
$(MAKECOOKIE)
install-src-p:
- @test -d $(SRCDIR)/$(GARNAME)-$(GARVERSION)
+ @test -d $(SRCDIR)/$(strip $(GARNAME))-$(strip $(GARVERSION))
uninstall-src:
@printf "[$(OK)uninstall-src$(OK)] $(MSG)Uninstalling
$(GARNAME)-$(GARVERSION) source code$(OFF)\n"
- [ -d $(SRCDIR)/$(GARNAME)-$(GARVERSION) ] && \
- rm -rvf $(SRCDIR)/$(GARNAME)-$(GARVERSION)
+ [ -d $(SRCDIR)/$(strip $(GARNAME))-$(strip $(GARVERSION)) ] && \
+ rm -rvf $(SRCDIR)/$(strip $(GARNAME))-$(strip $(GARVERSION))
$(MAKECOOKIE)
uninstall-src-old:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] trunk r3082: strip trailing whitespace from GARNAME/PROFILE/VERSION when building up directory names,
Brandon Invergo <=