[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9355 - in gnuradio/branches/developers/jblum/grc: con
|
From: |
jblum |
|
Subject: |
[Commit-gnuradio] r9355 - in gnuradio/branches/developers/jblum/grc: config gnuradio-core/doc grc/data/grc grc/data/grc_gnuradio grc/data/grc_gnuradio/blocks grc/src/grc grc/src/grc_gnuradio usrp/doc |
|
Date: |
Wed, 20 Aug 2008 14:49:48 -0600 (MDT) |
Author: jblum
Date: 2008-08-20 14:49:46 -0600 (Wed, 20 Aug 2008)
New Revision: 9355
Modified:
gnuradio/branches/developers/jblum/grc/config/gr_doxygen.m4
gnuradio/branches/developers/jblum/grc/config/grc_grc.m4
gnuradio/branches/developers/jblum/grc/gnuradio-core/doc/Doxyfile.in
gnuradio/branches/developers/jblum/grc/gnuradio-core/doc/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/src/grc/Constants.py.in
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Constants.py.in
gnuradio/branches/developers/jblum/grc/usrp/doc/Doxyfile.in
Log:
prefix substitution, doxygen + xml fix
Modified: gnuradio/branches/developers/jblum/grc/config/gr_doxygen.m4
===================================================================
--- gnuradio/branches/developers/jblum/grc/config/gr_doxygen.m4 2008-08-20
19:07:36 UTC (rev 9354)
+++ gnuradio/branches/developers/jblum/grc/config/gr_doxygen.m4 2008-08-20
20:49:46 UTC (rev 9355)
@@ -24,13 +24,16 @@
AC_HELP_STRING([--enable-doxygen],
[enable documentation generation with doxygen
(no)]))
AC_ARG_ENABLE(dot, AC_HELP_STRING([--enable-dot],[use 'dot' to generate
graphs in doxygen (auto)]))
+ AC_ARG_ENABLE(xml-docs,
+ AC_HELP_STRING([--enable-xml-docs],[enable XML generation with
doxygen (default: yes)]),
+ [ enable_xml_docs=NO], [ enable_xml_docs=YES])
AC_ARG_ENABLE(html-docs,
- AC_HELP_STRING([--enable-html-docs],[enable HTML generation
with doxygen (yes)]),
- [], [ enable_html_docs=yes])
+ AC_HELP_STRING([--enable-html-docs],[enable HTML generation
with doxygen (default: yes)]),
+ [ enable_html_docs=NO], [ enable_html_docs=YES])
AC_ARG_ENABLE(latex-docs,
AC_HELP_STRING([--enable-latex-docs],
- [enable LaTeX doc generation with doxygen (no)]),
- [], [ enable_latex_docs=no])
+ [enable LaTeX doc generation with doxygen
(default: no)]),
+ [ enable_latex_docs=YES], [ enable_latex_docs=NO])
if test "x$enable_doxygen" = xyes; then
AC_PATH_PROG(DOXYGEN, doxygen, , $PATH)
@@ -60,6 +63,7 @@
enable_dot=yes
fi
AC_SUBST(enable_dot)
+ AC_SUBST(enable_xml_docs)
AC_SUBST(enable_html_docs)
AC_SUBST(enable_latex_docs)
AC_SUBST(generate_docs)
Modified: gnuradio/branches/developers/jblum/grc/config/grc_grc.m4
===================================================================
--- gnuradio/branches/developers/jblum/grc/config/grc_grc.m4 2008-08-20
19:07:36 UTC (rev 9354)
+++ gnuradio/branches/developers/jblum/grc/config/grc_grc.m4 2008-08-20
20:49:46 UTC (rev 9355)
@@ -1,17 +1,17 @@
dnl Copyright 2008 Free Software Foundation, Inc.
-dnl
+dnl
dnl This file is part of GNU Radio
-dnl
+dnl
dnl GNU Radio is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 3, or (at your option)
dnl any later version.
-dnl
+dnl
dnl GNU Radio is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
+dnl
dnl You should have received a copy of the GNU General Public License
dnl along with GNU Radio; see the file COPYING. If not, write to
dnl the Free Software Foundation, Inc., 51 Franklin Street,
@@ -19,29 +19,17 @@
AC_DEFUN([GRC_GRC],[
-
GRC_ENABLE(grc)
- dnl GRC_CHECK_DEPENDENCY(grc, gnuradio-core)
+ 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)
+ grc_data_prefix=share/${PACKAGE}/grc dnl# cannot start with slash
+ AC_SUBST(grc_gnuradio_pyexec, python)
+ AC_SUBST(grc_data_dir, $grc_data_prefix/grc)
+ AC_SUBST(grc_gnuradio_data_dir, $grc_data_prefix/grc_gnuradio)
+ AC_SUBST(grc_gnuradio_blocks_dir, $grc_data_prefix/grc_gnuradio/blocks)
+
AC_CONFIG_FILES([ \
grc/src/grc/gui/elements/Makefile \
grc/src/grc/gui/Makefile \
Modified: gnuradio/branches/developers/jblum/grc/gnuradio-core/doc/Doxyfile.in
===================================================================
--- gnuradio/branches/developers/jblum/grc/gnuradio-core/doc/Doxyfile.in
2008-08-20 19:07:36 UTC (rev 9354)
+++ gnuradio/branches/developers/jblum/grc/gnuradio-core/doc/Doxyfile.in
2008-08-20 20:49:46 UTC (rev 9355)
@@ -765,7 +765,7 @@
# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
# generate HTML output.
-GENERATE_HTML = YES
+GENERATE_HTML = @enable_html_docs@
# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
@@ -885,7 +885,7 @@
# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
# generate Latex output.
-GENERATE_LATEX = NO
+GENERATE_LATEX = @enable_latex_docs@
# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
@@ -1032,7 +1032,7 @@
# generate an XML file that captures the structure of
# the code including all documentation.
-GENERATE_XML = NO
+GENERATE_XML = @enable_xml_docs@
# The XML_OUTPUT tag is used to specify where the XML pages will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
Modified: gnuradio/branches/developers/jblum/grc/gnuradio-core/doc/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/gnuradio-core/doc/Makefile.am
2008-08-20 19:07:36 UTC (rev 9354)
+++ gnuradio/branches/developers/jblum/grc/gnuradio-core/doc/Makefile.am
2008-08-20 20:49:46 UTC (rev 9355)
@@ -23,7 +23,6 @@
SUBDIRS = other xml
-man3dir = $(mandir)/man3
docdir = $(prefix)/share/doc/@address@hidden@VERSION@
EXTRA_DIST =
@@ -38,20 +37,6 @@
prep:
mkdir -p html
-#install-data-local:
-# $(mkinstalldirs) $(DESTDIR)$(man3dir)
-# @for i in ./man/man3/*.3; do \
-# inst=`basename $$i | sed 's/_/:/g'`; \
-# echo "$(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$inst"; \
-# $(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$inst; \
-# done
-# $(mkinstalldirs) $(DESTDIR)$(docdir)
-## @for i in ../README ../ChangeLog @address@hidden @address@hidden; do \
-## echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \
-## $(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \
-## done
-# cp -r html $(docdir)
-
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(docdir)
@for i in $(top_srcdir)/README $(top_srcdir)/README.hacking; do \
@@ -59,6 +44,7 @@
$(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \
done
cp -r html $(DESTDIR)$(docdir)
+ cp -r xml $(DESTDIR)$(docdir)
uninstall-local:
@for i in README README.hacking; do \
@@ -66,6 +52,7 @@
$(RM) $(DESTDIR)$(docdir)/$$i; \
done
$(RM) -fr $(DESTDIR)$(docdir)/html
+ $(RM) -fr $(DESTDIR)$(docdir)/xml
clean-local:
$(RM) -fr latex html man
Modified: gnuradio/branches/developers/jblum/grc/grc/data/grc/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/data/grc/Makefile.am
2008-08-20 19:07:36 UTC (rev 9354)
+++ gnuradio/branches/developers/jblum/grc/grc/data/grc/Makefile.am
2008-08-20 20:49:46 UTC (rev 9355)
@@ -21,7 +21,7 @@
include ../Makefile.common
-datadir = @grc_data_dir@
+datadir = $(prefix)/@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 19:07:36 UTC (rev 9354)
+++ gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/Makefile.am
2008-08-20 20:49:46 UTC (rev 9355)
@@ -23,7 +23,7 @@
SUBDIRS = blocks
-datadir = @grc_gnuradio_data_dir@
+datadir = $(prefix)/@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 19:07:36 UTC (rev 9354)
+++
gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/blocks/Makefile.am
2008-08-20 20:49:46 UTC (rev 9355)
@@ -21,7 +21,7 @@
include ../../Makefile.common
-datadir = @grc_gnuradio_blocks_dir@
+datadir = $(prefix)/@grc_gnuradio_blocks_dir@
EXTRA_DIST = \
audio_sink.xml \
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 19:07:36 UTC (rev 9354)
+++ gnuradio/branches/developers/jblum/grc/grc/src/grc/Constants.py.in
2008-08-20 20:49:46 UTC (rev 9355)
@@ -27,7 +27,7 @@
######################################################################################################
##The current version of this code
-VERSION = '@gnuradio_version@'
+VERSION = '@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 = os.path.join('@prefix@', '@grc_data_dir@')
##DTD validator for saved flow graphs.
FLOW_GRAPH_DTD = os.path.join(DATA_DIR, 'flow_graph.dtd')
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 19:07:36 UTC (rev 9354)
+++ gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Constants.py.in
2008-08-20 20:49:46 UTC (rev 9355)
@@ -24,12 +24,12 @@
import sys
import stat
-PYEXEC = @grc_gnuradio_pyexec@
+PYEXEC = '@grc_gnuradio_pyexec@'
#setup paths
-DOCS_DIR = '@grc_gnuradio_docs_dir@'
-DATA_DIR = '@grc_gnuradio_data_dir@'
-BLOCKS_DIR = '@grc_gnuradio_blocks_dir@'
+DOCS_DIR = os.path.join('@prefix@', 'share', 'doc, '@address@hidden@VERSION@',
xml)
+DATA_DIR = os.path.join('@prefix@', '@grc_gnuradio_data_dir@')
+BLOCKS_DIR = os.path.join('@prefix@', '@grc_gnuradio_blocks_dir@')
HIER_BLOCKS_LIB_DIR = os.path.join(os.path.expanduser('~'), '.grc_gnuradio')
#file creation modes
Modified: gnuradio/branches/developers/jblum/grc/usrp/doc/Doxyfile.in
===================================================================
--- gnuradio/branches/developers/jblum/grc/usrp/doc/Doxyfile.in 2008-08-20
19:07:36 UTC (rev 9354)
+++ gnuradio/branches/developers/jblum/grc/usrp/doc/Doxyfile.in 2008-08-20
20:49:46 UTC (rev 9355)
@@ -586,7 +586,7 @@
# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
# generate HTML output.
-GENERATE_HTML = YES
+GENERATE_HTML = @enable_html_docs@
# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
@@ -698,7 +698,7 @@
# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
# generate Latex output.
-GENERATE_LATEX = NO
+GENERATE_LATEX = @enable_latex_docs@
# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
@@ -845,7 +845,7 @@
# generate an XML file that captures the structure of
# the code including all documentation.
-GENERATE_XML = YES
+GENERATE_XML = @enable_xml_docs@
# The XML_OUTPUT tag is used to specify where the XML pages will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r9355 - in gnuradio/branches/developers/jblum/grc: config gnuradio-core/doc grc/data/grc grc/data/grc_gnuradio grc/data/grc_gnuradio/blocks grc/src/grc grc/src/grc_gnuradio usrp/doc,
jblum <=