Rename libraries graphqlservice and graphqlintrospection

Author: wravery

res/graphqlservice_nointrospection_version.rc renamed to res/graphqlintrospection_version.rc

@@ -28,9 +28,9 @@ BEGIN
             VALUE "CompanyName",        "Microsoft Corporation"
             VALUE "FileDescription",    "Shared library for https://github.com/microsoft/cppgraphqlgen"
             VALUE "FileVersion",        GRAPHQL_RC_VERSION_STR
-            VALUE "InternalName",       "graphqlservice_nointrospection"
+            VALUE "InternalName",       "graphqlintrospection"
             VALUE "LegalCopyright",     "Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License."
-            VALUE "OriginalFilename",   "graphqlservice_nointrospection.dll"
+            VALUE "OriginalFilename",   "graphqlintrospection.dll"
             VALUE "ProductName",        "CppGraphQLGen"
             VALUE "ProductVersion",     GRAPHQL_RC_VERSION_STR
         END

samples/CMakeLists.txt

@@ -110,7 +110,7 @@ foreach(CPP_FILE IN LISTS SEPARATE_SCHEMA_FILES)
 endforeach(CPP_FILE)
 
 add_library(separateschema STATIC ${SEPARATE_SCHEMA_PATHS})
-target_link_libraries(separateschema PUBLIC graphqlservice)
+target_link_libraries(separateschema PUBLIC graphqlintrospection)
 target_compile_definitions(separateschema PUBLIC IMPL_SEPARATE_TODAY)
 target_include_directories(separateschema PUBLIC
   ${CMAKE_CURRENT_SOURCE_DIR}/../include
@@ -130,7 +130,7 @@ foreach(CPP_FILE IN LISTS SEPARATE_NOINTROSPECTION_SCHEMA_FILES)
 endforeach(CPP_FILE)
 
 add_library(separateschema_nointrospection STATIC ${SEPARATE_NOINTROSPECTION_SCHEMA_PATHS})
-target_link_libraries(separateschema_nointrospection PUBLIC graphqlservice_nointrospection)
+target_link_libraries(separateschema_nointrospection PUBLIC graphqlservice)
 target_compile_definitions(separateschema_nointrospection PUBLIC IMPL_SEPARATE_TODAY)
 target_include_directories(separateschema_nointrospection PUBLIC
   ${CMAKE_CURRENT_SOURCE_DIR}/../include
@@ -173,16 +173,16 @@ target_include_directories(sample_nointrospection PRIVATE
 if(WIN32 AND BUILD_SHARED_LIBS)
   add_custom_command(OUTPUT copied_sample_dlls
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
-      $<TARGET_FILE:graphqlservice_nointrospection>
       $<TARGET_FILE:graphqlservice>
+      $<TARGET_FILE:graphqlintrospection>
       $<TARGET_FILE:graphqljson>
       $<TARGET_FILE:graphqlpeg>
       $<TARGET_FILE:graphqlresponse>
       ${CMAKE_CURRENT_BINARY_DIR}
     COMMAND ${CMAKE_COMMAND} -E touch copied_sample_dlls
     DEPENDS
-      graphqlservice_nointrospection
       graphqlservice
+      graphqlintrospection
       graphqljson
       graphqlpeg
       graphqlresponse)
@@ -219,7 +219,7 @@ endif()
 if(GRAPHQL_BUILD_TESTS)
   # tests
   add_library(unifiedschema STATIC unified/TodaySchema.cpp)
-  target_link_libraries(unifiedschema PUBLIC graphqlservice)
+  target_link_libraries(unifiedschema PUBLIC graphqlintrospection)
   target_include_directories(unifiedschema PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../include
     ${CMAKE_CURRENT_SOURCE_DIR}/../PEGTL/include
@@ -236,7 +236,7 @@ if(GRAPHQL_BUILD_TESTS)
   add_bigobj_flag(unifiedgraphql)
 
   add_library(unifiedschema_nointrospection STATIC unified_nointrospection/TodaySchema.cpp)
-  target_link_libraries(unifiedschema_nointrospection PUBLIC graphqlservice_nointrospection)
+  target_link_libraries(unifiedschema_nointrospection PUBLIC graphqlservice)
   target_include_directories(unifiedschema_nointrospection PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../include
     ${CMAKE_CURRENT_SOURCE_DIR}/../PEGTL/include
@@ -255,7 +255,7 @@ if(GRAPHQL_BUILD_TESTS)
   add_library(validationgraphql STATIC
     validation/ValidationMock.cpp
     validation/ValidationSchema.cpp)
-  target_link_libraries(validationgraphql PUBLIC graphqlservice)
+  target_link_libraries(validationgraphql PUBLIC graphqlintrospection)
   target_include_directories(validationgraphql PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../include
     ${CMAKE_CURRENT_SOURCE_DIR}/../PEGTL/include

src/CMakeLists.txt

@@ -207,52 +207,52 @@ if(GRAPHQL_UPDATE_SAMPLES)
     DEPENDS updated_introspection)
 endif()
 
-# graphqlservice_nointrospection
-add_library(graphqlservice_nointrospection
+# graphqlservice
+add_library(graphqlservice
   GraphQLService.cpp
   GraphQLSchema.cpp
   Validation.cpp)
-add_library(cppgraphqlgen::graphqlservice_nointrospection ALIAS graphqlservice_nointrospection)
-target_link_libraries(graphqlservice_nointrospection PUBLIC
+add_library(cppgraphqlgen::graphqlservice ALIAS graphqlservice)
+target_link_libraries(graphqlservice PUBLIC
     graphqlpeg
     graphqlresponse
     Threads::Threads)
 
 if(GRAPHQL_UPDATE_SAMPLES)
   # Even though this target doesn't build IntrospectionSchema.cpp, it still
   # depends on IntrospectionSchema.h for some enum definitions.
-  add_dependencies(graphqlservice_nointrospection update_introspection)
+  add_dependencies(graphqlservice update_introspection)
 endif()
 
 if(GRAPHQL_UPDATE_VERSION)
-  update_version_rc(graphqlservice_nointrospection)
+  update_version_rc(graphqlservice)
 endif()
 
 if(WIN32 AND BUILD_SHARED_LIBS)
-  target_compile_definitions(graphqlservice_nointrospection
+  target_compile_definitions(graphqlservice
     PUBLIC GRAPHQL_DLLEXPORTS
     PRIVATE IMPL_GRAPHQLSERVICE_DLL)
 
-  add_version_rc(graphqlservice_nointrospection)
+  add_version_rc(graphqlservice)
 endif()
 
-# graphqlservice
-add_library(graphqlservice
+# graphqlintrospection
+add_library(graphqlintrospection
   Introspection.cpp
   IntrospectionSchema.cpp)
-add_library(cppgraphqlgen::graphqlservice ALIAS graphqlservice)
-target_link_libraries(graphqlservice PUBLIC graphqlservice_nointrospection)
+add_library(cppgraphqlgen::graphqlintrospection ALIAS graphqlintrospection)
+target_link_libraries(graphqlintrospection PUBLIC graphqlservice)
 
 if(GRAPHQL_UPDATE_VERSION)
-  update_version_rc(graphqlservice)
+  update_version_rc(graphqlintrospection)
 endif()
 
 if(WIN32 AND BUILD_SHARED_LIBS)
-  target_compile_definitions(graphqlservice
+  target_compile_definitions(graphqlintrospection
     PUBLIC GRAPHQL_DLLEXPORTS
     PRIVATE IMPL_GRAPHQLINTROSPECTION_DLL)
 
-  add_version_rc(graphqlservice)
+  add_version_rc(graphqlintrospection)
 endif()
 
 # RapidJSON is the only option for JSON serialization used in this project, but if you want
@@ -289,7 +289,7 @@ endif()
 if(BUILD_GRAPHQLJSON)
   option(GRAPHQL_BUILD_TESTS "Build the tests and sample schema library." ON)
 
-  target_link_libraries(graphqljson PUBLIC graphqlservice)
+  target_link_libraries(graphqljson PUBLIC graphqlintrospection)
 
   install(TARGETS graphqljson
     EXPORT cppgraphqlgen-targets
@@ -298,16 +298,16 @@ if(BUILD_GRAPHQLJSON)
     LIBRARY DESTINATION lib)
   install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/JSONResponse.h
     CONFIGURATIONS ${GRAPHQL_INSTALL_CONFIGURATIONS}
-    DESTINATION ${GRAPHQL_INSTALL_INCLUDE_DIR}/graphqlservice)
+    DESTINATION ${GRAPHQL_INSTALL_INCLUDE_DIR}/graphqlintrospection)
 else()
   set(GRAPHQL_BUILD_TESTS OFF CACHE BOOL "GRAPHQL_BUILD_TESTS depends on BUILD_GRAPHQLJSON" FORCE)
 endif()
 
 install(TARGETS
     graphqlpeg
     graphqlresponse
-    graphqlservice_nointrospection
     graphqlservice
+    graphqlintrospection
   EXPORT cppgraphqlgen-targets
   RUNTIME DESTINATION bin
   ARCHIVE DESTINATION lib
@@ -321,7 +321,7 @@ install(FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/GraphQLGrammar.h
     ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/GraphQLTree.h
   CONFIGURATIONS ${GRAPHQL_INSTALL_CONFIGURATIONS}
-  DESTINATION ${GRAPHQL_INSTALL_INCLUDE_DIR}/graphqlservice)
+  DESTINATION ${GRAPHQL_INSTALL_INCLUDE_DIR}/graphqlintrospection)
 
 install(FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/internal/SortedMap.h
@@ -333,7 +333,7 @@ install(FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/introspection/Introspection.h
     ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/introspection/IntrospectionSchema.h
   CONFIGURATIONS ${GRAPHQL_INSTALL_CONFIGURATIONS}
-  DESTINATION ${GRAPHQL_INSTALL_INCLUDE_DIR}/graphqlservice/introspection)
+  DESTINATION ${GRAPHQL_INSTALL_INCLUDE_DIR}/graphqlintrospection/introspection)
 
 install(EXPORT cppgraphqlgen-targets
   NAMESPACE cppgraphqlgen::

test/CMakeLists.txt

@@ -53,7 +53,7 @@ gtest_add_tests(TARGET pegtl_tests)
 
 add_executable(response_tests ResponseTests.cpp)
 target_link_libraries(response_tests PRIVATE
-  graphqlservice_nointrospection
+  graphqlservice
   GTest::GTest
   GTest::Main)
 target_include_directories(response_tests PUBLIC
@@ -63,16 +63,16 @@ gtest_add_tests(TARGET response_tests)
 if(WIN32 AND BUILD_SHARED_LIBS)
   add_custom_command(OUTPUT copied_test_dlls
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
-      $<TARGET_FILE:graphqlservice_nointrospection>
       $<TARGET_FILE:graphqlservice>
+      $<TARGET_FILE:graphqlintrospection>
       $<TARGET_FILE:graphqljson>
       $<TARGET_FILE:graphqlpeg>
       $<TARGET_FILE:graphqlresponse>
       ${CMAKE_CURRENT_BINARY_DIR}
     COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/copied_test_dlls
     DEPENDS
-      graphqlservice_nointrospection
       graphqlservice
+      graphqlintrospection
       graphqljson
       graphqlpeg
       graphqlresponse