[Openocd-svn] r1347 - in trunk: . src

[<kc...@ma...>]

Author: kc8apf
Date: 2009-01-20 05:03:31 +0100 (Tue, 20 Jan 2009)
New Revision: 1347

Modified:
   trunk/Makefile.am
   trunk/configure.in
   trunk/src/Makefile.am
   trunk/src/openocd.c
Log:
Fixes for handling release versions

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2009-01-20 03:58:39 UTC (rev 1346)
+++ trunk/Makefile.am	2009-01-20 04:03:31 UTC (rev 1347)
@@ -2,8 +2,6 @@
 # have all needed files, that a GNU package needs
 AUTOMAKE_OPTIONS = foreign 1.4
 
-EXTRA_DIST = guess-rev.sh
-
 nobase_dist_pkgdata_DATA = \
 	contrib/libdcc/dcc_stdio.c \
 	contrib/libdcc/dcc_stdio.h \

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2009-01-20 03:58:39 UTC (rev 1346)
+++ trunk/configure.in	2009-01-20 04:03:31 UTC (rev 1347)
@@ -27,7 +27,17 @@
 is_cygwin=no
 is_mingw=no
 is_win32=no
+build_release=yes
 
+AC_ARG_ENABLE(release,
+	AS_HELP_STRING([--enable-release], [Enable Release Build, default no]),
+	[build_release=$enableval], [build_release=no])
+
+if test $build_release = no; then
+	# check we can find guess-rev.sh
+	AC_CHECK_FILE("guess-rev.sh", build_release=no, build_release=yes)
+fi
+
 # We are not *ALWAYS* being installed in the standard place.
 # We may be installed in a "tool-build" specific location.
 # Normally with other packages - as part of a tool distro.
@@ -627,6 +637,7 @@
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(openocd, 1.0)
 
+AM_CONDITIONAL(RELEASE, test $build_release = yes)
 AM_CONDITIONAL(PARPORT, test $build_parport = yes)
 AM_CONDITIONAL(DUMMY, test $build_dummy = yes)
 AM_CONDITIONAL(GIVEIO, test $parport_use_giveio = yes)

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2009-01-20 03:58:39 UTC (rev 1346)
+++ trunk/src/Makefile.am	2009-01-20 04:03:31 UTC (rev 1347)
@@ -6,7 +6,6 @@
 MAINFILE = main.c
 endif
 
-
 openocd_SOURCES = $(MAINFILE) openocd.c
 
 # set the include path found by configure
@@ -17,10 +16,17 @@
 # pass path to prefix path
 openocd_CPPFLAGS = \
  -DPKGLIBDIR=\"$(pkglibdir)\" \
- -DPKGBLDDATE=\"`date +%F-%R`\" \
- -DPKGBLDREV=\"`$(top_srcdir)/guess-rev.sh`\" \
- @CPPFLAGS@
+ -DPKGBLDDATE=\"`date +%F-%R`\"
 
+if RELEASE
+openocd_CPPFLAGS += -DRELSTR=\"Release\" -DPKGBLDREV=\"\"
+else
+openocd_CPPFLAGS += -DRELSTR=\"svn:\" -DPKGBLDREV=\"`$(top_srcdir)/guess-rev.sh`\"
+endif
+
+# add default CPPFLAGS
+openocd_CPPFLAGS += @CPPFLAGS@
+
 # the library search path.
 openocd_LDFLAGS = $(all_libraries) 
 SUBDIRS = helper jtag xsvf svf target server flash pld
@@ -59,8 +65,6 @@
 endif
 endif
 
-
-
 openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a $(top_builddir)/src/svf/libsvf.a \
 	$(top_builddir)/src/target/libtarget.a $(top_builddir)/src/jtag/libjtag.a \
 	$(top_builddir)/src/helper/libhelper.a \
@@ -69,13 +73,10 @@
 	$(top_builddir)/src/pld/libpld.a \
 	$(FTDI2232LIB) $(MINGWLDADD) $(LIBUSB)
 
-
 if HTTPD
 openocd_LDADD += -lmicrohttpd
 endif
 
-
-
 nobase_dist_pkglib_DATA = \
 	tcl/bitsbytes.tcl			\
 	tcl/chip/atmel/at91/aic.tcl		\

Modified: trunk/src/openocd.c
===================================================================
--- trunk/src/openocd.c	2009-01-20 03:58:39 UTC (rev 1346)
+++ trunk/src/openocd.c	2009-01-20 04:03:31 UTC (rev 1347)
@@ -24,7 +24,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#define OPENOCD_VERSION "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") svn:" PKGBLDREV
+#define OPENOCD_VERSION "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") "RELSTR PKGBLDREV
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"