diff --git a/tools/py/build_spark.py b/tools/py/build_spark.py index 96fa4c02c..d4e80572d 100644 --- a/tools/py/build_spark.py +++ b/tools/py/build_spark.py @@ -307,10 +307,13 @@ def build( bins = SparkPaths.client_bins(build_dir, configuration=configuration) for t in publish_tgts: - build_cmd_steps.append(f'cd {Path(t.path).parent}') - build_cmd_steps.append('dotnet publish -c Release -r win-x64 --sc') + build_cmd_steps.append(f'cmake --build {build_dir} --config {configuration}') + build_cmd_steps.append(f'dotnet publish -c Release -r win-x64 --sc {t.path}') + libspark_path=build_dir.joinpath("src", "lib", configuration, "libspark.dll") + print(f'libspark-src: {libspark_path}') + print(f'libspark-dst: {bins.joinpath("win-x64", "publish")}') build_cmd_steps.append( - f'copy {bins.joinpath("libspark.dll")} {bins.joinpath("win-x64", "publish")}') + f'copy {libspark_path} {bins.joinpath("win-x64", "publish")}') build_cmd = ' && '.join(build_cmd_steps) proc_results.append(subprocess.run(build_cmd)) diff --git a/tools/py/core/file_utils.py b/tools/py/core/file_utils.py index b0fb82163..27e10818b 100644 --- a/tools/py/core/file_utils.py +++ b/tools/py/core/file_utils.py @@ -42,7 +42,7 @@ class SparkPaths: @staticmethod def client_bins(build_root=_default_build(), configuration='Release'): - return build_root.joinpath(configuration, 'bin', 'net6.0-windows') + return build_root.joinpath(configuration, 'bin', 'net7.0-windows') @staticmethod def client_sln(): diff --git a/tools/py/publish_spark.py b/tools/py/publish_spark.py index 69ff3cf07..6f22daa56 100644 --- a/tools/py/publish_spark.py +++ b/tools/py/publish_spark.py @@ -38,10 +38,10 @@ def _main(): output_dir = args.output_dir or SparkPaths.default_build() output_dir = Path(output_dir) build( - configuration='release', + configuration='Release', restore=True, build_dir=output_dir, - targets=['libspark', 'publish'], + targets=['publish'], verbosity=args.verbosity)