[hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5163: Give VCS-neutral names to C variables containing Bazaar metadata.
- From: noreply@xxxxxxxxxxxxx
- To: HIPL core team <hipl-dev@xxxxxxxxxxxxx>
- Date: Tue, 16 Nov 2010 14:45:51 -0000
------------------------------------------------------------
revno: 5163
committer: Diego Biurrun <diego@xxxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-11-16 15:38:02 +0100
message:
Give VCS-neutral names to C variables containing Bazaar metadata.
Some developers prefer to work with git as a VCS client, this change reflects
that fact. Furthermore, should HIPL change VCS systems one day, then there
will be one less adjustment to make.
modified:
Makefile.am
lib/core/util.h
packaging/create-package.sh
--
lp:hipl
https://code.launchpad.net/~hipl-core/hipl/trunk
Your team HIPL core team is subscribed to branch lp:hipl.
To unsubscribe from this branch go to
https://code.launchpad.net/~hipl-core/hipl/trunk/+edit-subscription
=== modified file 'Makefile.am'
--- Makefile.am 2010-11-12 17:49:42 +0000
+++ Makefile.am 2010-11-16 14:38:02 +0000
@@ -301,7 +301,7 @@
# when creating specific objects that may depend on version.h directly.
BUILT_SOURCES = version.h
$(srcdir)/version.h: $(wildcard $(srcdir)/.bzr/checkout/dirstate)
- bzr version-info $(srcdir) --custom --template='#define BZR_REVISION
"{revno}"\n#define BZR_DATE "{date}"\n#define BZR_BRANCH "{branch_nick}"\n' > $@
+ bzr version-info $(srcdir) --custom --template='#define VCS_REVISION
"{revno}"\n#define VCS_DATE "{date}"\n#define VCS_BRANCH "{branch_nick}"\n' > $@
# The complete doc/ subdirectory is in EXTRA_DIST, so files that should
=== modified file 'lib/core/util.h'
--- lib/core/util.h 2010-10-15 15:17:22 +0000
+++ lib/core/util.h 2010-11-16 14:38:02 +0000
@@ -43,7 +43,7 @@
static inline void hip_print_version(const char *name)
{
printf("%s %s (Bazaar branch-nick: '%s', revision: %s, commit date:
'%s')\n",
- name, VERSION, BZR_BRANCH, BZR_REVISION, BZR_DATE);
+ name, VERSION, VCS_BRANCH, VCS_REVISION, VCS_DATE);
printf("build configuration: %s\n", HIPL_CONFIGURATION);
}
=== modified file 'packaging/create-package.sh'
--- packaging/create-package.sh 2010-11-16 10:41:03 +0000
+++ packaging/create-package.sh 2010-11-16 14:38:02 +0000
@@ -48,7 +48,7 @@
mkdir -p $BUILDDIR/$SUBDIR
done
- RELEASE=$(grep BZR_REVISION $SRCDIR/version.h | cut -d\" -f2)
+ RELEASE=$(grep VCS_REVISION $SRCDIR/version.h | cut -d\" -f2)
echo "Version: $VERSION" > $SPECFILE
echo "Release: $RELEASE" >> $SPECFILE
Other related posts:
- » [hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5163: Give VCS-neutral names to C variables containing Bazaar metadata. - noreply
