[Commit-gnuradio] r9346 - in gnuradio/branches/developers/jblum/grc: config grc grc/data/grc grc/data/grc_gnuradio grc/data/grc_gnuradio/blocks grc/scripts grc/src/grc grc/src/grc_gnuradio

[jblum]

Author: jblum
Date: 2008-08-19 21:35:46 -0600 (Tue, 19 Aug 2008)
New Revision: 9346

Added:
   gnuradio/branches/developers/jblum/grc/grc/scripts/Makefile.am
Modified:
   gnuradio/branches/developers/jblum/grc/config/grc_grc.m4
   gnuradio/branches/developers/jblum/grc/grc/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/data/grc/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/Makefile.am
   
gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/blocks/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/scripts/
   gnuradio/branches/developers/jblum/grc/grc/src/grc/
   gnuradio/branches/developers/jblum/grc/grc/src/grc/Constants.py.in
   gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/
   gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Constants.py.in
   gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Platform.py
Log:
replacement and scripts makefile

Modified: gnuradio/branches/developers/jblum/grc/config/grc_grc.m4
===================================================================
--- gnuradio/branches/developers/jblum/grc/config/grc_grc.m4    2008-08-20 
03:21:05 UTC (rev 9345)
+++ gnuradio/branches/developers/jblum/grc/config/grc_grc.m4    2008-08-20 
03:35:46 UTC (rev 9346)
@@ -18,22 +18,49 @@
 dnl Boston, MA 02110-1301, USA.
 
 AC_DEFUN([GRC_GRC],[
+
+
     GRC_ENABLE(grc)
 
-       dnl GRC_CHECK_DEPENDENCY(grc, gnuradio-core)
+    dnl GRC_CHECK_DEPENDENCY(grc, gnuradio-core)
 
+       grc_gnuradio_pyexec=python
+       AC_SUBST(grc_gnuradio_pyexec)
+       
+       gnuradio_version=3.1svn
+       AC_SUBST(gnuradio_version)
+       
+       grc_data_dir=/usr/local/gnuradio/grc/grc
+       AC_SUBST(grc_data_dir)
+       
+       grc_gnuradio_data_dir=/usr/local/gnuradio/grc/grc_gnuradio
+       AC_SUBST(grc_gnuradio_data_dir)
+       
+       grc_gnuradio_blocks_dir=/usr/local/gnuradio/grc/grc_gnuradio/blocks
+       AC_SUBST(grc_gnuradio_blocks_dir)
+       
+       grc_gnuradio_docs_dir=/usr/local/gnuradio/docs
+       AC_SUBST(grc_gnuradio_docs_dir)
+
     AC_CONFIG_FILES([ \
-               grc/src/grc/gui/elements/Makefile \
-               grc/src/grc/gui/Makefile \
-               grc/src/grc/elements/Makefile \
-               grc/src/grc/Makefile \
-               grc/src/grc_gnuradio/usrp/Makefile \
-               grc/src/grc_gnuradio/blks2/Makefile \
-               grc/src/grc_gnuradio/utils/Makefile \
-               grc/src/grc_gnuradio/wxgui/Makefile \
-               grc/src/grc_gnuradio/Makefile \
-               grc/src/Makefile \
-               grc/Makefile \
+        grc/src/grc/gui/elements/Makefile \
+        grc/src/grc/gui/Makefile \
+        grc/src/grc/elements/Makefile \
+        grc/src/grc/Makefile \
+        grc/src/grc_gnuradio/usrp/Makefile \
+        grc/src/grc_gnuradio/blks2/Makefile \
+        grc/src/grc_gnuradio/utils/Makefile \
+        grc/src/grc_gnuradio/wxgui/Makefile \
+        grc/src/grc_gnuradio/Makefile \
+        grc/src/Makefile \
+        grc/data/grc/Makefile \
+        grc/data/Makefile \
+        grc/data/grc_gnuradio/blocks/Makefile \
+        grc/data/grc_gnuradio/Makefile \
+        grc/scripts/Makefile \
+        grc/Makefile \
+        grc/src/grc/Constants.py \
+        grc/src/grc_gnuradio/Constants.py \
     ])
 
     GRC_BUILD_CONDITIONAL(grc)

Modified: gnuradio/branches/developers/jblum/grc/grc/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/Makefile.am      2008-08-20 
03:21:05 UTC (rev 9345)
+++ gnuradio/branches/developers/jblum/grc/grc/Makefile.am      2008-08-20 
03:35:46 UTC (rev 9346)
@@ -21,4 +21,4 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = src data
+SUBDIRS = src data scripts

Modified: gnuradio/branches/developers/jblum/grc/grc/data/grc/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/data/grc/Makefile.am     
2008-08-20 03:21:05 UTC (rev 9345)
+++ gnuradio/branches/developers/jblum/grc/grc/data/grc/Makefile.am     
2008-08-20 03:35:46 UTC (rev 9346)
@@ -21,7 +21,7 @@
 
 include ../Makefile.common
 
-datadir = $(prefix)/share/gnuradio/grc
+datadir = @grc_data_dir@
 
 EXTRA_DIST = \
        block_tree.dtd \

Modified: 
gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/Makefile.am    
2008-08-20 03:21:05 UTC (rev 9345)
+++ gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/Makefile.am    
2008-08-20 03:35:46 UTC (rev 9346)
@@ -23,7 +23,7 @@
 
 SUBDIRS = blocks
 
-datadir = $(prefix)/share/gnuradio/grc_gnuradio
+datadir = @grc_gnuradio_data_dir@
 
 EXTRA_DIST = \
        block.dtd \

Modified: 
gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/blocks/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/blocks/Makefile.am 
    2008-08-20 03:21:05 UTC (rev 9345)
+++ 
gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/blocks/Makefile.am 
    2008-08-20 03:35:46 UTC (rev 9346)
@@ -21,7 +21,7 @@
 
 include ../../Makefile.common
 
-datadir = $(prefix)/share/gnuradio/grc_gnuradio/blocks
+datadir = @grc_gnuradio_blocks_dir@
 
 EXTRA_DIST = \
        audio_sink.xml \


Property changes on: gnuradio/branches/developers/jblum/grc/grc/scripts
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in


Added: gnuradio/branches/developers/jblum/grc/grc/scripts/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/scripts/Makefile.am              
                (rev 0)
+++ gnuradio/branches/developers/jblum/grc/grc/scripts/Makefile.am      
2008-08-20 03:35:46 UTC (rev 9346)
@@ -0,0 +1,23 @@
+#
+# Copyright 2008 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio 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, or (at your option)
+# any later version.
+# 
+# GNU Radio 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 GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+include $(top_srcdir)/Makefile.common
+


Property changes on: gnuradio/branches/developers/jblum/grc/grc/src/grc
___________________________________________________________________
Name: svn:ignore
   - Makefile
Makefile.in

   + Makefile
Makefile.in
Constants.py


Modified: gnuradio/branches/developers/jblum/grc/grc/src/grc/Constants.py.in
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/src/grc/Constants.py.in  
2008-08-20 03:21:05 UTC (rev 9345)
+++ gnuradio/branches/developers/jblum/grc/grc/src/grc/Constants.py.in  
2008-08-20 03:35:46 UTC (rev 9346)
@@ -27,7 +27,7 @@
 
######################################################################################################
 
 ##The current version of this code
-VERSION = @gnuradio_version@
+VERSION = '@gnuradio_version@'
 
 ##The name to appear in the main window for a flow graph that has not been 
saved to file.
 NEW_FLOGRAPH_TITLE = 'untitled'
@@ -132,7 +132,7 @@
 
######################################################################################################
 
 ##Location of external data files.
-DATA_DIR = @grc_data_dir@
+DATA_DIR = '@grc_data_dir@'
 
 ##DTD validator for saved flow graphs.
 FLOW_GRAPH_DTD = os.path.join(DATA_DIR, 'flow_graph.dtd')


Property changes on: gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio
___________________________________________________________________
Name: svn:ignore
   - Makefile
Makefile.in

   + Makefile
Makefile.in
Constants.py


Modified: 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Constants.py.in
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Constants.py.in 
2008-08-20 03:21:05 UTC (rev 9345)
+++ gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Constants.py.in 
2008-08-20 03:35:46 UTC (rev 9346)
@@ -27,10 +27,10 @@
 PYEXEC = @grc_gnuradio_pyexec@
 
 #setup paths
-DOCS_DIR = @gnuradio_xml_docs_dir@
-DATA_DIR = @grc_gnuradio_data_dir@
-BLOCK_PATH = os.path.join(DATA_DIR, 'blocks')
-HIER_BLOCKS_LIB_PATH = os.path.join(os.path.expanduser('~'), '.grc_gnuradio')
+DOCS_DIR = '@grc_gnuradio_docs_dir@'
+DATA_DIR = '@grc_gnuradio_data_dir@'
+BLOCKS_DIR = '@grc_gnuradio_blocks_dir@'
+HIER_BLOCKS_LIB_DIR = os.path.join(os.path.expanduser('~'), '.grc_gnuradio')
 
 #file creation modes
 TOP_BLOCK_FILE_MODE = stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR | 
stat.S_IRGRP | stat.S_IWGRP | stat.S_IXGRP | stat.S_IROTH

Modified: 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Platform.py
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Platform.py     
2008-08-20 03:21:05 UTC (rev 9345)
+++ gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Platform.py     
2008-08-20 03:35:46 UTC (rev 9346)
@@ -41,15 +41,15 @@
                @param block_paths_external a list of blocks to load in 
addition to the above blocks
                """
                #ensure hier dir
-               if not os.path.exists(HIER_BLOCKS_LIB_PATH): 
os.mkdir(HIER_BLOCKS_LIB_PATH)
+               if not os.path.exists(HIER_BLOCKS_LIB_DIR): 
os.mkdir(HIER_BLOCKS_LIB_DIR)
                #handle internal/only
                if block_paths_internal_only: 
-                       block_paths = map(lambda b: os.path.join(BLOCK_PATH, 
b), ['options.xml'] + block_paths_internal_only)
-               else: block_paths = [BLOCK_PATH]
+                       block_paths = map(lambda b: os.path.join(BLOCKS_DIR, 
b), ['options.xml'] + block_paths_internal_only)
+               else: block_paths = [BLOCKS_DIR]
                #handle external
                block_paths.extend(block_paths_external)
                #append custom hiers
-               block_paths.append(HIER_BLOCKS_LIB_PATH)
+               block_paths.append(HIER_BLOCKS_LIB_DIR)
                #init
                _Platform.__init__(
                        self,