Salome HOME
Increment version to 6.6.0 V6_6_0rc1
authorvsr <vsr@opencascade.com>
Mon, 19 Nov 2012 11:12:34 +0000 (11:12 +0000)
committervsr <vsr@opencascade.com>
Mon, 19 Nov 2012 11:12:34 +0000 (11:12 +0000)
CMakeLists.txt
configure.ac
salome_adm/cmake_files/am2cmake.py

index 80dd89acfa801310a3e62665fadbfd98eb81352e..e9f020b3f1333bf121fa278fa2e6edd0a5e340bd 100755 (executable)
@@ -37,8 +37,8 @@ SET(WITH_LOCAL 1)
 SET(WITH_BATCH 1)
 
 ENABLE_TESTING()
-SET(VERSION "6.5.0")
-SET(VERSION_DEV "1")
+SET(VERSION "6.6.0")
+SET(VERSION_DEV "0")
 
 INCLUDE(${CMAKE_SOURCE_DIR}/salome_adm/cmake_files/FindPLATFORM.cmake)
 INCLUDE(${CMAKE_SOURCE_DIR}/salome_adm/cmake_files/FindPYTHON.cmake)
index e8d2e1458140314c0460e41efb0b70c0e0aa9dab..f2f1390206362b0a1602b2babe6b96f0e6df0bb0 100644 (file)
@@ -25,7 +25,7 @@
 # ================================================================
 #AC_PREREQ(2.59)
 #
-AC_INIT([Salome2 Project], [6.5.0], [paul.rascle@edf.fr], [SalomeKERNEL])
+AC_INIT([Salome2 Project], [6.6.0], [paul.rascle@edf.fr], [SalomeKERNEL])
 
 # AC_CONFIG_AUX_DIR defines an alternative directory where to find the auxiliary
 # scripts such as config.guess, install-sh, ...
@@ -37,7 +37,7 @@ AM_INIT_AUTOMAKE([tar-pax -Wno-portability])
 
 XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'`
 AC_SUBST(XVERSION)
-VERSION_DEV=1
+VERSION_DEV=0
 AC_SUBST(VERSION_DEV)
 
 # set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
index 138248109be9e43343ac2ea05cab85bf0da10876..f502a631085670444da5201db1938f5a8aedd7cd 100644 (file)
@@ -802,10 +802,10 @@ class CMakeFile(object):
                 pass
             # --
             newlines.append("""
-            set(VERSION 6.5.0)
-            set(SHORT_VERSION 6.5)
-            set(XVERSION 0x060500)
-            set(VERSION_DEV 1)
+            set(VERSION 6.6.0)
+            set(SHORT_VERSION 6.6)
+            set(XVERSION 0x060600)
+            set(VERSION_DEV 0)
             """)
             pass
         # --