From: Thomas Debesse Date: Sat, 3 Nov 2018 23:16:02 +0000 (+0100) Subject: cmake: drop generation and usage of radiant version files X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7717adff6294ba4f080b217eb2c4089b64985187;p=xonotic%2Fnetradiant.git cmake: drop generation and usage of radiant version files RADIANT_MAJOR etc. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index e920fd62..aada8ecd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,10 +20,6 @@ set(NetRadiant_VERSION_MINOR 5) set(NetRadiant_VERSION_PATCH 0) set(NetRadiant_VERSION "${NetRadiant_VERSION_MAJOR}.${NetRadiant_VERSION_MINOR}.${NetRadiant_VERSION_PATCH}") -file(WRITE "${PROJECT_BINARY_DIR}/RADIANT_MAJOR" ${NetRadiant_VERSION_MAJOR}) -file(WRITE "${PROJECT_BINARY_DIR}/RADIANT_MINOR" ${NetRadiant_VERSION_MINOR}) -file(WRITE "${PROJECT_BINARY_DIR}/RADIANT_PATCH" ${NetRadiant_VERSION_PATCH}) - set(RADIANT_ABOUTMSG "Custom build" CACHE STRING "About message") find_package(Git REQUIRED) @@ -267,14 +263,6 @@ endif() # Install #----------------------------------------------------------------------- -install( - FILES - "${PROJECT_BINARY_DIR}/RADIANT_MAJOR" - "${PROJECT_BINARY_DIR}/RADIANT_MINOR" - "${PROJECT_BINARY_DIR}/RADIANT_PATCH" - DESTINATION . -) - install( DIRECTORY setup/data/tools/ diff --git a/radiant/main.cpp b/radiant/main.cpp index cd328b37..a9cde39c 100644 --- a/radiant/main.cpp +++ b/radiant/main.cpp @@ -362,39 +362,6 @@ bool check_version_file( const char* filename, const char* version ){ return false; } -bool check_version(){ - // a safe check to avoid people running broken installations - // (otherwise, they run it, crash it, and blame us for not forcing them hard enough to pay attention while installing) - // make something idiot proof and someone will make better idiots, this may be overkill - // let's leave it disabled in debug mode in any case - // http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=431 - if (GDEF_DEBUG) { - return true; - } - // locate and open RADIANT_MAJOR and RADIANT_MINOR - bool bVerIsGood = true; - { - StringOutputStream ver_file_name(256); - ver_file_name << AppPath_get() << "RADIANT_MAJOR"; - bVerIsGood = check_version_file(ver_file_name.c_str(), RADIANT_MAJOR_VERSION); - } - { - StringOutputStream ver_file_name(256); - ver_file_name << AppPath_get() << "RADIANT_MINOR"; - bVerIsGood = check_version_file(ver_file_name.c_str(), RADIANT_MINOR_VERSION); - } - - if (!bVerIsGood) { - StringOutputStream msg(256); - msg - << "This editor binary (" RADIANT_VERSION ") doesn't match what the latest setup has configured in this directory\n" - "Make sure you run the right/latest editor binary you installed\n" - << AppPath_get(); - ui::alert(ui::root, msg.c_str(), "Radiant", ui::alert_type::OK, ui::alert_icon::Default); - } - return bVerIsGood; -} - void create_global_pid(){ /*! the global prefs loading / game selection dialog might fail for any reason we don't know about @@ -597,10 +564,6 @@ int main( int argc, char* argv[] ){ paths_init(); - if ( !check_version() ) { - return EXIT_FAILURE; - } - show_splash(); create_global_pid();