Handle version numbers with 'rcN' additions.

Kasper Peeters · Kasper Peeters · commit 45c667fdd648 · 2024-11-30T21:20:54.000Z
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -12,7 +12,7 @@ name: Docker
 
 on:
   release:
-    types: [created]
+    types: [released]
 
 jobs:
   build:
diff --git a/.github/workflows/tarball.yml b/.github/workflows/tarball.yml
@@ -5,7 +5,7 @@ name: Tarball
 
 on:
   release:
-    types: [created]
+    types: [released]
 
 # on: [push]
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -88,19 +88,14 @@ set(PKG_CONFIG_USE_STATIC_LIBS OFF)
 
 # Get version information.
 include(cmake/version.cmake)
-print_header("Building Cadabra version ${CADABRA_VERSION_MAJOR}.${CADABRA_VERSION_MINOR}.${CADABRA_VERSION_PATCH}.${CADABRA_VERSION_TWEAK} (${SYSTEM_BITS}-bit)")
+print_header("Building Cadabra version ${CADABRA_VERSION_SEM} (${SYSTEM_BITS}-bit)")
 message(STATUS "Build id '${CADABRA_VERSION_BUILD}' dated ${CADABRA_VERSION_DATE}")
 message(STATUS "Build mode is set to '${CMAKE_BUILD_TYPE}'")
 message(STATUS "Architecture is '${CMAKE_SYSTEM_PROCESSOR}'")
 
 # Store the version number in a build/VERSION file (so that e.g. github
 # actions can pick it up).
-if(NOT "${CADABRA_VERSION_TWEAK}" STREQUAL "0")
-  file(WRITE build/VERSION       "${CADABRA_VERSION_MAJOR}.${CADABRA_VERSION_MINOR}.${CADABRA_VERSION_PATCH}.${CADABRA_VERSION_TWEAK}")
-else()
-  file(WRITE build/VERSION       "${CADABRA_VERSION_MAJOR}.${CADABRA_VERSION_MINOR}.${CADABRA_VERSION_PATCH}")
-endif()  
-
+file(WRITE build/VERSION       "${CADABRA_VERSION_SEM}")
 
 # Notify about install directory
 if ("${CMAKE_INSTALL_PREFIX}" STREQUAL "")
@@ -599,7 +594,7 @@ endif()
 if(WIN32)
   add_custom_target(windows-installer
     COMMAND cpack
-#    COMMAND osslsigncode sign -pkcs12 "/mnt/c/path/to/certificate.p12" -pass "certificate password" -n "Cadabra2" -i "https://cadabra.science" -t "http://timestamp.comodoca.com/authenticode" -in "cadabra2-${CADABRA_VERSION_MAJOR}.${CADABRA_VERSION_MINOR}.${CADABRA_VERSION_PATCH}-win64.exe" -out "cadabra2-${CADABRA_VERSION_MAJOR}.${CADABRA_VERSION_MINOR}.${CADABRA_VERSION_PATCH}-win64-installer.exe"
+#    COMMAND osslsigncode sign -pkcs12 "/mnt/c/path/to/certificate.p12" -pass "certificate password" -n "Cadabra2" -i "https://cadabra.science" -t "http://timestamp.comodoca.com/authenticode" -in "cadabra2-${CADABRA_VERSION_SEM}-win64.exe" -out "cadabra2-${CADABRA_VERSION_SEM}-win64-installer.exe"
     COMMAND gh auth setup-git
     COMMAND release upload "${CADABRA_VERSION_SEM}" cadabra2-${CADABRA_VERSION_SEM}-win64.exe --clobber
   )
