* configure.in, configure: re-introduced .version

* sdcc.spec, doc/INSTALL.txt: they are used only for releases;
  the version reverted to 2.7.0

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4887 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/.version b/.version
new file mode 100644 (file)
index 0000000..2c9b4ef
--- /dev/null
+++ b/.version
@@ -0,0 +1 @@
+2.7.3

diff --git a/ChangeLog b/ChangeLog
index 7064b1262186ac7804d9905664c9f97c5de5f23c..f10e1f59d9be366ce0d87772f92f05c7e093b2e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-22 Borut Razem <borut.razem AT siol.net>
+
+       * configure.in, configure: re-introduced .version
+       * sdcc.spec, doc/INSTALL.txt: they are used only for releases;
+         the version reverted to 2.7.0
+

 2007-07-18 Maarten Brock <sourceforge.brock AT dse.nl>
 
        * configure.in,
 2007-07-18 Maarten Brock <sourceforge.brock AT dse.nl>
 
        * configure.in,

diff --git a/configure b/configure
index acb7b36f5c9d4df583f193517124f98654136bf8..3292299889784d73582c4eb773617bfc668cb68b 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,8 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.

-# Generated by GNU Autoconf 2.61 for sdcc 2.7.2.
-#
-# Report bugs to <sdcc-devel@lists.sourceforge.net>.
+# Generated by GNU Autoconf 2.61.

 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.


@@ -572,12 +570,13 @@ MAKEFLAGS=
 SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.

-PACKAGE_NAME='sdcc'
-PACKAGE_TARNAME='sdcc'
-PACKAGE_VERSION='2.7.2'
-PACKAGE_STRING='sdcc 2.7.2'
-PACKAGE_BUGREPORT='sdcc-devel@lists.sourceforge.net'
+PACKAGE_NAME=
+PACKAGE_TARNAME=
+PACKAGE_VERSION=
+PACKAGE_STRING=
+PACKAGE_BUGREPORT=

 
 

+ac_unique_file=".version"

 ac_unique_file="Makefile.in"
 # Factoring default headers for most tests.
 ac_includes_default="\
 ac_unique_file="Makefile.in"
 # Factoring default headers for most tests.
 ac_includes_default="\


@@ -763,7 +762,7 @@ sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'

-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+docdir='${datarootdir}/doc/${PACKAGE}'

 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'


@@ -1227,7 +1226,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF

-\`configure' configures sdcc 2.7.2 to adapt to many kinds of systems.
+\`configure' configures this package to adapt to many kinds of systems.

 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 


@@ -1275,7 +1274,7 @@ Fine tuning of the installation directories:
   --infodir=DIR          info documentation [DATAROOTDIR/info]
   --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR           man documentation [DATAROOTDIR/man]
   --infodir=DIR          info documentation [DATAROOTDIR/info]
   --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR           man documentation [DATAROOTDIR/man]

-  --docdir=DIR           documentation root [DATAROOTDIR/doc/sdcc]
+  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]

   --htmldir=DIR          html documentation [DOCDIR]
   --dvidir=DIR           dvi documentation [DOCDIR]
   --pdfdir=DIR           pdf documentation [DOCDIR]
   --htmldir=DIR          html documentation [DOCDIR]
   --dvidir=DIR           dvi documentation [DOCDIR]
   --pdfdir=DIR           pdf documentation [DOCDIR]


@@ -1292,9 +1291,7 @@ _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
 fi
 
 if test -n "$ac_init_help"; then

-  case $ac_init_help in
-     short | recursive ) echo "Configuration of sdcc 2.7.2:";;
-   esac
+

   cat <<\_ACEOF
 
 Optional Features:
   cat <<\_ACEOF
 
 Optional Features:


@@ -1339,7 +1336,6 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 

-Report bugs to <sdcc-devel@lists.sourceforge.net>.

 _ACEOF
 ac_status=$?
 fi
 _ACEOF
 ac_status=$?
 fi


@@ -1400,7 +1396,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF

-sdcc configure 2.7.2
+configure

 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,


@@ -1414,7 +1410,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 

-It was created by sdcc $as_me 2.7.2, which was
+It was created by $as_me, which was

 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@


@@ -1747,14 +1743,6 @@ fi
 
 
 
 
 
 

-
-
-
-
-
-
-
-

 
 
 
 
 
 


@@ -1814,7 +1802,21 @@ fi
 done
 
 
 done
 
 

-VERSION=$PACKAGE_VERSION
+{ echo "$as_me:$LINENO: checking version of the package" >&5
+echo $ECHO_N "checking version of the package... $ECHO_C" >&6; }
+if test -f ${srcdir}/.version; then
+  { read VERSION; } < ${srcdir}/.version
+  { echo "$as_me:$LINENO: result: $VERSION" >&5
+echo "${ECHO_T}$VERSION" >&6; }
+elif test -f ../.version; then
+  { read VERSION; } < ../.version
+  { echo "$as_me:$LINENO: result: $VERSION" >&5
+echo "${ECHO_T}$VERSION" >&6; }
+else
+  VERSION="0.0.0"
+  { echo "$as_me:$LINENO: result: unknown using 0.0.0" >&5
+echo "${ECHO_T}unknown using 0.0.0" >&6; }
+fi

 VERSIONHI=`echo $VERSION|$AWK 'BEGIN {FS="."} {print $1}'`
 VERSIONLO=`echo $VERSION|$AWK 'BEGIN {FS="."} {print $2}'`
 VERSIONP=`echo $VERSION|$AWK 'BEGIN {FS="."} {print $3}'`
 VERSIONHI=`echo $VERSION|$AWK 'BEGIN {FS="."} {print $1}'`
 VERSIONLO=`echo $VERSION|$AWK 'BEGIN {FS="."} {print $2}'`
 VERSIONP=`echo $VERSION|$AWK 'BEGIN {FS="."} {print $3}'`


@@ -8062,7 +8064,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="

-This file was extended by sdcc $as_me 2.7.2, which was
+This file was extended by $as_me, which was

 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES


@@ -8111,7 +8113,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\

-sdcc config.status 2.7.2
+config.status

 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/configure.in b/configure.in
index 22bb30e4d379ca879bf8afdb9637c86d553241c5..735fafb17de753f7a845c228645c590eb612850f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,13 +1,23 @@
 #!/bin/sh
 
 AC_PREREQ(2.60)
 #!/bin/sh
 
 AC_PREREQ(2.60)

-AC_INIT([sdcc], [2.7.3], [sdcc-devel@lists.sourceforge.net])
+AC_INIT(.version)

 AC_CONFIG_SRCDIR([Makefile.in])
 AC_CONFIG_HEADER(sdccconf.h:sdccconf_in.h)
 
 AC_PROG_AWK
 
 AC_CONFIG_SRCDIR([Makefile.in])
 AC_CONFIG_HEADER(sdccconf.h:sdccconf_in.h)
 
 AC_PROG_AWK
 

-VERSION=$PACKAGE_VERSION
+AC_MSG_CHECKING(version of the package)
+if test -f ${srcdir}/.version; then
+  { read VERSION; } < ${srcdir}/.version
+  AC_MSG_RESULT($VERSION)
+elif test -f ../.version; then
+  { read VERSION; } < ../.version
+  AC_MSG_RESULT($VERSION)
+else
+  VERSION="0.0.0"
+  AC_MSG_RESULT(unknown using 0.0.0)
+fi

 VERSIONHI=`echo $VERSION|$AWK 'BEGIN {FS="."} {print $1}'`
 VERSIONLO=`echo $VERSION|$AWK 'BEGIN {FS="."} {print $2}'`
 VERSIONP=`echo $VERSION|$AWK 'BEGIN {FS="."} {print $3}'`
 VERSIONHI=`echo $VERSION|$AWK 'BEGIN {FS="."} {print $1}'`
 VERSIONLO=`echo $VERSION|$AWK 'BEGIN {FS="."} {print $2}'`
 VERSIONP=`echo $VERSION|$AWK 'BEGIN {FS="."} {print $3}'`

diff --git a/configure_vc.awk b/configure_vc.awk
index f48422876e062001ee1066cf554afe3537638b87..07e4f7a130b0dfbd02ccbc17a3449c6bf2f6de22 100644 (file)
--- a/configure_vc.awk
+++ b/configure_vc.awk
@@ -1,7 +1,7 @@
 #!/usr/bin/awk
 
 # configure_vc.awk - Genarate sdcc_vc.h using sdcc_vc_in.h as template
 #!/usr/bin/awk
 
 # configure_vc.awk - Genarate sdcc_vc.h using sdcc_vc_in.h as template

-#                    and insert the version number definitions from configure.in
+#                    and insert the version number definitions from .version

 #
 # Written By - Borut Razem borut.razem@siol.net
 #
 #
 # Written By - Borut Razem borut.razem@siol.net
 #


@@ -22,19 +22,12 @@
 # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 BEGIN {
 # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 BEGIN {

-  # get the values from configure.in
-
-  while (getline <"configure.in" > 0) {
-    if ($0 ~ "^AC_INIT\\(.*\\)") {
-      package = gensub("^AC_INIT\\(\\[([^]]*)\\].*", "\\1", "1", $0);
-      version = gensub("^AC_INIT\\(\\[[^]]*\\], \\[([^]]*)\\].*", "\\1", "1", $0);
-      bugreport = gensub("^AC_INIT\\(\\[[^]]*\\], \\[[^]]*\\], \\[([^]]*)\\].*", "\\1", "1", $0);
-
-      version_high = gensub(/^([^.]*).([^.]*).([^.]*)/, "\\1", "1", version)
-      version_lo = gensub(/^([^.]*).([^.]*).([^.]*)/, "\\2", "1", version)
-      version_patch = gensub(/^([^.]*).([^.]*).([^.]*)/, "\\3", "1", version)
-    }
-  }
+  # get the values from .version
+  FS=".";
+  getline <".version";
+  version_high = $1;
+  version_lo = $2;
+  version_patch = $3;

 
   print "/*"
   print " * sdcc_vc.h"
 
   print "/*"
   print " * sdcc_vc.h"


@@ -60,7 +53,7 @@ BEGIN {
 }
 
 /^#undef SDCC_VERSION_STR$/ {
 }
 
 /^#undef SDCC_VERSION_STR$/ {

-  print("#define SDCC_VERSION_STR " "\"" version "\"");
+  print("#define SDCC_VERSION_STR " "\"" version_high "." version_lo "." version_patch "\"");

   next
 }
 
   next
 }
 

diff --git a/doc/INSTALL.txt b/doc/INSTALL.txt
index e543fc592a02bcf181918ebf67bd79899e7f3fff..0c0ad419790af63354bb286561c07a82fb15d161 100644 (file)
--- a/doc/INSTALL.txt
+++ b/doc/INSTALL.txt
@@ -10,7 +10,7 @@ To install:
     cd ~
     mkdir tmp
     cd tmp
     cd ~
     mkdir tmp
     cd tmp

-    tar xzf path/to/binary/kit/sdcc-2.7.2-i386-unknown-linux2.5.tar.gz
+    tar xzf path/to/binary/kit/sdcc-2.7.0-i386-unknown-linux2.5.tar.gz

 
 * Change to the sdcc directory and copy all files to /usr/local
     cd sdcc
 
 * Change to the sdcc directory and copy all files to /usr/local
     cd sdcc


@@ -37,7 +37,7 @@ To install:
 
 * If you would like to keep a copy of your previous version,
   rename the directory where it's installed first
 
 * If you would like to keep a copy of your previous version,
   rename the directory where it's installed first

-* Run sdcc-2.7.2-setup.exe
+* Run sdcc-2.7.0-setup.exe

 
 By default this will install sdcc binaries into: C:\Program Files\SDCC\bin\
 header files into:                               C:\Program Files\SDCC\include\
 
 By default this will install sdcc binaries into: C:\Program Files\SDCC\bin\
 header files into:                               C:\Program Files\SDCC\include\


@@ -63,7 +63,7 @@ To install:
     cd ~
     mkdir tmp
     cd tmp
     cd ~
     mkdir tmp
     cd tmp

-    tar xzf path/to/binary/kit/sdcc-2.7.2-ppc-apple-macosx.tar.gz
+    tar xzf path/to/binary/kit/sdcc-2.7.0-ppc-apple-macosx.tar.gz

 
 * Change to the sdcc directory and copy all files to /Developer/sdcc
     cp -r sdcc /Developer/sdcc
 
 * Change to the sdcc directory and copy all files to /Developer/sdcc
     cp -r sdcc /Developer/sdcc

diff --git a/sdcc.spec b/sdcc.spec
index 8d2567216b60b9d527beaa71d0597d358b330363..f72caf2605040264deb7134b10e1157a886661d4 100644 (file)
--- a/sdcc.spec
+++ b/sdcc.spec
@@ -8,7 +8,7 @@ License:       GPL
 Group:         Applications/Engineering
 Summary:       Small Device C Compiler
 Requires:      sdcc-common
 Group:         Applications/Engineering
 Summary:       Small Device C Compiler
 Requires:      sdcc-common

-Version:       2.7.2
+Version:       2.7.0

 Release:       2
 Source:        %{name}-src-%{version}.tar.gz
 URL:           http://sdcc.sourceforge.net/
 Release:       2
 Source:        %{name}-src-%{version}.tar.gz
 URL:           http://sdcc.sourceforge.net/