[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r10959 - in gnuradio/branches/developers/jcorgan/deb:
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r10959 - in gnuradio/branches/developers/jcorgan/deb: config debian gr-usrp2 gr-usrp2/src |
|
Date: |
Tue, 5 May 2009 13:34:05 -0600 (MDT) |
Author: jcorgan
Date: 2009-05-05 13:34:05 -0600 (Tue, 05 May 2009)
New Revision: 10959
Added:
gnuradio/branches/developers/jcorgan/deb/gr-usrp2/gnuradio-usrp2.pc.in
Modified:
gnuradio/branches/developers/jcorgan/deb/config/grc_gr_usrp2.m4
gnuradio/branches/developers/jcorgan/deb/debian/control
gnuradio/branches/developers/jcorgan/deb/debian/gen-install-files.sh
gnuradio/branches/developers/jcorgan/deb/debian/rules
gnuradio/branches/developers/jcorgan/deb/gr-usrp2/
gnuradio/branches/developers/jcorgan/deb/gr-usrp2/Makefile.am
gnuradio/branches/developers/jcorgan/deb/gr-usrp2/src/Makefile.am
Log:
wip, all C++ API library packages created
Modified: gnuradio/branches/developers/jcorgan/deb/config/grc_gr_usrp2.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/config/grc_gr_usrp2.m4
2009-05-05 18:35:39 UTC (rev 10958)
+++ gnuradio/branches/developers/jcorgan/deb/config/grc_gr_usrp2.m4
2009-05-05 19:34:05 UTC (rev 10959)
@@ -26,6 +26,7 @@
AC_CONFIG_FILES([ \
gr-usrp2/Makefile \
+ gr-usrp2/gnuradio-usrp2.pc \
gr-usrp2/src/Makefile \
gr-usrp2/src/run_tests \
])
Modified: gnuradio/branches/developers/jcorgan/deb/debian/control
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/debian/control 2009-05-05
18:35:39 UTC (rev 10958)
+++ gnuradio/branches/developers/jcorgan/deb/debian/control 2009-05-05
19:34:05 UTC (rev 10959)
@@ -1,3 +1,7 @@
+################################################################################
+# Single source deb for entire distribution
#
+################################################################################
+
Source: gnuradio
Section: comm
Priority: optional
@@ -7,10 +11,14 @@
Standards-Version: 3.7.2
XS-Python-Version: >= 2.5
+################################################################################
+# C++ auxiliary libraries
#
+################################################################################
+
Package: libgruel
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: libboost-date-time1.37.0, libboost-thread1.37.0
Description: GNU Radio Utility Etcetera Library
This package implements a variety of low-level utility
routines for GNU Radio.
@@ -18,7 +26,7 @@
Package: libgruel-dev
Section: libdevel
Architecture: any
-Depends: libgruel (= ${binary:Version}), libboost1.37-dev
+Depends: libgruel (= ${binary:Version}), libboost-date-time1.37-dev,
libboost-thread1.37-dev
Description: GNU Radio Utility Etcetera Library
This package implements a variety of low-level utility
routines for GNU Radio.
@@ -30,7 +38,6 @@
Architecture: any
Replaces: libgnuradio-omnithread0c2a
Conflicts: libgnuradio-omnithread0c2a
-Depends: ${shlibs:Depends}
Description: GNU Radio Omnithreads Abstraction Library
This package is a fork of the omniORB-4.0.1 threading library
for use with GNU Radio.
@@ -47,33 +54,12 @@
.
This package contains header files needed by developers.
-Package: libgnuradio-core
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}
-Conflicts: libgnuradio-core0, libgnuradio-core0c2, libgnuradio-core0c2a
-Replaces: libgnuradio-core0, libgnuradio-core0c2, libgnuradio-core0c2a
-Suggests: gnuradio-doc
-Description: The GNU Sofware Radio Core Library
- This package contains the core GNU Radio libraries.
-
-Package: libgnuradio-core-dev
-Section: libdevel
-Architecture: any
-Replaces: libgnuradio-core0-dev
-Conflicts: libgnuradio-core0-dev
-Depends: libgnuradio-core (= ${binary:Version}), libgnuradio-omnithread-dev,
libboost1.37-dev, libgruel-dev, libgsl0-dev, fftw3-dev | libfftw3-dev
-Description: The GNU Software Radio Core Library
- This package contains the core GNU Radio libraries.
- .
- This package contains header files needed by developers.
-
Package: libpmt
Section: libs
Architecture: any
Replaces: libpmt0c2a
Conflicts: libpmt0c2a
-Depends: ${shlibs:Depends}
+Depends: libgnuradio-omnithread (= ${binary:Version})
Description: GNU Radio Polymorphic Type Library
This package implements polymorphic types. These are similar
to lisp or Python data objects, and implement transparent
@@ -84,7 +70,7 @@
Architecture: any
Replaces: libpmt0-dev
Conflicts: libpmt0-dev
-Depends: libpmt (= ${binary:Version}), libgnuradio-omnithread-dev,
libboost1.37-dev
+Depends: libpmt (= ${binary:Version}), libgnuradio-omnithread-dev (=
${binary:Version})
Description: GNU Radio Polymorphic Type Library
This package implements polymorphic types. These are similar
to lisp or Python data objects, and implement transparent
@@ -92,12 +78,16 @@
.
This package contains header files needed by developers.
+################################################################################
+# C++ M-Block library packages
#
+################################################################################
+
Package: libmblock
Section: libs
Architecture: any
Replaces: libmblock0c2a
Conflicts: libmblock0c2a
-Depends: ${shlibs:Depends}
+Depends: libpmt (= ${binary:Version}), libgnuradio-omnithread (=
${binary:Version})
Description: GNU Radio Message Block Library
This package provides the GNU Radio message block library.
@@ -106,50 +96,20 @@
Architecture: any
Replaces: libmblock0-dev
Conflicts: libmblock0-dev
-Depends: libmblock (= ${binary:Version}), libgnuradio-omnithread-dev,
libpmt-dev
+Depends: libmblock (= ${binary:Version}), libgnuradio-omnithread-dev (=
${binary:Version}), libpmt-dev (= ${binary:Version})
Description: GNU Radio Message Block Library
This package provides the GNU Radio message block library.
.
This package contains header files needed by developers.
-Package: libgnuradio-audio-alsa
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: GNU Radio C++ block for ALSA sound system
- This package contains the ALSA sound system driver for GNU Radio.
+################################################################################
+# C++ USRP/USRP2 library packages
#
+################################################################################
-Package: libgnuradio-audio-alsa-dev
-Section: libdevel
-Architecture: any
-Depends: libgnuradio-audio-alsa (= ${binary:Version}), libgnuradio-core-dev
-Description: GNU Radio C++ block for ALSA sound system
- This package contains the ALSA sound system driver for GNU Radio.
- .
- This package contains header files needed by developers.
-
-Package: libgnuradio-qtgui
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: GNU Radio C++ blocks fro QT-based GUI applications
- This package contains the C++ library for using GNU Radio inside
- QT-based GUI applications.
-
-Package: libgnuradio-qtgui-dev
-Section: libdevel
-Architecture: any
-Depends: libgnuradio-qtgui (= ${binary:Version}), libgnuradio-core-dev,
libqt4-dev
-Description: GNU Radio C++ blocks fro QT-based GUI applications
- This package contains the C++ library for using GNU Radio inside
- QT-based GUI applications.
- .
- This package contains header files needed by developers.
-
Package: libusrp
Section: comm
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: libusb-0.1-4
Replaces: libusrp0, libusrp0c2a, usrp-firmware
Suggests: usrp-doc
Description: Client side library for the USRP(1) hardware
@@ -184,7 +144,7 @@
Package: libusrp2
Section: comm
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: libboost-thread1.37.0, libgruel (= ${binary:Version}),
libgnuradio-omnithread (= ${binary:Version})
Suggests: usrp-doc
Description: Client side library for the USRP2 hardware
The Universal Software Radio Peripheral 2 (USRP2) is a GbE-connected,
@@ -200,7 +160,7 @@
Package: libusrp2-dev
Section: libdevel
Architecture: any
-Depends: libusrp2 (= ${binary:Version}), libboost1.37-dev,
libgnuradio-omnithread-dev, libgruel-dev
+Depends: libusrp2 (= ${binary:Version}), libboost1.37-dev,
libgnuradio-omnithread-dev (= ${binary:Version}), libgruel-dev (=
${binary:Version})
Description: Client side library for the USRP(1) hardware
The Universal Software Radio Peripheral 2 (USRP2) is a GbE-connected,
low-cost and open board. It features two high-speed analog-to-digital
@@ -214,6 +174,105 @@
.
This package contains header files needed by developers.
+################################################################################
+# C++ GNU Radio block library packages
#
+################################################################################
+
+Package: libgnuradio-core
+Section: libs
+Architecture: any
+Depends: libgruel (= ${binary:Version}), libgnuradio-omnithread (=
${binary:Version}), libboost-thread1.37.0, libboost-date-time1.37.0,
libfftw3-3, libgsl0ldbl
+Conflicts: libgnuradio-core0, libgnuradio-core0c2, libgnuradio-core0c2a
+Replaces: libgnuradio-core0, libgnuradio-core0c2, libgnuradio-core0c2a
+Suggests: gnuradio-doc
+Description: The GNU Sofware Radio Core Library
+ This package contains the core GNU Radio libraries.
+
+Package: libgnuradio-core-dev
+Section: libdevel
+Architecture: any
+Replaces: libgnuradio-core0-dev
+Conflicts: libgnuradio-core0-dev
+Depends: libgnuradio-core (= ${binary:Version}), libgruel-dev (=
${binary:Version}), libgnuradio-omnithread-dev (= ${binary:Version}),
libboost-thread1.37-dev, libboost-date-time1.37-dev, libgsl0-dev, libfftw3-dev
+Description: The GNU Software Radio Core Library
+ This package contains the core GNU Radio libraries.
+ .
+ This package contains header files needed by developers.
+
+Package: libgnuradio-audio-alsa
+Section: libs
+Architecture: any
+Depends: libgnuradio-core (= ${binary:Version}), libasound2
+Description: GNU Radio C++ block for ALSA sound system
+ This package contains the ALSA sound system driver for GNU Radio.
+
+Package: libgnuradio-audio-alsa-dev
+Section: libdevel
+Architecture: any
+Depends: libgnuradio-audio-alsa (= ${binary:Version}), libgnuradio-core-dev (=
${binary:Version}), libasound2-dev
+Description: GNU Radio C++ block for ALSA sound system
+ This package contains the ALSA sound system driver for GNU Radio.
+ .
+ This package contains header files needed by developers.
+
+Package: libgnuradio-qtgui
+Section: libs
+Architecture: any
+Depends: libgnuradio-core (= ${binary:Version}), libqt4-opengl, libqtcore4,
libqtgui4, libqwt5-qt4, libqwtplot3d-qt4
+Description: GNU Radio C++ blocks fro QT-based GUI applications
+ This package contains the C++ library for using GNU Radio inside
+ QT-based GUI applications.
+
+Package: libgnuradio-qtgui-dev
+Section: libdevel
+Architecture: any
+Depends: libgnuradio-qtgui (= ${binary:Version}), libgnuradio-core-dev (=
${binary:Version}), libqt4-dev, libqwtplot3d-qt4-dev
+Description: GNU Radio C++ blocks fro QT-based GUI applications
+ This package contains the C++ library for using GNU Radio inside
+ QT-based GUI applications.
+ .
+ This package contains header files needed by developers.
+
+Package: libgnuradio-usrp
+Section: libs
+Architecture: any
+Depends: libgnuradio-core (= ${binary:Version}), libusrp (= ${binary:Version})
+Description: GNU Radio C++ blocks for USRP(1) hardware
+ This package contains the C++ API blocks for the Universal Software Radio
+ Peripheral.
+
+Package: libgnuradio-usrp-dev
+Section: libdevel
+Architecture: any
+Depends: libgnuradio-usrp (= ${binary:Version}), libgnuradio-core-dev (=
${binary:Version}), libusrp-dev (= ${binary:Version})
+Description: GNU Radio C++ blocks for USRP(1) hardware
+ This package contains the C++ API blocks for the Universal Software Radio
+ Peripheral.
+ .
+ This package contains header files needed by developers.
+
+Package: libgnuradio-usrp2
+Section: libs
+Architecture: any
+Depends: libgnuradio-core (= ${binary:Version}), libusrp2 (= ${binary:Version})
+Description: GNU Radio C++ blocks for USRP(1) hardware
+ This package contains the C++ API blocks for the Universal Software Radio
+ Peripheral.
+
+Package: libgnuradio-usrp2-dev
+Section: libdevel
+Architecture: any
+Depends: libgnuradio-usrp2 (= ${binary:Version}), libgnuradio-core-dev (=
${binary:Version}), libusrp2-dev (= ${binary:Version})
+Description: GNU Radio C++ blocks for USRP(1) hardware
+ This package contains the C++ API blocks for the Universal Software Radio
+ Peripheral.
+ .
+ This package contains header files needed by developers.
+
+################################################################################
+# Documentation packages
#
+################################################################################
+
Package: gnuradio-doc
Section: doc
Architecture: all
Modified: gnuradio/branches/developers/jcorgan/deb/debian/gen-install-files.sh
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/debian/gen-install-files.sh
2009-05-05 18:35:39 UTC (rev 10958)
+++ gnuradio/branches/developers/jcorgan/deb/debian/gen-install-files.sh
2009-05-05 19:34:05 UTC (rev 10959)
@@ -2,6 +2,23 @@
EXTRACT=dtools/bin/extract_install_filenames
+# libusrp-dev
+NAME=debian/libusrp-dev.install
+rm -f $NAME
+touch $NAME
+$EXTRACT usrp/host/lib/legacy/Makefile include_HEADERS >>$NAME
+$EXTRACT usrp/firmware/include/Makefile include_HEADERS >>$NAME
+echo usr/lib/libusrp.so >>$NAME
+echo usr/lib/pkgconfig/usrp.pc >>$NAME
+
+# libusrp2-dev
+NAME=debian/libusrp2-dev.install
+rm -f $NAME
+touch $NAME
+$EXTRACT usrp2/host/include/usrp2/Makefile usrp2include_HEADERS >>$NAME
+echo usr/lib/libusrp2.so >>$NAME
+echo usr/lib/pkgconfig/usrp2.pc >>$NAME
+
# libgnuradio-core-dev
NAME=debian/libgnuradio-core-dev.install
rm -f $NAME
@@ -57,23 +74,38 @@
$EXTRACT gr-qtgui/src/lib/Makefile grinclude_HEADERS >>$NAME
echo usr/lib/libgnuradio-qtgui.so >>$NAME
-# libusrp-dev
-NAME=debian/libusrp-dev.install
+# libgnuradio-usrp
+NAME=debian/libgnuradio-usrp.install
rm -f $NAME
touch $NAME
-$EXTRACT usrp/host/lib/legacy/Makefile include_HEADERS >>$NAME
-$EXTRACT usrp/firmware/include/Makefile include_HEADERS >>$NAME
-echo usr/lib/libusrp.so >>$NAME
-echo usr/lib/pkgconfig/usrp.pc >>$NAME
+$EXTRACT gr-usrp/src/Makefile lib_LTLIBRARIES >>$NAME
+$EXTRACT gr-usrp/src/Makefile lib_LTLIBRARIES | \
+ sed -e 's/\.la$/.so.*/' >>$NAME
+echo usr/lib/pkgconfig/gnuradio-usrp.pc >> $NAME
-# libusrp2-dev
-NAME=debian/libusrp2-dev.install
+# libgnuradio-usrp-dev
+NAME=debian/libgnuradio-usrp-dev.install
rm -f $NAME
touch $NAME
-$EXTRACT usrp2/host/include/usrp2/Makefile usrp2include_HEADERS >>$NAME
-echo usr/lib/libusrp2.so >>$NAME
-echo usr/lib/pkgconfig/usrp2.pc >>$NAME
+$EXTRACT gr-usrp/src/Makefile grinclude_HEADERS >>$NAME
+echo usr/lib/libgnuradio-usrp.so >>$NAME
+# libgnuradio-usrp2
+NAME=debian/libgnuradio-usrp2.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-usrp2/src/Makefile lib_LTLIBRARIES >>$NAME
+$EXTRACT gr-usrp2/src/Makefile lib_LTLIBRARIES | \
+ sed -e 's/\.la$/.so.*/' >>$NAME
+echo usr/lib/pkgconfig/gnuradio-usrp2.pc >> $NAME
+
+# libgnuradio-usrp2-dev
+NAME=debian/libgnuradio-usrp2-dev.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-usrp2/src/Makefile grinclude_HEADERS >>$NAME
+echo usr/lib/libgnuradio-usrp2.so >>$NAME
+
exit 0
# python-gnuradio-core
Modified: gnuradio/branches/developers/jcorgan/deb/debian/rules
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/debian/rules 2009-05-05
18:35:39 UTC (rev 10958)
+++ gnuradio/branches/developers/jcorgan/deb/debian/rules 2009-05-05
19:34:05 UTC (rev 10959)
@@ -111,7 +111,7 @@
dh_shlibdeps
dh_gencontrol
dh_md5sums
- dh_builddeb
+ dh_builddeb --destdir=../debfiles
# Build architecture independant packages using the common target.
binary-indep: build install
Property changes on: gnuradio/branches/developers/jcorgan/deb/gr-usrp2
___________________________________________________________________
Modified: svn:ignore
- .libs
.deps
Makefile
Makefile.in
*.pyc
usrp2.cc
usrp2.py
test_gr_usrp2
+ Makefile
Makefile.in
gnuradio-usrp2.pc
Modified: gnuradio/branches/developers/jcorgan/deb/gr-usrp2/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/gr-usrp2/Makefile.am
2009-05-05 18:35:39 UTC (rev 10958)
+++ gnuradio/branches/developers/jcorgan/deb/gr-usrp2/Makefile.am
2009-05-05 19:34:05 UTC (rev 10959)
@@ -1,5 +1,5 @@
#
-# Copyright 2001,2006,2008 Free Software Foundation, Inc.
+# Copyright 2001,2006,2008,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -22,3 +22,6 @@
include $(top_srcdir)/Makefile.common
SUBDIRS = src
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = gnuradio-usrp2.pc
Added: gnuradio/branches/developers/jcorgan/deb/gr-usrp2/gnuradio-usrp2.pc.in
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/gr-usrp2/gnuradio-usrp2.pc.in
(rev 0)
+++ gnuradio/branches/developers/jcorgan/deb/gr-usrp2/gnuradio-usrp2.pc.in
2009-05-05 19:34:05 UTC (rev 10959)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@/gnuradio
+
+Name: gnuradio-usrp2
+Description: GNU Software Radio support for Universal Software Radio
Peripheral 2
+Requires: gnuradio-core usrp2
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-usrp2
+Cflags: -I${includedir}
Modified: gnuradio/branches/developers/jcorgan/deb/gr-usrp2/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/deb/gr-usrp2/src/Makefile.am
2009-05-05 18:35:39 UTC (rev 10958)
+++ gnuradio/branches/developers/jcorgan/deb/gr-usrp2/src/Makefile.am
2009-05-05 19:34:05 UTC (rev 10959)
@@ -49,9 +49,9 @@
$(USRP2_INCLUDES) \
$(WITH_INCLUDES)
-lib_LTLIBRARIES = libgr-usrp2.la
+lib_LTLIBRARIES = libgnuradio-usrp2.la
-libgr_usrp2_la_SOURCES = \
+libgnuradio_usrp2_la_SOURCES = \
rx_16sc_handler.cc \
rx_32fc_handler.cc \
usrp2_base.cc \
@@ -62,7 +62,7 @@
usrp2_sink_16sc.cc \
usrp2_sink_32fc.cc
-libgr_usrp2_la_LIBADD = \
+libgnuradio_usrp2_la_LIBADD = \
$(USRP2_LA) \
$(GNURADIO_CORE_LA)
@@ -102,7 +102,7 @@
# additional libraries for linking with the SWIG-generated library
usrp2_la_swig_libadd = \
- libgr-usrp2.la
+ libgnuradio-usrp2.la
include $(top_srcdir)/Makefile.swig
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r10959 - in gnuradio/branches/developers/jcorgan/deb: config debian gr-usrp2 gr-usrp2/src,
jcorgan <=