Merge pull request #146 from wravery/master

wravery · web-flow · commit d557b9d2bede · 2021-01-02T17:52:32.000-08:00
Fix #145
diff --git a/README.md b/README.md
@@ -93,6 +93,7 @@ with `schemagen`, you can look at [samples/CMakeLists.txt](samples/CMakeLists.tx
 ```
 Usage:  schemagen [options] <schema file> <output filename prefix> <output namespace>
 Command line options:
+  --version              Print the version number
   -? [ --help ]          Print the command line options
   -v [ --verbose ]       Verbose output including generated header names as
                          well as sources
diff --git a/cmake/SchemaGen.rc.in b/cmake/SchemaGen.rc.in
@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#include <winver.h>
+
+#define SCHEMAGEN_RC_VERSION     @SCHEMAGEN_RC_VERSION@
+#define SCHEMAGEN_RC_VERSION_STR "@SCHEMAGEN_RC_VERSION_STR@"
+
+#ifndef DEBUG
+#define VER_DEBUG   0
+#else
+#define VER_DEBUG   VS_FF_DEBUG
+#endif
+
+VS_VERSION_INFO	VERSIONINFO
+FILEVERSION     SCHEMAGEN_RC_VERSION
+PRODUCTVERSION  SCHEMAGEN_RC_VERSION
+FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
+FILEFLAGS       VER_DEBUG
+FILEOS          VOS__WINDOWS32
+FILETYPE        VFT_APP
+FILESUBTYPE     VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "CompanyName",        "Microsoft Corporation"
+            VALUE "FileDescription",    "Code generator for https://github.com/microsoft/cppgraphqlgen"
+            VALUE "FileVersion",        SCHEMAGEN_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
+        END
+    END
+
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/cmake/Version.h.in b/cmake/Version.h.in
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+
+#ifndef VERSION_H
+#define VERSION_H
+
+#include <string_view>
+
+namespace graphql::internal {
+
+constexpr std::string_view FullVersion { "@PROJECT_VERSION@" };
+
+constexpr size_t MajorVersion = @PROJECT_VERSION_MAJOR@;
+constexpr size_t MinorVersion = @PROJECT_VERSION_MINOR@;
+constexpr size_t PatchVersion = @PROJECT_VERSION_PATCH@;
+
+} // namespace graphql::internal
+
+#endif // VERSION_H
diff --git a/cmake/Version.rc.in b/cmake/Version.rc.in
@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#include <winver.h>
+
+#define GRAPHQL_RC_VERSION     @GRAPHQL_RC_VERSION@
+#define GRAPHQL_RC_VERSION_STR "@GRAPHQL_RC_VERSION_STR@"
+
+#ifndef DEBUG
+#define VER_DEBUG   0
+#else
+#define VER_DEBUG   VS_FF_DEBUG
+#endif
+
+VS_VERSION_INFO	VERSIONINFO
+FILEVERSION     GRAPHQL_RC_VERSION
+PRODUCTVERSION  GRAPHQL_RC_VERSION
+FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
+FILEFLAGS       VER_DEBUG
+FILEOS          VOS__WINDOWS32
+FILETYPE        VFT_DLL
+FILESUBTYPE     VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "CompanyName",        "Microsoft Corporation"
+            VALUE "FileDescription",    "Shared library for https://github.com/microsoft/cppgraphqlgen"
+            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",   "@GRAPHQL_RC_FILENAME@.dll"
+            VALUE "ProductName",        "CppGraphQLGen"
+            VALUE "ProductVersion",     GRAPHQL_RC_VERSION_STR
+        END
+    END
+
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/cmake/version.txt b/cmake/version.txt
@@ -1 +1 @@
-3.4.0
+3.4.1
diff --git a/include/graphqlservice/GraphQLService.h b/include/graphqlservice/GraphQLService.h
@@ -20,7 +20,9 @@
 
 #include "graphqlservice/GraphQLParse.h"
 #include "graphqlservice/GraphQLResponse.h"
+
 #include "graphqlservice/internal/SortedMap.h"
+#include "graphqlservice/internal/Version.h"
 
 #include <functional>
 #include <future>
diff --git a/samples/introspection/IntrospectionSchema.h b/samples/introspection/IntrospectionSchema.h
@@ -9,6 +9,10 @@
 #include "graphqlservice/GraphQLSchema.h"
 #include "graphqlservice/GraphQLService.h"
 
+// Check if the library version is compatible with schemagen 3.4.1
+static_assert(graphql::internal::MajorVersion == 3, "regenerate with schemagen: major version mismatch");
+static_assert(graphql::internal::MinorVersion == 4, "regenerate with schemagen: minor version mismatch");
+
 // clang-format off
 #ifdef GRAPHQL_DLLEXPORTS
 	#ifdef IMPL_GRAPHQLINTROSPECTION_DLL
diff --git a/samples/separate/TodaySchema.h b/samples/separate/TodaySchema.h
@@ -9,6 +9,10 @@
 #include "graphqlservice/GraphQLSchema.h"
 #include "graphqlservice/GraphQLService.h"
 
+// Check if the library version is compatible with schemagen 3.4.1
+static_assert(graphql::internal::MajorVersion == 3, "regenerate with schemagen: major version mismatch");
+static_assert(graphql::internal::MinorVersion == 4, "regenerate with schemagen: minor version mismatch");
+
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/samples/separate_nointrospection/TodaySchema.h b/samples/separate_nointrospection/TodaySchema.h
@@ -9,6 +9,10 @@
 #include "graphqlservice/GraphQLSchema.h"
 #include "graphqlservice/GraphQLService.h"
 
+// Check if the library version is compatible with schemagen 3.4.1
+static_assert(graphql::internal::MajorVersion == 3, "regenerate with schemagen: major version mismatch");
+static_assert(graphql::internal::MinorVersion == 4, "regenerate with schemagen: minor version mismatch");
+
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/samples/unified/TodaySchema.h b/samples/unified/TodaySchema.h
@@ -9,6 +9,10 @@
 #include "graphqlservice/GraphQLSchema.h"
 #include "graphqlservice/GraphQLService.h"
 
+// Check if the library version is compatible with schemagen 3.4.1
+static_assert(graphql::internal::MajorVersion == 3, "regenerate with schemagen: major version mismatch");
+static_assert(graphql::internal::MinorVersion == 4, "regenerate with schemagen: minor version mismatch");
+
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/samples/unified_nointrospection/TodaySchema.h b/samples/unified_nointrospection/TodaySchema.h
@@ -9,6 +9,10 @@
 #include "graphqlservice/GraphQLSchema.h"
 #include "graphqlservice/GraphQLService.h"
 
+// Check if the library version is compatible with schemagen 3.4.1
+static_assert(graphql::internal::MajorVersion == 3, "regenerate with schemagen: major version mismatch");
+static_assert(graphql::internal::MinorVersion == 4, "regenerate with schemagen: minor version mismatch");
+
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/samples/validation/ValidationSchema.h b/samples/validation/ValidationSchema.h
@@ -9,6 +9,10 @@
 #include "graphqlservice/GraphQLSchema.h"
 #include "graphqlservice/GraphQLService.h"
 
+// Check if the library version is compatible with schemagen 3.4.1
+static_assert(graphql::internal::MajorVersion == 3, "regenerate with schemagen: major version mismatch");
+static_assert(graphql::internal::MinorVersion == 4, "regenerate with schemagen: minor version mismatch");
+
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -3,6 +3,26 @@
 
 cmake_minimum_required(VERSION 3.8.2)
 
+# internal/Version.h
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Version.h.in 
+  ${CMAKE_CURRENT_BINARY_DIR}/../include/graphqlservice/internal/Version.h
+  @ONLY)
+
+if(WIN32 AND BUILD_SHARED_LIBS)
+  # Version.rc
+  set(GRAPHQL_RC_VERSION "${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH},0")
+  set(GRAPHQL_RC_VERSION_STR "${PROJECT_VERSION}")
+
+  function(add_version_rc target)
+    set(GRAPHQL_RC_FILENAME "${target}")
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Version.rc.in 
+      ${CMAKE_CURRENT_BINARY_DIR}/${target}_version.rc
+      @ONLY)
+    add_library(${target}_version OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${target}_version.rc)
+    target_link_libraries(${target} PRIVATE ${target}_version)
+  endfunction()
+endif()
+
 function(add_bigobj_flag target)
   if(MSVC)
     # MSVC requires the /bigobj flag if the number of sections gets too big.
@@ -24,6 +44,8 @@ if(WIN32 AND BUILD_SHARED_LIBS)
   target_compile_definitions(graphqlpeg
     PUBLIC GRAPHQL_DLLEXPORTS
     PRIVATE IMPL_GRAPHQLPEG_DLL)
+
+  add_version_rc(graphqlpeg)
 endif()
 
 # graphqlresponse
@@ -37,12 +59,16 @@ if(WIN32 AND BUILD_SHARED_LIBS)
   target_compile_definitions(graphqlresponse
     PUBLIC GRAPHQL_DLLEXPORTS
     PRIVATE IMPL_GRAPHQLRESPONSE_DLL)
+
+  add_version_rc(graphqlresponse)
 endif()
 
 # schemagen
 if(GRAPHQL_BUILD_SCHEMAGEN)
   add_executable(schemagen SchemaGenerator.cpp)
   add_executable(cppgraphqlgen::schemagen ALIAS schemagen)
+  target_include_directories(schemagen PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR}/../include)
   target_link_libraries(schemagen PRIVATE
     graphqlpeg
     graphqlresponse)
@@ -101,6 +127,18 @@ if(GRAPHQL_BUILD_SCHEMAGEN)
 
   find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
   target_link_libraries(schemagen PRIVATE ${BOOST_LIBRARIES})
+
+  if(WIN32)
+    # SchemaGen.rc
+    set(SCHEMAGEN_RC_VERSION "${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH},0")
+    set(SCHEMAGEN_RC_VERSION_STR "${PROJECT_VERSION}")
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/SchemaGen.rc.in 
+      ${CMAKE_CURRENT_BINARY_DIR}/SchemaGen.rc
+      @ONLY)
+
+    add_library(schemagen_version OBJECT ${CMAKE_CURRENT_BINARY_DIR}/SchemaGen.rc)
+    target_link_libraries(schemagen PRIVATE schemagen_version)
+  endif()
   
   install(TARGETS schemagen
     EXPORT cppgraphqlgen-targets
@@ -170,6 +208,8 @@ if(WIN32 AND BUILD_SHARED_LIBS)
   target_compile_definitions(graphqlservice_nointrospection
     PUBLIC GRAPHQL_DLLEXPORTS
     PRIVATE IMPL_GRAPHQLSERVICE_DLL)
+
+  add_version_rc(graphqlservice_nointrospection)
 endif()
 
 # graphqlservice
@@ -183,6 +223,8 @@ if(WIN32 AND BUILD_SHARED_LIBS)
   target_compile_definitions(graphqlservice
     PUBLIC GRAPHQL_DLLEXPORTS
     PRIVATE IMPL_GRAPHQLINTROSPECTION_DLL)
+
+  add_version_rc(graphqlservice)
 endif()
 
 # RapidJSON is the only option for JSON serialization used in this project, but if you want
@@ -206,6 +248,8 @@ if(GRAPHQL_USE_RAPIDJSON)
     target_compile_definitions(graphqljson
       PUBLIC GRAPHQL_DLLEXPORTS
       PRIVATE IMPL_JSONRESPONSE_DLL)
+
+    add_version_rc(graphqljson)
   endif()
 endif()
 
@@ -249,6 +293,7 @@ install(FILES
 
 install(FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/internal/SortedMap.h
+    ${CMAKE_CURRENT_BINARY_DIR}/../include/graphqlservice/internal/Version.h
   CONFIGURATIONS ${GRAPHQL_INSTALL_CONFIGURATIONS}
   DESTINATION ${GRAPHQL_INSTALL_INCLUDE_DIR}/graphqlservice/internal)
 
diff --git a/src/SchemaGenerator.cpp b/src/SchemaGenerator.cpp
@@ -1691,6 +1691,13 @@ bool Generator::outputHeader() const noexcept
 	headerFile << R"cpp(#include "graphqlservice/GraphQLSchema.h"
 #include "graphqlservice/GraphQLService.h"
 
+// Check if the library version is compatible with schemagen )cpp"
+			   << graphql::internal::FullVersion << R"cpp(
+static_assert(graphql::internal::MajorVersion == )cpp"
+			   << graphql::internal::MajorVersion << R"cpp(, "regenerate with schemagen: major version mismatch");
+static_assert(graphql::internal::MinorVersion == )cpp"
+		<< graphql::internal::MinorVersion << R"cpp(, "regenerate with schemagen: minor version mismatch");
+
 )cpp";
 	if (_isIntrospection)
 	{
@@ -2602,7 +2609,8 @@ Operations::Operations()cpp";
 			{
 				bool firstValue = true;
 
-				sourceFile << R"cpp(	type)cpp" << unionType.cppType << R"cpp(->AddPossibleTypes({
+				sourceFile << R"cpp(	type)cpp" << unionType.cppType
+						   << R"cpp(->AddPossibleTypes({
 )cpp";
 
 				for (const auto& unionOption : unionType.options)
@@ -3673,12 +3681,16 @@ using namespace std::literals;
 
 namespace po = boost::program_options;
 
+void outputVersion(std::ostream& ostm)
+{
+	ostm << graphql::internal::FullVersion << std::endl;
+}
+
 void outputUsage(std::ostream& ostm, const po::options_description& options)
 {
-	std::cerr
-		<< "Usage:\tschemagen [options] <schema file> <output filename prefix> <output namespace>"
-		<< std::endl;
-	std::cerr << options;
+	ostm << "Usage:\tschemagen [options] <schema file> <output filename prefix> <output namespace>"
+		 << std::endl;
+	ostm << options;
 }
 
 int main(int argc, char** argv)
@@ -3688,6 +3700,7 @@ int main(int argc, char** argv)
 	po::options_description internalOptions("Internal options");
 	po::variables_map variables;
 	bool showUsage = false;
+	bool showVersion = false;
 	bool buildIntrospection = false;
 	bool buildCustom = false;
 	bool noStubs = false;
@@ -3700,8 +3713,10 @@ int main(int argc, char** argv)
 	std::string sourceDir;
 	std::string headerDir;
 
-	options.add_options()("help,?", po::bool_switch(&showUsage), "Print the command line options")(
-		"verbose,v",
+	options.add_options()("version", po::bool_switch(&showVersion), "Print the version number")(
+		"help,?",
+		po::bool_switch(&showUsage),
+		"Print the command line options")("verbose,v",
 		po::bool_switch(&verbose),
 		"Verbose output including generated header names as well as sources")("schema,s",
 		po::value(&schemaFileName),
@@ -3762,7 +3777,12 @@ int main(int argc, char** argv)
 		return 1;
 	}
 
-	if (showUsage || (!buildIntrospection && !buildCustom))
+	if (showVersion)
+	{
+		outputVersion(std::cout);
+		return 0;
+	}
+	else if (showUsage || (!buildIntrospection && !buildCustom))
 	{
 		outputUsage(std::cout, options);
 		return 0;
