Skip to content

Commit f9d584c

Browse files
wraverywravery
committed
Split out graphqlservice_nointrospection
1 parent bf1221c commit f9d584c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+135
-80
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Debug/
66
Release/
77
Testing/
88
Win32/
9-
/include/graphqlservice/IntrospectionSchema.h
9+
/include/graphqlservice/introspection/IntrospectionSchema.h
1010
/IntrospectionSchema.cpp
1111
*.filters
1212
*.vcxproj

include/graphqlservice/Introspection.h renamed to include/graphqlservice/introspection/Introspection.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define INTROSPECTION_H
88

99
#include "graphqlservice/GraphQLSchema.h"
10-
#include "graphqlservice/IntrospectionSchema.h"
10+
#include "graphqlservice/introspection/IntrospectionSchema.h"
1111

1212
namespace graphql::introspection {
1313

@@ -21,7 +21,7 @@ class EnumValue;
2121
class Schema : public object::Schema
2222
{
2323
public:
24-
GRAPHQLSERVICE_EXPORT explicit Schema(const std::shared_ptr<schema::Schema>& schema);
24+
GRAPHQLINTROSPECTION_EXPORT explicit Schema(const std::shared_ptr<schema::Schema>& schema);
2525

2626
// Accessors
2727
service::FieldResult<std::vector<std::shared_ptr<object::Type>>> getTypes(
@@ -52,7 +52,7 @@ class Schema : public object::Schema
5252
class Type : public object::Type
5353
{
5454
public:
55-
GRAPHQLSERVICE_EXPORT explicit Type(const std::shared_ptr<schema::BaseType>& type);
55+
GRAPHQLINTROSPECTION_EXPORT explicit Type(const std::shared_ptr<schema::BaseType>& type);
5656

5757
// Accessors
5858
service::FieldResult<TypeKind> getKind(service::FieldParams&&) const override;
@@ -82,7 +82,7 @@ class Type : public object::Type
8282
class Field : public object::Field
8383
{
8484
public:
85-
GRAPHQLSERVICE_EXPORT explicit Field(const std::shared_ptr<schema::Field>& field);
85+
GRAPHQLINTROSPECTION_EXPORT explicit Field(const std::shared_ptr<schema::Field>& field);
8686

8787
// Accessors
8888
service::FieldResult<response::StringType> getName(
@@ -105,7 +105,7 @@ class Field : public object::Field
105105
class InputValue : public object::InputValue
106106
{
107107
public:
108-
GRAPHQLSERVICE_EXPORT explicit InputValue(
108+
GRAPHQLINTROSPECTION_EXPORT explicit InputValue(
109109
const std::shared_ptr<schema::InputValue>& inputValue);
110110

111111
// Accessors
@@ -125,7 +125,7 @@ class InputValue : public object::InputValue
125125
class EnumValue : public object::EnumValue
126126
{
127127
public:
128-
GRAPHQLSERVICE_EXPORT explicit EnumValue(const std::shared_ptr<schema::EnumValue>& enumValue);
128+
GRAPHQLINTROSPECTION_EXPORT explicit EnumValue(const std::shared_ptr<schema::EnumValue>& enumValue);
129129

130130
// Accessors
131131
service::FieldResult<response::StringType> getName(
@@ -144,7 +144,7 @@ class EnumValue : public object::EnumValue
144144
class Directive : public object::Directive
145145
{
146146
public:
147-
GRAPHQLSERVICE_EXPORT explicit Directive(const std::shared_ptr<schema::Directive>& directive);
147+
GRAPHQLINTROSPECTION_EXPORT explicit Directive(const std::shared_ptr<schema::Directive>& directive);
148148

149149
// Accessors
150150
service::FieldResult<response::StringType> getName(

‎samples/CMakeLists.txt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ foreach(CPP_FILE IN LISTS SEPARATE_NOINTROSPECTION_SCHEMA_FILES)
137137
endforeach(CPP_FILE)
138138

139139
add_library(separateschema_nointrospection STATIC ${SEPARATE_NOINTROSPECTION_SCHEMA_PATHS})
140-
target_link_libraries(separateschema_nointrospection PUBLIC graphqlservice)
140+
target_link_libraries(separateschema_nointrospection PUBLIC graphqlservice_nointrospection)
141141
target_compile_definitions(separateschema_nointrospection PUBLIC IMPL_SEPARATE_TODAY)
142142
target_include_directories(separateschema_nointrospection PUBLIC
143143
${CMAKE_CURRENT_BINARY_DIR}/../include
@@ -182,7 +182,8 @@ target_include_directories(sample_nointrospection PRIVATE
182182
${CMAKE_CURRENT_SOURCE_DIR}/../PEGTL/include)
183183

184184
if(WIN32 AND BUILD_SHARED_LIBS)
185-
add_custom_target(copy_sample_dlls ${CMAKE_COMMAND} -E copy $<TARGET_FILE:graphqlservice> ${CMAKE_CURRENT_BINARY_DIR}
185+
add_custom_target(copy_sample_dlls ${CMAKE_COMMAND} -E copy $<TARGET_FILE:graphqlservice_nointrospection> ${CMAKE_CURRENT_BINARY_DIR}
186+
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:graphqlservice> ${CMAKE_CURRENT_BINARY_DIR}
186187
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:graphqljson> ${CMAKE_CURRENT_BINARY_DIR}
187188
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:graphqlpeg> ${CMAKE_CURRENT_BINARY_DIR}
188189
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:graphqlresponse> ${CMAKE_CURRENT_BINARY_DIR}
@@ -239,7 +240,7 @@ if(GRAPHQL_BUILD_TESTS)
239240
add_bigobj_flag(unifiedgraphql)
240241

241242
add_library(unifiedschema_nointrospection STATIC unified_nointrospection/TodaySchema.cpp)
242-
target_link_libraries(unifiedschema_nointrospection PUBLIC graphqlservice)
243+
target_link_libraries(unifiedschema_nointrospection PUBLIC graphqlservice_nointrospection)
243244
target_include_directories(unifiedschema_nointrospection PUBLIC
244245
${CMAKE_CURRENT_BINARY_DIR}/../include
245246
${CMAKE_CURRENT_SOURCE_DIR}/../include

‎samples/introspection/IntrospectionSchema.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
#include "graphqlservice/Introspection.h"
4+
#include "graphqlservice/introspection/Introspection.h"
55

66
#include <algorithm>
77
#include <array>

‎samples/introspection/IntrospectionSchema.h‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,18 @@
99
#include "graphqlservice/GraphQLSchema.h"
1010
#include "graphqlservice/GraphQLService.h"
1111

12+
// clang-format off
13+
#ifdef GRAPHQL_DLLEXPORTS
14+
#ifdef IMPL_GRAPHQLINTROSPECTION_DLL
15+
#define GRAPHQLINTROSPECTION_EXPORT __declspec(dllexport)
16+
#else // !IMPL_GRAPHQLINTROSPECTION_DLL
17+
#define GRAPHQLINTROSPECTION_EXPORT __declspec(dllimport)
18+
#endif // !IMPL_GRAPHQLINTROSPECTION_DLL
19+
#else // !GRAPHQL_DLLEXPORTS
20+
#define GRAPHQLINTROSPECTION_EXPORT
21+
#endif // !GRAPHQL_DLLEXPORTS
22+
// clang-format on
23+
1224
#include <memory>
1325
#include <string>
1426
#include <vector>
@@ -203,7 +215,7 @@ class Directive
203215

204216
} /* namespace object */
205217

206-
GRAPHQLSERVICE_EXPORT void AddTypesToSchema(const std::shared_ptr<schema::Schema>& schema);
218+
GRAPHQLINTROSPECTION_EXPORT void AddTypesToSchema(const std::shared_ptr<schema::Schema>& schema);
207219

208220
} /* namespace introspection */
209221
} /* namespace graphql */

‎samples/separate/AppointmentConnectionObject.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "TodayObjects.h"
55

6-
#include "graphqlservice/Introspection.h"
6+
#include "graphqlservice/introspection/Introspection.h"
77

88
#include <algorithm>
99
#include <functional>

‎samples/separate/AppointmentEdgeObject.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "TodayObjects.h"
55

6-
#include "graphqlservice/Introspection.h"
6+
#include "graphqlservice/introspection/Introspection.h"
77

88
#include <algorithm>
99
#include <functional>

‎samples/separate/AppointmentObject.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "TodayObjects.h"
55

6-
#include "graphqlservice/Introspection.h"
6+
#include "graphqlservice/introspection/Introspection.h"
77

88
#include <algorithm>
99
#include <functional>

‎samples/separate/CompleteTaskPayloadObject.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "TodayObjects.h"
55

6-
#include "graphqlservice/Introspection.h"
6+
#include "graphqlservice/introspection/Introspection.h"
77

88
#include <algorithm>
99
#include <functional>

‎samples/separate/ExpensiveObject.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "TodayObjects.h"
55

6-
#include "graphqlservice/Introspection.h"
6+
#include "graphqlservice/introspection/Introspection.h"
77

88
#include <algorithm>
99
#include <functional>

0 commit comments

Comments
 (0)