[QGIS Commit] r8361 - in trunk/qgis: . cmake_templates doc src/app
src/core src/mac/Contents
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Thu Apr 17 08:35:32 EDT 2008
Author: timlinux
Date: 2008-04-17 08:35:32 -0400 (Thu, 17 Apr 2008)
New Revision: 8361
Modified:
trunk/qgis/CMakeLists.txt
trunk/qgis/cmake_templates/qgsconfig.h.in
trunk/qgis/doc/index.html
trunk/qgis/src/app/main.cpp
trunk/qgis/src/app/qgisapp.cpp
trunk/qgis/src/core/qgis.cpp
trunk/qgis/src/core/qgsprojectfiletransform.cpp
trunk/qgis/src/core/qgsprojectfiletransform.h
trunk/qgis/src/mac/Contents/CMakeLists.txt
Log:
Updated version to 0.10.0 since this release will contain new features 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.
Modified: trunk/qgis/CMakeLists.txt
===================================================================
--- trunk/qgis/CMakeLists.txt 2008-04-17 12:31:12 UTC (rev 8360)
+++ trunk/qgis/CMakeLists.txt 2008-04-17 12:35:32 UTC (rev 8361)
@@ -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 @@
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)
Modified: trunk/qgis/cmake_templates/qgsconfig.h.in
===================================================================
--- trunk/qgis/cmake_templates/qgsconfig.h.in 2008-04-17 12:31:12 UTC (rev 8360)
+++ trunk/qgis/cmake_templates/qgsconfig.h.in 2008-04-17 12:35:32 UTC (rev 8361)
@@ -8,8 +8,13 @@
// <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}"
#define QGIS_PLUGIN_SUBDIR "${QGIS_PLUGIN_SUBDIR}"
Modified: trunk/qgis/doc/index.html
===================================================================
--- trunk/qgis/doc/index.html 2008-04-17 12:31:12 UTC (rev 8360)
+++ trunk/qgis/doc/index.html 2008-04-17 12:35:32 UTC (rev 8361)
@@ -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 @@
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 @@
<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 @@
<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>
Modified: trunk/qgis/src/app/main.cpp
===================================================================
--- trunk/qgis/src/app/main.cpp 2008-04-17 12:31:12 UTC (rev 8360)
+++ trunk/qgis/src/app/main.cpp 2008-04-17 12:35:32 UTC (rev 8361)
@@ -75,7 +75,7 @@
*/
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"
Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp 2008-04-17 12:31:12 UTC (rev 8360)
+++ trunk/qgis/src/app/qgisapp.cpp 2008-04-17 12:35:32 UTC (rev 8361)
@@ -1560,7 +1560,7 @@
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 @@
"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>"
Modified: trunk/qgis/src/core/qgis.cpp
===================================================================
--- trunk/qgis/src/core/qgis.cpp 2008-04-17 12:31:12 UTC (rev 8360)
+++ trunk/qgis/src/core/qgis.cpp 2008-04-17 12:35:32 UTC (rev 8361)
@@ -32,10 +32,10 @@
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[] =
{
Modified: trunk/qgis/src/core/qgsprojectfiletransform.cpp
===================================================================
--- trunk/qgis/src/core/qgsprojectfiletransform.cpp 2008-04-17 12:31:12 UTC (rev 8360)
+++ trunk/qgis/src/core/qgsprojectfiletransform.cpp 2008-04-17 12:35:32 UTC (rev 8361)
@@ -30,7 +30,7 @@
{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::transform091to092()
+void QgsProjectFileTransform::transform091to0100()
{
QgsDebugMsg("entering");
if ( ! mDom.isNull() )
Modified: trunk/qgis/src/core/qgsprojectfiletransform.h
===================================================================
--- trunk/qgis/src/core/qgsprojectfiletransform.h 2008-04-17 12:31:12 UTC (rev 8360)
+++ trunk/qgis/src/core/qgsprojectfiletransform.h 2008-04-17 12:35:32 UTC (rev 8361)
@@ -75,7 +75,7 @@
// to the transformArray with proper version number
void transformNull() {}; // Do absolutely nothing
void transform081to090();
- void transform091to092();
+ void transform091to0100();
};
Modified: trunk/qgis/src/mac/Contents/CMakeLists.txt
===================================================================
--- trunk/qgis/src/mac/Contents/CMakeLists.txt 2008-04-17 12:31:12 UTC (rev 8360)
+++ trunk/qgis/src/mac/Contents/CMakeLists.txt 2008-04-17 12:35:32 UTC (rev 8361)
@@ -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 |
More information about the QGIS-commit
mailing list