mirror of
https://github.com/JustArchiNET/ArchiSteamFarm.git
synced 2025-12-16 14:30:31 +00:00
Revert "Fix compilation with Mono master"
This reverts commit b64491e284.
Didn't fix the issue as mcs.exe is bugged as well, I'll just live with Mono weekly being broken and unreliable ¯\_(ツ)_/¯
This commit is contained in:
@@ -189,10 +189,6 @@
|
|||||||
copy "$(TargetDir)$(TargetName).exe" "$(SolutionDir)out\ASF.exe"
|
copy "$(TargetDir)$(TargetName).exe" "$(SolutionDir)out\ASF.exe"
|
||||||
</PostBuildEvent>
|
</PostBuildEvent>
|
||||||
<PostBuildEvent Condition=" '$(OS)' == 'Unix' AND '$(ConfigurationName)' == 'Release' ">
|
<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"
|
mkdir -p "$(SolutionDir)out/config"
|
||||||
cp "$(TargetDir)config/ASF.json" "$(SolutionDir)out/config"
|
cp "$(TargetDir)config/ASF.json" "$(SolutionDir)out/config"
|
||||||
cp "$(TargetDir)config/example.json" "$(SolutionDir)out/config"
|
cp "$(TargetDir)config/example.json" "$(SolutionDir)out/config"
|
||||||
|
|||||||
@@ -115,10 +115,6 @@
|
|||||||
copy "$(TargetDir)$(TargetName).exe" "$(SolutionDir)out\ASF-ConfigGenerator.exe"
|
copy "$(TargetDir)$(TargetName).exe" "$(SolutionDir)out\ASF-ConfigGenerator.exe"
|
||||||
</PostBuildEvent>
|
</PostBuildEvent>
|
||||||
<PostBuildEvent Condition=" '$(OS)' == 'Unix' AND '$(ConfigurationName)' == 'Release' ">
|
<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"
|
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"
|
rm "$(SolutionDir)out/ASF-ConfigGenerator.exe.config"
|
||||||
</PostBuildEvent>
|
</PostBuildEvent>
|
||||||
|
|||||||
4
cc.sh
4
cc.sh
@@ -29,10 +29,6 @@ XBUILD_ARGS+=("/p:Configuration=$BUILD")
|
|||||||
|
|
||||||
cd "$(dirname "$(readlink -f "$0")")"
|
cd "$(dirname "$(readlink -f "$0")")"
|
||||||
|
|
||||||
if [[ -f "mono_envsetup.sh" ]]; then
|
|
||||||
source "mono_envsetup.sh"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -d ".git" ]] && hash git &>/dev/null; then
|
if [[ -d ".git" ]] && hash git &>/dev/null; then
|
||||||
git pull || true
|
git pull || true
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -1,23 +0,0 @@
|
|||||||
#!/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
4
run.sh
@@ -26,10 +26,6 @@ fi
|
|||||||
|
|
||||||
cd "$(dirname "$(readlink -f "$0")")"
|
cd "$(dirname "$(readlink -f "$0")")"
|
||||||
|
|
||||||
if [[ -f "mono_envsetup.sh" ]]; then
|
|
||||||
source "mono_envsetup.sh"
|
|
||||||
fi
|
|
||||||
|
|
||||||
BINARY="ArchiSteamFarm/bin/$BUILD/ArchiSteamFarm.exe"
|
BINARY="ArchiSteamFarm/bin/$BUILD/ArchiSteamFarm.exe"
|
||||||
|
|
||||||
if [[ ! -f "$BINARY" ]]; then
|
if [[ ! -f "$BINARY" ]]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user