Fix compilation with Mono master

Bugs, bugs everywhere! https://bugzilla.xamarin.com/show_bug.cgi?id=42606
This commit is contained in:
JustArchi
2016-07-21 23:24:03 +02:00
parent ba40448e7d
commit b64491e284
5 changed files with 39 additions and 0 deletions

View File

@@ -189,6 +189,10 @@
copy "$(TargetDir)$(TargetName).exe" "$(SolutionDir)out\ASF.exe"
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Unix' AND '$(ConfigurationName)' == 'Release' ">
if [[ -f "$(SolutionDir)/mono_envsetup.sh" ]]; then
source "$(SolutionDir)/mono_envsetup.sh"
fi
mkdir -p "$(SolutionDir)out/config"
cp "$(TargetDir)config/ASF.json" "$(SolutionDir)out/config"
cp "$(TargetDir)config/example.json" "$(SolutionDir)out/config"

View File

@@ -115,6 +115,10 @@
copy "$(TargetDir)$(TargetName).exe" "$(SolutionDir)out\ASF-ConfigGenerator.exe"
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Unix' AND '$(ConfigurationName)' == 'Release' ">
if [[ -f "$(SolutionDir)/mono_envsetup.sh" ]]; then
source "$(SolutionDir)/mono_envsetup.sh"
fi
mono --llvm --server -O=all "$(SolutionDir)tools/ILRepack/ILRepack.exe" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(SolutionDir)out/ASF-ConfigGenerator.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll"
rm "$(SolutionDir)out/ASF-ConfigGenerator.exe.config"
</PostBuildEvent>

4
cc.sh
View File

@@ -29,6 +29,10 @@ XBUILD_ARGS+=("/p:Configuration=$BUILD")
cd "$(dirname "$(readlink -f "$0")")"
if [[ -f "mono_envsetup.sh" ]]; then
source "mono_envsetup.sh"
fi
if [[ -d ".git" ]] && hash git &>/dev/null; then
git pull || true
fi

23
mono_envsetup.sh Normal file
View File

@@ -0,0 +1,23 @@
#!/bin/bash
MONO_DEBUG_IF_AVAILABLE() {
local PREVIOUS_MONO_DEBUG="$MONO_DEBUG"
if [[ -z "$PREVIOUS_MONO_DEBUG" ]]; then
export MONO_DEBUG="$1"
elif echo "$PREVIOUS_MONO_DEBUG" | grep -Fq "$1"; then
return 0
else
export MONO_DEBUG="${PREVIOUS_MONO_DEBUG},${1}"
fi
if mono "" 2>&1 | head -n 1 | grep -Fq "$1"; then
export MONO_DEBUG="$PREVIOUS_MONO_DEBUG"
return 1
fi
return 0
}
# https://bugzilla.xamarin.com/show_bug.cgi?id=42606
MONO_DEBUG_IF_AVAILABLE "no-compact-seq-points"

4
run.sh
View File

@@ -26,6 +26,10 @@ fi
cd "$(dirname "$(readlink -f "$0")")"
if [[ -f "mono_envsetup.sh" ]]; then
source "mono_envsetup.sh"
fi
BINARY="ArchiSteamFarm/bin/$BUILD/ArchiSteamFarm.exe"
if [[ ! -f "$BINARY" ]]; then