Merge branch 'sdk_doc' of bitbucket.org:bluetradesys/spark into sdk_doc2

This commit is contained in:
Kevin Darby committed 2018-12-03 10:41:34 -05:00
commit b8dd5c119d
8 files changed
+25 -39

No files matched your search

-1
View File
@@ -51,7 +51,6 @@ else ()
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/server
COMMAND mkdir -p ${CMAKE_BINARY_DIR}/server
COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/server/sparkd/sparkd ${CMAKE_BINARY_DIR}/server
#COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/server/sparkd/defaults ${CMAKE_BINARY_DIR}/server
COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/web ${CMAKE_BINARY_DIR}/server
COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/data_files ${CMAKE_BINARY_DIR}/server
COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/lib/libspark.so ${CMAKE_BINARY_DIR}/server
-5
View File
@@ -82,9 +82,4 @@
</ItemGroup>
<Target Name="diagnostic" AfterTargets="PreBuildEvent">
</Target>
<Target Name="copy_defaults" AfterTargets="PostBuildEvent">
<!-- this feels like the wrong place to copy defaults but it works alright -->
<!-- <Message Importance="High" Text="copy defaults :: @(ConfigDefaults)" /> -->
<!-- <Copy SourceFiles="@(ConfigDefaults)" DestinationFolder="$(OutputPath)\defaults\" SkipUnchangedFiles="true" /> -->
</Target>
</Project>
@@ -3,6 +3,5 @@ using System.Runtime.CompilerServices;
[assembly: InternalsVisibleTo("spark_core")]
[assembly: InternalsVisibleTo("sparkcmd")]
[assembly: InternalsVisibleTo("spark_test")]
[assembly: InternalsVisibleTo("spark_sdk")]
[assembly: InternalsVisibleTo("spark_fix")]
+22 -19
View File
@@ -32,12 +32,14 @@ namespace bts {
Testing,
Latency,
DataFlow,
Plugin
Plugin,
ClientSdk
// Please keep this list in sync with logging.h/logging.cpp
}
readonly struct Logger {
public readonly struct Logger {
readonly Subsystem _sys;
public Logger(Subsystem sys) {
internal Logger(Subsystem sys) {
_sys = sys;
}
@@ -61,19 +63,20 @@ namespace bts {
static extern void Logger_log (Level level, Subsystem subsystem, string message, string file, int line);
}
static class Log {
public static Logger Gen => new Logger(Subsystem.gen);
public static Logger Config => new Logger(Subsystem.Config);
public static Logger QBus => new Logger(Subsystem.QBus);
public static Logger Md => new Logger(Subsystem.md);
public static Logger Api => new Logger(Subsystem.Api);
public static Logger Persist => new Logger(Subsystem.Persist);
public static Logger User => new Logger(Subsystem.User);
public static Logger OrderMan => new Logger(Subsystem.OrderMan);
public static Logger Assert => new Logger(Subsystem.Assert);
public static Logger Ui => new Logger(Subsystem.Ui);
public static Logger Testing => new Logger(Subsystem.Testing);
public static Logger DataFlow => new Logger(Subsystem.DataFlow);
public static class Log {
internal static Logger Gen => new Logger(Subsystem.gen);
internal static Logger Config => new Logger(Subsystem.Config);
internal static Logger QBus => new Logger(Subsystem.QBus);
internal static Logger Md => new Logger(Subsystem.md);
internal static Logger Api => new Logger(Subsystem.Api);
internal static Logger Persist => new Logger(Subsystem.Persist);
internal static Logger User => new Logger(Subsystem.User);
internal static Logger OrderMan => new Logger(Subsystem.OrderMan);
internal static Logger Assert => new Logger(Subsystem.Assert);
internal static Logger Ui => new Logger(Subsystem.Ui);
internal static Logger Testing => new Logger(Subsystem.Testing);
internal static Logger DataFlow => new Logger(Subsystem.DataFlow);
public static Logger ClientSdk => new Logger(Subsystem.ClientSdk);
[Conditional("DEBUG")]
@@ -99,10 +102,10 @@ namespace bts {
assert(o == null);
}
delegate void on_crash_callback([MarshalAs(UnmanagedType.LPStr)]string msg, [MarshalAs(UnmanagedType.LPStr)] string details);
public static void system_is_crashing(string message, object details) {
internal static void system_is_crashing(string message, object details) {
OnSystemCrashing?.Invoke(message, details);
}
public static event Action<string, object> OnSystemCrashing;
internal static event Action<string, object> OnSystemCrashing;
}
}
}
+1 -1
View File
@@ -24,7 +24,7 @@ namespace bts.sdk
}
public static void Main(string[] args)
{
bts.Log.Gen.info("Welcome to the BTS Client Side SDK example");
Log.ClientSdk.info("Welcome to the BTS Client Side SDK example");
if (args.FirstOrDefault() == "users")
{
user_test();
-5
View File
@@ -57,7 +57,6 @@
<ItemGroup Condition= " '$(SparkRoot)' != '' ">
<None Include="README.md" pack="true" PackagePath="." />
<!-- <None Include="..\..\lib\config\defaults\**" pack="true" PackagePath=".\defaults\" /> -->
<None Include="$(OutputPath)\net471\spark_excel_example_2018.xlsm" pack="true" PackagePath=".\excel\spark_excel_example_2018.xlsm" />
<None Include="$(OutputPath)\net471\spark_excel-addin64-packed.xll" pack="true" PackagePath=".\excel\spark_excel-addin64-packed.xll" />
<None Include="$(OutputPath)\net471\spark_excel-addin64.dna" pack="true" PackagePath=".\excel\spark_excel-addin64.dna" />
@@ -88,13 +87,9 @@
</Reference>
</ItemGroup>
<ItemGroup>
<_Defaults Include="..\..\defaults\*.*" />
</ItemGroup>
<Target Name="copy_lib_deployed" AfterTargets="PostBuildEvent" Condition= " '$(SparkRoot)' == '' " >
<Copy SourceFiles="..\..\lib\net471\libspark.dll" DestinationFolder="$(OutputPath)\" SkipUnchangedFiles="true" />
<!-- <Copy SourceFiles="@(_Defaults)" DestinationFolder="$(OutputPath)\defaults\" SkipUnchangedFiles="true" /> -->
</Target>
<Target Name="copy_lib_deployed471" AfterTargets="PostBuildEvent" Condition= " '$(SparkRoot)' == '' and '$(TargetFramework)' == 'net471'" >
-6
View File
@@ -76,12 +76,6 @@ if(NOT config_defaults_str STREQUAL old_defaults_str)
endif()
# copy defaults to output directory
#foreach (cfg_file_path ${Conf_Defaults})
# get_filename_component(cfg_file_name ${cfg_file_path} NAME)
# configure_file(${cfg_file_path} ${CMAKE_BINARY_DIR}/src/server/sparkd/defaults/${cfg_file_name})
#endforeach(cfg_file_path)
# lib
if (WIN32)
add_library(libspark SHARED
+2 -1
View File
@@ -42,7 +42,8 @@ constexpr log::Subsystem Mercury {ExSim.ordinal+1 };
constexpr log::Subsystem Testing {Mercury.ordinal+1 };
constexpr log::Subsystem Latency {Testing.ordinal+1 };
constexpr log::Subsystem DataFlow {Latency.ordinal+1 };
constexpr log::Subsystem Plugin {DataFlow.ordinal+1 };
constexpr log::Subsystem Plugin {DataFlow.ordinal+1 };
constexpr log::Subsystem ClientSdk {Plugin.ordinal+1 };
struct LoggerHandle {
LoggerHandle(LoggerHandle const&) = delete;