Skip to content

Commit

Permalink
Simplify build output directory to not contain the architecture. (#1869)
Browse files Browse the repository at this point in the history
  • Loading branch information
tritao authored Sep 5, 2024
1 parent 3ca746a commit 166e45e
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<GlobalTargetFramework>$(TargetFramework)</GlobalTargetFramework>
<BaseIntermediateOutputPath>$(ObjDir)$(MSBuildProjectName)\</BaseIntermediateOutputPath>
<BaseOutputPath>$(RootDir)bin\</BaseOutputPath>
<OutputPath>$(BaseOutputPath)$(Configuration)_$(PlatformTarget)\</OutputPath>
<OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
<ActionDir>$(BuildDir)$(PremakeAction)\</ActionDir>
<NativeProjectsDir>$(ActionDir)projects\</NativeProjectsDir>
<PackageDir>$(RootDir)artifacts\package\</PackageDir>
Expand Down
2 changes: 1 addition & 1 deletion build/Helpers.lua
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ bindir = path.join(rootdir, "bin")
objsdir = path.join(builddir, "obj");
gendir = path.join(builddir, "gen");
actionbuilddir = path.join(builddir, _ACTION == "gmake2" and "gmake" or (_ACTION and _ACTION or ""));
bindircfg = path.join(bindir, "%{cfg.buildcfg}_%{cfg.platform}");
bindircfg = path.join(bindir, "%{cfg.buildcfg}");
prjobjdir = path.join(objsdir, "%{prj.name}", "%{cfg.buildcfg}")

msvc_buildflags = { "/MP", "/wd4267" }
Expand Down
2 changes: 1 addition & 1 deletion build/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ pack()

test()
{
dotnet test {"$bindir/${configuration}_$platform","$gendir"/*}/*.Tests*.dll --nologo
dotnet test {"$bindir/${configuration}","$gendir"/*}/*.Tests*.dll --nologo
}

clean()
Expand Down
2 changes: 1 addition & 1 deletion tests/emscripten/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ generate=true

if [ $generate = true ]; then
echo "${green}Generating bindings${reset}"
dotnet $rootdir/bin/${dotnet_configuration}_${platform}/CppSharp.CLI.dll \
dotnet $rootdir/bin/${dotnet_configuration}/CppSharp.CLI.dll \
--gen=emscripten --platform=emscripten --arch=wasm32 \
-I$dir/.. -I$rootdir/include -o $dir/gen -m tests $dir/../*.h
fi
Expand Down
2 changes: 1 addition & 1 deletion tests/napi/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ else
fi

echo "${green}Generating bindings${reset}"
dotnet $rootdir/bin/${configuration}_${platform}/CppSharp.CLI.dll \
dotnet $rootdir/bin/${configuration}/CppSharp.CLI.dll \
--gen=napi -I$dir/.. -o $dir/gen -m tests $dir/../*.h

echo "${green}Building generated binding files${reset}"
Expand Down
3 changes: 1 addition & 2 deletions tests/quickjs/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ dir=$(cd "$(dirname "$0")"; pwd)
rootdir="$dir/../.."
dotnet_configuration=Release
configuration=debug
platform=x64
jsinterp="$dir/runtime/build/qjs"

cd $dir
Expand All @@ -23,7 +22,7 @@ generate=true

if [ $generate = true ]; then
echo "${green}Generating bindings${reset}"
dotnet $rootdir/bin/${dotnet_configuration}_${platform}/CppSharp.CLI.dll \
dotnet $rootdir/bin/${dotnet_configuration}/CppSharp.CLI.dll \
$dir/bindings.lua
fi

Expand Down
2 changes: 1 addition & 1 deletion tests/ts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ generate=true

if [ $generate = true ]; then
echo "${green}Generating bindings${reset}"
dotnet $rootdir/bin/${dotnet_configuration}_${platform}/CppSharp.CLI.dll \
dotnet $rootdir/bin/${dotnet_configuration}/CppSharp.CLI.dll \
--gen=ts -I$dir/.. -I$rootdir/include -o $dir/gen -m tests $dir/../*.h
fi

Expand Down

0 comments on commit 166e45e

Please sign in to comment.