simplify custom builds

Author: mtrojnar

CMakeLists.txt

@@ -1,14 +1,20 @@
 # required cmake version
 cmake_minimum_required(VERSION 3.6)
 
-# set the project name and version
-project(osslsigncode VERSION 2.4 LANGUAGES C)
+# configure basic project information
+project(osslsigncode
+  VERSION 2.4
+  DESCRIPTION "OpenSSL based Authenticode signing for PE, CAB, CAT and MSI files"
+  HOMEPAGE_URL "https://github.com/mtrojnar/osslsigncode"
+  LANGUAGES C)
+
+# force nonstandard version format for development packages
 set(DEV "-dev")
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}${DEV}")
+
+# version and contact information
 set(PACKAGE_STRING "${PROJECT_NAME} ${PROJECT_VERSION}")
 set(PACKAGE_BUGREPORT "Michal.Trojnara@stunnel.org")
-set(PACKAGE_URL "https://github.com/mtrojnar/osslsigncode")
-set(PACKAGE_DESCRIPTION "OpenSSL based Authenticode signing for PE, CAB, CAT and MSI files")
 
 # specify the C standard
 set(CMAKE_C_STANDARD 11)

INSTALL.W32.md

@@ -14,8 +14,8 @@
   cd osslsigncode-folder
   x86_64-w64-mingw32-gcc osslsigncode.c msi.c -o osslsigncode.exe \
     -lcrypto -lssl -lcurl \
-    -D 'PACKAGE_STRING="osslsigncode 2.4"' \
-    -D 'PACKAGE_BUGREPORT="Michal.Trojnara@stunnel.org"' \
+    -D 'PACKAGE_STRING="osslsigncode x.y"' \
+    -D 'PACKAGE_BUGREPORT="Your.Email@example.com"' \
     -D ENABLE_CURL
 ```
 
@@ -76,8 +76,8 @@
     -I 'C:/OpenSSL/include/' \
     -L 'C:/curl/lib' -lcurl \
     -I 'C:/curl/include' \
-    -D 'PACKAGE_STRING="osslsigncode 2.4"' \
-    -D 'PACKAGE_BUGREPORT="Michal.Trojnara@stunnel.org"' \
+    -D 'PACKAGE_STRING="osslsigncode x.y"' \
+    -D 'PACKAGE_BUGREPORT="Your.Email@example.com"' \
     -D ENABLE_CURL
 ```
 

osslsigncode.c

@@ -5570,16 +5570,24 @@ static PKCS7 *cat_presign_file(file_type_t type, cmd_type_t cmd, FILE_HEADER *he
 
 static void print_version()
 {
+	printf("%s, using:\n\t%s (Library: %s)\n\t%s\n",
+#ifdef PACKAGE_STRING
+		PACKAGE_STRING,
+#else /* PACKAGE_STRING */
+		"osslsigncode custom build",
+#endif /* PACKAGE_STRING */
+		OPENSSL_VERSION_TEXT,
+		OpenSSL_version(OPENSSL_VERSION),
 #ifdef ENABLE_CURL
-	printf(PACKAGE_STRING ", using:\n\t%s (Library: %s)\n\t%s\n",
-		OPENSSL_VERSION_TEXT, OpenSSL_version(OPENSSL_VERSION),
-		curl_version());
-#else
-	printf(PACKAGE_STRING ", using:\n\t%s (Library: %s)\n\t%s\n",
-		OPENSSL_VERSION_TEXT, OpenSSL_version(OPENSSL_VERSION),
-		"no libcurl available");
+		curl_version()
+#else /* ENABLE_CURL */
+		"no libcurl available"
 #endif /* ENABLE_CURL */
-	printf("\nPlease send bug-reports to " PACKAGE_BUGREPORT "\n\n");
+	);
+#ifdef PACKAGE_BUGREPORT
+	printf("\nPlease send bug-reports to " PACKAGE_BUGREPORT "\n");
+#endif
+	printf("\n");
 }
 
 static cmd_type_t get_command(char **argv)