diff --git a/.gitignore b/.gitignore index 7e95da1d91..17f0fd2d32 100644 --- a/.gitignore +++ b/.gitignore @@ -154,7 +154,7 @@ designer_version.h *.sw? # Build version -build_version.hpp +platform/platform_qt_version.cpp #python modules building tools/python/*/build diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b3ed0a1bd..1de5728162 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -279,27 +279,6 @@ if (USE_PCH) ${OMIM_PCH_TARGET_NAME} ) endif() - -# Generate version header file. -execute_process(COMMAND tools/unix/version.sh android_name - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - OUTPUT_VARIABLE OM_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE -) -execute_process(COMMAND tools/unix/version.sh android_code - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - OUTPUT_VARIABLE OM_VERSION_CODE - OUTPUT_STRIP_TRAILING_WHITESPACE -) -execute_process(COMMAND tools/unix/version.sh git_hash - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - OUTPUT_VARIABLE OM_GIT_HASH - OUTPUT_STRIP_TRAILING_WHITESPACE -) -# TODO: Does it run on every build or only on configure step? -# TODO: Run only when dependent targets are built. -configure_file(build_version.hpp.in ${CMAKE_SOURCE_DIR}/build_version.hpp @ONLY) - # Include 3party dependencies. # Configure expat library. diff --git a/android/jni/com/mapswithme/platform/Platform.cpp b/android/jni/com/mapswithme/platform/Platform.cpp index 28d17923a3..324b5fa1ee 100644 --- a/android/jni/com/mapswithme/platform/Platform.cpp +++ b/android/jni/com/mapswithme/platform/Platform.cpp @@ -58,6 +58,21 @@ std::string Platform::DeviceModel() const return jni::ToNativeString(env, deviceModel); } +std::string Platform::Version() const +{ + JNIEnv * env = jni::GetEnv(); + static jmethodID const getVersionId = jni::GetStaticMethodID(env, g_utilsClazz, "getVersion", "()Ljava/lang/String;"); + auto const version = static_cast(env->CallStaticObjectMethod(g_utilsClazz, getVersionId)); + return jni::ToNativeString(env, version); +} + +int32_t Platform::IntVersion() const +{ + JNIEnv * env = jni::GetEnv(); + static jmethodID const getIntVersionId = jni::GetStaticMethodID(env, g_utilsClazz, "getIntVersion", "()I"); + return env->CallStaticIntMethod(g_utilsClazz, getIntVersionId); +} + Platform::EConnectionType Platform::ConnectionStatus() { JNIEnv * env = jni::GetEnv(); diff --git a/build_version.hpp.in b/build_version.hpp.in deleted file mode 100644 index 373ebbcbb9..0000000000 --- a/build_version.hpp.in +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#include - -namespace build_version -{ -constexpr uint64_t kCode = @OM_VERSION_CODE@; -constexpr char const * const kName = "@OM_VERSION@ (@OM_GIT_HASH@)"; -} // namespace build_version diff --git a/generator/complex_generator/complex_generator.cpp b/generator/complex_generator/complex_generator.cpp index 41f88981e9..963dc0fd86 100644 --- a/generator/complex_generator/complex_generator.cpp +++ b/generator/complex_generator/complex_generator.cpp @@ -42,7 +42,6 @@ #include #include -#include "build_version.hpp" #include "defines.hpp" #include "gflags/gflags.h" @@ -61,14 +60,15 @@ DEFINE_bool(debug, false, "Debug mode."); MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv) { CHECK(IsLittleEndian(), ("Only little-endian architectures are supported.")); + Platform & pl = GetPlatform(); + gflags::SetUsageMessage( "complex_generator is a program that generates complexes on the basis of " "the last generation of maps. Complexes are a hierarchy of interesting " "geographical features."); - gflags::SetVersionString(build_version::kName); + gflags::SetVersionString(pl.Version()); gflags::ParseCommandLineFlags(&argc, &argv, true); - Platform & pl = GetPlatform(); auto threadsCount = pl.CpuCores(); CHECK(!FLAGS_user_resource_path.empty(), ()); pl.SetResourceDir(FLAGS_user_resource_path); diff --git a/generator/generator_tool/generator_tool.cpp b/generator/generator_tool/generator_tool.cpp index 19b004d06c..bb84e4ea6e 100644 --- a/generator/generator_tool/generator_tool.cpp +++ b/generator/generator_tool/generator_tool.cpp @@ -69,8 +69,6 @@ #include "gflags/gflags.h" -#include "build_version.hpp" - namespace { char const * GetDataPathHelp() @@ -214,12 +212,13 @@ MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv) CHECK(IsLittleEndian(), ("Only little-endian architectures are supported.")); + Platform & pl = GetPlatform(); + gflags::SetUsageMessage( "Takes OSM XML data from stdin and creates data and index files in several passes."); - gflags::SetVersionString(build_version::kName); + gflags::SetVersionString(pl.Version()); gflags::ParseCommandLineFlags(&argc, &argv, true); - Platform & pl = GetPlatform(); unsigned threadsCount = FLAGS_threads_count != 0 ? static_cast(FLAGS_threads_count) : pl.CpuCores(); diff --git a/platform/CMakeLists.txt b/platform/CMakeLists.txt index 293d8f6023..36bed22608 100644 --- a/platform/CMakeLists.txt +++ b/platform/CMakeLists.txt @@ -83,12 +83,29 @@ elseif(${PLATFORM_ANDROID}) platform_unix_impl.hpp ) else() # neither iPhone nor Android + + # Generate version header file. + execute_process(COMMAND tools/unix/version.sh qt_version + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT_VARIABLE OM_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + execute_process(COMMAND tools/unix/version.sh qt_int_version + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT_VARIABLE OM_INT_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/platform_qt_version.cpp.in" + "${CMAKE_CURRENT_BINARY_DIR}/platform_qt_version.cpp" + @ONLY) + append(SRC localization_dummy.cpp location_service.cpp location_service.hpp network_policy_dummy.cpp platform_qt.cpp + "${CMAKE_CURRENT_BINARY_DIR}/platform_qt_version.cpp" ) if (${PLATFORM_WIN}) diff --git a/platform/platform.hpp b/platform/platform.hpp index cea004fc80..23f26480bd 100644 --- a/platform/platform.hpp +++ b/platform/platform.hpp @@ -258,6 +258,12 @@ public: std::string DeviceModel() const; + /// @return string version as displayed to the user. + std::string Version() const; + + /// @return integer version in yyMMdd format. + int32_t IntVersion() const; + /// @return url for clients to download maps //@{ std::string MetaServerUrl() const; diff --git a/platform/platform_ios.mm b/platform/platform_ios.mm index 5ff78de53b..f259e13469 100644 --- a/platform/platform_ios.mm +++ b/platform/platform_ios.mm @@ -157,6 +157,26 @@ std::string Platform::DeviceModel() const return deviceModel.UTF8String; } +std::string Platform::Version() const +{ + NSString * version = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"]; + return version.UTF8String; +} + +int32_t Platform::IntVersion() const +{ + NSString * version = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"]; + int year = 0; + int month = 0; + int day = 0; + int rc = sscanf(version.UTF8String, "%d.%d.%d", &year, &month, &day); + CHECK_EQUAL(rc, 3, ("Failed to parse version")); + CHECK(year > 2000 && year < 3000, ("Invalid year")); + CHECK(month > 0 && month <= 12, ("Invalid month")); + CHECK(day > 0 && day <= 31, ("Invalid day")); + return (int32_t)(year - 2000) * 10000 + month * 100 + day; +} + Platform::EConnectionType Platform::ConnectionStatus() { struct sockaddr_in zero; diff --git a/platform/platform_qt_version.cpp.in b/platform/platform_qt_version.cpp.in new file mode 100644 index 0000000000..dcbafe76a6 --- /dev/null +++ b/platform/platform_qt_version.cpp.in @@ -0,0 +1,11 @@ +#include "platform/platform.hpp" + +std::string Platform::Version() const +{ + return "@OM_VERSION@"; +} + +int32_t Platform::IntVersion() const +{ + return @OM_INT_VERSION@; +} diff --git a/qt/about.cpp b/qt/about.cpp index e2d3da0a49..ff80066173 100644 --- a/qt/about.cpp +++ b/qt/about.cpp @@ -4,8 +4,6 @@ #include "base/logging.hpp" -#include "build_version.hpp" - #include #include @@ -26,9 +24,11 @@ AboutDialog::AboutDialog(QWidget * parent) QLabel * labelIcon = new QLabel(); labelIcon->setPixmap(icon.pixmap(128)); + Platform & platform = GetPlatform(); + QVBoxLayout * versionBox = new QVBoxLayout(); versionBox->addWidget(new QLabel(qAppName())); - versionBox->addWidget(new QLabel(QString("Version: ") + build_version::kName)); + versionBox->addWidget(new QLabel(QString("Version: ") + QString::fromStdString(platform.Version()))); // TODO: insert maps data version. //versionBox->addWidget(new QLabel(QString("Data: ") + DESIGNER_DATA_VERSION)); @@ -39,7 +39,7 @@ AboutDialog::AboutDialog(QWidget * parent) std::string aboutText; try { - ReaderPtr reader = GetPlatform().GetReader("copyright.html"); + ReaderPtr reader = platform.GetReader("copyright.html"); reader.ReadAsString(aboutText); } catch (RootException const & ex) diff --git a/qt/main.cpp b/qt/main.cpp index 2dd4d13e5b..4f948ff9c2 100644 --- a/qt/main.cpp +++ b/qt/main.cpp @@ -14,8 +14,6 @@ #include "build_style/build_style.h" -#include "build_version.hpp" - #include #include #include @@ -119,11 +117,12 @@ int main(int argc, char * argv[]) // See http://dbaron.org/log/20121222-locale for more details. (void)::setenv("LC_NUMERIC", "C", 1); + Platform & platform = GetPlatform(); + gflags::SetUsageMessage("Desktop application."); - gflags::SetVersionString(build_version::kName); + gflags::SetVersionString(platform.Version()); gflags::ParseCommandLineFlags(&argc, &argv, true); - Platform & platform = GetPlatform(); if (!FLAGS_resources_path.empty()) platform.SetResourceDir(FLAGS_resources_path); if (!FLAGS_data_path.empty()) diff --git a/tools/unix/generate_version.sh b/tools/unix/generate_version.sh deleted file mode 100755 index 353cab6206..0000000000 --- a/tools/unix/generate_version.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/bash - -#set -x - -if [ $# -lt 3 ]; then - echo "Usage:" - echo " $0 GIT_WORKING_DIR_PATH MAJOR MINOR [out_version_header]" - echo "if only 3 arguments are given, script prints current string version to stdout" - exit 1 -fi - -GIT_WORKING_DIR_PATH="$1" -MAJOR=$2 -MINOR=$3 - -# Windows workaround -WIN_GIT_BIN_PATH1="/C/Program Files/Git/bin" -if [ -e "$WIN_GIT_BIN_PATH1" ]; then - PATH="$WIN_GIT_BIN_PATH1:$PATH" -else - WIN_GIT_BIN_PATH2="/C/Program Files (x86)/Git/bin" - if [ -e "$WIN_GIT_BIN_PATH2" ]; then - PATH="$WIN_GIT_BIN_PATH2:$PATH" - else - MAC_GIT_BIN_PATH1=/usr/local/git/bin - if [ -e "$MAC_GIT_BIN_PATH1" ]; then - PATH="$MAC_GIT_BIN_PATH1:$PATH" - fi - MAC_GIT_BIN_PATH2=/opt/local/bin - if [ -e "$MAC_GIT_BIN_PATH2" ]; then - PATH="$MAC_GIT_BIN_PATH2:$PATH" - fi - fi -fi - -BUILD_TIMESTAMP=`date -u +%y%m%d%H%M` -BUILD_TIMESTAMP_FULL=`date -u` - -GIT_CMD="git --git-dir=$GIT_WORKING_DIR_PATH/.git --work-tree=$GIT_WORKING_DIR_PATH" - -GIT_COMMIT=`cd $GIT_WORKING_DIR_PATH; $GIT_CMD log --oneline -1` -GIT_COMMIT_HASH=${GIT_COMMIT:0:7} - -# check if git repo has local uncommitted modifications -STRING_MODIFICATIONS="" -GIT_STATUS_OUTPUT=`cd $GIT_WORKING_DIR_PATH; $GIT_CMD status -s -uno` -if [ -n "$GIT_STATUS_OUTPUT" ]; then - STRING_MODIFICATIONS=".altered" -fi - -STRING_VER="${MAJOR}.${MINOR}.${BUILD_TIMESTAMP}.${GIT_COMMIT_HASH}${STRING_MODIFICATIONS}" - -if [ $# -eq 3 ]; then - echo $STRING_VER - exit 0 -fi - -# write out header -if [ $# -eq 4 ]; then - OUT_FILE=$4 - - echo "#pragma once" > $OUT_FILE - echo "// This header is auto generated by script" >> $OUT_FILE - echo "namespace Version" >> $OUT_FILE - echo "{" >> $OUT_FILE - echo " static unsigned int const MAJOR = $MAJOR;" >> $OUT_FILE - echo " static unsigned int const MINOR = $MINOR;" >> $OUT_FILE - echo " static unsigned int const BUILD = $BUILD_TIMESTAMP;" >> $OUT_FILE - echo " static unsigned int const GIT_HASH = 0x$GIT_COMMIT_HASH;" >> $OUT_FILE - echo " #define VERSION_STRING \"$STRING_VER\"" >> $OUT_FILE - echo " #define VERSION_DATE_STRING \"$BUILD_TIMESTAMP_FULL\"" >> $OUT_FILE - echo "}" >> $OUT_FILE - echo "" >> $OUT_FILE - exit 0 -fi diff --git a/tools/unix/process_plist.sh b/tools/unix/process_plist.sh deleted file mode 100755 index 9072373977..0000000000 --- a/tools/unix/process_plist.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# we depend on generate_version.sh script in the same directory!!! - -VERSION_SCRIPT_PATH=`dirname $0` -VERSION_STRING=`bash $VERSION_SCRIPT_PATH/generate_version.sh $1 $2 $3` - -echo "Altering bundle version in $4" - -perl -i -pe "s/\@VERSION\@/$VERSION_STRING/" $4 \ No newline at end of file diff --git a/tools/unix/version.sh b/tools/unix/version.sh index 23c40b05f0..dd2362e243 100755 --- a/tools/unix/version.sh +++ b/tools/unix/version.sh @@ -42,8 +42,19 @@ function android_code { echo "${cutYear//./}$(printf %02d "$COUNT")" } -function git_hash { - git describe --match="" --always --abbrev=8 --dirty +function qt_int_version { + # yy_MM_dd + # yy - year + # MM - month + # dd - day + local cutYear=${DATE:2} + echo "${cutYear//./}" +} + +function qt_version { + local GIT_HASH=$(git describe --match="" --always --abbrev=8 --dirty) + local OS_NAME=$(uname -s) + echo "$DATE-$COUNT-$GIT_HASH-$OS_NAME" } function usage { @@ -52,11 +63,12 @@ Prints Organic Maps version in specified format. Version is the last git commit's date plus a number of commits on that day. Usage: $0 Where format is one of the following arguments (shows current values): - ios_version $(ios_version) - ios_build $(ios_build) - android_name $(android_name) - android_code $(android_code) - git_hash $(git_hash) + ios_version $(ios_version) + ios_build $(ios_build) + android_name $(android_name) + android_code $(android_code) + qt_version $(qt_version) + qt_int_version $(qt_int_version) EOF }