Updated version to 0.10.0 since this release will contain new feature…

…s as well as bug fixes. I've also softcoded the places that had release numbers hard coded in various points in the code, so setting the version no in top level CMakeLists.txt should 'trickle down' into most places where version numbers need to be set. Made some small changes to whats new too. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8361 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 17, 2008 · 7500ab6 · 7500ab6
1 parent 0698da2
commit 7500ab6
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,8 @@
+PROJECT(qgis0.10.0)
 SET(CPACK_PACKAGE_VERSION_MAJOR "0")
-SET(CPACK_PACKAGE_VERSION_MINOR "9")
-SET(CPACK_PACKAGE_VERSION_PATCH "2")
+SET(CPACK_PACKAGE_VERSION_MINOR "10")
+SET(CPACK_PACKAGE_VERSION_PATCH "0")
+SET(RELEASE_NAME "Io")
 
 SET(PROJECT_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 
@@ -317,6 +319,8 @@ SUBDIRS(src doc images resources i18n tools)
 
 IF (HAVE_PYTHON AND WITH_BINDINGS)
   SUBDIRS (python)
+ELSE (HAVE_PYTHON AND WITH_BINDINGS)
+  MESSAGE ("Python not being built")
 ENDIF (HAVE_PYTHON AND WITH_BINDINGS)
 
 IF (ENABLE_TESTS)

diff --git a/cmake_templates/qgsconfig.h.in b/cmake_templates/qgsconfig.h.in
@@ -8,7 +8,12 @@
 // <int>.<int>.<int>-<any text>.
 // or else upgrading old project file will not work
 // reliably.
-#define VERSION "0.9.2-Ganymede"
+#define VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${RELEASE_NAME}"
+
+//used in vim src/core/qgis.cpp
+#define VERSION_INT ${CPACK_PACKAGE_VERSION_MAJOR}${CPACK_PACKAGE_VERSION_MINOR}${CPACK_PACKAGE_VERSION_PATCH}
+//used in main.cpp and anywhere else where the release name is needed
+#define RELEASE_NAME "${RELEASE_NAME}"
 
 #define PREFIX "${CMAKE_INSTALL_PREFIX}"
 

diff --git a/doc/index.html b/doc/index.html
@@ -10,7 +10,7 @@
   </td>
   <td valign="center">
     <span class="header">Quantum GIS Documentation</span><br>
-    <span class="subheader">Version 0.9.1 <i>Ganymede</i></span><br>
+    <span class="subheader">Version 0.10.0 <i>Io</i></span><br>
     <span class="warning">Please read this entire document for important information about this release.</span>
   </td>
 </tr>
@@ -21,14 +21,14 @@
 -->
 <!-- This documentation describes the Quantum GIS (QGIS) application. More
 information on QGIS is available on the web page at http://qgis.org. -->
-<h2>Whats new in Version 0.9.2rc1?</h2>
+<h2>Whats new in Version 0.10.0?</h2>
 <p>
 </p>
-This release candidate includes over 40 bug fixes and enchancements 
+This release includes over 120 bug fixes and enchancements 
 over the QGIS 0.9.1 release. In addition we have added 
 the following new features:
 <ul><li>
-Imrovements to digitising capabilities.
+Improvements to digitising capabilities.
 </li>
 <li>
 Supporting default and defined styles (.qml) files for file based 
@@ -42,6 +42,12 @@ <h2>Whats new in Version 0.9.2rc1?</h2>
 Support for non-north up rasters. Many other raster 
 improvements 'under the hood'.
 </li>
+<li>
+Updated icons for improved visual consistancy.
+</li>
+<li>
+Support for migration of old projects to work in newer QGIS versions.
+</li>
 </ul>
 
 
@@ -59,7 +65,6 @@ <h2>Whats new in Version 0.9.2rc1?</h2>
     <dd>
     General
     <ul class="normal">
-    <li>Project files from previous versions of QGIS will likely not work. 
     <li>Some internationalization (translation) files may be incomplete.
     <li>QGIS is not bug free - we make no assertions as to its fitness for
         use for any particular purpose. Use entirely at your own risk.
@@ -75,7 +80,7 @@ <h2>Whats new in Version 0.9.2rc1?</h2>
     <dd>
     Windows
     <ul class="normal">
-      <li> GRASS included with windows build is from : GRASS 6.3 rc3
+      <li> GRASS included with windows build is from : GRASS 6.3 rc6
     </ul>
     </dd>
     </dt>

diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -75,7 +75,7 @@ static const char * const ident_ = "$Id$";
  */
 void usage( std::string const & appName )
 {
-  std::cerr << "Quantum GIS - " << VERSION << " 'Ganymede' (" 
+  std::cerr << "Quantum GIS - " << VERSION << " '" << RELEASE_NAME << "' (" 
             << QGSSVNVERSION << ")\n" 
       << "Quantum GIS (QGIS) is a viewer for spatial data sets, including\n" 
       << "raster and vector data.\n"  

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1560,7 +1560,7 @@ void QgisApp::about()
      QString whatsNew = "<html><body>" + tr("Version") + " ";
      whatsNew += QGis::qgisVersion;
      whatsNew += "<h3>" + tr("New features") + "</h3>" +
-       tr("This release candidate includes over 40 bug fixes and enchancements "
+       tr("This release candidate includes over 120 bug fixes and enchancements "
            "over the QGIS 0.9.1 release. In addition we have added "
            "the following new features:");
      whatsNew += "<ul><li>"
@@ -1578,6 +1578,12 @@ void QgisApp::about()
            "Support for non-north up rasters. Many other raster "
            "improvements 'under the hood'.")
        + "</li>"
+       + "<li>"
+       + tr("Updated icons for improved visual consistancy.")
+       + "</li>"
+       + "<li>"
+       + tr("Support for migration of old projects to work in newer QGIS versions.")
+       + "</li>"
 //+ "<li>"
 //+ tr("X")
 //+ "</li>"

diff --git a/src/core/qgis.cpp b/src/core/qgis.cpp
@@ -32,10 +32,10 @@ const char* QGis::qgisVersion = VERSION;
 const char* QGis::qgisSvnVersion = QGSSVNVERSION;
 
 // Version number used for comparing versions using the "Check QGIS Version" function
-const int QGis::qgisVersionInt =920;
+const int QGis::qgisVersionInt =VERSION_INT;
 
 // Release name
-const char* QGis::qgisReleaseName = "Ganymede";
+const char* QGis::qgisReleaseName = RELEASE_NAME;
 
 const char* QGis::qgisVectorGeometryType[] =
 {

diff --git a/src/core/qgsprojectfiletransform.cpp b/src/core/qgsprojectfiletransform.cpp
@@ -30,7 +30,7 @@ QgsProjectFileTransform::transform QgsProjectFileTransform::transformers[] = {
   {PFV(0,8,0), PFV(0,8,1), &QgsProjectFileTransform::transformNull},
   {PFV(0,8,1), PFV(0,9,0), &QgsProjectFileTransform::transform081to090},
   {PFV(0,9,0), PFV(0,9,1), &QgsProjectFileTransform::transformNull},
-  {PFV(0,9,1), PFV(0,9,2), &QgsProjectFileTransform::transform091to092}
+  {PFV(0,9,1), PFV(0,10,0), &QgsProjectFileTransform::transform091to0100}
 };
 
 bool QgsProjectFileTransform::updateRevision(QgsProjectVersion newVersion)
@@ -175,7 +175,7 @@ void QgsProjectFileTransform::transform081to090()
 
 };
 
-void QgsProjectFileTransform::transform091to092()
+void QgsProjectFileTransform::transform091to0100()
 {
   QgsDebugMsg("entering");
   if ( ! mDom.isNull() )

diff --git a/src/core/qgsprojectfiletransform.h b/src/core/qgsprojectfiletransform.h
@@ -75,7 +75,7 @@ class QgsProjectFileTransform
   // to the transformArray with proper version number
   void transformNull() {}; // Do absolutely nothing
   void transform081to090();
-  void transform091to092();
+  void transform091to0100();
 };
 
 

diff --git a/src/mac/Contents/CMakeLists.txt b/src/mac/Contents/CMakeLists.txt
@@ -3,7 +3,7 @@
 # create Info.plist
 
 ADD_CUSTOM_TARGET(Info.plist ALL
-                  VERSION=`grep VERSION ${CMAKE_BINARY_DIR}/qgsconfig.h |
+                  VERSION=`grep VERSION ${CMAKE_BINARY_DIR}/qgsconfig.h | head -1 |
                            sed -e "s/#define VERSION //"
                                -e "s/\\\"//g"` &&
                   SVNVERSION=`grep QGSSVNVERSION ${CMAKE_BINARY_DIR}/qgssvnversion.h |