Skip to content

Commit 4d480fc

Browse files
jef-njef-n
committedMay 4, 2011
update version tracking to git
·
ltr-3_40Before-merge-new_vector_api
1 parent 730b651 commit 4d480fc

File tree

12 files changed

+42
-69
lines changed

12 files changed

+42
-69
lines changed
 

‎CMakeLists.txt

Lines changed: 19 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -439,55 +439,28 @@ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
439439
LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/src/core ${CMAKE_BINARY_DIR}/src/gui)
440440

441441
#############################################################
442-
# create qgssvnversion.h
442+
# create qgsversion.h
443443

444-
FIND_FILE(SVN_MARKER entries PATHS ${CMAKE_SOURCE_DIR}/.svn)
445444
FIND_FILE(GIT_MARKER index PATHS ${CMAKE_SOURCE_DIR}/.git)
446445

447-
IF (SVN_MARKER)
448-
# See if we have svn installed
449-
FIND_PROGRAM(SVNVERSION svnversion PATHS c:/cygwin/bin)
450-
451-
IF(SVNVERSION)
452-
IF(MSVC)
453-
ADD_CUSTOM_COMMAND(
454-
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
455-
COMMAND for /f usebackq %%a in "(`\"${SVNVERSION}\"`)" do echo \#define QGSSVNVERSION \"%%a\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
456-
MAIN_DEPENDENCY ${SVN_MARKER}
457-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
458-
)
459-
ELSE(MSVC)
460-
ADD_CUSTOM_COMMAND(
461-
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
462-
COMMAND echo \\\#define QGSSVNVERSION \\\"`${SVNVERSION}`\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
463-
MAIN_DEPENDENCY ${SVN_MARKER}
464-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
465-
)
466-
ENDIF(MSVC)
467-
ELSE(SVNVERSION)
468-
MESSAGE(STATUS "svnversion not found - version will be unknown")
469-
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h "#define QGSSVNVERSION \"unknown\"")
470-
ENDIF (SVNVERSION)
471-
ELSE (SVN_MARKER)
472-
IF (GIT_MARKER)
473-
FIND_PROGRAM(GIT git PATHS c:/cygwin/bin)
474-
IF(GIT)
475-
ADD_CUSTOM_COMMAND(
476-
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
477-
COMMAND echo \\\#define QGSSVNVERSION \\\"$$\( ${GIT} log -n1 --grep='git-svn-id' | sed -ne 's/^ *git-svn-id:.*@\\\([0-9]*\\\).*$$/\\1/p' \)$$\( ${GIT} log --oneline $$\( ${GIT} log -n1 --grep='git-svn-id' --pretty=%H \).. | wc -l | sed -e 's/^/+/' -e 's/+0$$//' \)\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
478-
MAIN_DEPENDENCY ${GIT_MARKER}
479-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
480-
)
481-
ELSE(GIT)
482-
MESSAGE(STATUS "git marker, but no git found - version will be unknown")
483-
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h "#define QGSSVNVERSION \"unknown\"")
484-
ENDIF(GIT)
485-
ELSE (GIT_MARKER)
486-
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h "#define QGSSVNVERSION \"exported\"")
487-
ENDIF (GIT_MARKER)
488-
ENDIF (SVN_MARKER)
489-
490-
ADD_CUSTOM_TARGET(svnversion ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h)
446+
IF (GIT_MARKER)
447+
FIND_PROGRAM(GIT git PATHS c:/cygwin/bin)
448+
IF(GIT)
449+
ADD_CUSTOM_COMMAND(
450+
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
451+
COMMAND echo \\\#define QGSVERSION \\\"$$\( ${GIT} log -n1 --pretty=%h \)\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
452+
MAIN_DEPENDENCY ${GIT_MARKER}
453+
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
454+
)
455+
ELSE(GIT)
456+
MESSAGE(STATUS "git marker, but no git found - version will be unknown")
457+
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"unknown\"")
458+
ENDIF(GIT)
459+
ELSE (GIT_MARKER)
460+
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"exported\"")
461+
ENDIF (GIT_MARKER)
462+
463+
ADD_CUSTOM_TARGET(version ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h)
491464

492465
#############################################################
493466
# process subdirs

