[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11843: tweak the snapshot directory
From: |
Rob Savoye |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11843: tweak the snapshot directory name so it works with both debian and redhat style packaging, |
Date: |
Fri, 29 Jan 2010 13:42:02 -0700 |
User-agent: |
Bazaar (2.0.2) |
------------------------------------------------------------
revno: 11843
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Fri 2010-01-29 13:42:02 -0700
message:
tweak the snapshot directory name so it works with both debian and redhat
style packaging,
modified:
packaging/deb.am
packaging/debian/rules
packaging/rpm.am
packaging/snapshot.am
=== modified file 'packaging/deb.am'
--- a/packaging/deb.am 2010-01-29 01:13:16 +0000
+++ b/packaging/deb.am 2010-01-29 20:42:02 +0000
@@ -24,7 +24,10 @@
# all the right places. This involves editing the debian/changelog
# file. Configure.ac is edited by the snapshot target.
setup-deb:
- snapshot_dir="$(SNAPSHOT_DIR)"; \
+ snapshot_dir="gnash-$(SNAPSHOT_VERSION)"; \
+ if test -d $(SNAPSHOT_DIR); then \
+ mv $(SNAPSHOT_DIR) $${snapshot_dir}; \
+ fi; \
mkdir -p $${snapshot_dir}/debian; \
cp -rfp $(srcdir)/packaging/debian/* $${snapshot_dir}/debian/; \
if test -e $${snapshot_dir}/debian/changelog; then \
@@ -33,7 +36,7 @@
fi;
snapshot-deb:
- snapshot_dir="$(SNAPSHOT_DIR)"; \
+ snapshot_dir="gnash-$(SNAPSHOT_VERSION)"; \
(cd $${snapshot_dir}; dpkg-buildpackage -rfakeroot -j4)
# these files are created when building packages
=== modified file 'packaging/debian/rules'
--- a/packaging/debian/rules 2010-01-29 19:36:05 +0000
+++ b/packaging/debian/rules 2010-01-29 20:42:02 +0000
@@ -83,11 +83,11 @@
dh_testdir
@printf "\n == MAKE
======================================================== \n\n"
- $(MAKE)
+ $(MAKE)
@printf "\n ----------------------------------------------- End of MAKE
---- \n\n"
# @printf "\n == CHECK
======================================================= \n\n"
-# $(MAKE) check
+# $(MAKE) -C debuild check
# @printf "\n ---------------------------------------------- End of CHECK
---- \n\n"
touch build-stamp
@@ -109,6 +109,7 @@
# we have no patches, we're the developers!
# $(MAKE) -f /usr/share/quilt/quilt.make unpatch
@printf "\n ----------------------------------- End of CLEANING PATCHES
---- \n\n"
+ # rm -rf debuild
dh_clean
=== modified file 'packaging/rpm.am'
--- a/packaging/rpm.am 2010-01-25 20:44:46 +0000
+++ b/packaging/rpm.am 2010-01-29 20:42:02 +0000
@@ -59,7 +59,7 @@
rpmbuild -bi --short-circuit $(RPMBUILD_FLAGS) gnash.spec
rpm-setup:
- cp $(SNAPSHOT_TAR) $${HOME}/rpmbuild/SOURCES/
+ cp $(SNAPSHOT_TAR) $${HOME}/rpmbuild/SOURCES/$(SNAPSHOT_DIR).tar.gz
# build klash and the konqueror plugin as a sepaate step.
rpm-klash:
=== modified file 'packaging/snapshot.am'
--- a/packaging/snapshot.am 2010-01-29 01:47:58 +0000
+++ b/packaging/snapshot.am 2010-01-29 20:42:02 +0000
@@ -28,7 +28,7 @@
# these is the directories where the snapshot gets built. Sources are
# in the top level, the build goes in a _build subdirectory
-SNAPSHOT_DIR = gnash-$(SNAPSHOT_VERSION)
+SNAPSHOT_DIR = gnash-$(BRANCH_NICK)$(BRANCH_REVNO)
SNAPSHOT_BUILD = $(SNAPSHOT_DIR)/_build
SNAPSHOT_NAME = $(SNAPSHOT_DIR)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r11843: tweak the snapshot directory name so it works with both debian and redhat style packaging,,
Rob Savoye <=