diff --git a/tools/py/build_data_stream.py b/tools/py/build_data_stream.py index 5b88c9f89..81948dfc3 100644 --- a/tools/py/build_data_stream.py +++ b/tools/py/build_data_stream.py @@ -28,6 +28,8 @@ def _get_arg_parser(): add_toggle_opt(parser, "cpp", help="Build c++ libs") add_toggle_opt(parser, "cs", help="Build c# libs") add_toggle_opt(parser, "csproj-refs", help="Use local csproj refs (instead of nugets)") + if sys.platform == "win32": + add_toggle_opt(parser, "dsqa", help="Build DataStreamQueryAnalyzer") parser.add_argument( "--spark-version", help="The version identifier to use (by default, uses git to generate semantic version number)" @@ -44,14 +46,17 @@ def _get_arg_parser(): action="store_true", help="Preview the build commands without running them", ) - parser.set_defaults( - configuration="debug", - clean=False, - cpp=True, - cs=True, - csproj_refs=True, - verbosity=1, - ) + defaults = { + "configuration": "debug", + "clean": False, + "cpp": True, + "cs": True, + "csproj_refs": True, + "verbosity": 1, + } + if sys.platform == "win32": + defaults["dsqa"] = True + parser.set_defaults(**defaults) return parser @@ -98,6 +103,10 @@ def build(args): "DataStreamSuite", "DataStreamSuite.sln", ) + dsqa = SparkPaths.root().joinpath( + "src", "DataStreamSuite", "DataStreamQueryAnalyzer", + "DataStreamQueryAnalyzer.csproj" + ) if args.dsqa and sys.platform == "win32" else None cmake_preset = _cmake_preset() cmake_config = args.configuration.title() cmake_jobs = args.cmake_jobs @@ -109,11 +118,16 @@ def build(args): if not spark_version: from core.git_utils import git_head_version spark_version = git_head_version() + dotnet_build_fstr = f"dotnet build %s -c {dotnet_config} -v {dotnet_verbosity} -p:UseProjectRefs={str(args.csproj_refs).lower()} -p:SparkVersion={spark_version}" + dotnet_clean_fstr = f"dotnet clean %s -c {dotnet_config} -v {dotnet_verbosity} -p:UseProjectRefs={str(args.csproj_refs).lower()} -p:SparkVersion={spark_version}" + if args.clean: if args.cpp: run(f"cmake --build build/{cmake_preset} --target clean") if args.cs: - run(f"dotnet clean {sln} -c {dotnet_config} -v {dotnet_verbosity} -p:UseProjectRefs={str(args.csproj_refs).lower()} -p:SparkVersion={spark_version}") + run(dotnet_clean_fstr % sln) + if args.dsqa: + run(dotnet_clean_fstr % dsqa) if args.cpp: run(f"cmake --preset {cmake_preset} -DCMAKE_MESSAGE_LOG_LEVEL={cmake_verbosity}") cmake_build_cmd = f"cmake --build build/{cmake_preset} --config {cmake_config}" @@ -121,7 +135,9 @@ def build(args): cmake_build_cmd += f" -j {cmake_jobs}" run(cmake_build_cmd) if args.cs: - run(f"dotnet build {sln} -c {dotnet_config} -v {dotnet_verbosity} -p:UseProjectRefs={str(args.csproj_refs).lower()} -p:SparkVersion={spark_version}") + run(dotnet_build_fstr % sln) + if args.dsqa: + run(dotnet_build_fstr % dsqa) def _main():