[Commit-gnuradio] r8514 - in usrp2/trunk/host-ng: . apps lib usrp2

[jcorgan]

Author: jcorgan
Date: 2008-05-28 09:40:06 -0600 (Wed, 28 May 2008)
New Revision: 8514

Added:
   usrp2/trunk/host-ng/apps/
   usrp2/trunk/host-ng/apps/Makefile.am
   usrp2/trunk/host-ng/apps/test_usrp2.cc
   usrp2/trunk/host-ng/lib/
   usrp2/trunk/host-ng/lib/Makefile.am
   usrp2/trunk/host-ng/lib/basic.cc
   usrp2/trunk/host-ng/usrp2/
   usrp2/trunk/host-ng/usrp2/Makefile.am
   usrp2/trunk/host-ng/usrp2/basic.h
Modified:
   usrp2/trunk/host-ng/
   usrp2/trunk/host-ng/Makefile.am
   usrp2/trunk/host-ng/Makefile.common
   usrp2/trunk/host-ng/configure.ac
Log:
Skeleton directory layout and stub files to implement host library practices
similarly to how Boost does things:

  * C++ namespace 'usrp2'.  

  * Include files in <usrp2/...> hierarchy.  Installation of include files will
    now go into $(includedir)/usrp2 (typically, '/usr/local/include/usrp2'). 
    In-tree include hierarchy is rooted at top-level.

  * Dropping usrp2_ prefix on .cc and .h file names.

Right now, the created library is libusrp2ng.so.  This is to allow parallel
installation and testing with the existing libusrp2.so.




Property changes on: usrp2/trunk/host-ng
___________________________________________________________________
Name: svn:ignore
   - configure
Makefile.in
config.log
config.status
config.guess
stamp-h1
config.h
ltmain.sh
config.sub
config.h.in
libtool
autom4te.cache
missing
aclocal.m4
Makefile
install-sh

   + configure
Makefile.in
config.log
config.status
config.guess
stamp-h1
config.h
ltmain.sh
config.sub
config.h.in
libtool
autom4te.cache
missing
aclocal.m4
Makefile
install-sh
depcomp
usrp2*.tar.gz


Modified: usrp2/trunk/host-ng/Makefile.am
===================================================================
--- usrp2/trunk/host-ng/Makefile.am     2008-05-28 14:03:11 UTC (rev 8513)
+++ usrp2/trunk/host-ng/Makefile.am     2008-05-28 15:40:06 UTC (rev 8514)
@@ -26,4 +26,4 @@
        configure \
        config.h.in
 
-SUBDIRS = config
+SUBDIRS = config usrp2 lib apps

Modified: usrp2/trunk/host-ng/Makefile.common
===================================================================
--- usrp2/trunk/host-ng/Makefile.common 2008-05-28 14:03:11 UTC (rev 8513)
+++ usrp2/trunk/host-ng/Makefile.common 2008-05-28 15:40:06 UTC (rev 8514)
@@ -19,10 +19,11 @@
 AM_CXXFLAGS = @autoconf_default_CXXFLAGS@
 
 STD_DEFINES_AND_INCLUDES = \
+  -I$(top_srcdir) \
   -I$(top_srcdir)/../firmware/include \
-  -I$(top_srcdir)/lib \
   $(GNURADIO_CORE_CFLAGS)
 
+
 # includes
 grincludedir   = $(includedir)/gnuradio
 swigincludedir = $(grincludedir)/swig
@@ -44,3 +45,4 @@
 RM=$(RM_PROG) -f
 
 MOSTLYCLEANFILES = *~ *.pyc *.pyo *.loT
+DISTCLEANFILES = Makefile.in


Property changes on: usrp2/trunk/host-ng/apps
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in
.libs
.deps
test_usrp2


Added: usrp2/trunk/host-ng/apps/Makefile.am
===================================================================
--- usrp2/trunk/host-ng/apps/Makefile.am                                (rev 0)
+++ usrp2/trunk/host-ng/apps/Makefile.am        2008-05-28 15:40:06 UTC (rev 
8514)
@@ -0,0 +1,32 @@
+#
+# Copyright 2007, 2008 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+include $(top_srcdir)/Makefile.common
+
+INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES)
+
+LDADD = \
+       ../lib/libusrp2ng.la
+
+noinst_PROGRAMS = \
+       test_usrp2
+
+test_usrp2_SOURCES = \
+       test_usrp2.cc
+
+TESTS = \
+       test_usrp2

