Fixes for handling release versions

git-svn-id: svn://svn.berlios.de/openocd/trunk@1347 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/Makefile.am b/Makefile.am
index 2f5be6365beb89241eaed851eabe7574a53d6ec8..f4d865e7dd333c363b33e0fec6b5397c6fcd5a05 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,6 @@
 # have all needed files, that a GNU package needs
 AUTOMAKE_OPTIONS = foreign 1.4
 
 # 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 \
 nobase_dist_pkgdata_DATA = \
        contrib/libdcc/dcc_stdio.c \
        contrib/libdcc/dcc_stdio.h \

diff --git a/configure.in b/configure.in
index 79e546e8aebe49d590e228834bd0fa083950d217..dd2c70b7d015c65da84ee5bb7cfdd52fcf73400a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -27,6 +27,16 @@ build_bitq=no
 is_cygwin=no
 is_mingw=no
 is_win32=no
 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.
 
 # We are not *ALWAYS* being installed in the standard place.
 # We may be installed in a "tool-build" specific location.


@@ -627,6 +637,7 @@ fi
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(openocd, 1.0)
 
 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)
 AM_CONDITIONAL(PARPORT, test $build_parport = yes)
 AM_CONDITIONAL(DUMMY, test $build_dummy = yes)
 AM_CONDITIONAL(GIVEIO, test $parport_use_giveio = yes)

diff --git a/src/Makefile.am b/src/Makefile.am
index 1103e57511088b77baf9b9cb7b12165a98507dbf..30b67f2693215ea90f2cf69cfb01fd6fe278dc17 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,6 @@ else
 MAINFILE = main.c
 endif
 
 MAINFILE = main.c
 endif
 

-

 openocd_SOURCES = $(MAINFILE) openocd.c
 
 # set the include path found by configure
 openocd_SOURCES = $(MAINFILE) openocd.c
 
 # set the include path found by configure


@@ -17,9 +16,16 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/helper \
 # pass path to prefix path
 openocd_CPPFLAGS = \
  -DPKGLIBDIR=\"$(pkglibdir)\" \
 # 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) 
 
 # the library search path.
 openocd_LDFLAGS = $(all_libraries) 


@@ -59,8 +65,6 @@ endif
 endif
 endif
 
 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 \
 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 @@ openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a $(top_builddir)/src/svf/libsv
        $(top_builddir)/src/pld/libpld.a \
        $(FTDI2232LIB) $(MINGWLDADD) $(LIBUSB)
 
        $(top_builddir)/src/pld/libpld.a \
        $(FTDI2232LIB) $(MINGWLDADD) $(LIBUSB)
 

-

 if HTTPD
 openocd_LDADD += -lmicrohttpd
 endif
 
 if HTTPD
 openocd_LDADD += -lmicrohttpd
 endif
 

-
-

 nobase_dist_pkglib_DATA = \
        tcl/bitsbytes.tcl                       \
        tcl/chip/atmel/at91/aic.tcl             \
 nobase_dist_pkglib_DATA = \
        tcl/bitsbytes.tcl                       \
        tcl/chip/atmel/at91/aic.tcl             \

diff --git a/src/openocd.c b/src/openocd.c
index 32d96c41be2cd270b85897975b46e7520706e44d..084b8a1d05be6361d4ec36d57fac59131ca254ad 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -24,7 +24,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
  *   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"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"