‎mac/xcode/Qgis.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15090,12 +15090,12 @@
1509015090
"$(SRCROOT)/../../cmake_templates/qgsconfig.h.in",
1509115091
);
1509215092
outputPaths = (
15093-
"$(CONFIGURATION_BUILD_DIR)/include/qgssvnversion.h",
15093+
"$(CONFIGURATION_BUILD_DIR)/include/qgsversion.h",
1509415094
"$(CONFIGURATION_BUILD_DIR)/include/qgsconfig.h",
1509515095
);
1509615096
runOnlyForDeploymentPostprocessing = 0;
1509715097
shellPath = /bin/sh;
15098-
shellScript = "mkdir -p \"$CONFIGURATION_BUILD_DIR/include\"\n\n# check if the files are generated, clean if need to regenerate\n\nif [ ! -f \"$CONFIGURATION_BUILD_DIR/include/qgsconfig.h\" ] || [ ../../cmake_templates/qgsconfig.h.in -nt \"$CONFIGURATION_BUILD_DIR/include/qgsconfig.h\" ] ; then\necho \"Generating qgsconfig.h...\"\nsed -e \"s,\\${CPACK_PACKAGE_VERSION_MAJOR},$QGIS_VERSION_MAJOR,g\" \\\n\t-e \"s,\\${CPACK_PACKAGE_VERSION_MINOR},$QGIS_VERSION_MINOR,g\" \\\n\t-e \"s,\\${CPACK_PACKAGE_VERSION_PATCH},$QGIS_VERSION_PATCH,g\" \\\n\t-e \"s,\\${RELEASE_NAME},$QGIS_RELEASE_NAME,g\" \\\n\t-e \"s,\\${QGIS_VERSION_INT},$QGIS_VERSION_INT,g\" \\\n\t-e \"s,\\${QGIS_PLUGIN_SUBDIR},$QGIS_PLUGIN_SUBDIR,g\" \\\n\t-e \"s,\\${QGIS_DATA_SUBDIR},$QGIS_DATA_SUBDIR,g\" \\\n\t-e \"s,\\${QGIS_LIBEXEC_SUBDIR},$QGIS_LIBEXEC_SUBDIR,g\" \\\n\t-e \"s,\\${QGIS_LIB_SUBDIR},$QGIS_LIB_SUBDIR,g\" \\\n\t-e \"s,\\${CMAKE_INSTALL_PREFIX},$CMAKE_INSTALL_PREFIX,g\" \\\n\t-e \"s,#cmakedefine,#define,g\" \\\n\t../../cmake_templates/qgsconfig.h.in > \"$CONFIGURATION_BUILD_DIR/include/qgsconfig.h\"\nfi\n\nif [ ! -f \"$CONFIGURATION_BUILD_DIR/include/qgssvnversion.h\" ] ; then\necho \"Generating qgssvnversion.h...\"\nsvnv=`which svnversion`\nif [ \"$svnv\" ] ; then\n\tsvnver=`svnversion $SRCROOT`\nelse\n\tsvnver=\"unknown\"\nfi\necho \"#define QGSSVNVERSION \\\"$svnver\\\"\" > \"$CONFIGURATION_BUILD_DIR/include/qgssvnversion.h\"\nfi\n\nexit 0";
15098+
shellScript = "mkdir -p \"$CONFIGURATION_BUILD_DIR/include\"\n\n# check if the files are generated, clean if need to regenerate\n\nif [ ! -f \"$CONFIGURATION_BUILD_DIR/include/qgsconfig.h\" ] || [ ../../cmake_templates/qgsconfig.h.in -nt \"$CONFIGURATION_BUILD_DIR/include/qgsconfig.h\" ] ; then\necho \"Generating qgsconfig.h...\"\nsed -e \"s,\\${CPACK_PACKAGE_VERSION_MAJOR},$QGIS_VERSION_MAJOR,g\" \\\n\t-e \"s,\\${CPACK_PACKAGE_VERSION_MINOR},$QGIS_VERSION_MINOR,g\" \\\n\t-e \"s,\\${CPACK_PACKAGE_VERSION_PATCH},$QGIS_VERSION_PATCH,g\" \\\n\t-e \"s,\\${RELEASE_NAME},$QGIS_RELEASE_NAME,g\" \\\n\t-e \"s,\\${QGIS_VERSION_INT},$QGIS_VERSION_INT,g\" \\\n\t-e \"s,\\${QGIS_PLUGIN_SUBDIR},$QGIS_PLUGIN_SUBDIR,g\" \\\n\t-e \"s,\\${QGIS_DATA_SUBDIR},$QGIS_DATA_SUBDIR,g\" \\\n\t-e \"s,\\${QGIS_LIBEXEC_SUBDIR},$QGIS_LIBEXEC_SUBDIR,g\" \\\n\t-e \"s,\\${QGIS_LIB_SUBDIR},$QGIS_LIB_SUBDIR,g\" \\\n\t-e \"s,\\${CMAKE_INSTALL_PREFIX},$CMAKE_INSTALL_PREFIX,g\" \\\n\t-e \"s,#cmakedefine,#define,g\" \\\n\t../../cmake_templates/qgsconfig.h.in > \"$CONFIGURATION_BUILD_DIR/include/qgsconfig.h\"\nfi\n\nif [ ! -f \"$CONFIGURATION_BUILD_DIR/include/qgsversion.h\" ] ; then\necho \"Generating qgsversion.h...\"\nsvnv=`which svnversion`\nif [ \"$svnv\" ] ; then\n\tsvnver=`svnversion $SRCROOT`\nelse\n\tsvnver=\"unknown\"\nfi\necho \"#define QGSSVNVERSION \\\"$svnver\\\"\" > \"$CONFIGURATION_BUILD_DIR/include/qgsversion.h\"\nfi\n\nexit 0";
1509915099
showEnvVarsInLog = 0;
1510015100
};
1510115101
7223B7830F96A96500D905B4 /* Script - ui */ = {

‎mac/xcode/ReadMe.rtf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ If recompiling any other target, you should then also recompile the \ul bundle\u
301301
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
302302
\cf0 \ul Cleaning\ulnone - to clean the project
303303
\b Clean All
304-
\b0 . This actually leaves qgsconfig.h and qgssvnversion.h in the build folder.\
304+
\b0 . This actually leaves qgsconfig.h and qgsversion.h in the build folder.\
305305
\
306306
For a complete clean, trash the build folder from the project folder (NOT from the project itself!).\
307307
\
@@ -347,4 +347,4 @@ See the Xcode documentation for more info on using the debugger.\
347347
{\field{\*\fldinst{HYPERLINK "http://www.kyngchaos.com"}}{\fldrslt
348348
\fs24 \cf0 http://www.kyngchaos.com/}}
349349
\fs24 \
350-
}
350+
}

‎python/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ INCLUDE_DIRECTORIES(
2727
../src/core/spatialindex
2828
../src/core/symbology
2929
../src/core/symbology-ng
30-
${CMAKE_BINARY_DIR} # qgsconfig.h, qgssvnversion.h
30+
${CMAKE_BINARY_DIR} # qgsconfig.h, qgsversion.h
3131
)
3232

3333

‎python/core/qgis.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public:
3434
// Release name
3535
static const char* QGIS_RELEASE_NAME;
3636
// The subversion version
37-
static const char* QGIS_SVN_VERSION;
37+
static const char* QGIS_DEV_VERSION;
3838

3939
// Enumerations
4040
//

‎scripts/prepare-commit.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ fi
3333

3434
# save original changes
3535
if [ -d .svn ]; then
36-
REV=$(svn info | sed -ne "s/Revision: //p")
37-
svn diff >r$REV.diff
36+
REV=r$(svn info | sed -ne "s/Revision: //p")
37+
svn diff >$REV.diff
3838
elif [ -d .git ]; then
39-
REV=$(git svn info | sed -ne "s/Revision: //p")
40-
git diff >r$REV.diff
39+
REV=$(git log -n1 --pretty=%H)
40+
git diff >$REV.diff
4141
fi
4242

43-
ASTYLEDIFF=astyle.r$REV.diff
43+
ASTYLEDIFF=astyle.$REV.diff
4444
>$ASTYLEDIFF
4545

4646
# reformat
@@ -59,7 +59,7 @@ for f in $MODIFIED; do
5959
;;
6060
esac
6161

62-
m=$f.r$REV.prepare
62+
m=$f.$REV.prepare
6363

6464
cp $f $m
6565
astyle.sh $f

‎src/app/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ typedef SInt32 SRefCon;
6767
#include "qgsmapcanvas.h"
6868
#include "qgsapplication.h"
6969
#include <qgsconfig.h>
70-
#include <qgssvnversion.h>
70+
#include <qgsversion.h>
7171
#include "qgsexception.h"
7272
#include "qgsproject.h"
7373
#include "qgsrectangle.h"
@@ -86,7 +86,7 @@ static const char * const ident_ = "$Id$";
8686
void usage( std::string const & appName )
8787
{
8888
std::cerr << "Quantum GIS - " << VERSION << " '" << RELEASE_NAME << "' ("
89-
<< QGSSVNVERSION << ")\n"
89+
<< QGSVERSION << ")\n"
9090
<< "Quantum GIS (QGIS) is a viewer for spatial data sets, including\n"
9191
<< "raster and vector data.\n"
9292
<< "Usage: " << appName << " [options] [FILES]\n"

‎src/app/qgisapp.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ static void setTitleBarText_( QWidget & qgisApp )
274274

275275
if ( QString( QGis::QGIS_VERSION ).endsWith( "Trunk" ) )
276276
{
277-
caption += QString( "r%1" ).arg( QGis::QGIS_SVN_VERSION );
277+
caption += QString( "r%1" ).arg( QGis::QGIS_DEV_VERSION );
278278
}
279279
else
280280
{
@@ -1916,7 +1916,7 @@ void QgisApp::about()
19161916
abt = new QgsAbout();
19171917
QString versionString = tr( "You are using QGIS version %1 built against code revision %2." )
19181918
.arg( QGis::QGIS_VERSION )
1919-
.arg( QGis::QGIS_SVN_VERSION );
1919+
.arg( QGis::QGIS_DEV_VERSION );
19201920

19211921
versionString += tr( "\nGDAL/OGR Version: %1." ).arg( GDAL_RELEASE_NAME );
19221922

‎src/core/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,8 +323,8 @@ ADD_LIBRARY(qgis_core SHARED ${QGIS_CORE_SRCS} ${QGIS_CORE_MOC_SRCS} ${INDEX_SRC
323323

324324
SET_TARGET_PROPERTIES(qgis_core PROPERTIES VERSION ${COMPLETE_VERSION} SOVERSION ${COMPLETE_VERSION})
325325

326-
# make sure to create qgssvnversion.h before compiling
327-
ADD_DEPENDENCIES(qgis_core svnversion)
326+
# make sure to create qgsversion.h before compiling
327+
ADD_DEPENDENCIES(qgis_core version)
328328

329329
# because of htonl
330330
IF (WIN32)

‎src/core/qgis.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
***************************************************************************/
1818
#include "qgis.h"
1919
#ifndef QGSSVNVERSION
20-
#include "qgssvnversion.h"
20+
#include "qgsversion.h"
2121
#endif
2222

2323
#include "qgsconfig.h"
@@ -29,7 +29,7 @@
2929
const char* QGis::QGIS_VERSION = VERSION;
3030

3131
// SVN version
32-
const char* QGis::QGIS_SVN_VERSION = QGSSVNVERSION;
32+
const char* QGis::QGIS_DEV_VERSION = QGSVERSION;
3333

3434
// Version number used for comparing versions using the
3535
// "Check QGIS Version" function

‎src/core/qgis.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ class CORE_EXPORT QGis
3939
static const int QGIS_VERSION_INT;
4040
// Release name
4141
static const char* QGIS_RELEASE_NAME;
42-
// The subversion version
43-
static const char* QGIS_SVN_VERSION;
42+
// The development version
43+
static const char* QGIS_DEV_VERSION;
4444

4545
// Enumerations
4646
//

‎src/python/qgspythonutilsimpl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ bool QgsPythonUtilsImpl::runString( const QString& command, QString msgOnError )
177177

178178
QString str = "<font color=\"red\">" + msgOnError + "</font><br><pre>\n" + traceback + "\n</pre>"
179179
+ QObject::tr( "Python version:" ) + "<br>" + version + "<br><br>"
180-
+ QObject::tr( "QGIS version:" ) + "<br>" + QString( "%1 '%2', %3" ).arg( QGis::QGIS_VERSION ).arg( QGis::QGIS_RELEASE_NAME ).arg( QGis::QGIS_SVN_VERSION ) + "<br><br>"
180+
+ QObject::tr( "QGIS version:" ) + "<br>" + QString( "%1 '%2', %3" ).arg( QGis::QGIS_VERSION ).arg( QGis::QGIS_RELEASE_NAME ).arg( QGis::QGIS_DEV_VERSION ) + "<br><br>"
181181
+ QObject::tr( "Python path:" ) + "<br>" + path;
182182
str.replace( "\n", "<br>" ).replace( " ", "&nbsp; " );
183183

0 commit comments

Comments
 (0)
Please sign in to comment.