Added: usrp2/trunk/host-ng/apps/test_usrp2.cc
===================================================================
--- usrp2/trunk/host-ng/apps/test_usrp2.cc                              (rev 0)
+++ usrp2/trunk/host-ng/apps/test_usrp2.cc      2008-05-28 15:40:06 UTC (rev 
8514)
@@ -0,0 +1,31 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007,2008 Free Software Foundation, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <usrp2/basic.h>
+
+int
+main(int argc, char **argv)
+{
+  usrp2::basic_sptr u2 = usrp2::make_basic();
+
+  return 0;
+}

Modified: usrp2/trunk/host-ng/configure.ac
===================================================================
--- usrp2/trunk/host-ng/configure.ac    2008-05-28 14:03:11 UTC (rev 8513)
+++ usrp2/trunk/host-ng/configure.ac    2008-05-28 15:40:06 UTC (rev 8514)
@@ -17,7 +17,7 @@
 AC_INIT
 AC_PREREQ(2.57)
 AM_CONFIG_HEADER(config.h)
-dnl AC_CONFIG_SRCDIR([lib/gri_ethernet.h])
+AC_CONFIG_SRCDIR([lib/basic.cc])
 
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
@@ -203,7 +203,10 @@
  
 AC_CONFIG_FILES([\
     Makefile \
+    apps/Makefile \
     config/Makefile \
+    lib/Makefile \
+    usrp2/Makefile \
 ])
 
 dnl run_tests.sh is created from run_tests.in.sh.  Make it executable.


Property changes on: usrp2/trunk/host-ng/lib
___________________________________________________________________
Name: svn:ignore
   + .libs
.deps
Makefile
Makefile.in


Copied: usrp2/trunk/host-ng/lib/Makefile.am (from rev 8512, 
usrp2/trunk/host/lib/Makefile.am)
===================================================================
--- usrp2/trunk/host-ng/lib/Makefile.am                         (rev 0)
+++ usrp2/trunk/host-ng/lib/Makefile.am 2008-05-28 15:40:06 UTC (rev 8514)
@@ -0,0 +1,30 @@
+#
+# Copyright 2007,2008 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+include $(top_srcdir)/Makefile.common
+
+INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES)
+
+lib_LTLIBRARIES = \
+       libusrp2ng.la
+
+libusrp2ng_la_SOURCES = \
+       basic.cc
+
+libusrp2ng_la_LIBADD = \
+       $(GR_OMNITHREAD_LIBS)
+

Added: usrp2/trunk/host-ng/lib/basic.cc
===================================================================
--- usrp2/trunk/host-ng/lib/basic.cc                            (rev 0)
+++ usrp2/trunk/host-ng/lib/basic.cc    2008-05-28 15:40:06 UTC (rev 8514)
@@ -0,0 +1,37 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008 Free Software Foundation, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <usrp2/basic.h>
+
+usrp2::basic_sptr
+usrp2::make_basic()
+{
+  return usrp2::basic_sptr(new usrp2::basic());
+}
+
+usrp2::basic::basic()
+{
+}
+
+usrp2::basic::~basic()
+{
+}


Property changes on: usrp2/trunk/host-ng/usrp2
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in


Added: usrp2/trunk/host-ng/usrp2/Makefile.am
===================================================================
--- usrp2/trunk/host-ng/usrp2/Makefile.am                               (rev 0)
+++ usrp2/trunk/host-ng/usrp2/Makefile.am       2008-05-28 15:40:06 UTC (rev 
8514)
@@ -0,0 +1,27 @@
+#
+# Copyright 2008 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+include $(top_srcdir)/Makefile.common
+
+INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES)
+
+usrp2includedir = $(includedir)/usrp2
+
+usrp2include_HEADERS = \
+       basic.h
+
+EXTRA_DIST = $(usrp2include_INCLUDES)

Added: usrp2/trunk/host-ng/usrp2/basic.h
===================================================================
--- usrp2/trunk/host-ng/usrp2/basic.h                           (rev 0)
+++ usrp2/trunk/host-ng/usrp2/basic.h   2008-05-28 15:40:06 UTC (rev 8514)
@@ -0,0 +1,48 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008 Free Software Foundation, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef INCLUDED_USRP2_BASIC_H
+#define INCLUDED_USRP2_BASIC_H
+
+#include <boost/shared_ptr.hpp>
+#include <boost/utility.hpp>
+
+namespace usrp2 {
+
+// Shared pointer to usrp2::basic
+class basic;
+typedef boost::shared_ptr<basic> basic_sptr;
+
+// Factory function to return a new instance of usrp2::basic
+basic_sptr make_basic();
+
+class basic
+{
+private:
+  // Only factory function can instantiate this class
+  basic();
+  friend basic_sptr make_basic();
+  
+public:
+  ~basic();  
+
+};
+
+};
+
+#endif /* INCLUDED_USRP2_BASIC_H */