Browse Source

Add missing quotes to support paths with spaces in build scripts

pull/1572/head
josetr 5 years ago
parent
commit
06f1cd578a
  1. 48
      build/build.sh
  2. 2
      build/generate.sh
  3. 4
      build/premake.sh
  4. 2
      build/test.sh

48
build/build.sh

@ -33,11 +33,11 @@ build()
fi fi
if [ $oshost = "linux" ] || [ $oshost = "macosx" ]; then if [ $oshost = "linux" ] || [ $oshost = "macosx" ]; then
config=$(tr '[:upper:]' '[:lower:]' <<< ${configuration}_$platform) make -C $builddir/gmake/ config=$(tr '[:upper:]' '[:lower:]' <<< ${configuration}_$platform) make -C "$builddir/gmake/"
fi fi
find_msbuild find_msbuild
$msbuild $slnpath -p:Configuration=$configuration -p:Platform=$platform -v:$verbosity -nologo $msbuild "$slnpath" -p:Configuration=$configuration -p:Platform=$platform -v:$verbosity -nologo
if [ $ci = true ]; then if [ $ci = true ]; then
test test
@ -46,7 +46,7 @@ build()
generate_config() generate_config()
{ {
$builddir/premake.sh --file=$builddir/premake5.lua $vs --os=$os --arch=$platform --configuration=$configuration --config_only "$builddir/premake.sh" --file="$builddir/premake5.lua" $vs --os=$os --arch=$platform --configuration=$configuration --config_only
} }
generate() generate()
@ -54,83 +54,83 @@ generate()
download_llvm download_llvm
if [ "$os" = "linux" ] || [ "$os" = "macosx" ]; then if [ "$os" = "linux" ] || [ "$os" = "macosx" ]; then
$builddir/premake.sh --file=$builddir/premake5.lua gmake2 --os=$os --arch=$platform --configuration=$configuration "$@" "$builddir/premake.sh" --file="$builddir/premake5.lua" gmake2 --os=$os --arch=$platform --configuration=$configuration "$@"
fi fi
$builddir/premake.sh --file=$builddir/premake5.lua $vs --os=$os --arch=$platform --configuration=$configuration "$builddir/premake.sh" --file="$builddir/premake5.lua" $vs --os=$os --arch=$platform --configuration=$configuration
} }
restore() restore()
{ {
find_msbuild find_msbuild
$msbuild $slnpath -p:Configuration=$configuration -p:Platform=$platform -v:$verbosity -t:restore -nologo $msbuild "$slnpath" -p:Configuration=$configuration -p:Platform=$platform -v:$verbosity -t:restore -nologo
} }
prepack() prepack()
{ {
find_msbuild find_msbuild
$msbuild $slnpath -t:prepack -p:Configuration=$configuration -p:Platform=$platform -v:$verbosity -nologo $msbuild "$slnpath" -t:prepack -p:Configuration=$configuration -p:Platform=$platform -v:$verbosity -nologo
} }
pack() pack()
{ {
find_msbuild find_msbuild
$msbuild -t:restore $rootdir/src/Package/CppSharp.Package.csproj -p:Configuration=$configuration -p:Platform=$platform $msbuild -t:restore "$rootdir/src/Package/CppSharp.Package.csproj" -p:Configuration=$configuration -p:Platform=$platform
$msbuild -t:pack $rootdir/src/Package/CppSharp.Package.csproj -p:Configuration=$configuration -p:Platform=$platform -p:PackageOutputPath=$rootdir/artifacts $msbuild -t:pack "$rootdir/src/Package/CppSharp.Package.csproj" -p:Configuration=$configuration -p:Platform=$platform -p:PackageOutputPath="$rootdir/artifacts"
} }
test() test()
{ {
dotnet test {$bindir/${configuration}_$platform,$gendir/*}/*.Tests*.dll --nologo dotnet test {"$bindir/${configuration}_$platform","$gendir"/*}/*.Tests*.dll --nologo
} }
clean() clean()
{ {
rm -rf $objdir rm -rf "$objdir"
rm -rf $gendir rm -rf "$gendir"
rm -rf $bindir rm -rf "$bindir"
rm -rf $builddir/gmake rm -rf "$builddir/gmake"
rm -rf $builddir/$vs rm -rf "$builddir/$vs"
rm -rf $slnpath rm -rf "$slnpath"
} }
download_premake() download_premake()
{ {
premake_dir=$builddir/premake premake_dir="$builddir/premake"
premake_filename=premake5 premake_filename=premake5
if [ $oshost = "windows" ]; then if [ $oshost = "windows" ]; then
premake_filename=$premake_filename.exe premake_filename=$premake_filename.exe
fi fi
premake_path=$premake_dir/$premake_filename premake_path=$premake_dir/$premake_filename
if ! [ -f $premake_path ]; then if ! [ -f "$premake_path" ]; then
echo "Downloading and unpacking Premake..." echo "Downloading and unpacking Premake..."
premake_url=https://github.com/InteropAlliance/premake-core/releases/download/latest/premake-$oshost-$platform.zip premake_url=https://github.com/InteropAlliance/premake-core/releases/download/latest/premake-$oshost-$platform.zip
curl -L -O $premake_url curl -L -O $premake_url
unzip premake-$oshost-$platform.zip $premake_filename -d $premake_dir unzip premake-$oshost-$platform.zip $premake_filename -d "$premake_dir"
chmod +x $premake_path chmod +x "$premake_path"
rm premake-$oshost-$platform.zip rm premake-$oshost-$platform.zip
fi fi
} }
download_llvm() download_llvm()
{ {
$builddir/premake.sh --file=$builddir/llvm/LLVM.lua download_llvm --os=$os --arch=$platform --configuration=$configuration "$builddir/premake.sh" --file="$builddir/llvm/LLVM.lua" download_llvm --os=$os --arch=$platform --configuration=$configuration
} }
clone_llvm() clone_llvm()
{ {
$builddir/premake.sh --file=$builddir/llvm/LLVM.lua clone_llvm --os=$os --arch=$platform --configuration=$configuration "$builddir/premake.sh" --file="$builddir/llvm/LLVM.lua" clone_llvm --os=$os --arch=$platform --configuration=$configuration
} }
build_llvm() build_llvm()
{ {
$builddir/premake.sh --file=$builddir/llvm/LLVM.lua build_llvm --os=$os --arch=$platform --configuration=$configuration "$builddir/premake.sh" --file="$builddir/llvm/LLVM.lua" build_llvm --os=$os --arch=$platform --configuration=$configuration
} }
package_llvm() package_llvm()
{ {
$builddir/premake.sh --file=$builddir/llvm/LLVM.lua package_llvm --os=$os --arch=$platform --configuration=$configuration "$builddir/premake.sh" --file="$builddir/llvm/LLVM.lua" package_llvm --os=$os --arch=$platform --configuration=$configuration
} }
detect_os() detect_os()

2
build/generate.sh

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
set -e set -e
DIR=$( cd "$( dirname "$0" )" && pwd ) DIR=$( cd "$( dirname "$0" )" && pwd )
$DIR/build.sh generate "$@" "$DIR/build.sh" generate "$@"

4
build/premake.sh

@ -5,11 +5,11 @@ DIR=$( cd "$( dirname "$0" )" && pwd )
case "$(uname -s)" in case "$(uname -s)" in
Darwin|Linux) Darwin|Linux)
$DIR/premake/premake5 $* "$DIR/premake/premake5" "$@"
;; ;;
CYGWIN*|MINGW32*|MSYS*|MINGW*) CYGWIN*|MINGW32*|MSYS*|MINGW*)
$DIR/premake/premake5.exe $* "$DIR/premake/premake5.exe" "$@"
;; ;;
*) *)

2
build/test.sh

@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e set -e
DIR=$( cd "$( dirname "$0" )" && pwd ) DIR=$( cd "$( dirname "$0" )" && pwd )
$DIR/build.sh test "$@" "$DIR/build.sh" test "$@"

Loading…
Cancel
Save