diff --git a/src/DataStreamSuite/Bts.Extensions.Hosting/Bts.Extensions.Hosting.csproj b/src/DataStreamSuite/Bts.Extensions.Hosting/Bts.Extensions.Hosting.csproj
index 6f62aa13d..a202836be 100644
--- a/src/DataStreamSuite/Bts.Extensions.Hosting/Bts.Extensions.Hosting.csproj
+++ b/src/DataStreamSuite/Bts.Extensions.Hosting/Bts.Extensions.Hosting.csproj
@@ -4,6 +4,7 @@
net8.0
enable
enable
+ $(SparkVersion)
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index ecd393d73..548771831 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -18,6 +18,7 @@
Debug
true
11
+ true
diff --git a/src/client/Spark.Console/Spark.Console.csproj b/src/client/Spark.Console/Spark.Console.csproj
index 6b017cb6a..1e983f7b9 100644
--- a/src/client/Spark.Console/Spark.Console.csproj
+++ b/src/client/Spark.Console/Spark.Console.csproj
@@ -9,15 +9,11 @@
Spark
x64
x64
- 1.0.0
+ $(SparkVersion)
-
- runtime; build; native; contentfiles; analyzers; buildtransitive
- all
-
diff --git a/src/client/spark/Spark.csproj b/src/client/spark/Spark.csproj
index cb3046202..2c682c0df 100644
--- a/src/client/spark/Spark.csproj
+++ b/src/client/spark/Spark.csproj
@@ -20,15 +20,12 @@
mbts.ui.shell.App
bts
true
+ $(SparkVersion)
-
- runtime; build; native; contentfiles; analyzers; buildtransitive
- all
-
diff --git a/src/client/spark_api_server/spark_api_server.csproj b/src/client/spark_api_server/spark_api_server.csproj
index f51a1b439..f09b9fff6 100644
--- a/src/client/spark_api_server/spark_api_server.csproj
+++ b/src/client/spark_api_server/spark_api_server.csproj
@@ -7,14 +7,11 @@
x64
x64
true
+ $(SparkVersion)
-
- runtime; build; native; contentfiles; analyzers; buildtransitive
- all
-
diff --git a/src/client/spark_sdk/spark_sdk.csproj b/src/client/spark_sdk/spark_sdk.csproj
index 4067a1eae..99b54fb51 100644
--- a/src/client/spark_sdk/spark_sdk.csproj
+++ b/src/client/spark_sdk/spark_sdk.csproj
@@ -16,14 +16,11 @@
x64
x64
true
+ $(SparkVersion)
-
- runtime; build; native; contentfiles; analyzers; buildtransitive
- all
-
diff --git a/src/client/spark_test/spark_test.csproj b/src/client/spark_test/spark_test.csproj
index 38e016f9a..dbd2bfc7c 100644
--- a/src/client/spark_test/spark_test.csproj
+++ b/src/client/spark_test/spark_test.csproj
@@ -4,15 +4,9 @@
net8.0
x64
x64
+ $(SparkVersion)
-
-
- runtime; build; native; contentfiles; analyzers; buildtransitive
- all
-
-
-
diff --git a/src/client/spark_websocket/spark_websocket.csproj b/src/client/spark_websocket/spark_websocket.csproj
index d06a24b6b..c72bbee95 100644
--- a/src/client/spark_websocket/spark_websocket.csproj
+++ b/src/client/spark_websocket/spark_websocket.csproj
@@ -7,6 +7,7 @@
x64
true
enable
+ $(SparkVersion)
@@ -14,10 +15,6 @@
-
- runtime; build; native; contentfiles; analyzers; buildtransitive
- all
-
diff --git a/src/cs/Bts.Spark.Api/Bts.Spark.Api.csproj b/src/cs/Bts.Spark.Api/Bts.Spark.Api.csproj
index 3cd73ab9b..71337b102 100644
--- a/src/cs/Bts.Spark.Api/Bts.Spark.Api.csproj
+++ b/src/cs/Bts.Spark.Api/Bts.Spark.Api.csproj
@@ -7,21 +7,27 @@
true
8981
+ $(SparkVersion)
-
- runtime; build; native; contentfiles; analyzers; buildtransitive
- all
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/cs/Bts.Spark.Core/Bts.Spark.Core.csproj b/src/cs/Bts.Spark.Core/Bts.Spark.Core.csproj
index c1506dc45..64d35ea3f 100644
--- a/src/cs/Bts.Spark.Core/Bts.Spark.Core.csproj
+++ b/src/cs/Bts.Spark.Core/Bts.Spark.Core.csproj
@@ -8,13 +8,10 @@
x64
true
+ $(SparkVersion)
-
- runtime; build; native; contentfiles; analyzers; buildtransitive
- all
-
diff --git a/tools/py/build_api_server.py b/tools/py/build_api_server.py
index 771c17e37..9e93f036d 100644
--- a/tools/py/build_api_server.py
+++ b/tools/py/build_api_server.py
@@ -26,6 +26,10 @@ def _get_arg_parser():
action="store_true",
help="Perform a clean build (remove artifacts from previous build)",
)
+ parser.add_argument(
+ "--spark-version",
+ help="The version identifier to use (by default, uses git to generate semantic version number)"
+ )
parser.add_argument(
"--verbosity",
metavar="{0-5}",
@@ -94,16 +98,20 @@ def _main():
cmake_verbosity = _cmake_verbosity(args.verbosity)
dotnet_config = args.configuration.title()
dotnet_verbosity = _dotnet_verbosity(args.verbosity)
+ spark_version = args.spark_version
+ if not spark_version:
+ from core.git_utils import git_head_version
+ spark_version = git_head_version()
os.chdir(SparkPaths.root())
if args.clean:
run(f"cmake --build build/{cmake_preset} --target clean")
- run(f"dotnet clean {sln} -c {dotnet_config} -v {dotnet_verbosity}")
+ run(f"dotnet clean {sln} -c {dotnet_config} -v {dotnet_verbosity} -p:SparkVersion={spark_version}")
run(f"cmake --preset {cmake_preset} -DCMAKE_MESSAGE_LOG_LEVEL={cmake_verbosity}")
cmake_build_cmd = f"cmake --build build/{cmake_preset} --config {cmake_config}"
if cmake_jobs:
cmake_build_cmd += f" -j {cmake_jobs}"
run(cmake_build_cmd)
- run(f"dotnet build {sln} -c {dotnet_config} -v {dotnet_verbosity}")
+ run(f"dotnet build {sln} -c {dotnet_config} -v {dotnet_verbosity} -p:SparkVersion={spark_version}")
if __name__ == "__main__":
diff --git a/tools/py/build_data_stream.py b/tools/py/build_data_stream.py
index 32c7437d0..aec5b1cb3 100644
--- a/tools/py/build_data_stream.py
+++ b/tools/py/build_data_stream.py
@@ -94,15 +94,19 @@ def build(args):
dotnet_config = args.configuration.title()
dotnet_verbosity = _dotnet_verbosity(args.verbosity)
os.chdir(SparkPaths.root())
+ spark_version = args.spark_version
+ if not spark_version:
+ from core.git_utils import git_head_version
+ spark_version = git_head_version()
if args.clean:
run(f"cmake --build build/{cmake_preset} --target clean")
- run(f"dotnet clean {sln} -c {dotnet_config} -v {dotnet_verbosity}")
+ run(f"dotnet clean {sln} -c {dotnet_config} -v {dotnet_verbosity} -p:SparkVersion={spark_version}")
run(f"cmake --preset {cmake_preset} -DCMAKE_MESSAGE_LOG_LEVEL={cmake_verbosity}")
cmake_build_cmd = f"cmake --build build/{cmake_preset} --config {cmake_config}"
if cmake_jobs:
cmake_build_cmd += f" -j {cmake_jobs}"
run(cmake_build_cmd)
- run(f"dotnet build {sln} -c {dotnet_config} -v {dotnet_verbosity}")
+ run(f"dotnet build {sln} -c {dotnet_config} -v {dotnet_verbosity} -p:SparkVersion={spark_version}")
def _main():
diff --git a/tools/py/build_spark.py b/tools/py/build_spark.py
index 9e76cd69e..c337b62d1 100644
--- a/tools/py/build_spark.py
+++ b/tools/py/build_spark.py
@@ -1,6 +1,7 @@
import argparse
import os
import subprocess
+from typing import Optional
from core.file_utils import SparkPaths
from core.iter_utils import at_bounded
@@ -14,6 +15,7 @@ class BuildArgs:
verbosity: int = 1,
dry_run: bool = False,
publish: bool = False,
+ version: Optional[str] = None,
):
self.configuration = configuration
self.clean = clean
@@ -36,6 +38,7 @@ class BuildArgs:
],
verbosity)
self.publish = publish
+ self.version = version
def _get_arg_parser():
@@ -50,6 +53,10 @@ def _get_arg_parser():
action='store_true',
help='Perform a clean build (remove artifacts from previous build)',
)
+ parser.add_argument(
+ "--spark-version",
+ help="The version identifier to use (by default, uses git to generate semantic version number)"
+ )
parser.add_argument(
'--verbosity',
metavar='{0-5}',
@@ -79,14 +86,7 @@ def build(args: BuildArgs):
return
subprocess.run(cmd).check_returncode()
- def dotnet_cmd(action='build'):
- return ' '.join(
- [
- f'dotnet {action} spark_client.sln',
- f'--configuration {args.configuration.title()}',
- f'--verbosity {args.dotnet_verbosity}',
- ])
-
+ dotnet_config = args.configuration.title()
os.chdir(SparkPaths.root())
cmake_configure_cmd = ' '.join(
[
@@ -100,12 +100,17 @@ def build(args: BuildArgs):
f'--build',
f'--preset spark-windows-{args.configuration.lower()}',
])
+ spark_version = args.version
+ if not spark_version:
+ from core.git_utils import git_head_version
+ spark_version = git_head_version()
if args.clean:
run(f'{cmake_build_cmd} --target clean')
- run(dotnet_cmd('clean'))
+ run(f"dotnet clean spark_client.sln -c {dotnet_config} -v {args.dotnet_verbosity} -p:SparkVersion={spark_version}")
run(cmake_configure_cmd)
run(cmake_build_cmd)
- run(dotnet_cmd('publish' if args.publish else 'build'))
+ build_action = "publish" if args.publish else "build"
+ run(f"dotnet {build_action} spark_client.sln -c {dotnet_config} -v {args.dotnet_verbosity} -p:SparkVersion={spark_version}")
def _main():
@@ -116,6 +121,7 @@ def _main():
clean=cli_args.clean,
verbosity=cli_args.verbosity,
dry_run=cli_args.dry_run,
+ version=cli_args.spark_version,
)
build(args)
diff --git a/tools/py/core/git_utils.py b/tools/py/core/git_utils.py
new file mode 100644
index 000000000..4194847ee
--- /dev/null
+++ b/tools/py/core/git_utils.py
@@ -0,0 +1,26 @@
+import subprocess
+from typing import Optional
+
+
+def git_head_version(revision: Optional[str] = None, check: bool = True):
+ def run_captured(*args):
+ res = subprocess.run(
+ args,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT,
+ text=True,
+ check=check,
+ )
+ return res.stdout
+
+ args = ["git", "describe", "--tags", "--always"]
+ if revision:
+ args += revision
+ vers = run_captured(*args).rstrip()
+ if vers.startswith("v") and "." in vers:
+ vers = vers[1:]
+ if check and not vers:
+ raise ValueError(
+ "Failed to generate spark version identifier. Please re-run pack_sdk.py with --spark-version "
+ )
+ return vers
diff --git a/tools/py/publish_api_server.py b/tools/py/publish_api_server.py
index 36c2b6320..2044a6814 100644
--- a/tools/py/publish_api_server.py
+++ b/tools/py/publish_api_server.py
@@ -62,6 +62,7 @@ class PublishArgs:
output: Optional[str] = None,
framework="net8.0",
runtime=_dotnet_runtime(),
+ version: Optional[str] = None,
):
self.configuration = configuration
self.cmake_jobs = cmake_jobs
@@ -88,6 +89,7 @@ class PublishArgs:
self.output = output
self.framework = framework
self.runtime = runtime
+ self.version = version
def _get_arg_parser():
@@ -110,6 +112,10 @@ def _get_arg_parser():
action="store_true",
help="Perform a clean build (remove artifacts from previous build)",
)
+ parser.add_argument(
+ "--spark-version",
+ help="The version identifier to use (by default, uses git to generate semantic version number)"
+ )
parser.add_argument(
"-o", "--output", type=str, help="The output directory for published artifacts."
)
@@ -159,11 +165,15 @@ def publish(args: PublishArgs):
"publish",
)
os.chdir(SparkPaths.root())
+ spark_version = args.version
+ if not spark_version:
+ from core.git_utils import git_head_version
+ spark_version = git_head_version()
if args.clean:
run(
f"cmake --build build/{cmake_preset} --config {cmake_config} --target clean"
)
- run(f"dotnet clean {sln} -c {dotnet_config} -v {dotnet_verbosity}")
+ run(f"dotnet clean {sln} -c {dotnet_config} -v {dotnet_verbosity} -p:SparkVersion={spark_version}")
run(f"cmake --preset {cmake_preset} -DCMAKE_MESSAGE_LOG_LEVEL={cmake_verbosity}")
cmake_build_cmd = (
f"cmake --build build/{cmake_preset} --config {cmake_config} --target install"
@@ -172,7 +182,7 @@ def publish(args: PublishArgs):
cmake_build_cmd += f" -j {cmake_jobs}"
run(cmake_build_cmd)
run(
- f"dotnet publish {sln} -c {dotnet_config} -v {dotnet_verbosity} -f {args.framework} -r {args.runtime} --sc"
+ f"dotnet publish {sln} -c {dotnet_config} -v {dotnet_verbosity} -p:SparkVersion={spark_version} -f {args.framework} -r {args.runtime} --sc"
)
# Copy cpp bins
print(f"[pseudo shell] cp -r install/{cmake_preset}/bin/* {publish_dir}")
@@ -196,6 +206,7 @@ def _main():
verbosity=args.verbosity,
dry_run=args.dry_run,
output=args.output,
+ version=args.spark_version,
)
)
diff --git a/tools/py/publish_data_stream.py b/tools/py/publish_data_stream.py
index 0f7eeab12..f940ac0dd 100644
--- a/tools/py/publish_data_stream.py
+++ b/tools/py/publish_data_stream.py
@@ -62,6 +62,7 @@ class PublishArgs:
output: Optional[str] = None,
framework="net8.0-windows",
runtime=_dotnet_runtime(),
+ version: Optional[str] = None,
):
self.configuration = configuration
self.cmake_jobs = cmake_jobs
@@ -88,6 +89,7 @@ class PublishArgs:
self.output = output
self.framework = framework
self.runtime = runtime
+ self.version = version
def _get_arg_parser():
@@ -110,6 +112,10 @@ def _get_arg_parser():
action="store_true",
help="Perform a clean build (remove artifacts from previous build)",
)
+ parser.add_argument(
+ "--spark-version",
+ help="The version identifier to use (by default, uses git to generate semantic version number)"
+ )
parser.add_argument(
"-o", "--output", type=str, help="The output directory for published artifacts."
)
@@ -159,11 +165,15 @@ def publish(args: PublishArgs):
"publish",
)
os.chdir(SparkPaths.root())
+ spark_version = args.version
+ if not spark_version:
+ from core.git_utils import git_head_version
+ spark_version = git_head_version()
if args.clean:
run(
f"cmake --build build/{cmake_preset} --config {cmake_config} --target clean"
)
- run(f"dotnet clean {csproj} -c {dotnet_config} -v {dotnet_verbosity}")
+ run(f"dotnet clean {csproj} -c {dotnet_config} -v {dotnet_verbosity} -p:SparkVersion={spark_version}")
run(f"cmake --preset {cmake_preset} -DCMAKE_MESSAGE_LOG_LEVEL={cmake_verbosity}")
cmake_build_cmd = (
f"cmake --build build/{cmake_preset} --config {cmake_config} --target install"
@@ -172,7 +182,7 @@ def publish(args: PublishArgs):
cmake_build_cmd += f" -j {cmake_jobs}"
run(cmake_build_cmd)
run(
- f"dotnet publish {csproj} -c {dotnet_config} -v {dotnet_verbosity} -f {args.framework} -r {args.runtime} --sc"
+ f"dotnet publish {csproj} -c {dotnet_config} -v {dotnet_verbosity} -p:SparkVersion={spark_version} -f {args.framework} -r {args.runtime} --sc"
)
copytree(f"install/{cmake_preset}/bin", publish_dir, dirs_exist_ok=True)
if args.output:
@@ -189,6 +199,7 @@ def _main():
verbosity=args.verbosity,
dry_run=args.dry_run,
output=args.output,
+ version=args.spark_version,
)
)