Merge pull request #189 from wravery/next

Re-use the same Library.rc.in and Generator.rc.in files across targets

Author: wravery

cmake/ClientGen.rc.in cmake/Generator.rc.incmake/ClientGen.rc.in renamed to cmake/Generator.rc.in

@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define CLIENTGEN_RC_VERSION     @CLIENTGEN_RC_VERSION@
-#define CLIENTGEN_RC_VERSION_STR "@CLIENTGEN_RC_VERSION_STR@"
+#define GRAPHQL_RC_VERSION     @GRAPHQL_RC_VERSION@
+#define GRAPHQL_RC_VERSION_STR "@GRAPHQL_RC_VERSION_STR@"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
@@ -13,8 +13,8 @@
 #endif
 
 VS_VERSION_INFO	VERSIONINFO
-FILEVERSION     CLIENTGEN_RC_VERSION
-PRODUCTVERSION  CLIENTGEN_RC_VERSION
+FILEVERSION     GRAPHQL_RC_VERSION
+PRODUCTVERSION  GRAPHQL_RC_VERSION
 FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
 FILEFLAGS       VER_DEBUG
 FILEOS          VOS__WINDOWS32
@@ -27,12 +27,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName",        "Microsoft Corporation"
             VALUE "FileDescription",    "Code generator for https://github.com/microsoft/cppgraphqlgen"
-            VALUE "FileVersion",        CLIENTGEN_RC_VERSION_STR
-            VALUE "InternalName",       "clientgen"
+            VALUE "FileVersion",        GRAPHQL_RC_VERSION_STR
+            VALUE "InternalName",       "@GRAPHQL_RC_FILENAME@"
             VALUE "LegalCopyright",     "Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License."
-            VALUE "OriginalFilename",   "clientgen.exe"
+            VALUE "OriginalFilename",   "@GRAPHQL_RC_FILENAME@.exe"
             VALUE "ProductName",        "CppGraphQLGen"
-            VALUE "ProductVersion",     CLIENTGEN_RC_VERSION_STR
+            VALUE "ProductVersion",     GRAPHQL_RC_VERSION_STR
         END
     END
 

cmake/Version.rc.in cmake/Library.rc.incmake/Version.rc.in renamed to cmake/Library.rc.in

@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define CLIENTGEN_RC_VERSION     4,0,0,0
-#define CLIENTGEN_RC_VERSION_STR "4.0.0"
+#define GRAPHQL_RC_VERSION     4,0,0,0
+#define GRAPHQL_RC_VERSION_STR "4.0.0"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
@@ -13,8 +13,8 @@
 #endif
 
 VS_VERSION_INFO	VERSIONINFO
-FILEVERSION     CLIENTGEN_RC_VERSION
-PRODUCTVERSION  CLIENTGEN_RC_VERSION
+FILEVERSION     GRAPHQL_RC_VERSION
+PRODUCTVERSION  GRAPHQL_RC_VERSION
 FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
 FILEFLAGS       VER_DEBUG
 FILEOS          VOS__WINDOWS32
@@ -27,12 +27,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName",        "Microsoft Corporation"
             VALUE "FileDescription",    "Code generator for https://github.com/microsoft/cppgraphqlgen"
-            VALUE "FileVersion",        CLIENTGEN_RC_VERSION_STR
+            VALUE "FileVersion",        GRAPHQL_RC_VERSION_STR
             VALUE "InternalName",       "clientgen"
             VALUE "LegalCopyright",     "Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License."
             VALUE "OriginalFilename",   "clientgen.exe"
             VALUE "ProductName",        "CppGraphQLGen"
-            VALUE "ProductVersion",     CLIENTGEN_RC_VERSION_STR
+            VALUE "ProductVersion",     GRAPHQL_RC_VERSION_STR
         END
     END
 

cmake/SchemaGen.rc.in

@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define SCHEMAGEN_RC_VERSION     4,0,0,0
-#define SCHEMAGEN_RC_VERSION_STR "4.0.0"
+#define GRAPHQL_RC_VERSION     4,0,0,0
+#define GRAPHQL_RC_VERSION_STR "4.0.0"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
@@ -13,8 +13,8 @@
 #endif
 
 VS_VERSION_INFO	VERSIONINFO
-FILEVERSION     SCHEMAGEN_RC_VERSION
-PRODUCTVERSION  SCHEMAGEN_RC_VERSION
+FILEVERSION     GRAPHQL_RC_VERSION
+PRODUCTVERSION  GRAPHQL_RC_VERSION
 FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
 FILEFLAGS       VER_DEBUG
 FILEOS          VOS__WINDOWS32
@@ -27,12 +27,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName",        "Microsoft Corporation"
             VALUE "FileDescription",    "Code generator for https://github.com/microsoft/cppgraphqlgen"
-            VALUE "FileVersion",        SCHEMAGEN_RC_VERSION_STR
+            VALUE "FileVersion",        GRAPHQL_RC_VERSION_STR
             VALUE "InternalName",       "schemagen"
             VALUE "LegalCopyright",     "Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License."
             VALUE "OriginalFilename",   "schemagen.exe"
             VALUE "ProductName",        "CppGraphQLGen"
-            VALUE "ProductVersion",     SCHEMAGEN_RC_VERSION_STR
+            VALUE "ProductVersion",     GRAPHQL_RC_VERSION_STR
         END
     END
 

res/ClientGen.rc

@@ -26,7 +26,7 @@ if(GRAPHQL_UPDATE_VERSION)
 
     set(GRAPHQL_RC_FILENAME "${target}")
 
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Version.rc.in 
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Library.rc.in 
       ${CMAKE_CURRENT_BINARY_DIR}/${target}_version.rc
       @ONLY)
 
@@ -176,10 +176,9 @@ if(GRAPHQL_BUILD_CLIENTGEN)
   if(GRAPHQL_UPDATE_VERSION)
     add_dependencies(clientgen update_version_h)
 
-    set(CLIENTGEN_RC_VERSION "${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH},0")
-    set(CLIENTGEN_RC_VERSION_STR "${PROJECT_VERSION}")
+    set(GRAPHQL_RC_FILENAME "clientgen")
 
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/ClientGen.rc.in 
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Generator.rc.in 
       ${CMAKE_CURRENT_BINARY_DIR}/ClientGen.rc
       @ONLY)
 
@@ -215,10 +214,9 @@ if(GRAPHQL_BUILD_SCHEMAGEN)
   if(GRAPHQL_UPDATE_VERSION)
     add_dependencies(schemagen update_version_h)
 
-    set(SCHEMAGEN_RC_VERSION "${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH},0")
-    set(SCHEMAGEN_RC_VERSION_STR "${PROJECT_VERSION}")
+    set(GRAPHQL_RC_FILENAME "schemagen")
 
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/SchemaGen.rc.in 
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Generator.rc.in 
       ${CMAKE_CURRENT_BINARY_DIR}/SchemaGen.rc
       @ONLY)