diff --git a/client_server/DocumentThread.cc b/client_server/DocumentThread.cc
@@ -25,7 +25,7 @@ DocumentThread::DocumentThread(GUIBase* g)
 	: gui(g), compute(0), disable_stacks(false)
 	{
 	// Setup logging.
-	std::string version=std::string(CADABRA_VERSION_MAJOR)+"."+CADABRA_VERSION_MINOR+"."+CADABRA_VERSION_PATCH;
+	std::string version=std::string(CADABRA_VERSION_SEM);
 #ifndef EMSCRIPTEN
 	snoop::log.init("Cadabra", version, "log.cadabra.science");
 	snoop::log.set_sync_immediately(true);
diff --git a/client_server/cadabra-jupyter-kernel.cc b/client_server/cadabra-jupyter-kernel.cc
@@ -151,8 +151,7 @@ xjson cadabra::CadabraJupyter::kernel_info_request_impl()
 	{
 	xjson result;
 	result["implementation"] = "Cadabra";
-	result["implementation_version"] = std::string(CADABRA_VERSION_MAJOR)+"."+CADABRA_VERSION_MINOR
-	                                   +"."+CADABRA_VERSION_PATCH;
+	result["implementation_version"] = std::string(CADABRA_VERSION_SEM);
 	result["language_info"]["name"] = "cadabra";
 	result["language_info"]["version"] = "2.0.0";
 	result["language_info"]["mimetype"] = "text/cadabra";
diff --git a/cmake/packaging.cmake b/cmake/packaging.cmake
@@ -234,13 +234,7 @@ set(CPACK_RPM_PACKAGE_LICENSE    "GPLv3")
 set(CPACK_PACKAGE_VERSION_MAJOR  "${CADABRA_VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR  "${CADABRA_VERSION_MINOR}")
 set(CPACK_PACKAGE_VERSION_PATCH  "${CADABRA_VERSION_PATCH}")
-if(NOT "${CADABRA_VERSION_TWEAK}" STREQUAL "0")
-  set(CPACK_PACKAGE_VERSION_TWEAK  "${CADABRA_VERSION_TWEAK}")
-  set(CPACK_PACKAGE_VERSION        "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}.${CPACK_PACKAGE_VERSION_TWEAK}")
-  message("-- Building tweak version")
-else()
-  message("-- Building normal version (no tweak)")
-endif()
+set(CPACK_PACKAGE_VERSION        "${CADABRA_VERSION_SEM}")
 set(CPACK_PACKAGE_VENDOR         "Kasper Peeters")
 set(CPACK_PACKAGE_CONTACT        "Kasper Peeters <info@cadabra.science>")
 set(CPACK_STRIP_FILES            ON)
diff --git a/cmake/version.cmake b/cmake/version.cmake
@@ -1,8 +1,11 @@
 set(CADABRA_VERSION_MAJOR 2)
 set(CADABRA_VERSION_MINOR 5)
 set(CADABRA_VERSION_PATCH 10)
-set(CADABRA_VERSION_TWEAK 0)
+set(CADABRA_VERSION_RC    "rc1")
 set(CADABRA_VERSION_SEM   ${CADABRA_VERSION_MAJOR}.${CADABRA_VERSION_MINOR}.${CADABRA_VERSION_PATCH})
+if(NOT "${CADABRA_VERSION_RC}" STREQUAL "")
+set(CADABRA_VERSION_SEM   ${CADABRA_VERSION_SEM}-${CADABRA_VERSION_RC})
+endif()
 set(COPYRIGHT_YEARS "2001-2024")
 math(EXPR SYSTEM_BITS "${CMAKE_SIZEOF_VOID_P} * 8")
 find_program(GIT git PATHS ${GIT_DIR})
diff --git a/config/install_script.iss.in b/config/install_script.iss.in
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Cadabra2"
-#define MyAppVersion "@CADABRA_VERSION_MAJOR@.@CADABRA_VERSION_MINOR@.@CADABRA_VERSION_PATCH@"
+#define MyAppVersion "@CADABRA_VERSION_SEM@"
 #define MyAppPublisher "Kasper Peeters"
 #define MyAppURL "https://www.cadabra.science/"
 #define MyAppExeName "cadabra2-gtk.exe"
diff --git a/config/science.cadabra.cadabra2-gtk.desktop.in b/config/science.cadabra.cadabra2-gtk.desktop.in
@@ -11,4 +11,4 @@ Terminal=false
 Keywords="Computer Algebra";Physics;Mathematics
 MimeType=application/cadabra;application/x-cadabra;
 X-AppImage-Name="Cadabra 2"
-X-AppImage-Version=@CADABRA_VERSION_MAJOR@.@CADABRA_VERSION_MINOR@.@CADABRA_VERSION_PATCH@
+X-AppImage-Version=@CADABRA_VERSION_SEM@
diff --git a/core/Config.hh.in b/core/Config.hh.in
@@ -8,6 +8,7 @@
 #define CADABRA_VERSION_MINOR "@CADABRA_VERSION_MINOR@"
 #define CADABRA_VERSION_PATCH "@CADABRA_VERSION_PATCH@"
 #define CADABRA_VERSION_FULL  "@CADABRA_VERSION_MAJOR@.@CADABRA_VERSION_MINOR@.@CADABRA_VERSION_PATCH@"
+#define CADABRA_VERSION_SEM   "@CADABRA_VERSION_SEM@"
 #define CADABRA_VERSION_DATE  "@CADABRA_VERSION_DATE@"
 #define CADABRA_VERSION_BUILD "@CADABRA_VERSION_BUILD@"
 #define COPYRIGHT_YEARS       "@COPYRIGHT_YEARS@"
diff --git a/core/cadabra2.in b/core/cadabra2.in
@@ -145,5 +145,5 @@ if __name__ == '__main__':
                 # would be nice to be able to continue from here on the command line, but that requires
                 # pulling in the right locals/globals
     else:
-        sh.runsource("import os; import sys; install_prefix=os.path.realpath(sys.argv[0]); install_prefix=install_prefix.replace('/bin/cadabra2','${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PATH}'); sys.path.append(install_prefix); print('Cadabra @CADABRA_VERSION_MAJOR@.@CADABRA_VERSION_MINOR@.@CADABRA_VERSION_PATCH@ (build @CADABRA_VERSION_BUILD@ dated @CADABRA_VERSION_DATE@)'); print ('Copyright (C) @COPYRIGHT_YEARS@  Kasper Peeters <info@cadabra.science>'); f=open('${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PATH}/cadabra2_defaults.py'); code=compile(f.read(), 'cadabra2_defaults.py', 'exec'); exec(code); f.close(); print('Using SymPy version '+sympy.__version__);")
+        sh.runsource("import os; import sys; install_prefix=os.path.realpath(sys.argv[0]); install_prefix=install_prefix.replace('/bin/cadabra2','${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PATH}'); sys.path.append(install_prefix); print('Cadabra @CADABRA_VERSION_SEM@ (build @CADABRA_VERSION_BUILD@ dated @CADABRA_VERSION_DATE@)'); print ('Copyright (C) @COPYRIGHT_YEARS@  Kasper Peeters <info@cadabra.science>'); f=open('${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PATH}/cadabra2_defaults.py'); code=compile(f.read(), 'cadabra2_defaults.py', 'exec'); exec(code); f.close(); print('Using SymPy version '+sympy.__version__);")
         sh.interact(banner='Info at https://cadabra.science/\nAvailable under the terms of the GNU General Public License v3\n')
diff --git a/frontend/gtkmm/Cadabra.cc b/frontend/gtkmm/Cadabra.cc
@@ -129,7 +129,7 @@ void Cadabra::on_activate()
 	add_window(*nw);
 	nw->show();
 
-	std::string version=std::string(CADABRA_VERSION_MAJOR)+"."+CADABRA_VERSION_MINOR+"."+CADABRA_VERSION_PATCH;
+	std::string version=std::string(CADABRA_VERSION_SEM);
 	snoop::log("start") << version << snoop::flush;
 
 	if(!nw->prefs.is_registered && !nw->prefs.is_anonymous) {
diff --git a/frontend/gtkmm/Console.cc b/frontend/gtkmm/Console.cc
@@ -158,7 +158,7 @@ Console::Console(sigc::slot<void> run_slot)
 void Console::initialize()
 	{
 	std::string welcome_message =
-		"Cadabra v" CADABRA_VERSION_MAJOR "." CADABRA_VERSION_MINOR "." CADABRA_VERSION_PATCH
+		"Cadabra v" CADABRA_VERSION_SEM
 		" Interactive Console\nFor more information, type help(console)\n";
 	buffer->insert_with_tag(buffer->begin(), welcome_message, output_tag);
 	server_cell_id = 0;
diff --git a/frontend/gtkmm/NotebookWindow.cc b/frontend/gtkmm/NotebookWindow.cc
@@ -2674,8 +2674,7 @@ void NotebookWindow::on_help_about()
 	about.set_transient_for(*this);
 	about.set_program_name("Cadabra");
 	about.set_comments("A field-theory motivated approach to computer algebra");
-	about.set_version(std::string("Version ")+CADABRA_VERSION_MAJOR+"."+CADABRA_VERSION_MINOR
-	                  +"."+CADABRA_VERSION_PATCH
+	about.set_version(std::string("Version ")+CADABRA_VERSION_SEM
 	                  +" (build "+CADABRA_VERSION_BUILD+" dated "+CADABRA_VERSION_DATE+")");
 	std::vector<Glib::ustring> authors;
 	authors.push_back("Kasper Peeters");
diff --git a/frontend/gtkmm/cadabra2-gtk.appdata.xml.in b/frontend/gtkmm/cadabra2-gtk.appdata.xml.in
@@ -41,7 +41,7 @@
   </provides>
 
   <releases>
-    <release version="@CADABRA_VERSION_MAJOR@.@CADABRA_VERSION_MINOR@.@CADABRA_VERSION_PATCH@" date="@CADABRA_VERSION_DATE@">
+    <release version="@CADABRA_VERSION_SEM@" date="@CADABRA_VERSION_DATE@">
       <description>
         <p>First release as AppImage.</p>
       </description>
diff --git a/frontend/gtkmm/science.cadabra.cadabra2-gtk.appdata.xml.in b/frontend/gtkmm/science.cadabra.cadabra2-gtk.appdata.xml.in
@@ -41,7 +41,7 @@
   </provides>
 
   <releases>
-    <release version="@CADABRA_VERSION_MAJOR@.@CADABRA_VERSION_MINOR@.@CADABRA_VERSION_PATCH@" date="@CADABRA_VERSION_DATE@">
+    <release version="@CADABRA_VERSION_SEM@" date="@CADABRA_VERSION_DATE@">
       <description>
         <p>First release as AppImage.</p>
       </description>
diff --git a/jupyterkernel/cadabra2_jupyter/__init__.py.in b/jupyterkernel/cadabra2_jupyter/__init__.py.in
@@ -1,2 +1,2 @@
-__version__ = "@CADABRA_VERSION_MAJOR@.@CADABRA_VERSION_MINOR@.@CADABRA_VERSION_PATCH@"
+__version__ = "@CADABRA_VERSION_SEM@"
 SITE_PATH = "@CMAKE_INSTALL_PREFIX@/@PYTHON_SITE_PATH@"

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ DocumentThread::DocumentThread(GUIBase* g)`
`25`	`25`	`: gui(g), compute(0), disable_stacks(false)`
`26`	`26`	`{`
`27`	`27`	`// Setup logging.`
`28`		`- std::string version=std::string(CADABRA_VERSION_MAJOR)+"."+CADABRA_VERSION_MINOR+"."+CADABRA_VERSION_PATCH;`
	`28`	`+ std::string version=std::string(CADABRA_VERSION_SEM);`
`29`	`29`	`#ifndef EMSCRIPTEN`
`30`	`30`	`snoop::log.init("Cadabra", version, "log.cadabra.science");`
`31`	`31`	`snoop::log.set_sync_immediately(true);`