Author: ivucica
Date: Sun May 11 03:07:59 2014
New Revision: 37875
URL: http://svn.gna.org/viewcvs/gnustep?rev=37875&view=rev
Log:
Fixed version string when using SVN revision suffix and date-time suffix (to
ensure proper ordering by Debian packaging tools). Removed dependency of 'make
deb' on 'make debfiles'.
Modified:
tools/make/trunk/ChangeLog
tools/make/trunk/GNUmakefile.in
tools/make/trunk/Master/deb.make
tools/make/trunk/Master/source-distribution.make
Modified: tools/make/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/ChangeLog?rev=37875&r1=37874&r2=37875&view=diff
==============================================================================
--- tools/make/trunk/ChangeLog (original)
+++ tools/make/trunk/ChangeLog Sun May 11 03:07:59 2014
@@ -1,3 +1,22 @@
+2014-05-11 Ivan Vucica <[email protected]>
+
+ * GNUmakefile.in: Date-time and svn-revision suffix are now using
+ the tilde character to ensure that the 'actual' commit and 'actual'
+ tagged release are treated as being newer by the Debian packaging.
+ Also stopped using periods in date-time.
+ debfiles target will no longer be automatically run, allowing for
+ build scripts to do some customization of debfiles inbetween, or
+ to permit the packager maintain the debfiles separately.
+ * Master/deb.make: Slightly cleaner build dependency line for
+ gnustep-make.
+ The version of gnustep-make we build-depend on is now read using
+ dpkg -s.
+ * Master/source-distribution.make: Date-time and svn-revision
+ suffix are now using the tilde character to ensure that the
+ 'actual' commit and 'actual' tagged release are treated as being
+ newer by the Debian packaging. Also stopped using periods in
+ date-time.
+
2014-05-06 Ivan Vucica <[email protected]>
* bake_debian_files.sh: If DEB_DEPENDS is non-empty, prepend a
Modified: tools/make/trunk/GNUmakefile.in
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/GNUmakefile.in?rev=37875&r1=37874&r2=37875&view=diff
==============================================================================
--- tools/make/trunk/GNUmakefile.in (original)
+++ tools/make/trunk/GNUmakefile.in Sun May 11 03:07:59 2014
@@ -171,7 +171,7 @@
# Version code that will be used in 'svn-export' target. Expand immediately;
# it should be constant in the script.
-DATE_TIME_VERSION := $(shell date +%Y.%m.%d.%H.%M)
+DATE_TIME_VERSION := $(shell date +%Y%m%d%H%M)
# Revision; potentially expensive so expand when used.
SVN_REVISION = $(shell svn info . | sed -ne 's/^Revision: //p')
@@ -386,18 +386,18 @@
svn-snapshot:
svn export $(SVNPREFIX)/trunk \
- gnustep-make-$(GNUSTEP_MAKE_VERSION).$(SVN_REVISION)
- tar --gzip -cf
gnustep-make-$(GNUSTEP_MAKE_VERSION).$(SVN_REVISION).tar.gz
gnustep-make-$(GNUSTEP_MAKE_VERSION).$(SVN_REVISION)
- echo $(GNUSTEP_MAKE_VERSION).$(SVN_REVISION) >
svn-snapshot-tarball-version
- rm -rf gnustep-make-$(GNUSTEP_MAKE_VERSION).$(SVN_REVISION)
+ gnustep-make-$(GNUSTEP_MAKE_VERSION)~svn$(SVN_REVISION)
+ tar --gzip -cf
gnustep-make-$(GNUSTEP_MAKE_VERSION)~svn$(SVN_REVISION).tar.gz
gnustep-make-$(GNUSTEP_MAKE_VERSION)~svn$(SVN_REVISION)
+ echo $(GNUSTEP_MAKE_VERSION)~svn$(SVN_REVISION) >
svn-snapshot-tarball-version
+ rm -rf gnustep-make-$(GNUSTEP_MAKE_VERSION)~svn$(SVN_REVISION)
svn-export:
@echo Note: any local changes are included.
svn export . \
-
gnustep-make-$(GNUSTEP_MAKE_VERSION).$(SVN_REVISION).$(DATE_TIME_VERSION)
- tar --gzip -cf
gnustep-make-$(GNUSTEP_MAKE_VERSION).$(SVN_REVISION).$(DATE_TIME_VERSION).tar.gz
gnustep-make-$(GNUSTEP_MAKE_VERSION).$(SVN_REVISION).$(DATE_TIME_VERSION)
- echo $(GNUSTEP_MAKE_VERSION).$(SVN_REVISION).$(DATE_TIME_VERSION) >
svn-export-tarball-version
- rm -rf
gnustep-make-$(GNUSTEP_MAKE_VERSION).$(SVN_REVISION).$(DATE_TIME_VERSION)
+
gnustep-make-$(GNUSTEP_MAKE_VERSION)~svn$(SVN_REVISION)~date$(DATE_TIME_VERSION)
+ tar --gzip -cf
gnustep-make-$(GNUSTEP_MAKE_VERSION)~svn$(SVN_REVISION)~date$(DATE_TIME_VERSION).tar.gz
gnustep-make-$(GNUSTEP_MAKE_VERSION)~svn$(SVN_REVISION)~date$(DATE_TIME_VERSION)
+ echo
$(GNUSTEP_MAKE_VERSION)~svn$(SVN_REVISION)~date$(DATE_TIME_VERSION) >
svn-export-tarball-version
+ rm -rf
gnustep-make-$(GNUSTEP_MAKE_VERSION)~svn$(SVN_REVISION)~date$(DATE_TIME_VERSION)
cvs-tag:
cvs -z3 rtag make-$(VERTAG) make
@@ -446,7 +446,11 @@
deb: debian_dist/gnustep-make_$(DEB_TARBALL_VERSION)_any.deb
-debian_dist/gnustep-make_$(DEB_TARBALL_VERSION)_any.deb: debfiles
+debian_dist/gnustep-make_$(DEB_TARBALL_VERSION)_any.deb:
+ $(EC)(if [ ! -e
"debian_dist/gnustep-make-$(DEB_TARBALL_VERSION)/debian/control" ] ; then \
+ echo "Please manually run 'make debfiles' first." ; \
+ echo "Intentionally not automatically depending to ease customization
between steps." ; \
+ fi)
cd debian_dist/gnustep-make-$(DEB_TARBALL_VERSION)/ && EDITOR=/bin/true
dpkg-source --commit -q . gnustep-make-automatic
cd debian_dist/gnustep-make-$(DEB_TARBALL_VERSION)/ && debuild
$(DEBUILD_ARGS) -S
cd debian_dist/gnustep-make-$(DEB_TARBALL_VERSION)/ && debuild
$(DEBUILD_ARGS) -b
Modified: tools/make/trunk/Master/deb.make
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/Master/deb.make?rev=37875&r1=37874&r2=37875&view=diff
==============================================================================
--- tools/make/trunk/Master/deb.make (original)
+++ tools/make/trunk/Master/deb.make Sun May 11 03:07:59 2014
@@ -84,10 +84,10 @@
#
ifeq ($(DEB_BUILD_DEPENDS),)
- DEB_BUILD_DEPENDS = gnustep-make (>= $(GNUSTEP_MAKE_VERSION))
+ DEB_BUILD_DEPENDS =gnustep-make (>= $(shell dpkg -s gnustep-make | grep
'Version: ' | sed 's/Version: //'))
export DEB_BUILD_DEPENDS
else
- DEB_BUILD_DEPENDS += , gnustep-make (>= $(GNUSTEP_MAKE_VERSION))
+ DEB_BUILD_DEPENDS +=, gnustep-make (>= $(shell dpkg -s gnustep-make | grep
'Version: ' | sed 's/Version: //'))
export DEB_BUILD_DEPENDS
endif
@@ -103,6 +103,7 @@
$(ECHO_NOTHING)(if [ -z "$(_DEB_TARBALL)" ] || [ ! -e "$(_DEB_TARBALL)"
] ; then \
echo "No tarball found. Please produce it manually using a target
such as dist, svn-dist, " ; \
echo "svn-bugfix, svn-snapshot or svn-export." ; \
+ echo "Expecting name $(VERSION_NAME).tar.gz in current or parent
directory." ; \
exit 1 ; \
fi)$(END_ECHO)
$(ECHO_NOTHING)echo "Baking deb control files
("$(GNUSTEP_TARGET_CPU)")..."$(END_ECHO)
Modified: tools/make/trunk/Master/source-distribution.make
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/Master/source-distribution.make?rev=37875&r1=37874&r2=37875&view=diff
==============================================================================
--- tools/make/trunk/Master/source-distribution.make (original)
+++ tools/make/trunk/Master/source-distribution.make Sun May 11 03:07:59 2014
@@ -147,13 +147,13 @@
ifeq ($(TARBALL_VERSION_INCLUDE_SVN_REVISION), yes)
# Revision; potentially expensive so expand when used.
SVN_REVISION = $(shell svn info . | sed -ne 's/^Revision: //p')
-TARBALL_VERSION := $(TARBALL_VERSION).$(SVN_REVISION)
+TARBALL_VERSION := $(TARBALL_VERSION)~svn$(SVN_REVISION)
endif
ifeq ($(TARBALL_VERSION_INCLUDE_DATE_TIME), yes)
# Expand immediately; it should be constant in the script.
-DATE_TIME_VERSION := $(shell date +%Y.%m.%d.%H.%M)
-TARBALL_VERSION := $(TARBALL_VERSION).$(DATE_TIME_VERSION)
+DATE_TIME_VERSION := $(shell date +%Y%m%d%H%M)
+TARBALL_VERSION := $(TARBALL_VERSION)~date$(DATE_TIME_VERSION)
endif
VERSION_NAME = $(PACKAGE_NAME)-$(TARBALL_VERSION)
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
