diff options
| author | Peter Johnson <peter@tortall.net> | 2010-08-06 08:13:24 +0000 |
|---|---|---|
| committer | Peter Johnson <peter@tortall.net> | 2010-08-06 08:13:24 +0000 |
| commit | f051c34271db13fbb4cf4b5328b28fa00dc086c1 (patch) | |
| tree | 503beb6755b45b260af314b560ece87ea03239d7 | |
| parent | 0d3b3797e57cd7ed5f5810246dbb17ea29e68d94 (diff) | |
| download | yasm-1.1.tar.gz | |
Bump branch version to 1.1.x, with an internal version of 1.1.0.1.1
svn path=/branches/yasm-1.1/; revision=2350
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Mkfiles/dj/config.h | 10 | ||||
| -rw-r--r-- | Mkfiles/vc10/config.h | 10 | ||||
| -rw-r--r-- | Mkfiles/vc9/config.h | 10 | ||||
| -rw-r--r-- | configure.ac | 6 |
5 files changed, 22 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0bbb68bf..25814d15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,11 +26,11 @@ IF(NOT CMAKE_BUILD_TYPE) FORCE) ENDIF(NOT CMAKE_BUILD_TYPE) -set (YASM_VERSION_MAJOR 0) -set (YASM_VERSION_MINOR 6) -set (YASM_VERSION_SUBMINOR 99) +set (YASM_VERSION_MAJOR 1) +set (YASM_VERSION_MINOR 1) +set (YASM_VERSION_SUBMINOR 0) set (PACKAGE_INTVER "${YASM_VERSION_MAJOR}.${YASM_VERSION_MINOR}.${YASM_VERSION_SUBMINOR}") -set (PACKAGE_BUILD "HEAD") +set (PACKAGE_BUILD "BRANCH") set (PACKAGE_VERSION ${PACKAGE_BUILD}) set (PACKAGE_STRING "yasm ${PACKAGE_VERSION}") diff --git a/Mkfiles/dj/config.h b/Mkfiles/dj/config.h index 0ce8a3f0..e6b44842 100644 --- a/Mkfiles/dj/config.h +++ b/Mkfiles/dj/config.h @@ -119,22 +119,22 @@ #define PACKAGE_BUGREPORT "bug-yasm@tortall.net"
/* Define to build version of this package. */
-#define PACKAGE_BUILD "HEAD"
+#define PACKAGE_BUILD "BRANCH"
/* Define to internal version of this package. */
-#define PACKAGE_INTVER "0.7.99"
+#define PACKAGE_INTVER "1.1.0"
/* Define to the full name of this package. */
#define PACKAGE_NAME "yasm"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "yasm HEAD"
+#define PACKAGE_STRING "yasm 1.1.x"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "yasm"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "HEAD"
+#define PACKAGE_VERSION "1.1.x"
/* Define if the C compiler supports function prototypes. */
#define PROTOTYPES 1
@@ -158,7 +158,7 @@ #define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "HEAD"
+#define VERSION "1.1.x"
/* Define if using the dmalloc debugging malloc package */
/* #undef WITH_DMALLOC */
diff --git a/Mkfiles/vc10/config.h b/Mkfiles/vc10/config.h index 96e2dddc..38d2c6d7 100644 --- a/Mkfiles/vc10/config.h +++ b/Mkfiles/vc10/config.h @@ -117,22 +117,22 @@ #define PACKAGE_BUGREPORT "bug-yasm@tortall.net"
/* Define to build version of this package. */
-#define PACKAGE_BUILD "HEAD"
+#define PACKAGE_BUILD "BRANCH"
/* Define to internal version of this package. */
-#define PACKAGE_INTVER "0.7.99"
+#define PACKAGE_INTVER "1.1.0"
/* Define to the full name of this package. */
#define PACKAGE_NAME "yasm"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "yasm HEAD"
+#define PACKAGE_STRING "yasm 1.1.x"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "yasm"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "HEAD"
+#define PACKAGE_VERSION "1.1.x"
/* Define if the C compiler supports function prototypes. */
#define PROTOTYPES 1
@@ -156,7 +156,7 @@ #define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "HEAD"
+#define VERSION "1.1.x"
/* Define if using the dmalloc debugging malloc package */
/* #undef WITH_DMALLOC */
diff --git a/Mkfiles/vc9/config.h b/Mkfiles/vc9/config.h index 96e2dddc..38d2c6d7 100644 --- a/Mkfiles/vc9/config.h +++ b/Mkfiles/vc9/config.h @@ -117,22 +117,22 @@ #define PACKAGE_BUGREPORT "bug-yasm@tortall.net"
/* Define to build version of this package. */
-#define PACKAGE_BUILD "HEAD"
+#define PACKAGE_BUILD "BRANCH"
/* Define to internal version of this package. */
-#define PACKAGE_INTVER "0.7.99"
+#define PACKAGE_INTVER "1.1.0"
/* Define to the full name of this package. */
#define PACKAGE_NAME "yasm"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "yasm HEAD"
+#define PACKAGE_STRING "yasm 1.1.x"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "yasm"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "HEAD"
+#define PACKAGE_VERSION "1.1.x"
/* Define if the C compiler supports function prototypes. */
#define PROTOTYPES 1
@@ -156,7 +156,7 @@ #define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "HEAD"
+#define VERSION "1.1.x"
/* Define if using the dmalloc debugging malloc package */
/* #undef WITH_DMALLOC */
diff --git a/configure.ac b/configure.ac index 638d654a..9e80ce7b 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ # autoconf setup # AC_PREREQ(2.53) -AC_INIT([yasm], [HEAD], [bug-yasm@tortall.net]) +AC_INIT([yasm], [1.1.x], [bug-yasm@tortall.net]) #AC_CONFIG_SRCDIR([src/main.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config.h]) @@ -13,9 +13,9 @@ AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE([1.9.6 foreign]) AM_MAINTAINER_MODE -AC_DEFINE(PACKAGE_INTVER, ["0.7.99"], +AC_DEFINE(PACKAGE_INTVER, ["1.1.0"], [Define to internal version of this package.]) -AC_DEFINE(PACKAGE_BUILD, ["HEAD"], [Define to build version of this package.]) +AC_DEFINE(PACKAGE_BUILD, ["BRANCH"], [Define to build version of this package.]) # # autoconf command-line options |