update version numbers to 3.3.0

Author: rp-

CMakeLists.txt

@@ -128,29 +128,14 @@ endif()
 
 set(gv "${CMAKE_SOURCE_DIR}/src/gen_version.h")
 
-# get git version hash
-if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
-	add_custom_command(OUTPUT "${gv}"
-        COMMAND echo "#ifndef GEN_VERSION_H" > "${gv}"
-        COMMAND echo "#define GEN_VERSION_H" >> "${gv}"
-        COMMAND git log -n1 "--format=#define APP_VERSION \"%h_git\"" >> "${gv}"
-        COMMAND echo "#define MAJOR_VERSION 999" >> "${gv}"
-        COMMAND echo "#define MINOR_VERSION 0" >> "${gv}"
-        COMMAND echo "#define PATCH_VERSION 0" >> "${gv}"
-        COMMAND echo "#endif" >> "${gv}"
-        DEPENDS .git/HEAD
-        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-        VERBATIM)
-else()
-	file(WRITE "${gv}"
-		 "#ifndef GEN_VERSION_H\n"
-		 "#define GEN_VERSION_H\n"
-		 "#define APP_VERSION \"999.0.0\"\n"
-		 "#define MAJOR_VERSION 999\n"
-		 "#define MINOR_VERSION 0\n"
-		 "#define PATCH_VERSION 0\n"
-		 "#endif\n")
-endif()
+file(WRITE "${gv}"
+	 "#ifndef GEN_VERSION_H\n"
+	 "#define GEN_VERSION_H\n"
+	 "#define APP_VERSION \"3.3.0\"\n"
+	 "#define MAJOR_VERSION 3\n"
+	 "#define MINOR_VERSION 3\n"
+	 "#define PATCH_VERSION 0\n"
+	 "#endif\n")
 
 #icon and correct libs/subsystem for windows
 if(WIN32)
@@ -224,7 +209,7 @@ set(CPACK_PACKAGE_VENDOR "oldsch00l")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
 set(CPACK_PACKAGE_VERSION_MAJOR "3")
-set(CPACK_PACKAGE_VERSION_MINOR "0")
+set(CPACK_PACKAGE_VERSION_MINOR "3")
 set(CPACK_PACKAGE_VERSION_PATCH "0")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "SqliteBrowser${CPACK_PACKAGE_VERSION_MAJOR}")
 if(WIN32 AND NOT UNIX)

src/app.plist

@@ -64,11 +64,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.2.99</string>
+	<string>3.3.0</string>
 	<key>CFBundleSignature</key>
 	<string>SqLB</string>
 	<key>CFBundleVersion</key>
-	<string>3.2.99</string>
+	<string>3.3.0</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSHighResolutionCapable</key>

src/gen_version.h

@@ -1,7 +1,7 @@
 #ifndef GEN_VERSION_H
 #define GEN_VERSION_H
-#define APP_VERSION "master_git"
-#define MAJOR_VERSION 999
-#define MINOR_VERSION 0
+#define APP_VERSION "3.3.0"
+#define MAJOR_VERSION 3
+#define MINOR_VERSION 3
 #define PATCH_VERSION 0
 #endif