Compare commits

...
1 Commits
Author SHA1 Message Date
johncolvin-og ea4e599ac6 fix build: Fix a few path errors in publish target 2023-05-31 21:59:51 -04:00
3 changed files with 9 additions and 6 deletions

No files matched your search

+6 -3
View File
@@ -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))
+1 -1
View File
@@ -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():
+2 -2
View File
@@ -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)