preprelease: bump version 3.1.0

rp- · rp- · commit fe7a6c12270c · 2014-05-16T18:37:35.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -106,21 +106,7 @@ else()
 endif()
 
 # get git version hash
-if(EXISTS ${CMAKE_SOURCE_DIR}/.git)
-	add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/src/gen_version.h
-                           COMMAND echo "#ifndef __VERSION_H__" > ${CMAKE_SOURCE_DIR}/src/gen_version.h
-                           COMMAND echo "#define __VERSION_H__" >> ${CMAKE_SOURCE_DIR}/src/gen_version.h
-                           COMMAND git log -n1 "--format=#define APP_VERSION \"%h_git\"" >> ${CMAKE_SOURCE_DIR}/src/gen_version.h
-                           COMMAND echo "#define MAJOR_VERSION 999" >> ${CMAKE_SOURCE_DIR}/src/gen_version.h
-                           COMMAND echo "#define MINOR_VERSION 0" >> ${CMAKE_SOURCE_DIR}/src/gen_version.h
-                           COMMAND echo "#define PATCH_VERSION 0" >> ${CMAKE_SOURCE_DIR}/src/gen_version.h
-                           COMMAND echo "#endif" >> ${CMAKE_SOURCE_DIR}/src/gen_version.h
-                           DEPENDS .git/HEAD
-                           WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-                           VERBATIM)
-else()
-	file(WRITE ${CMAKE_SOURCE_DIR}/src/gen_version.h "#ifndef __GEN_VERSIONS_H__\n#define __GEN_VERSIONS_H__\n#define APP_VERSION \"3.0.1\"\n#define MAJOR_VERSION 3\n#define MINOR_VERSION 0\n#define PATCH_VERSION 1\n#endif")
-endif()
+file(WRITE ${CMAKE_SOURCE_DIR}/src/gen_version.h "#ifndef __GEN_VERSIONS_H__\n#define __GEN_VERSIONS_H__\n#define APP_VERSION \"3.1.0\"\n#define MAJOR_VERSION 3\n#define MINOR_VERSION 1\n#define PATCH_VERSION 0\n#endif\n")
 
 #icon and correct libs/subsystem for windows
 if(WIN32)
@@ -172,7 +158,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 "1")
 set(CPACK_PACKAGE_VERSION_PATCH "0")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "SqliteBrowser${CPACK_PACKAGE_VERSION_MAJOR}")
 if(WIN32 AND NOT UNIX)
diff --git a/src/gen_version.h b/src/gen_version.h
@@ -1,7 +1,7 @@
 #ifndef __GEN_VERSIONS_H__
-#define __GEN_VERISONS_H__
-#define APP_VERSION "master_git"
-#define MAJOR_VERSION 999
-#define MINOR_VERSION 0
+#define __GEN_VERSIONS_H__
+#define APP_VERSION "3.1.0"
+#define MAJOR_VERSION 3
+#define MINOR_VERSION 1
 #define PATCH_VERSION 0
 #endif
