Add new export to HMTL function

* Minor fix error dialog
* Versions now max out at MAJOR.MINOR
* Fix up the cmake valadoc functions
* Other small fixes

CMakeLists.txt

@@ -17,17 +17,16 @@ endif()
 #
 set(VERSION_MAJOR 2)
 set(VERSION_MINOR 0)
-set(VERSION_REVISION 0)
 set(VERSION_COMMIT ${Project_WC_REVISION_HASH})
 
 # Anything other than "Release" will add the latest commit 
 # hash when built to the version string
 set(VERSION_DESC "Development")
 
 if(NOT ${VERSION_DESC} MATCHES "Development")
-	set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION})
+	set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR})
 else()
-	set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}-${VERSION_COMMIT})
+	set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}-${VERSION_COMMIT})
 endif()
 
 #
@@ -91,9 +90,12 @@ add_custom_target(
 	COMMAND git archive --prefix=${ARCHIVE_BASE_NAME}/ HEAD	| xz -z > ${CMAKE_BINARY_DIR}/${ARCHIVE_FULL_NAME}
 		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 
-	COMMAND	sha512sum ${CMAKE_BINARY_DIR}/${ARCHIVE_FULL_NAME} > ${CMAKE_BINARY_DIR}/balistica-${VERSION}-checksum 
+        COMMAND md5sum ${CMAKE_BINARY_DIR}/${ARCHIVE_FULL_NAME} >> ${CMAKE_BINARY_DIR}/balistica-${VERSION}-checksum
+	COMMAND	sha1sum ${CMAKE_BINARY_DIR}/${ARCHIVE_FULL_NAME} >> ${CMAKE_BINARY_DIR}/balistica-${VERSION}-checksum
+	COMMAND	sha256sum ${CMAKE_BINARY_DIR}/${ARCHIVE_FULL_NAME} >> ${CMAKE_BINARY_DIR}/balistica-${VERSION}-checksum
 )
 
+add_subdirectory(data)
 add_subdirectory(help)
 add_subdirectory(sql)
 add_subdirectory(src)

src/CMakeLists.txt

@@ -53,7 +53,6 @@ set(CFLAGS
     ${DEPS_CFLAGS_OTHER}
     -D_VERSION_MAJOR=\"${VERSION_MAJOR}\"
     -D_VERSION_MINOR=\"${VERSION_MAJOR}\"
-    -D_VERSION_REVISION=\"${VERSION_REVISION}\"
     -D_VERSION_COMMIT=\"${VERSION_COMMIT}\"
     -D_VERSION_DESC=\"${VERSION_DESC}\"
     -D_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\"
@@ -135,22 +134,22 @@ if(VALADOC_FOUND)
     foreach(pkg ${LIB_BALISTICA_PACKAGES})
         list(APPEND valadoc_pkg_opts "--pkg=${pkg}")
     endforeach(pkg ${LIB_BALISTICA_PACKAGES})
-    
+
     include(FindValadoc)
     add_custom_target(
         valadoc
         WORKING_DIRECTORY
         ${CMAKE_SOURCE_DIR}/src
     COMMAND
-        ${VALADOC_EXECUTABLE} 
-        --force 
-        --no-protected 
-        --target-glib=${TARGET_GLIB} 
-        -b ${CMAKE_CURRENT_SOURCE_DIR} 
-        -o ${CMAKE_SOURCE_DIR}/valadoc 
-        --package-name=lib-balistica 
-        ${LIB_BALISTICA_SRC} 
+        ${VALADOC_EXECUTABLE}
+        --verbose --force --deps
+        --package-name=lib-balistica
+        --package-version=${VERSION}
+        --target-glib=${TARGET_GLIB}
+        -b ${CMAKE_CURRENT_SOURCE_DIR}
+        -o ${CMAKE_SOURCE_DIR}/valadoc
         ${valadoc_pkg_opts}
+        ${LIB_BALISTICA_SRC}
     )
 endif()