PR: synchro V7_main tag mergefrom_V6_main_28Feb13

diff --git a/build_cmake b/build_cmake
index 47bd15c16738261b80f48509803fd9b75e140113..57364c49b593b4e1a36b5ade21f31f6641f56d74 100755 (executable)
--- a/build_cmake
+++ b/build_cmake
@@ -21,7 +21,8 @@
 CURRENT_DIR=`pwd`
 CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"`
 cd ${CONF_DIR}
-python $KERNEL_ROOT_DIR/salome_adm/cmake_files/am2cmake.py --ghs3dplugin
+python $KERNEL_ROOT_DIR/salome_adm/cmake_files/deprecated/am2cmake.py --ghs3dplugin
 status=$?
 cd ${CURRENT_DIR}
 exit $status
+

diff --git a/build_cmake.bat b/build_cmake.bat
index 5008649ba63d6aaf38d2a3d30265ebfebfdc59a2..d7029326a07fa90cb09dc492b306e3856ee658ab 100644 (file)
--- a/build_cmake.bat
+++ b/build_cmake.bat
@@ -17,4 +17,4 @@
 @REM See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 @REM
 
-%PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\am2cmake.py --ghs3dplugin\r
+%PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\deprecated\am2cmake.py --ghs3dplugin\r

diff --git a/configure.ac b/configure.ac
index b89d2e2e755abf1b42038429638e58a17a35a897..01fc6016952766c7689633f229d79e036639f186 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@
 # Modified by : Marc Tajchman (CEA)
 # Created from configure.in.base
 #
-AC_INIT([Salome2 Project GHS3DPLUGIN module],[6.6.0], [webmaster.salome@opencascade.com], [SalomeGHS3DPLUGIN])
+AC_INIT([Salome2 Project GHS3DPLUGIN module],[7.0.0], [webmaster.salome@opencascade.com], [SalomeGHS3DPLUGIN])
 AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET