cpp/openttd-patchpack/source Changeset - r25891:90a4bf886d7d

Changeset - r25891:90a4bf886d7d

Parent rev.

Child rev.

[Not reviewed]

master

2 14 2

Patric Stout - 3 years ago 2021-08-14 16:28:35
truebrain@openttd.org

Change: rebrand 1.12.0 to 12.0

One question that keeps popping up: "when do we release 2.0?".
NewGRF will force that at least 1.16 will be 2.0, but to not wait
for this, let's drop the "1." and be for ever done with that
conversation.

We are following in the footstep of giants here.

18 files changed with 42 insertions and 36 deletions:

CMakeLists.txt

bin/ai/CMakeLists.txt

bin/ai/compat_1.12.nut

bin/ai/compat_12.nut

bin/game/CMakeLists.txt

bin/game/compat_1.12.nut

bin/game/compat_12.nut

cmake/scripts/FindVersion.cmake

known-bugs.txt

regression/regression/info.nut

regression/stationlist/info.nut

src/ai/ai_info.cpp

src/game/game_info.cpp

src/os/windows/ottdres.rc.in

src/rev.cpp.in

src/script/api/ai_changelog.hpp

src/script/api/game_changelog.hpp

src/script/api/script_controller.hpp

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -2,13 +2,13 @@ cmake_minimum_required(VERSION 3.9) @@
 if(NOT BINARY_NAME)
     set(BINARY_NAME openttd)
 endif()
 project(${BINARY_NAME}
-    VERSION 1.12.0
     VERSION 12.0
+)
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
     message(FATAL_ERROR "In-source builds not allowed. Please run \"cmake ..\" from the build directory. You may need to delete \"${CMAKE_SOURCE_DIR}/CMakeCache.txt\" first.")
 endif()
@@ @@ -73,13 +73,12 @@ endif() @@
 add_custom_target(find_version
         ${CMAKE_COMMAND}
                 -DFIND_VERSION_BINARY_DIR=${CMAKE_BINARY_DIR}/generated
                 -DCPACK_BINARY_DIR=${CMAKE_BINARY_DIR}
                 -DREV_MAJOR=${PROJECT_VERSION_MAJOR}
                 -DREV_MINOR=${PROJECT_VERSION_MINOR}
                 -DREV_BUILD=${PROJECT_VERSION_PATCH}
                 -DWINDOWS=${WIN32}
                 -P "${CMAKE_SOURCE_DIR}/cmake/scripts/FindVersion.cmake"
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
         BYPRODUCTS ${GENERATED_SOURCE_FILES}
+)

bin/ai/CMakeLists.txt

➞

Show inline comments

@@ @@ -9,13 +9,13 @@ set(AI_COMPAT_SOURCE_FILES @@
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_1.6.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_1.7.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_1.8.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_1.9.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_1.10.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_1.11.nut
-	${CMAKE_CURRENT_SOURCE_DIR}/compat_1.12.nut
+	${CMAKE_CURRENT_SOURCE_DIR}/compat_12.nut
+)
 foreach(AI_COMPAT_SOURCE_FILE IN LISTS AI_COMPAT_SOURCE_FILES)
     string(REPLACE "${CMAKE_SOURCE_DIR}/bin/" "" AI_COMPAT_SOURCE_FILE_NAME "${AI_COMPAT_SOURCE_FILE}")
     string(CONCAT AI_COMPAT_BINARY_FILE "${CMAKE_BINARY_DIR}/" "${AI_COMPAT_SOURCE_FILE_NAME}")

bin/ai/compat_1.12.nut

➞

Show inline comments

deleted file

bin/ai/compat_12.nut

➞

Show inline comments

@@ new file 100644 @@
 /*
  * This file is part of OpenTTD.
  * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
  * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */

bin/game/CMakeLists.txt

➞

Show inline comments

@@ @@ -6,13 +6,13 @@ set(GS_COMPAT_SOURCE_FILES @@
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_1.6.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_1.7.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_1.8.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_1.9.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_1.10.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_1.11.nut
-	${CMAKE_CURRENT_SOURCE_DIR}/compat_1.12.nut
+	${CMAKE_CURRENT_SOURCE_DIR}/compat_12.nut
+)
 foreach(GS_COMPAT_SOURCE_FILE IN LISTS GS_COMPAT_SOURCE_FILES)
     string(REPLACE "${CMAKE_SOURCE_DIR}/bin/" "" GS_COMPAT_SOURCE_FILE_NAME "${GS_COMPAT_SOURCE_FILE}")
     string(CONCAT GS_COMPAT_BINARY_FILE "${CMAKE_BINARY_DIR}/" "${GS_COMPAT_SOURCE_FILE_NAME}")

bin/game/compat_1.12.nut

➞

Show inline comments

deleted file

bin/game/compat_12.nut

➞

Show inline comments

@@ new file 100644 @@
 /*
  * This file is part of OpenTTD.
  * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
  * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */

cmake/scripts/FindVersion.cmake

➞

Show inline comments

@@ @@ -3,15 +3,12 @@ cmake_minimum_required(VERSION 3.5) @@
 if(NOT REV_MAJOR)
     set(REV_MAJOR 0)
 endif()
 if(NOT REV_MINOR)
     set(REV_MINOR 0)
 endif()
 if(NOT REV_BUILD)
     set(REV_BUILD 0)
 endif()
+#
 # Finds the current version of the current folder.
+#
 find_package(Git QUIET)

known-bugs.txt

➞

Show inline comments

 OpenTTD's known bugs
 Last updated:    2021-04-01
 Release version: 1.11.0
 ------------------------------------------------------------------------
 Table of contents
 -----------------
 .0) About

regression/regression/info.nut

➞

Show inline comments

 class Regression extends AIInfo {
 	function GetAuthor()      { return "OpenTTD NoAI Developers Team"; }
 	function GetName()        { return "Regression"; }
 	function GetShortName()   { return "REGR"; }
 	function GetDescription() { return "This runs regression-tests on some commands. On the same map the result should always be the same."; }
 	function GetVersion()     { return 1; }
-	function GetAPIVersion()  { return "1.12"; }
 	function GetAPIVersion()  { return "12"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "Regression"; }
 	function UseAsRandomAI()  { return false; }
+}
 RegisterAI(Regression());

regression/stationlist/info.nut

➞

Show inline comments

 class StationList extends AIInfo {
 	function GetAuthor()      { return "OpenTTD NoAI Developers Team"; }
 	function GetName()        { return "StationList"; }
 	function GetShortName()   { return "REGS"; }
 	function GetDescription() { return "This runs stationlist-tests on some commands. On the same map the result should always be the same."; }
 	function GetVersion()     { return 1; }
-	function GetAPIVersion()  { return "1.12"; }
 	function GetAPIVersion()  { return "12"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "StationList"; }
 	function UseAsRandomAI()  { return false; }
+}
 RegisterAI(StationList());

src/ai/ai_info.cpp

➞

Show inline comments

@@ @@ -22,13 +22,13 @@ @@
 /**
  * Check if the API version provided by the AI is supported.
  * @param api_version The API version as provided by the AI.
  */
 static bool CheckAPIVersion(const char *api_version)
+{
-	static const std::set<std::string> versions = { "0.7", "1.0", "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "1.10", "1.11", "1.12" };
 	static const std::set<std::string> versions = { "0.7", "1.0", "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "1.10", "1.11", "12" };
 	return versions.find(api_version) != versions.end();
+}
 #if defined(_WIN32)
 #undef GetClassName
 #endif /* _WIN32 */

src/game/game_info.cpp

➞

Show inline comments

@@ @@ -20,13 +20,13 @@ @@
 /**
  * Check if the API version provided by the Game is supported.
  * @param api_version The API version as provided by the Game.
  */
 static bool CheckAPIVersion(const char *api_version)
+{
-	static const std::set<std::string> versions = { "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "1.10", "1.11", "1.12" };
 	static const std::set<std::string> versions = { "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "1.10", "1.11", "12" };
 	return versions.find(api_version) != versions.end();
+}
 #if defined(_WIN32)
 #undef GetClassName
 #endif /* _WIN32 */

src/os/windows/ottdres.rc.in

➞

Show inline comments

@@ @@ -74,14 +74,14 @@ END @@
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
 //
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION ${REV_MAJOR},${REV_MINOR},${REV_BUILD},${REV_ISODATE}
  PRODUCTVERSION ${REV_MAJOR},${REV_MINOR},${REV_BUILD},${REV_ISODATE}
  FILEVERSION ${REV_MAJOR},${REV_MINOR},0,${REV_ISODATE}
  PRODUCTVERSION ${REV_MAJOR},${REV_MINOR},0,${REV_ISODATE}
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
 #else
  FILEFLAGS 0x0L
 #endif

src/rev.cpp.in

➞

Show inline comments

@@ @@ -72,17 +72,20 @@ const byte _openttd_revision_modified = @@
  */
 const byte _openttd_revision_tagged = ${REV_ISTAG};
 /**
  * The NewGRF revision of OTTD:
  * bits  meaning.
  * 28-31 major version
  * 24-27 minor version
  * 20-23 build
  * 24-31 major version + 16
  * 20-23 minor version
  *    19 1 if it is a release, 0 if it is not.
  *  0-18 used to be the SVN revision, now just last revision before switch to git
+ *
  * The 19th bit is there so the development/betas/alpha, etc. leading to a
  * final release will always have a lower version number than the released
  * version, thus making comparisons on specific revisions easy.
+ *
  * The + 16 for the major version is because we went from 1.11.0 to 12.0, dropping
  * the "patch" part of the version. To make sure "1.11.0" is smaller than "12.0", we
  * have to adjust the major by 16.
  */
-const uint32 _openttd_newgrf_version = ${REV_MAJOR} << 28 | ${REV_MINOR} << 24 | ${REV_BUILD} << 20 | ${REV_ISSTABLETAG} << 19 | 28004;
+const uint32 _openttd_newgrf_version = (${REV_MAJOR} + 16) << 24 | ${REV_MINOR} << 20 | ${REV_ISSTABLETAG} << 19 | 28004;

src/script/api/ai_changelog.hpp

➞

Show inline comments

@@ @@ -10,13 +10,13 @@ @@
+ *
  * Only new / renamed / deleted api functions will be listed here. A list of
  * bug fixes can be found in the normal changelog. Note that removed API
  * functions may still be available if you return an older API version
  * in GetAPIVersion() in info.nut.
+ *
- * \b 1.12.0
  * \b 12.0
+ *
  * This version is not yet released. The following changes are not set in stone yet.
+ *
  * API additions:
  * \li AINewGRF
  * \li AINewGRFList

src/script/api/game_changelog.hpp

➞

Show inline comments

@@ @@ -10,13 +10,13 @@ @@
+ *
  * Only new / renamed / deleted api functions will be listed here. A list of
  * bug fixes can be found in the normal changelog. Note that removed API
  * functions may still be available if you return an older API version
  * in GetAPIVersion() in info.nut.
+ *
- * \b 1.12.0
  * \b 12.0
+ *
  * This version is not yet released. The following changes are not set in stone yet.
+ *
  * API additions:
  * \li GSNewGRF
  * \li GSNewGRFList

src/script/api/script_controller.hpp

➞

Show inline comments

@@ @@ -132,17 +132,26 @@ public: @@
 	 */
 	static int GetSetting(const char *name);
 	/**
 	 * Get the OpenTTD version of this executable. The version is formatted
 	 * with the bits having the following meaning:
 	 * 28-31 major version
 	 * 24-27 minor version
 	 * 20-23 build
 	 * 24-31 major version + 16.
 	 * 20-23 minor version.
 	 *    19 1 if it is a release, 0 if it is not.
 	 *  0-18 revision number; 0 when the revision is unknown.
 	 * You have to subtract 16 from the major version to get the correct
 	 * value.
+	 *
 	 * Prior to OpenTTD 12, the bits have the following meaning:
 	 * 28-31 major version.
 	 * 24-27 minor version.
 	 * 20-23 build.
 	 *    19 1 if it is a release, 0 if it is not.
 	 *  0-18 revision number; 0 when the revision is unknown.
+	 *
 	 * @return The version in newgrf format.
 	 */
 	static uint GetVersion();
 	/**
 	 * Change the minimum amount of time the script should be put in suspend mode

0 comments (0 inline, 0 general)