From 329ad323e0f2b19cc6caaf62ddd35c370e4d63b0 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 6 Nov 2019 12:41:37 -0500 Subject: [PATCH 1/7] delete protos to change case on windows --- src/lib/api/apicore.proto | 56 ----------- src/lib/api/apigateway.proto | 76 -------------- src/lib/api/apioptions.proto | 15 --- src/lib/md/protos/co2.proto | 187 ----------------------------------- 4 files changed, 334 deletions(-) delete mode 100644 src/lib/api/apicore.proto delete mode 100644 src/lib/api/apigateway.proto delete mode 100644 src/lib/api/apioptions.proto delete mode 100644 src/lib/md/protos/co2.proto diff --git a/src/lib/api/apicore.proto b/src/lib/api/apicore.proto deleted file mode 100644 index e6e30c2c3..000000000 --- a/src/lib/api/apicore.proto +++ /dev/null @@ -1,56 +0,0 @@ -syntax="proto3"; -import "lib/api/Apioptions.proto"; -package bts.api; -option csharp_namespace="bts.api"; - -message PingPong { - bytes payload = 1; -} - -// *** wire protocol *** -// 1 byte - header size -// RequestHeader -// T Request - -message AuthToken { - bytes token = 1; -} - -message RequestHeader { - int32 request_id = 1; - int32 method = 2; - AuthToken token = 3; -} - -enum ApiError { - SUCCESS = 0; - NO_SERVER = 1; - SERVER_DISCONNECT = 2; - MISSING_METHOD = 3; - SERVER_FAULT = 4; - UNEXPECTED_RESPONSE = 5; - ACCESS_DENIED = 6; -} - -message ResponseHeader { - int32 request_id = 1; - ApiError code = 2; -} - -message StreamAccessRequest { - string qualifier = 1; -} -message StreamAccessResponse { - bool authorized = 1; -} - -// Some Useful buffers for use as arguments/returns - -message VoidMessage {} -message BytesMessage { - bytes buffer = 1; -} -message ResultMessage { - bool success = 1; - string error_message = 2; -} diff --git a/src/lib/api/apigateway.proto b/src/lib/api/apigateway.proto deleted file mode 100644 index 57bd84315..000000000 --- a/src/lib/api/apigateway.proto +++ /dev/null @@ -1,76 +0,0 @@ -syntax="proto3"; -package bts.api.gateway; -option csharp_namespace="bts.api.gateway"; -import "lib/api/Apicore.proto"; - -message GatewayLogin { - string username = 1; - string password = 2; -} -message GatewayLoginResult { - bool is_valid = 1; - string reason = 2; - api.AuthToken token = 3; - bool can_create = 4; -} - -message GatewayCallHeader { - int32 request_id = 1; - int32 method = 2; - api.AuthToken token = 3; - string service_type = 4; - string service_qualifier = 5; -} - -message GatewaySubscribe { - int32 request_id = 1; - int32 method = 2; - api.AuthToken token = 3; - string service_type = 4; - string service_qualifier = 5; - string stream_qualifier = 6; - string method_name = 7; -} -message GatewayUnsubscribe { - uint32 subscription_id = 1; - string service_type = 4; - string service_qualifier = 5; -} - -message StreamGWUpdate { - enum UpdateType { - REMOVE = 0; - REPLACE = 1; - CREATE= 2; - RESET = 3; - } - UpdateType update_type = 1; - int32 key = 2; - bytes buffer = 3; -} -message SubscriptionUpdate { - int32 id = 1; - repeated StreamGWUpdate updates = 2; -} - -message GatewayRequest { - oneof request { - GatewayLogin login = 1; - // Call and subscribe are lazy on the server - // proxy is not generated until first call - // client can determine if a service "should" exist. - // If the types are there server will return OK regardless - GatewayCallHeader call = 2; - GatewaySubscribe subscribe = 3; - GatewayUnsubscribe unsubscribe = 4; - } - bytes addendum = 100; -} -message GatewayResponse { - oneof response { - GatewayLoginResult logon = 1; - bytes call_result = 2; - SubscriptionUpdate tick = 3; - string error = 10; - } -} \ No newline at end of file diff --git a/src/lib/api/apioptions.proto b/src/lib/api/apioptions.proto deleted file mode 100644 index 1d2067173..000000000 --- a/src/lib/api/apioptions.proto +++ /dev/null @@ -1,15 +0,0 @@ -syntax="proto3"; -import "google/protobuf/descriptor.proto"; -package bts.api; -option csharp_namespace="bts.api"; - -extend google.protobuf.ServiceOptions { - string service_description = 8501; -} -extend google.protobuf.MethodOptions { - string method_description = 8503; - bool skip_excel_generation = 8504; -} -extend google.protobuf.FieldOptions { - bool key = 8502; -} diff --git a/src/lib/md/protos/co2.proto b/src/lib/md/protos/co2.proto deleted file mode 100644 index c44566db6..000000000 --- a/src/lib/md/protos/co2.proto +++ /dev/null @@ -1,187 +0,0 @@ -syntax='proto3'; -package bts.co2; -option csharp_namespace="bts.co2"; -import "lib/domain_model/Security.proto"; - -option cc_enable_arenas=true; - -enum Platform { - PLATFORM_UNSET = 0; - PLATFORM_SIM = 1; - PLATFORM_MDP3ONIXS = 10; - PLATFORM_CELOXICA = 13; - PLATFORM_MDP3EMUMBA = 14; - PLATFORM_ICEONIXS = 15; -} - -enum TradingStatus { - TRADINGSTATUS_UNKNOWN = 0; - TRADINGSTATUS_NORMAL = 2; - TRADINGSTATUS_CLOSED = 3; - TRADINGSTATUS_PRE_OPEN = 4; - TRADINGSTATUS_OPENING_ROTATION = 5; - TRADINGSTATUS_FAST_MARKET = 6; // CBOE - TRADINGSTATUS_SUSPENDED = 7; - TRADINGSTATUS_HALTED = 8; - TRADINGSTATUS_PRICE_INDICATION = 9; // CME - TRADINGSTATUS_PRE_CROSS = 10; // CME - TRADINGSTATUS_CROSS = 11; // CME - TRADINGSTATUS_NO_CANCEL = 12; // CME - TRADINGSTATUS_POST_CLOSE = 13; - TRADINGSTATUS_NO_CHANGE = 14; - TRADINGSTATUS_NOT_AVAILABLE = 15; // CME NotAvailableForTrading -} - - -enum CoconutSecurityStatus { - COCONUTSECURITYSTATUS_OK = 0; - COCONUTSECURITYSTATUS_PACKET_LOSS = 2; -} - -message SecurityChannel { - uint64 time = 1; - uint32 flags = 2; - bts.api.SecurityType type = 3; - bts.api.Venue exchange = 4; - string symbol = 5; - - int64 trade_cursor = 6; - int64 rfq_cursor = 7; - uint64 segment_id = 8; - bool entitled = 9; -} - -message MDRequest { - // Separate out timestamps by symbol+type so we can easily add symbols 'lazily' - repeated SecurityChannel channels = 1; - enum Flags { - SECURITY = 0; - BBO = 0x1; - DIRECT = 0x2; - LAST_TRADE = 0x4; - TRADE_LOG = 0x8; - RFQ = 0x10; - MISC = 0x30; - IMPLIED = 0x40; - } - string host = 2; - // bytes token = 3; - reserved 3; -} - -message ChannelUpdate { - uint32 key = 1; - bts.api.Security security = 2; - BookMessage direct = 3; - BookMessage implied = 4; - MiscMessage misc = 5; - TradeMessage last_trade = 6; -} - -message ChannelReply { - SecurityChannel channel = 1; - Platform platform = 2; - repeated ChannelUpdate updates = 3; - repeated TradeMessage trade_log = 4; - repeated QuoteRequestMessage rfq_log = 5; -} - -message MDReply { - repeated ChannelReply channels = 1; -} - -message PriceMessage { - int64 mantissa = 1; - sint32 exponent = 2; -} - -message PriceSizeMessage { - int64 mantissa = 1; - sint32 exponent = 2; - uint32 size = 3; -} - -message TopBookMessage { - // uint32 key = 1; - // int64 time = 2; - PriceSizeMessage bid = 10; - PriceSizeMessage ask = 11; -} - -message BookMessage { - // uint32 key = 1; - // int64 time = 2; - repeated PriceSizeMessage bids = 10; - repeated PriceSizeMessage asks = 11; -} - -message MiscMessage { - // int32 key = 1; - reserved 1; - reserved 2; - PriceMessage settlement = 22; - uint32 settlement_date = 3; - PriceMessage previous_settlement_price = 23; - uint32 previous_settlement_date = 21; - double open_price = 4; - uint32 open_date = 5; - double close_price = 6; - uint32 close_date = 7; - double session_high = 8; - double session_low = 9; -// double open_interest = 10; - double session_high_bid = 11; - double session_low_offer = 12; - double fixing_price = 13; -} - -enum AggressorSide { - AGGRESSOR_SIDE_NONE = 0; - AGGRESSOR_SIDE_BUY = 1; - AGGRESSOR_SIDE_SELL = 2; -} - -message TradeMessage { - uint32 key = 1; - int64 time = 2; - // Flattened out the TradeMessage so it can be stored directly in shared memory - //PriceSizeMessage price_size = 3; - int64 mantissa = 4; - sint32 exponent = 5; - uint32 size = 6; - uint32 total_volume = 7; - bool gap = 8; - AggressorSide aggressor_side = 9; - bool from_spread = 10; -} -message QuoteRequestMessage { - enum Side { - UNDEFINED = 0; - BUY = 49; - SELL = 50; - CROSS = 99; - } - uint32 key = 1; - int64 time = 2; - string request_id = 3; - int32 size = 5; - Side side = 6; - bool tradable = 7; - bool gap = 8; -} - -message TradeList { - repeated TradeMessage items = 1; -} -message RFQList { - repeated QuoteRequestMessage items = 1; -} - -message CoconutReplayHeader { - string magic = 1; - uint32 version = 2; - int64 timestamp = 3; - string host = 4; - - int32 naggle_ms = 5; -} From adee8b584c1f801e0b17b3428c20a6cb6d3d806e Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 6 Nov 2019 12:43:27 -0500 Subject: [PATCH 2/7] capitalized first letter of proto to work around a protoc bug --- src/lib/api/Apicore.proto | 56 +++++++++++ src/lib/api/Apigateway.proto | 76 ++++++++++++++ src/lib/api/Apioptions.proto | 18 ++++ src/lib/md/protos/Co2.proto | 187 +++++++++++++++++++++++++++++++++++ 4 files changed, 337 insertions(+) create mode 100644 src/lib/api/Apicore.proto create mode 100644 src/lib/api/Apigateway.proto create mode 100644 src/lib/api/Apioptions.proto create mode 100644 src/lib/md/protos/Co2.proto diff --git a/src/lib/api/Apicore.proto b/src/lib/api/Apicore.proto new file mode 100644 index 000000000..e6e30c2c3 --- /dev/null +++ b/src/lib/api/Apicore.proto @@ -0,0 +1,56 @@ +syntax="proto3"; +import "lib/api/Apioptions.proto"; +package bts.api; +option csharp_namespace="bts.api"; + +message PingPong { + bytes payload = 1; +} + +// *** wire protocol *** +// 1 byte - header size +// RequestHeader +// T Request + +message AuthToken { + bytes token = 1; +} + +message RequestHeader { + int32 request_id = 1; + int32 method = 2; + AuthToken token = 3; +} + +enum ApiError { + SUCCESS = 0; + NO_SERVER = 1; + SERVER_DISCONNECT = 2; + MISSING_METHOD = 3; + SERVER_FAULT = 4; + UNEXPECTED_RESPONSE = 5; + ACCESS_DENIED = 6; +} + +message ResponseHeader { + int32 request_id = 1; + ApiError code = 2; +} + +message StreamAccessRequest { + string qualifier = 1; +} +message StreamAccessResponse { + bool authorized = 1; +} + +// Some Useful buffers for use as arguments/returns + +message VoidMessage {} +message BytesMessage { + bytes buffer = 1; +} +message ResultMessage { + bool success = 1; + string error_message = 2; +} diff --git a/src/lib/api/Apigateway.proto b/src/lib/api/Apigateway.proto new file mode 100644 index 000000000..57bd84315 --- /dev/null +++ b/src/lib/api/Apigateway.proto @@ -0,0 +1,76 @@ +syntax="proto3"; +package bts.api.gateway; +option csharp_namespace="bts.api.gateway"; +import "lib/api/Apicore.proto"; + +message GatewayLogin { + string username = 1; + string password = 2; +} +message GatewayLoginResult { + bool is_valid = 1; + string reason = 2; + api.AuthToken token = 3; + bool can_create = 4; +} + +message GatewayCallHeader { + int32 request_id = 1; + int32 method = 2; + api.AuthToken token = 3; + string service_type = 4; + string service_qualifier = 5; +} + +message GatewaySubscribe { + int32 request_id = 1; + int32 method = 2; + api.AuthToken token = 3; + string service_type = 4; + string service_qualifier = 5; + string stream_qualifier = 6; + string method_name = 7; +} +message GatewayUnsubscribe { + uint32 subscription_id = 1; + string service_type = 4; + string service_qualifier = 5; +} + +message StreamGWUpdate { + enum UpdateType { + REMOVE = 0; + REPLACE = 1; + CREATE= 2; + RESET = 3; + } + UpdateType update_type = 1; + int32 key = 2; + bytes buffer = 3; +} +message SubscriptionUpdate { + int32 id = 1; + repeated StreamGWUpdate updates = 2; +} + +message GatewayRequest { + oneof request { + GatewayLogin login = 1; + // Call and subscribe are lazy on the server + // proxy is not generated until first call + // client can determine if a service "should" exist. + // If the types are there server will return OK regardless + GatewayCallHeader call = 2; + GatewaySubscribe subscribe = 3; + GatewayUnsubscribe unsubscribe = 4; + } + bytes addendum = 100; +} +message GatewayResponse { + oneof response { + GatewayLoginResult logon = 1; + bytes call_result = 2; + SubscriptionUpdate tick = 3; + string error = 10; + } +} \ No newline at end of file diff --git a/src/lib/api/Apioptions.proto b/src/lib/api/Apioptions.proto new file mode 100644 index 000000000..27a79ab03 --- /dev/null +++ b/src/lib/api/Apioptions.proto @@ -0,0 +1,18 @@ +syntax="proto3"; +import "google/protobuf/descriptor.proto"; +package bts.api; +option csharp_namespace="bts.api"; + +extend google.protobuf.ServiceOptions { + string service_description = 8501; +} +extend google.protobuf.MessageOptions { + string protofix_message_type = 8505; +} +extend google.protobuf.MethodOptions { + string method_description = 8503; + bool skip_excel_generation = 8504; +} +extend google.protobuf.FieldOptions { + bool key = 8502; +} diff --git a/src/lib/md/protos/Co2.proto b/src/lib/md/protos/Co2.proto new file mode 100644 index 000000000..c44566db6 --- /dev/null +++ b/src/lib/md/protos/Co2.proto @@ -0,0 +1,187 @@ +syntax='proto3'; +package bts.co2; +option csharp_namespace="bts.co2"; +import "lib/domain_model/Security.proto"; + +option cc_enable_arenas=true; + +enum Platform { + PLATFORM_UNSET = 0; + PLATFORM_SIM = 1; + PLATFORM_MDP3ONIXS = 10; + PLATFORM_CELOXICA = 13; + PLATFORM_MDP3EMUMBA = 14; + PLATFORM_ICEONIXS = 15; +} + +enum TradingStatus { + TRADINGSTATUS_UNKNOWN = 0; + TRADINGSTATUS_NORMAL = 2; + TRADINGSTATUS_CLOSED = 3; + TRADINGSTATUS_PRE_OPEN = 4; + TRADINGSTATUS_OPENING_ROTATION = 5; + TRADINGSTATUS_FAST_MARKET = 6; // CBOE + TRADINGSTATUS_SUSPENDED = 7; + TRADINGSTATUS_HALTED = 8; + TRADINGSTATUS_PRICE_INDICATION = 9; // CME + TRADINGSTATUS_PRE_CROSS = 10; // CME + TRADINGSTATUS_CROSS = 11; // CME + TRADINGSTATUS_NO_CANCEL = 12; // CME + TRADINGSTATUS_POST_CLOSE = 13; + TRADINGSTATUS_NO_CHANGE = 14; + TRADINGSTATUS_NOT_AVAILABLE = 15; // CME NotAvailableForTrading +} + + +enum CoconutSecurityStatus { + COCONUTSECURITYSTATUS_OK = 0; + COCONUTSECURITYSTATUS_PACKET_LOSS = 2; +} + +message SecurityChannel { + uint64 time = 1; + uint32 flags = 2; + bts.api.SecurityType type = 3; + bts.api.Venue exchange = 4; + string symbol = 5; + + int64 trade_cursor = 6; + int64 rfq_cursor = 7; + uint64 segment_id = 8; + bool entitled = 9; +} + +message MDRequest { + // Separate out timestamps by symbol+type so we can easily add symbols 'lazily' + repeated SecurityChannel channels = 1; + enum Flags { + SECURITY = 0; + BBO = 0x1; + DIRECT = 0x2; + LAST_TRADE = 0x4; + TRADE_LOG = 0x8; + RFQ = 0x10; + MISC = 0x30; + IMPLIED = 0x40; + } + string host = 2; + // bytes token = 3; + reserved 3; +} + +message ChannelUpdate { + uint32 key = 1; + bts.api.Security security = 2; + BookMessage direct = 3; + BookMessage implied = 4; + MiscMessage misc = 5; + TradeMessage last_trade = 6; +} + +message ChannelReply { + SecurityChannel channel = 1; + Platform platform = 2; + repeated ChannelUpdate updates = 3; + repeated TradeMessage trade_log = 4; + repeated QuoteRequestMessage rfq_log = 5; +} + +message MDReply { + repeated ChannelReply channels = 1; +} + +message PriceMessage { + int64 mantissa = 1; + sint32 exponent = 2; +} + +message PriceSizeMessage { + int64 mantissa = 1; + sint32 exponent = 2; + uint32 size = 3; +} + +message TopBookMessage { + // uint32 key = 1; + // int64 time = 2; + PriceSizeMessage bid = 10; + PriceSizeMessage ask = 11; +} + +message BookMessage { + // uint32 key = 1; + // int64 time = 2; + repeated PriceSizeMessage bids = 10; + repeated PriceSizeMessage asks = 11; +} + +message MiscMessage { + // int32 key = 1; + reserved 1; + reserved 2; + PriceMessage settlement = 22; + uint32 settlement_date = 3; + PriceMessage previous_settlement_price = 23; + uint32 previous_settlement_date = 21; + double open_price = 4; + uint32 open_date = 5; + double close_price = 6; + uint32 close_date = 7; + double session_high = 8; + double session_low = 9; +// double open_interest = 10; + double session_high_bid = 11; + double session_low_offer = 12; + double fixing_price = 13; +} + +enum AggressorSide { + AGGRESSOR_SIDE_NONE = 0; + AGGRESSOR_SIDE_BUY = 1; + AGGRESSOR_SIDE_SELL = 2; +} + +message TradeMessage { + uint32 key = 1; + int64 time = 2; + // Flattened out the TradeMessage so it can be stored directly in shared memory + //PriceSizeMessage price_size = 3; + int64 mantissa = 4; + sint32 exponent = 5; + uint32 size = 6; + uint32 total_volume = 7; + bool gap = 8; + AggressorSide aggressor_side = 9; + bool from_spread = 10; +} +message QuoteRequestMessage { + enum Side { + UNDEFINED = 0; + BUY = 49; + SELL = 50; + CROSS = 99; + } + uint32 key = 1; + int64 time = 2; + string request_id = 3; + int32 size = 5; + Side side = 6; + bool tradable = 7; + bool gap = 8; +} + +message TradeList { + repeated TradeMessage items = 1; +} +message RFQList { + repeated QuoteRequestMessage items = 1; +} + +message CoconutReplayHeader { + string magic = 1; + uint32 version = 2; + int64 timestamp = 3; + string host = 4; + + int32 naggle_ms = 5; +} From 90c3edbbe727fdd16b559e2e073f6dd982eafa03 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 6 Nov 2019 13:24:57 -0500 Subject: [PATCH 3/7] adding core 2 back to docker per eric --- docker/linux | 2 +- src/lib/CMakeDeps_win.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/linux b/docker/linux index 68f43cef8..bc306395b 160000 --- a/docker/linux +++ b/docker/linux @@ -1 +1 @@ -Subproject commit 68f43cef8d3edbda05a9517421092ada3c392aff +Subproject commit bc306395b75c8f4a7a76bfecf593c659caeaad8f diff --git a/src/lib/CMakeDeps_win.cmake b/src/lib/CMakeDeps_win.cmake index ded2fc636..9b40059fe 100644 --- a/src/lib/CMakeDeps_win.cmake +++ b/src/lib/CMakeDeps_win.cmake @@ -1 +1 @@ -set(sources api/Apioptions.proto;api/apicore.proto;api/apigateway.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/HistoricalDataService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/UI.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/fix.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/fix.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/Co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/IDGeneratorTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/Apicore.proto;api/Apigateway.proto;api/Apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/Co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/IDGeneratorTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file From 9f1cd47cfa403cc5a0071d1fa8f6c889bc5c0dee Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 6 Nov 2019 13:55:07 -0500 Subject: [PATCH 4/7] hooking build to cmake --- CMakeLists.txt | 3 +- src/client/CMakeLists.txt | 19 ++ src/client/Directory.Build.Props | 76 -------- src/client/Directory.Build.Targets | 159 ----------------- src/client/build_spark_dotnetcore.sh | 0 src/client/spark_client_dotnetcore.sln | 232 +++++++++++++++++++++++++ 6 files changed, 253 insertions(+), 236 deletions(-) create mode 100644 src/client/CMakeLists.txt delete mode 100644 src/client/Directory.Build.Props delete mode 100644 src/client/Directory.Build.Targets create mode 100644 src/client/build_spark_dotnetcore.sh create mode 100644 src/client/spark_client_dotnetcore.sln diff --git a/CMakeLists.txt b/CMakeLists.txt index be98723f2..e12b0b774 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,6 +48,7 @@ else () add_subdirectory(doc/user) add_subdirectory(src/sdk) add_subdirectory(src/data_files) + add_subdirectory(src/client/sparkcmd) add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/server COMMAND mkdir -p ${CMAKE_BINARY_DIR}/server @@ -60,7 +61,7 @@ else () COMMAND mkdir ARGS -p ${CMAKE_BINARY_DIR}/server/plugins COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/sdk/examples/order_plugin_example.so ${CMAKE_BINARY_DIR}/server/plugins/ COMMENT "Creating server runtime layout" - DEPENDS sparkd data_files_dir) + DEPENDS sparkd data_files_dir spark_client) add_custom_target(server_layout ALL DEPENDS ${CMAKE_BINARY_DIR}/server) endif() diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt new file mode 100644 index 000000000..6b98e5bf3 --- /dev/null +++ b/src/client/CMakeLists.txt @@ -0,0 +1,19 @@ + +cmake_minimum_required(VERSION 3.5) +project(spark_client) +include(${CMAKE_SOURCE_DIR}/tools/safe_dep_glob.cmake) + +file(GLOB_RECURSE spark_client_sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cs) +file(GLOB_RECURSE spark_ui_sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} spark/*.cs) +list(REMOVE_ITEM spark_ui_sources ${spark_client_sources} ) + +#update_deps_file("${spark_client_sources}") + +add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/../ + COMMAND /bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/build_spark_dotnetcore.sh + ARGS ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} + COMMENT "Building sparkcmd in dotnetcore3" + DEPENDS server_layout ${spark_client_sources}) + + add_custom_target(spark_client_dir ALL DEPENDS ${CMAKE_BINARY_DIR}/../) +endif() diff --git a/src/client/Directory.Build.Props b/src/client/Directory.Build.Props deleted file mode 100644 index e72d04725..000000000 --- a/src/client/Directory.Build.Props +++ /dev/null @@ -1,76 +0,0 @@ - - - - ..\..\tools\override\$(computername).props - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)\..\..)) - $([System.IO.Path]::GetFullPath($(SparkRoot)\src)) - $(SparkRoot)\externals\windows - $(SparkRoot)/externals/linux - $([System.IO.Path]::GetFileName($([System.IO.Path]::GetFullPath($(SparkRoot))))) - None - False - true - False - false - Debug - - - - $(SparkRoot)\build\$(Configuration) - $(BaseOutputPath)\bin - $(BaseOutputPath)\obj\$(MSBuildProjectName) - $(BaseOutputPath)\obj\$(MSBuildProjectName) - $(BaseOutputPath)\gen\$(MSBuildProjectName) - - - - - - - - CompileProto2 - CompileProto2Linux - - - CompileProto3 - CompileProto3Linux - - - CompileProto3Excel - - - - - $(SparkRoot)\src\lib\api\service_compiler - $(Externals)\include - $(Externals)\bin\protoc.exe - $(Externals)\bin\protogen.exe - - - - $(SparkRoot)/src/lib/api/service_compiler - $(Externals)/include - $(Externals)/bin/protoc - $(Externals)/bin/lowercase_files.sh - $(Externals)/bin/protogen - - - - - - - $(IntermediateOutputPath)\gen\%(relativedir) - %(OutBase)%(FileName).cs - %(OutBase)%(FileName).client.pb.cs - %(OutBase)%(FileName).server.pb.cs - %(OutBase)%(FileName).immutable.pb.cs - - - - $(IntermediateOutputPath)\gen\%(relativedir) - %(OutBase)%(FileName).excel.pb.cs - - - - - diff --git a/src/client/Directory.Build.Targets b/src/client/Directory.Build.Targets deleted file mode 100644 index 2aa10b04e..000000000 --- a/src/client/Directory.Build.Targets +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - $([System.String]::Copy('%(proto2.fullpath)').Replace($(SourceRoot), '')) - $([System.IO.Path]::GetDirectoryName($(SourceRelativeFile))) - $(GenDir)\proto2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $([System.String]::Copy('%(proto2.fullpath)').Replace($(SourceRoot), '')) - $([System.IO.Path]::GetDirectoryName($(SourceRelativeFile))) - $(GenDir)/proto2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/client/build_spark_dotnetcore.sh b/src/client/build_spark_dotnetcore.sh new file mode 100644 index 000000000..e69de29bb diff --git a/src/client/spark_client_dotnetcore.sln b/src/client/spark_client_dotnetcore.sln new file mode 100644 index 000000000..1624dd1a5 --- /dev/null +++ b/src/client/spark_client_dotnetcore.sln @@ -0,0 +1,232 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2024 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api", "src\client\spark_api\spark_api.csproj", "{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspark", "build\src\lib\libspark.vcxproj", "{3335AAF0-489D-359D-8305-9B7A44E2C760}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark", "src\client\spark\Spark.csproj", "{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "sparkcmd", "src\client\sparkcmd\sparkcmd.csproj", "{387566C6-C6F6-412C-A30C-9855BBCB4816}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_core", "src\client\spark_core\spark_core.csproj", "{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZERO_CHECK", "build\ZERO_CHECK.vcxproj", "{2256015B-E7D5-3614-8F39-814CA68A4444}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_sdk", "src\client\spark_sdk\spark_sdk.csproj", "{6963C314-83C4-4667-B0D0-C2F7AE208C29}" + ProjectSection(ProjectDependencies) = postProject + {3335AAF0-489D-359D-8305-9B7A44E2C760} = {3335AAF0-489D-359D-8305-9B7A44E2C760} + EndProjectSection +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_test", "src\client\spark_test\spark_test.csproj", "{ECD78CC5-138F-4809-A764-2358C2AC2E82}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_excel", "src\client\spark_excel\spark_excel.csproj", "{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + MinSizeRel|Any CPU = MinSizeRel|Any CPU + MinSizeRel|x64 = MinSizeRel|x64 + MinSizeRel|x86 = MinSizeRel|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + RelWithDebInfo|Any CPU = RelWithDebInfo|Any CPU + RelWithDebInfo|x64 = RelWithDebInfo|x64 + RelWithDebInfo|x86 = RelWithDebInfo|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|Any CPU.ActiveCfg = Debug|x64 + {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.ActiveCfg = Debug|x64 + {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.Build.0 = Debug|x64 + {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x86.ActiveCfg = Debug|x64 + {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|Any CPU.ActiveCfg = Release|x64 + {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|Any CPU.Build.0 = Release|x64 + {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.ActiveCfg = Release|x64 + {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.Build.0 = Release|x64 + {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x86.ActiveCfg = Release|x64 + {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x86.Build.0 = Release|x64 + {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|Any CPU.ActiveCfg = Release|x64 + {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.ActiveCfg = Release|x64 + {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.Build.0 = Release|x64 + {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x86.ActiveCfg = Release|x64 + {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|Any CPU.ActiveCfg = Release|x64 + {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|Any CPU.Build.0 = Release|x64 + {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.ActiveCfg = Release|x64 + {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.Build.0 = Release|x64 + {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x86.ActiveCfg = Release|x64 + {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x86.Build.0 = Release|x64 + {3335AAF0-489D-359D-8305-9B7A44E2C760}.Debug|Any CPU.ActiveCfg = Debug|x64 + {3335AAF0-489D-359D-8305-9B7A44E2C760}.Debug|x64.ActiveCfg = Debug|x64 + {3335AAF0-489D-359D-8305-9B7A44E2C760}.Debug|x64.Build.0 = Debug|x64 + {3335AAF0-489D-359D-8305-9B7A44E2C760}.Debug|x86.ActiveCfg = Debug|x64 + {3335AAF0-489D-359D-8305-9B7A44E2C760}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|x64 + {3335AAF0-489D-359D-8305-9B7A44E2C760}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64 + {3335AAF0-489D-359D-8305-9B7A44E2C760}.MinSizeRel|x64.Build.0 = MinSizeRel|x64 + {3335AAF0-489D-359D-8305-9B7A44E2C760}.MinSizeRel|x86.ActiveCfg = MinSizeRel|x64 + {3335AAF0-489D-359D-8305-9B7A44E2C760}.Release|Any CPU.ActiveCfg = Release|x64 + {3335AAF0-489D-359D-8305-9B7A44E2C760}.Release|x64.ActiveCfg = Release|x64 + {3335AAF0-489D-359D-8305-9B7A44E2C760}.Release|x64.Build.0 = Release|x64 + {3335AAF0-489D-359D-8305-9B7A44E2C760}.Release|x86.ActiveCfg = Release|x64 + {3335AAF0-489D-359D-8305-9B7A44E2C760}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|x64 + {3335AAF0-489D-359D-8305-9B7A44E2C760}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 + {3335AAF0-489D-359D-8305-9B7A44E2C760}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 + {3335AAF0-489D-359D-8305-9B7A44E2C760}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x64 + {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|Any CPU.ActiveCfg = Debug|x64 + {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.ActiveCfg = Debug|x64 + {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.Build.0 = Debug|x64 + {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x86.ActiveCfg = Debug|x64 + {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|Any CPU.ActiveCfg = Release|x64 + {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|Any CPU.Build.0 = Release|x64 + {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x64.ActiveCfg = Release|x64 + {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x64.Build.0 = Release|x64 + {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x86.ActiveCfg = Release|x64 + {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x86.Build.0 = Release|x64 + {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|Any CPU.ActiveCfg = Release|x64 + {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x64.ActiveCfg = Release|x64 + {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x64.Build.0 = Release|x64 + {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x86.ActiveCfg = Release|x64 + {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|Any CPU.ActiveCfg = Release|x64 + {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|Any CPU.Build.0 = Release|x64 + {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x64.ActiveCfg = Release|x64 + {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x64.Build.0 = Release|x64 + {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x86.ActiveCfg = Release|x64 + {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x86.Build.0 = Release|x64 + {387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|Any CPU.Build.0 = Debug|Any CPU + {387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.ActiveCfg = Debug|Any CPU + {387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.Build.0 = Debug|Any CPU + {387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x86.ActiveCfg = Debug|Any CPU + {387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x86.Build.0 = Debug|Any CPU + {387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU + {387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x86.Build.0 = Debug|Any CPU + {387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|Any CPU.ActiveCfg = Release|Any CPU + {387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|Any CPU.Build.0 = Release|Any CPU + {387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.ActiveCfg = Release|Any CPU + {387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.Build.0 = Release|Any CPU + {387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x86.ActiveCfg = Release|Any CPU + {387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x86.Build.0 = Release|Any CPU + {387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU + {387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x86.Build.0 = Release|Any CPU + {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|Any CPU.ActiveCfg = Debug|x64 + {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.ActiveCfg = Debug|x64 + {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.Build.0 = Debug|x64 + {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x86.ActiveCfg = Debug|x64 + {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|Any CPU.ActiveCfg = Release|x64 + {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|Any CPU.Build.0 = Release|x64 + {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.ActiveCfg = Release|x64 + {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.Build.0 = Release|x64 + {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x86.ActiveCfg = Release|x64 + {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x86.Build.0 = Release|x64 + {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|Any CPU.ActiveCfg = Release|x64 + {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.ActiveCfg = Release|x64 + {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.Build.0 = Release|x64 + {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x86.ActiveCfg = Release|x64 + {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|Any CPU.ActiveCfg = Release|x64 + {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|Any CPU.Build.0 = Release|x64 + {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.ActiveCfg = Release|x64 + {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.Build.0 = Release|x64 + {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x86.ActiveCfg = Release|x64 + {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x86.Build.0 = Release|x64 + {2256015B-E7D5-3614-8F39-814CA68A4444}.Debug|Any CPU.ActiveCfg = Debug|x64 + {2256015B-E7D5-3614-8F39-814CA68A4444}.Debug|x64.ActiveCfg = Debug|x64 + {2256015B-E7D5-3614-8F39-814CA68A4444}.Debug|x64.Build.0 = Debug|x64 + {2256015B-E7D5-3614-8F39-814CA68A4444}.Debug|x86.ActiveCfg = Debug|x64 + {2256015B-E7D5-3614-8F39-814CA68A4444}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|x64 + {2256015B-E7D5-3614-8F39-814CA68A4444}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64 + {2256015B-E7D5-3614-8F39-814CA68A4444}.MinSizeRel|x64.Build.0 = MinSizeRel|x64 + {2256015B-E7D5-3614-8F39-814CA68A4444}.MinSizeRel|x86.ActiveCfg = MinSizeRel|x64 + {2256015B-E7D5-3614-8F39-814CA68A4444}.Release|Any CPU.ActiveCfg = Release|x64 + {2256015B-E7D5-3614-8F39-814CA68A4444}.Release|x64.ActiveCfg = Release|x64 + {2256015B-E7D5-3614-8F39-814CA68A4444}.Release|x64.Build.0 = Release|x64 + {2256015B-E7D5-3614-8F39-814CA68A4444}.Release|x86.ActiveCfg = Release|x64 + {2256015B-E7D5-3614-8F39-814CA68A4444}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|x64 + {2256015B-E7D5-3614-8F39-814CA68A4444}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 + {2256015B-E7D5-3614-8F39-814CA68A4444}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 + {2256015B-E7D5-3614-8F39-814CA68A4444}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x64 + {6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|Any CPU.ActiveCfg = Debug|x64 + {6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.ActiveCfg = Debug|x64 + {6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.Build.0 = Debug|x64 + {6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x86.ActiveCfg = Debug|x64 + {6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|Any CPU.ActiveCfg = Release|x64 + {6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|Any CPU.Build.0 = Release|x64 + {6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x64.ActiveCfg = Release|x64 + {6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x64.Build.0 = Release|x64 + {6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x86.ActiveCfg = Release|x64 + {6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x86.Build.0 = Release|x64 + {6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|Any CPU.ActiveCfg = Release|x64 + {6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x64.ActiveCfg = Release|x64 + {6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x64.Build.0 = Release|x64 + {6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x86.ActiveCfg = Release|x64 + {6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|Any CPU.ActiveCfg = Release|x64 + {6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|Any CPU.Build.0 = Release|x64 + {6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x64.ActiveCfg = Release|x64 + {6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x64.Build.0 = Release|x64 + {6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x86.ActiveCfg = Release|x64 + {6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x86.Build.0 = Release|x64 + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.ActiveCfg = Debug|Any CPU + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.Build.0 = Debug|Any CPU + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x86.ActiveCfg = Debug|Any CPU + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x86.Build.0 = Debug|Any CPU + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x86.Build.0 = Debug|Any CPU + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|Any CPU.Build.0 = Release|Any CPU + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.ActiveCfg = Release|Any CPU + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.Build.0 = Release|Any CPU + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x86.ActiveCfg = Release|Any CPU + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x86.Build.0 = Release|Any CPU + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU + {ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x86.Build.0 = Release|Any CPU + {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Debug|Any CPU.ActiveCfg = Debug|x64 + {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Debug|x64.ActiveCfg = Debug|x64 + {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Debug|x64.Build.0 = Debug|x64 + {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Debug|x86.ActiveCfg = Debug|x64 + {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|Any CPU.ActiveCfg = Release|x64 + {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|Any CPU.Build.0 = Release|x64 + {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|x64.ActiveCfg = Release|x64 + {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|x64.Build.0 = Release|x64 + {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|x86.ActiveCfg = Release|x64 + {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|x86.Build.0 = Release|x64 + {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Release|Any CPU.ActiveCfg = Release|x64 + {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Release|x64.ActiveCfg = Release|x64 + {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Release|x64.Build.0 = Release|x64 + {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Release|x86.ActiveCfg = Release|x64 + {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|Any CPU.ActiveCfg = Release|x64 + {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|Any CPU.Build.0 = Release|x64 + {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|x64.ActiveCfg = Release|x64 + {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|x64.Build.0 = Release|x64 + {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|x86.ActiveCfg = Release|x64 + {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|x86.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {422D1620-0166-4C26-9A81-CA8A2EB1AB58} + EndGlobalSection + GlobalSection(Performance) = preSolution + HasPerformanceSessions = true + EndGlobalSection +EndGlobal From eab92fb48678354c8a7cd4a642fa5e84c81baa9a Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 6 Nov 2019 13:55:29 -0500 Subject: [PATCH 5/7] damn windows casing --- src/client/Directory.Build.props | 76 ++++++++++++++ src/client/Directory.Build.targets | 159 +++++++++++++++++++++++++++++ 2 files changed, 235 insertions(+) create mode 100644 src/client/Directory.Build.props create mode 100644 src/client/Directory.Build.targets diff --git a/src/client/Directory.Build.props b/src/client/Directory.Build.props new file mode 100644 index 000000000..e72d04725 --- /dev/null +++ b/src/client/Directory.Build.props @@ -0,0 +1,76 @@ + + + + ..\..\tools\override\$(computername).props + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)\..\..)) + $([System.IO.Path]::GetFullPath($(SparkRoot)\src)) + $(SparkRoot)\externals\windows + $(SparkRoot)/externals/linux + $([System.IO.Path]::GetFileName($([System.IO.Path]::GetFullPath($(SparkRoot))))) + None + False + true + False + false + Debug + + + + $(SparkRoot)\build\$(Configuration) + $(BaseOutputPath)\bin + $(BaseOutputPath)\obj\$(MSBuildProjectName) + $(BaseOutputPath)\obj\$(MSBuildProjectName) + $(BaseOutputPath)\gen\$(MSBuildProjectName) + + + + + + + + CompileProto2 + CompileProto2Linux + + + CompileProto3 + CompileProto3Linux + + + CompileProto3Excel + + + + + $(SparkRoot)\src\lib\api\service_compiler + $(Externals)\include + $(Externals)\bin\protoc.exe + $(Externals)\bin\protogen.exe + + + + $(SparkRoot)/src/lib/api/service_compiler + $(Externals)/include + $(Externals)/bin/protoc + $(Externals)/bin/lowercase_files.sh + $(Externals)/bin/protogen + + + + + + + $(IntermediateOutputPath)\gen\%(relativedir) + %(OutBase)%(FileName).cs + %(OutBase)%(FileName).client.pb.cs + %(OutBase)%(FileName).server.pb.cs + %(OutBase)%(FileName).immutable.pb.cs + + + + $(IntermediateOutputPath)\gen\%(relativedir) + %(OutBase)%(FileName).excel.pb.cs + + + + + diff --git a/src/client/Directory.Build.targets b/src/client/Directory.Build.targets new file mode 100644 index 000000000..2aa10b04e --- /dev/null +++ b/src/client/Directory.Build.targets @@ -0,0 +1,159 @@ + + + + + + + $([System.String]::Copy('%(proto2.fullpath)').Replace($(SourceRoot), '')) + $([System.IO.Path]::GetDirectoryName($(SourceRelativeFile))) + $(GenDir)\proto2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $([System.String]::Copy('%(proto2.fullpath)').Replace($(SourceRoot), '')) + $([System.IO.Path]::GetDirectoryName($(SourceRelativeFile))) + $(GenDir)/proto2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 9957af655fa79d511edceaa4239254c653a3909b Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 6 Nov 2019 17:47:21 -0500 Subject: [PATCH 6/7] hooked sparkcmd linux build to the main server build stuff --- .vscode/launch.json | 11 +- CMakeLists.txt | 5 +- docker/linux | 2 +- src/client/CMakeLists.txt | 12 +- src/client/build_spark_dotnetcore.sh | 8 + src/client/spark_client_dotnetcore.sln | 232 ------------------ .../spark_core/TestRunner/TestRunner.cs | 3 + src/server/sparkd/CMakeLists.txt | 4 +- src/web/ui/src/ui.fsproj | 8 +- 9 files changed, 33 insertions(+), 252 deletions(-) delete mode 100644 src/client/spark_client_dotnetcore.sln diff --git a/.vscode/launch.json b/.vscode/launch.json index 99ab46efc..2be4dbc58 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -46,7 +46,7 @@ "sourceFileMap": { "/home/bts/spark/": "${workspaceRoot}" } - }, + }, { "name": "(gdb) Launch", "type": "cppdbg", @@ -345,12 +345,11 @@ "name": ".NET Core Remote Launch", "type": "coreclr", "request": "launch", - "program": "/usr/bin/dotnet", + "program": "sparkcmd", "args": [ - "sparkcmd.dll", "test", - "test_join_create_and_takeout_market" ], + "env": {"LD_LIBRARY_PATH" : "."}, "stopAtEntry": false, "cwd": "/home/bts/spark/build/ninja_debug/server", "pipeTransport": { @@ -361,11 +360,11 @@ "debuggerPath": "/home/bts/vsdbg/vsdbg", "pipeCwd": "${workspaceRoot}", "quoteArgs": true - }, + }, "sourceFileMap": { "/home/bts/spark/": "${workspaceRoot}" }, "justMyCode": false - }, + }, ] } \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index e12b0b774..4c364eb53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ else () add_subdirectory(doc/user) add_subdirectory(src/sdk) add_subdirectory(src/data_files) - add_subdirectory(src/client/sparkcmd) + add_subdirectory(src/client) add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/server COMMAND mkdir -p ${CMAKE_BINARY_DIR}/server @@ -60,8 +60,9 @@ else () COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libACE-5.7.5.so ${CMAKE_BINARY_DIR}/server COMMAND mkdir ARGS -p ${CMAKE_BINARY_DIR}/server/plugins COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/sdk/examples/order_plugin_example.so ${CMAKE_BINARY_DIR}/server/plugins/ + COMMAND ln -fs ${CMAKE_BINARY_DIR}/../${CMAKE_BUILD_TYPE}/bin/netcoreapp3.0/linux-x64/sparkcmd ${CMAKE_BINARY_DIR}/server/ COMMENT "Creating server runtime layout" - DEPENDS sparkd data_files_dir spark_client) + DEPENDS sparkd data_files_dir spark_client_dir) add_custom_target(server_layout ALL DEPENDS ${CMAKE_BINARY_DIR}/server) endif() diff --git a/docker/linux b/docker/linux index bc306395b..46e48af46 160000 --- a/docker/linux +++ b/docker/linux @@ -1 +1 @@ -Subproject commit bc306395b75c8f4a7a76bfecf593c659caeaad8f +Subproject commit 46e48af4694443bcd5d9e09d72fde8f3d660828b diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index 6b98e5bf3..b64f07efe 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -4,16 +4,16 @@ project(spark_client) include(${CMAKE_SOURCE_DIR}/tools/safe_dep_glob.cmake) file(GLOB_RECURSE spark_client_sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cs) +file(GLOB_RECURSE spark_client_csproj RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.csproj) file(GLOB_RECURSE spark_ui_sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} spark/*.cs) +file(GLOB_RECURSE spark_ui_csproj RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} spark/*.csproj) list(REMOVE_ITEM spark_ui_sources ${spark_client_sources} ) - -#update_deps_file("${spark_client_sources}") +list(REMOVE_ITEM spark_ui_csproj ${spark_client_csproj} ) add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/../ COMMAND /bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/build_spark_dotnetcore.sh - ARGS ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - COMMENT "Building sparkcmd in dotnetcore3" - DEPENDS server_layout ${spark_client_sources}) + ARGS ${CMAKE_BUILD_TYPE} ${CMAKE_BINARY_DIR} + COMMENT "Building sparkcmd in netcore3" + DEPENDS libspark ${spark_client_sources} ${spark_client_csproj} ) add_custom_target(spark_client_dir ALL DEPENDS ${CMAKE_BINARY_DIR}/../) -endif() diff --git a/src/client/build_spark_dotnetcore.sh b/src/client/build_spark_dotnetcore.sh index e69de29bb..4614bf104 100644 --- a/src/client/build_spark_dotnetcore.sh +++ b/src/client/build_spark_dotnetcore.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +#$1 = Debug / Release (CMAKE_BUILD_TYPE), $2 = CMAKE_BINARY_DIR +cd "$(dirname "$0")" +echo $PWD dotnet build -c $1 ./sparkcmd/ +dotnet build -c $1 ./sparkcmd/ + +ln -fs $2/src/lib/libspark.so $2/../$1/bin/netcoreapp3.0/linux-x64 \ No newline at end of file diff --git a/src/client/spark_client_dotnetcore.sln b/src/client/spark_client_dotnetcore.sln deleted file mode 100644 index 1624dd1a5..000000000 --- a/src/client/spark_client_dotnetcore.sln +++ /dev/null @@ -1,232 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2024 -MinimumVisualStudioVersion = 15.0.26124.0 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api", "src\client\spark_api\spark_api.csproj", "{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspark", "build\src\lib\libspark.vcxproj", "{3335AAF0-489D-359D-8305-9B7A44E2C760}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark", "src\client\spark\Spark.csproj", "{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "sparkcmd", "src\client\sparkcmd\sparkcmd.csproj", "{387566C6-C6F6-412C-A30C-9855BBCB4816}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_core", "src\client\spark_core\spark_core.csproj", "{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZERO_CHECK", "build\ZERO_CHECK.vcxproj", "{2256015B-E7D5-3614-8F39-814CA68A4444}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_sdk", "src\client\spark_sdk\spark_sdk.csproj", "{6963C314-83C4-4667-B0D0-C2F7AE208C29}" - ProjectSection(ProjectDependencies) = postProject - {3335AAF0-489D-359D-8305-9B7A44E2C760} = {3335AAF0-489D-359D-8305-9B7A44E2C760} - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_test", "src\client\spark_test\spark_test.csproj", "{ECD78CC5-138F-4809-A764-2358C2AC2E82}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_excel", "src\client\spark_excel\spark_excel.csproj", "{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - MinSizeRel|Any CPU = MinSizeRel|Any CPU - MinSizeRel|x64 = MinSizeRel|x64 - MinSizeRel|x86 = MinSizeRel|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - RelWithDebInfo|Any CPU = RelWithDebInfo|Any CPU - RelWithDebInfo|x64 = RelWithDebInfo|x64 - RelWithDebInfo|x86 = RelWithDebInfo|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|Any CPU.ActiveCfg = Debug|x64 - {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.ActiveCfg = Debug|x64 - {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.Build.0 = Debug|x64 - {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x86.ActiveCfg = Debug|x64 - {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|Any CPU.ActiveCfg = Release|x64 - {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|Any CPU.Build.0 = Release|x64 - {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.ActiveCfg = Release|x64 - {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.Build.0 = Release|x64 - {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x86.ActiveCfg = Release|x64 - {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x86.Build.0 = Release|x64 - {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|Any CPU.ActiveCfg = Release|x64 - {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.ActiveCfg = Release|x64 - {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.Build.0 = Release|x64 - {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x86.ActiveCfg = Release|x64 - {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|Any CPU.ActiveCfg = Release|x64 - {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|Any CPU.Build.0 = Release|x64 - {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.ActiveCfg = Release|x64 - {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.Build.0 = Release|x64 - {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x86.ActiveCfg = Release|x64 - {DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x86.Build.0 = Release|x64 - {3335AAF0-489D-359D-8305-9B7A44E2C760}.Debug|Any CPU.ActiveCfg = Debug|x64 - {3335AAF0-489D-359D-8305-9B7A44E2C760}.Debug|x64.ActiveCfg = Debug|x64 - {3335AAF0-489D-359D-8305-9B7A44E2C760}.Debug|x64.Build.0 = Debug|x64 - {3335AAF0-489D-359D-8305-9B7A44E2C760}.Debug|x86.ActiveCfg = Debug|x64 - {3335AAF0-489D-359D-8305-9B7A44E2C760}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|x64 - {3335AAF0-489D-359D-8305-9B7A44E2C760}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64 - {3335AAF0-489D-359D-8305-9B7A44E2C760}.MinSizeRel|x64.Build.0 = MinSizeRel|x64 - {3335AAF0-489D-359D-8305-9B7A44E2C760}.MinSizeRel|x86.ActiveCfg = MinSizeRel|x64 - {3335AAF0-489D-359D-8305-9B7A44E2C760}.Release|Any CPU.ActiveCfg = Release|x64 - {3335AAF0-489D-359D-8305-9B7A44E2C760}.Release|x64.ActiveCfg = Release|x64 - {3335AAF0-489D-359D-8305-9B7A44E2C760}.Release|x64.Build.0 = Release|x64 - {3335AAF0-489D-359D-8305-9B7A44E2C760}.Release|x86.ActiveCfg = Release|x64 - {3335AAF0-489D-359D-8305-9B7A44E2C760}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|x64 - {3335AAF0-489D-359D-8305-9B7A44E2C760}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 - {3335AAF0-489D-359D-8305-9B7A44E2C760}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 - {3335AAF0-489D-359D-8305-9B7A44E2C760}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x64 - {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|Any CPU.ActiveCfg = Debug|x64 - {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.ActiveCfg = Debug|x64 - {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.Build.0 = Debug|x64 - {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x86.ActiveCfg = Debug|x64 - {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|Any CPU.ActiveCfg = Release|x64 - {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|Any CPU.Build.0 = Release|x64 - {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x64.ActiveCfg = Release|x64 - {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x64.Build.0 = Release|x64 - {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x86.ActiveCfg = Release|x64 - {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x86.Build.0 = Release|x64 - {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|Any CPU.ActiveCfg = Release|x64 - {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x64.ActiveCfg = Release|x64 - {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x64.Build.0 = Release|x64 - {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x86.ActiveCfg = Release|x64 - {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|Any CPU.ActiveCfg = Release|x64 - {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|Any CPU.Build.0 = Release|x64 - {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x64.ActiveCfg = Release|x64 - {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x64.Build.0 = Release|x64 - {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x86.ActiveCfg = Release|x64 - {9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x86.Build.0 = Release|x64 - {387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|Any CPU.Build.0 = Debug|Any CPU - {387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.ActiveCfg = Debug|Any CPU - {387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.Build.0 = Debug|Any CPU - {387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x86.ActiveCfg = Debug|Any CPU - {387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x86.Build.0 = Debug|Any CPU - {387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU - {387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x86.Build.0 = Debug|Any CPU - {387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|Any CPU.ActiveCfg = Release|Any CPU - {387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|Any CPU.Build.0 = Release|Any CPU - {387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.ActiveCfg = Release|Any CPU - {387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.Build.0 = Release|Any CPU - {387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x86.ActiveCfg = Release|Any CPU - {387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x86.Build.0 = Release|Any CPU - {387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x86.Build.0 = Release|Any CPU - {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|Any CPU.ActiveCfg = Debug|x64 - {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.ActiveCfg = Debug|x64 - {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.Build.0 = Debug|x64 - {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x86.ActiveCfg = Debug|x64 - {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|Any CPU.ActiveCfg = Release|x64 - {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|Any CPU.Build.0 = Release|x64 - {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.ActiveCfg = Release|x64 - {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.Build.0 = Release|x64 - {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x86.ActiveCfg = Release|x64 - {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x86.Build.0 = Release|x64 - {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|Any CPU.ActiveCfg = Release|x64 - {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.ActiveCfg = Release|x64 - {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.Build.0 = Release|x64 - {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x86.ActiveCfg = Release|x64 - {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|Any CPU.ActiveCfg = Release|x64 - {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|Any CPU.Build.0 = Release|x64 - {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.ActiveCfg = Release|x64 - {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.Build.0 = Release|x64 - {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x86.ActiveCfg = Release|x64 - {6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x86.Build.0 = Release|x64 - {2256015B-E7D5-3614-8F39-814CA68A4444}.Debug|Any CPU.ActiveCfg = Debug|x64 - {2256015B-E7D5-3614-8F39-814CA68A4444}.Debug|x64.ActiveCfg = Debug|x64 - {2256015B-E7D5-3614-8F39-814CA68A4444}.Debug|x64.Build.0 = Debug|x64 - {2256015B-E7D5-3614-8F39-814CA68A4444}.Debug|x86.ActiveCfg = Debug|x64 - {2256015B-E7D5-3614-8F39-814CA68A4444}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|x64 - {2256015B-E7D5-3614-8F39-814CA68A4444}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64 - {2256015B-E7D5-3614-8F39-814CA68A4444}.MinSizeRel|x64.Build.0 = MinSizeRel|x64 - {2256015B-E7D5-3614-8F39-814CA68A4444}.MinSizeRel|x86.ActiveCfg = MinSizeRel|x64 - {2256015B-E7D5-3614-8F39-814CA68A4444}.Release|Any CPU.ActiveCfg = Release|x64 - {2256015B-E7D5-3614-8F39-814CA68A4444}.Release|x64.ActiveCfg = Release|x64 - {2256015B-E7D5-3614-8F39-814CA68A4444}.Release|x64.Build.0 = Release|x64 - {2256015B-E7D5-3614-8F39-814CA68A4444}.Release|x86.ActiveCfg = Release|x64 - {2256015B-E7D5-3614-8F39-814CA68A4444}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|x64 - {2256015B-E7D5-3614-8F39-814CA68A4444}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 - {2256015B-E7D5-3614-8F39-814CA68A4444}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 - {2256015B-E7D5-3614-8F39-814CA68A4444}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x64 - {6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|Any CPU.ActiveCfg = Debug|x64 - {6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.ActiveCfg = Debug|x64 - {6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.Build.0 = Debug|x64 - {6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x86.ActiveCfg = Debug|x64 - {6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|Any CPU.ActiveCfg = Release|x64 - {6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|Any CPU.Build.0 = Release|x64 - {6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x64.ActiveCfg = Release|x64 - {6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x64.Build.0 = Release|x64 - {6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x86.ActiveCfg = Release|x64 - {6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x86.Build.0 = Release|x64 - {6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|Any CPU.ActiveCfg = Release|x64 - {6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x64.ActiveCfg = Release|x64 - {6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x64.Build.0 = Release|x64 - {6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x86.ActiveCfg = Release|x64 - {6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|Any CPU.ActiveCfg = Release|x64 - {6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|Any CPU.Build.0 = Release|x64 - {6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x64.ActiveCfg = Release|x64 - {6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x64.Build.0 = Release|x64 - {6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x86.ActiveCfg = Release|x64 - {6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x86.Build.0 = Release|x64 - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.ActiveCfg = Debug|Any CPU - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.Build.0 = Debug|Any CPU - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x86.ActiveCfg = Debug|Any CPU - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x86.Build.0 = Debug|Any CPU - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x86.Build.0 = Debug|Any CPU - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|Any CPU.Build.0 = Release|Any CPU - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.ActiveCfg = Release|Any CPU - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.Build.0 = Release|Any CPU - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x86.ActiveCfg = Release|Any CPU - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x86.Build.0 = Release|Any CPU - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x86.Build.0 = Release|Any CPU - {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Debug|Any CPU.ActiveCfg = Debug|x64 - {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Debug|x64.ActiveCfg = Debug|x64 - {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Debug|x64.Build.0 = Debug|x64 - {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Debug|x86.ActiveCfg = Debug|x64 - {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|Any CPU.ActiveCfg = Release|x64 - {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|Any CPU.Build.0 = Release|x64 - {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|x64.ActiveCfg = Release|x64 - {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|x64.Build.0 = Release|x64 - {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|x86.ActiveCfg = Release|x64 - {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|x86.Build.0 = Release|x64 - {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Release|Any CPU.ActiveCfg = Release|x64 - {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Release|x64.ActiveCfg = Release|x64 - {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Release|x64.Build.0 = Release|x64 - {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Release|x86.ActiveCfg = Release|x64 - {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|Any CPU.ActiveCfg = Release|x64 - {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|Any CPU.Build.0 = Release|x64 - {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|x64.ActiveCfg = Release|x64 - {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|x64.Build.0 = Release|x64 - {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|x86.ActiveCfg = Release|x64 - {BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|x86.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {422D1620-0166-4C26-9A81-CA8A2EB1AB58} - EndGlobalSection - GlobalSection(Performance) = preSolution - HasPerformanceSessions = true - EndGlobalSection -EndGlobal diff --git a/src/client/spark_core/TestRunner/TestRunner.cs b/src/client/spark_core/TestRunner/TestRunner.cs index 4de8733e7..b640407a9 100644 --- a/src/client/spark_core/TestRunner/TestRunner.cs +++ b/src/client/spark_core/TestRunner/TestRunner.cs @@ -74,6 +74,9 @@ namespace bts.test { try{ var p = Process.Start(psi); p.WaitForExit((int)time_out.TotalMilliseconds); + var errorlevel = p.ExitCode; + string stdout = p.StandardOutput.ReadToEnd(); + string stderr = p.StandardError.ReadToEnd(); if (p.HasExited) { return 0; } diff --git a/src/server/sparkd/CMakeLists.txt b/src/server/sparkd/CMakeLists.txt index 802ffd19b..ded2df6a5 100644 --- a/src/server/sparkd/CMakeLists.txt +++ b/src/server/sparkd/CMakeLists.txt @@ -36,4 +36,6 @@ target_link_libraries( sparkd -pthread) add_custom_command(TARGET sparkd POST_BUILD - COMMAND ln -fs ${CMAKE_BINARY_DIR}/src/lib/libspark.so ${CMAKE_CURRENT_BINARY_DIR}) + COMMAND ln -fs ${CMAKE_BINARY_DIR}/src/lib/libspark.so ${CMAKE_CURRENT_BINARY_DIR} ) + + diff --git a/src/web/ui/src/ui.fsproj b/src/web/ui/src/ui.fsproj index c8e39c1f8..9effcdd09 100644 --- a/src/web/ui/src/ui.fsproj +++ b/src/web/ui/src/ui.fsproj @@ -1,6 +1,6 @@ - netstandard2.1 + netstandard2.0 @@ -22,8 +22,8 @@ - - + + @@ -32,7 +32,7 @@ - + From 721c889235f9a9386580f69041c77980646f28bf Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 6 Nov 2019 18:22:06 -0500 Subject: [PATCH 7/7] release mode uses published sparkcmd --- CMakeLists.txt | 12 ++++++++++-- src/client/CMakeLists.txt | 2 +- src/client/build_spark_dotnetcore.sh | 10 ++++++++-- src/client/spark_core/TestRunner/TestRunner.cs | 2 +- src/client/sparkcmd/sparkcmd.csproj | 6 +++--- 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c364eb53..7a3af0eaf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,10 +59,18 @@ else () COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.13.0.0 ${CMAKE_BINARY_DIR}/server COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libACE-5.7.5.so ${CMAKE_BINARY_DIR}/server COMMAND mkdir ARGS -p ${CMAKE_BINARY_DIR}/server/plugins - COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/sdk/examples/order_plugin_example.so ${CMAKE_BINARY_DIR}/server/plugins/ - COMMAND ln -fs ${CMAKE_BINARY_DIR}/../${CMAKE_BUILD_TYPE}/bin/netcoreapp3.0/linux-x64/sparkcmd ${CMAKE_BINARY_DIR}/server/ + COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/sdk/examples/order_plugin_example.so ${CMAKE_BINARY_DIR}/server/plugins/ COMMENT "Creating server runtime layout" DEPENDS sparkd data_files_dir spark_client_dir) add_custom_target(server_layout ALL DEPENDS ${CMAKE_BINARY_DIR}/server) + +if(${CMAKE_BUILD_TYPE} STREQUAL "Debug") + add_custom_command(TARGET server_layout POST_BUILD + COMMAND ln -fs ${CMAKE_BINARY_DIR}/../${CMAKE_BUILD_TYPE}/bin/netcoreapp3.0/linux-x64/sparkcmd ${CMAKE_BINARY_DIR}/server/ ) +else() + add_custom_command(TARGET server_layout POST_BUILD + COMMAND ln -fs ${CMAKE_BINARY_DIR}/../${CMAKE_BUILD_TYPE}/bin/netcoreapp3.0/linux-x64/publish/sparkcmd ${CMAKE_BINARY_DIR}/server/ ) +endif() + endif() diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index b64f07efe..8f618ff96 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -14,6 +14,6 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/../ COMMAND /bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/build_spark_dotnetcore.sh ARGS ${CMAKE_BUILD_TYPE} ${CMAKE_BINARY_DIR} COMMENT "Building sparkcmd in netcore3" - DEPENDS libspark ${spark_client_sources} ${spark_client_csproj} ) + DEPENDS libspark ${spark_client_sources} ${spark_client_csproj} ${CMAKE_CURRENT_SOURCE_DIR}/build_spark_dotnetcore.sh) add_custom_target(spark_client_dir ALL DEPENDS ${CMAKE_BINARY_DIR}/../) diff --git a/src/client/build_spark_dotnetcore.sh b/src/client/build_spark_dotnetcore.sh index 4614bf104..ae293ec82 100644 --- a/src/client/build_spark_dotnetcore.sh +++ b/src/client/build_spark_dotnetcore.sh @@ -3,6 +3,12 @@ #$1 = Debug / Release (CMAKE_BUILD_TYPE), $2 = CMAKE_BINARY_DIR cd "$(dirname "$0")" echo $PWD dotnet build -c $1 ./sparkcmd/ -dotnet build -c $1 ./sparkcmd/ +dotnet build -c $1 ./sparkcmd/ -ln -fs $2/src/lib/libspark.so $2/../$1/bin/netcoreapp3.0/linux-x64 \ No newline at end of file +if [ "$1" == "Release" ] +then + dotnet publish -c $1 ./sparkcmd/ + ln -fs $2/src/lib/libspark.so $2/../$1/bin/netcoreapp3.0/linux-x64/publish +fi + +ln -fs $2/src/lib/libspark.so $2/../$1/bin/netcoreapp3.0/linux-x64 diff --git a/src/client/spark_core/TestRunner/TestRunner.cs b/src/client/spark_core/TestRunner/TestRunner.cs index b640407a9..3f3136e8f 100644 --- a/src/client/spark_core/TestRunner/TestRunner.cs +++ b/src/client/spark_core/TestRunner/TestRunner.cs @@ -70,7 +70,7 @@ namespace bts.test { psi.RedirectStandardOutput = true; psi.RedirectStandardError = true; psi.UseShellExecute = false; - + try{ var p = Process.Start(psi); p.WaitForExit((int)time_out.TotalMilliseconds); diff --git a/src/client/sparkcmd/sparkcmd.csproj b/src/client/sparkcmd/sparkcmd.csproj index 3eaa3bae6..06a0c4e43 100644 --- a/src/client/sparkcmd/sparkcmd.csproj +++ b/src/client/sparkcmd/sparkcmd.csproj @@ -2,10 +2,10 @@ Exe - net471 - win7-x64 + net471 + win7-x64 - netcoreapp3.0 + netcoreapp3.0 linux-x64 true true