[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r6241 - in gnuradio/branches/features/deb: debian dtoo
From: |
jcorgan |
Subject: |
[Commit-gnuradio] r6241 - in gnuradio/branches/features/deb: debian dtools/bin |
Date: |
Fri, 31 Aug 2007 10:09:46 -0600 (MDT) |
Author: jcorgan
Date: 2007-08-31 10:09:46 -0600 (Fri, 31 Aug 2007)
New Revision: 6241
Added:
gnuradio/branches/features/deb/debian/make-build-area.sh
Modified:
gnuradio/branches/features/deb/debian/
gnuradio/branches/features/deb/debian/build-pkgs.sh
gnuradio/branches/features/deb/debian/rules
gnuradio/branches/features/deb/dtools/bin/extract_install_filenames
Log:
Reorganize rules file, clean up, fix bug in extract_install_filenames
Property changes on: gnuradio/branches/features/deb/debian
___________________________________________________________________
Name: svn:ignore
+ libgnuradio-core0-dev.install
Modified: gnuradio/branches/features/deb/debian/build-pkgs.sh
===================================================================
--- gnuradio/branches/features/deb/debian/build-pkgs.sh 2007-08-31 14:44:36 UTC
(rev 6240)
+++ gnuradio/branches/features/deb/debian/build-pkgs.sh 2007-08-31 16:09:46 UTC
(rev 6241)
@@ -4,8 +4,8 @@
svn-buildpackage \
--svn-ignore-new \
--svn-dont-clean \
+ --svn-dont-purge \
--svn-reuse \
- --svn-no-links \
-uc \
-us \
-nc \
Added: gnuradio/branches/features/deb/debian/make-build-area.sh
===================================================================
--- gnuradio/branches/features/deb/debian/make-build-area.sh
(rev 0)
+++ gnuradio/branches/features/deb/debian/make-build-area.sh 2007-08-31
16:09:46 UTC (rev 6241)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+cd ..
+svn-buildpackage \
+ --svn-export \
+ --svn-ignore-new
+
Property changes on: gnuradio/branches/features/deb/debian/make-build-area.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: gnuradio/branches/features/deb/debian/rules
===================================================================
--- gnuradio/branches/features/deb/debian/rules 2007-08-31 14:44:36 UTC (rev
6240)
+++ gnuradio/branches/features/deb/debian/rules 2007-08-31 16:09:46 UTC (rev
6241)
@@ -24,6 +24,30 @@
CFLAGS += -O2
endif
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+
+ if [ -f Makefile ]; \
+ then\
+ if [ -d .svn ]; \
+ then \
+ $(MAKE) maintainer-clean; \
+ else \
+ $(MAKE) distclean; \
+ fi; \
+ fi
+
+ dh_clean
+
+update:
+ dh_testdir
+ -test -r /usr/share/misc/config.sub && \
+ cp -f /usr/share/misc/config.sub config.sub
+ -test -r /usr/share/misc/config.guess && \
+ cp -f /usr/share/misc/config.guess config.guess
+
configure: configure-stamp
configure-stamp:
dh_testdir
@@ -37,39 +61,19 @@
--disable-gr-qtgui
touch configure-stamp
+extract: extract-stamp
+extract-stamp: configure-stamp
+ dh_testdir
+ debian/gen-install-files.sh
+ touch $@
+
build: build-stamp
-build-stamp: configure-stamp
+build-stamp: extract-stamp
$(MAKE)
$(MAKE) check
- # Some of these only exist after build
- debian/gen-install-files.sh
touch $@
-update:
- dh_testdir
- -test -r /usr/share/misc/config.sub && \
- cp -f /usr/share/misc/config.sub config.sub
- -test -r /usr/share/misc/config.guess && \
- cp -f /usr/share/misc/config.guess config.guess
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- if [ -f Makefile ]; \
- then\
- if [ -d .svn ]; \
- then \
- $(MAKE) maintainer-clean; \
- else \
- $(MAKE) distclean; \
- fi; \
- fi
-
- dh_clean
-
install: install-stamp
install-stamp: build-stamp
dh_testdir
Modified: gnuradio/branches/features/deb/dtools/bin/extract_install_filenames
===================================================================
--- gnuradio/branches/features/deb/dtools/bin/extract_install_filenames
2007-08-31 14:44:36 UTC (rev 6240)
+++ gnuradio/branches/features/deb/dtools/bin/extract_install_filenames
2007-08-31 16:09:46 UTC (rev 6241)
@@ -70,9 +70,9 @@
(head, tail) = os.path.split(makefile_name)
if head:
# cd to directory that contained the original Makefile
- cmd = 'cd %s; make -f %s extract_install_filenames' % (head, tmp_name)
+ cmd = 'cd %s; make -s -f %s extract_install_filenames' % (head,
tmp_name)
else:
- cmd = 'make -f %s extract_install_filenames' % (tmp_name,)
+ cmd = 'make -s -f %s extract_install_filenames' % (tmp_name,)
#print "cmd =", cmd
make = os.popen(cmd, 'r')
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r6241 - in gnuradio/branches/features/deb: debian dtools/bin,
jcorgan <=