Skip to content

Commit 09bed19

Browse files
Firefly35Firefly35
committed
Merge branch 'develop'
2 parents 8e4d206 + abbf56f commit 09bed19

146 files changed

Lines changed: 19358 additions & 1032 deletions

File tree

Some content is hidden

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

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ target_wrapper.*
4646
# QtCreator CMake
4747
CMakeLists.txt.user*
4848

49-
# QtCreator 4.8< compilation database
50-
compile_commands.json
51-
5249
# QtCreator local machine specific files for imported projects
5350
*creator.user*
5451

‎.vscode/launch.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
// Use IntelliSense to find out which attributes exist for C# debugging
6+
// Use hover for the description of the existing attributes
7+
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
8+
"name": ".NET Core Launch (console)",
9+
"type": "coreclr",
10+
"request": "launch",
11+
"preLaunchTask": "build",
12+
// If you have changed target frameworks, make sure to update the program path.
13+
"program": "${workspaceFolder}/scripts/swig/test/bin/Debug/net6.0/testXpcfCsharp.dll",
14+
"args": [],
15+
"cwd": "${workspaceFolder}/scripts/swig/test",
16+
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
17+
"console": "internalConsole",
18+
"stopAtEntry": false,
19+
"env": {
20+
"DYLD_LIBRARY_PATH": "bin/Debug/net6.0/."
21+
},
22+
"nativeDebugging": true
23+
},
24+
{
25+
"name": ".NET Core Attach",
26+
"type": "coreclr",
27+
"request": "attach"
28+
}
29+
]
30+
}

‎.vscode/tasks.json‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "build",
6+
"command": "dotnet",
7+
"type": "process",
8+
"args": [
9+
"build",
10+
"${workspaceFolder}/scripts/swig/test/testXpcfCsharp.csproj",
11+
"/property:GenerateFullPaths=true",
12+
"/consoleloggerparameters:NoSummary"
13+
],
14+
"problemMatcher": "$msCompile"
15+
},
16+
{
17+
"label": "publish",
18+
"command": "dotnet",
19+
"type": "process",
20+
"args": [
21+
"publish",
22+
"${workspaceFolder}/scripts/swig/test/testXpcfCsharp.csproj",
23+
"/property:GenerateFullPaths=true",
24+
"/consoleloggerparameters:NoSummary"
25+
],
26+
"problemMatcher": "$msCompile"
27+
},
28+
{
29+
"label": "watch",
30+
"command": "dotnet",
31+
"type": "process",
32+
"args": [
33+
"watch",
34+
"run",
35+
"--project",
36+
"${workspaceFolder}/scripts/swig/test/testXpcfCsharp.csproj"
37+
],
38+
"problemMatcher": "$msCompile"
39+
}
40+
]
41+
}

‎BUILD‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
cc_library(
2+
name = "xpcf",
3+
defines = [
4+
"WITHREMOTING",
5+
"XPCF_USE_BOOST",
6+
"BOOST_ALL_NO_LIB",
7+
"BOOST_ALL_DYN_LINK",
8+
"XPCFSUBDIRSEARCH=\\\"debug\\\"",
9+
"TIXML_USE_STL"
10+
],
11+
copts = ["-std=c++17"],
12+
hdrs = glob(["interfaces/xpcf/**/*.h", "interfaces/xpcf/**/*.hpp", "interfaces/private/xpcf/*.hpp", "interfaces/private/xpcf/*.h"]),
13+
srcs = ["src/GrpcManager.cpp", "src/AliasManager.cpp","src/Factory.cpp","src/Property.cpp","src/BaseTask.cpp","src/PropertyManager.cpp","src/ComponentBase.cpp","src/InjectableMetadata.cpp","src/PropertyMap.cpp","src/ComponentManager.cpp","src/InterfaceMetadata.cpp","src/Registry.cpp","src/ComponentMetadata.cpp","src/tinyxml2.cpp","src/ConfigurableBase.cpp","src/ModuleManager.cpp","src/tinyxmlhelper.cpp","src/Enumerator.cpp","src/ModuleMetadata.cpp","src/Exception.cpp","src/PathBuilder.cpp"],
14+
strip_include_prefix = "interfaces",
15+
linkstatic = False,
16+
deps = ["@boost//:boost","@grpcpp//:grpcpp"],
17+
alwayslink=1,
18+
visibility = ["//visibility:public"],
19+
)
20+
21+
cc_binary(
22+
name = "testXpcf",
23+
copts = ["-std=c++17", "-Isamples/sample_component"],
24+
srcs = ["test/xpcf_dynamic_test.cpp", "test/xpcf_properties_test.cpp", "test/xpcf_threading_test.cpp", "test/TestDefines.h"],
25+
deps = ["@boost//:boost","@xpcfSampleComponent//:xpcfSampleComponent"],
26+
linkstatic=False,
27+
)

‎WORKSPACE‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#WORKSPACE
2+
workspace(name = "xpcf")
3+
4+
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository", "new_git_repository")
5+
load("//.build-rules/mac-clang-x86_64/shared/debug:dependenciesBuildInfo.bzl", "setup_all_remaken_deps")
6+
7+
setup_all_remaken_deps()

‎builddefs/qmake‎

Submodule qmake updated 91 files

‎configure_conditions.pri‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
DEFINES += WITHREMOTING

‎doc/overview.drawio‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<mxfile host="Electron" modified="2022-03-30T15:59:11.854Z" agent="5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/14.1.8 Chrome/87.0.4280.88 Electron/11.1.1 Safari/537.36" etag="D8FfRgqVx_tZ3it7Tzhl" version="14.1.8" type="device"><diagram name="Page-1" id="1622d65d-c77d-c4b6-e0e7-3c11208c8684">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</diagram></mxfile>

‎doc/xpcf_overview.pptx‎

1.78 MB
Binary file not shown.

src/AliasManager.h renamed to interfaces/private/xpcf/AliasManager.h

File renamed without changes.

0 commit comments

Comments
 (0)