Rename calligragitversion.h -> kritagitversion.h

parent fbaf338c
......@@ -111,8 +111,8 @@ message("Module path:" ${CMAKE_MODULE_PATH})
# fetch git revision for the current build
set(CALLIGRA_GIT_SHA1_STRING "")
set(CALLIGRA_GIT_BRANCH_STRING "")
set(KRITA_GIT_SHA1_STRING "")
set(KRITA_GIT_BRANCH_STRING "")
include(GetGitRevisionDescription)
get_git_head_revision(GIT_REFSPEC GIT_SHA1)
......@@ -120,8 +120,8 @@ get_git_branch(GIT_BRANCH)
if(GIT_SHA1 AND GIT_BRANCH)
string(SUBSTRING ${GIT_SHA1} 0 7 GIT_SHA1)
set(CALLIGRA_GIT_SHA1_STRING ${GIT_SHA1})
set(CALLIGRA_GIT_BRANCH_STRING ${GIT_BRANCH})
set(KRITA_GIT_SHA1_STRING ${GIT_SHA1})
set(KRITA_GIT_BRANCH_STRING ${GIT_BRANCH})
endif()
if(NOT DEFINED RELEASE_BUILD)
......
......@@ -28,7 +28,7 @@
#include <kis_debug.h>
#include <calligraversion.h>
#include <calligragitversion.h>
#include <kritagitversion.h>
#include "mainwindow.h"
......@@ -39,8 +39,8 @@ int main( int argc, char **argv )
KLocalizedString::setApplicationDomain( "crashhandler" );
#ifdef CALLIGRA_GIT_SHA1_STRING
QString gitVersion(CALLIGRA_GIT_SHA1_STRING);
#ifdef KRITA_GIT_SHA1_STRING
QString gitVersion(KRITA_GIT_SHA1_STRING);
version = QString("%1 (git %2)").arg(calligraVersion).arg(gitVersion).toLatin1();
#else
version = calligraVersion;
......
......@@ -26,7 +26,7 @@
#include <KoResourcePaths.h>
#include <calligraversion.h>
#include <calligragitversion.h>
#include <kritagitversion.h>
#include <cstdlib>
......@@ -287,14 +287,14 @@ void MainWindow::startUpload()
QString version;
#ifdef CALLIGRA_GIT_SHA1_STRING
QString gitVersion(CALLIGRA_GIT_SHA1_STRING);
#ifdef KRITA_GIT_SHA1_STRING
QString gitVersion(KRITA_GIT_SHA1_STRING);
version = QString("%1-%2").arg(calligraVersion).arg(gitVersion).toLatin1();
#else
version = calligraVersion;
#endif
fields << Field("BuildID", CALLIGRA_GIT_SHA1_STRING)
fields << Field("BuildID", KRITA_GIT_SHA1_STRING)
<< Field("ProductName", "krita")
<< Field("Version", version.toLatin1())
<< Field("Vendor", "Krita Foundation")
......
......@@ -39,7 +39,7 @@
#include "sketch/SketchInputContext.h"
#include <calligraversion.h>
#include <calligragitversion.h>
#include <kritagitversion.h>
#if defined Q_OS_WIN
#include "stdlib.h"
......@@ -55,8 +55,8 @@ int main( int argc, char** argv )
QString version;
#ifdef CALLIGRA_GIT_SHA1_STRING
QString gitVersion(CALLIGRA_GIT_SHA1_STRING);
#ifdef KRITA_GIT_SHA1_STRING
QString gitVersion(KRITA_GIT_SHA1_STRING);
version = QString("%1 (git %2)").arg(calligraVersion).arg(gitVersion).toLatin1();
#else
version = calligraVersion;
......
......@@ -32,7 +32,7 @@
#include <KoResourcePaths.h>
#include <calligraversion.h>
#include <calligragitversion.h>
#include <kritagitversion.h>
#include <opengl/kis_opengl.h>
#include <kis_icon.h>
......@@ -57,8 +57,8 @@ int main( int argc, char** argv )
QString version;
#ifdef CALLIGRA_GIT_SHA1_STRING
QString gitVersion(CALLIGRA_GIT_SHA1_STRING);
#ifdef KRITA_GIT_SHA1_STRING
QString gitVersion(KRITA_GIT_SHA1_STRING);
version = QString("%1 (git %2)").arg(calligraVersion).arg(gitVersion).toLatin1();
#else
version = calligraVersion;
......
# generate calligraversion.h
configure_file(calligraversion.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/calligraversion.h)
# generate calligragitversion.h
configure_file(calligragitversion.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/calligragitversion.h)
# generate kritagitversion.h
configure_file(kritagitversion.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kritagitversion.h)
set(kritaversion_LIB_SRCS
calligraversion.cpp
......
......@@ -18,7 +18,7 @@
#include <KritaVersionWrapper.h>
#include <calligraversion.h>
#include <calligragitversion.h>
#include <kritagitversion.h>
QString KritaVersionWrapper::versionString(bool checkGit)
{
......@@ -26,8 +26,8 @@ QString KritaVersionWrapper::versionString(bool checkGit)
QString version = calligraVersion;
if (checkGit) {
#ifdef CALLIGRA_GIT_SHA1_STRING
QString gitVersion(CALLIGRA_GIT_SHA1_STRING);
#ifdef KRITA_GIT_SHA1_STRING
QString gitVersion(KRITA_GIT_SHA1_STRING);
version = QString("%1 (git %2)").arg(calligraVersion).arg(gitVersion).toLatin1();
#endif
}
......
......@@ -18,21 +18,21 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef __CALLIGRA_GIT_VERSION_H
#define __CALLIGRA_GIT_VERSION_H
#ifndef __KRITA_GIT_VERSION_H
#define __KRITA_GIT_VERSION_H
/**
* @def CALLIGRA_GIT_SHA1_STRING
* @ingroup CalligraMacros
* @brief Indicates the git sha1 commit which was used for compilation of Calligra
* @def KRITA_GIT_SHA1_STRING
* @ingroup KritaMacros
* @brief Indicates the git sha1 commit which was used for compilation of Krita
*/
#cmakedefine CALLIGRA_GIT_SHA1_STRING "@CALLIGRA_GIT_SHA1_STRING@"
#cmakedefine KRITA_GIT_SHA1_STRING "@KRITA_GIT_SHA1_STRING@"
/**
* @def CALLIGRA_GIT_BRANCH_STRING
* @ingroup CalligraMacros
* @brief Indicates the git branch name which was used for compilation of Calligra
* @def KRITA_GIT_BRANCH_STRING
* @ingroup KritaMacros
* @brief Indicates the git branch name which was used for compilation of Krita
*/
#cmakedefine CALLIGRA_GIT_BRANCH_STRING "@CALLIGRA_GIT_BRANCH_STRING@"
#cmakedefine KRITA_GIT_BRANCH_STRING "@KRITA_GIT_BRANCH_STRING@"
#endif /* __CALLIGRA_GIT_VERSION_H */
#endif /* __KRITA_GIT_VERSION_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment