From 2ac65cc98ca22217fd00ae8250c0fd7512099e2a Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 30 Apr 2020 21:43:49 +0200 Subject: [PATCH] CMake: remove obsolete plugin version settings --- dtool/PandaVersion.cmake | 51 +--------------------------------------- 1 file changed, 1 insertion(+), 50 deletions(-) diff --git a/dtool/PandaVersion.cmake b/dtool/PandaVersion.cmake index 2ca0a3e6e5..4ea2ef6688 100644 --- a/dtool/PandaVersion.cmake +++ b/dtool/PandaVersion.cmake @@ -24,37 +24,7 @@ particular license. Some packages don't have a listed license because they are almost always required/used, or because they are only used in plugins that can be easily removed (eg. directx, ffmpeg, fmod, ...).") -set(PANDA_PACKAGE_VERSION CACHE STRING - "This string is used to describe the Panda3D \"package\" associated -with this current build of Panda. It should increment with major -and minor version changes, but not sequence (or \"bugfix\") changes. -It should be unique for each unique distributor. The default is -the empty string, which means this build does not precisely match -any distributable Panda3D packages. If you are making a Panda3D -build which you will be using to produce a distributable Panda3D -package, you should set this string appropriately.") - -set(P3D_PLUGIN_VERSION "1.0.4" CACHE STRING - "We also define a version for the Panda3D plugin/runtime, -i.e. nppanda3d.dll, p3dactivex.ocx, and panda3d.exe. This is an -independent version number from PANDA_VERSION or -PANDA_PACKAGE_VERSION, because it is anticipated that this plugin -code, once settled, will need to be updated much less frequently -than Panda itself.") - -set(P3D_COREAPI_VERSION "${P3D_PLUGIN_VERSION}.1" CACHE STRING - "Finally, there's a separate version number for the Core API. At -first, we didn't believe we needed a Core API version number, but -in this belief we were naive. This version number is a little less -strict in its format requirements than P3D_PLUGIN_VERSION, above, -and it doesn't necessarily consist of a specific number of -integers, but by convention it will consist of four integers, with -the first three matching the plugin version, and the fourth integer -being incremented with each new Core API revision.") - -mark_as_advanced(PANDA_VERSION PANDA_OFFICIAL_VERSION - PANDA_PACKAGE_VERSION P3D_PLUGIN_VERSION P3D_COREAPI_VERSION - PANDA_DIST_USE_LICENSES) +mark_as_advanced(PANDA_VERSION PANDA_OFFICIAL_VERSION PANDA_DIST_USE_LICENSES) # The version gets a "c" at the end if it's not an official one. if(PANDA_OFFICIAL_VERSION) @@ -82,22 +52,3 @@ if(GIT_EXECUTABLE) OUTPUT_VARIABLE PANDA_GIT_COMMIT_STR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) endif() - -# Separate the plugin version into its three components. -string(REPLACE "." ";" P3D_PLUGIN_VERSION_LIST "${P3D_PLUGIN_VERSION}") -list(GET P3D_PLUGIN_VERSION_LIST 0 P3D_PLUGIN_MAJOR_VERSION) -list(GET P3D_PLUGIN_VERSION_LIST 1 P3D_PLUGIN_MINOR_VERSION) -list(GET P3D_PLUGIN_VERSION_LIST 2 P3D_PLUGIN_SEQUENCE_VERSION) - -set(P3D_PLUGIN_VERSION_STR "${P3D_PLUGIN_VERSION}${VERSION_SUFFIX}") - -# The plugin version as dot-delimited integer quad, according to MS -# conventions for DLL version numbers. -if(PANDA_OFFICIAL_VERSION) - set(P3D_PLUGIN_DLL_DOT_VERSION "${P3D_PLUGIN_VERSION}.1000") -else() - set(P3D_PLUGIN_DLL_DOT_VERSION "${P3D_PLUGIN_VERSION}.0") -endif() - -# The same thing as a comma-delimited quad. -string(REPLACE "." "," P3D_PLUGIN_DLL_COMMA_VERSION "${P3D_PLUGIN_DLL_DOT_VERSION}")