Unify mono params

This commit is contained in:
JustArchi
2016-09-12 20:52:30 +02:00
parent 11d4430bbc
commit 4d6f2811bb
6 changed files with 8 additions and 6 deletions

View File

@@ -196,7 +196,7 @@
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"
cp "$(TargetDir)config/minimal.json" "$(SolutionDir)out/config" cp "$(TargetDir)config/minimal.json" "$(SolutionDir)out/config"
mono --llvm --server -O=all "$(SolutionDir)tools/ILRepack/ILRepack.exe" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(SolutionDir)out/ASF-Service.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll" mono "$(SolutionDir)tools/ILRepack/ILRepack.exe" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(SolutionDir)out/ASF-Service.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll"
rm "$(SolutionDir)out/ASF-Service.exe.config" rm "$(SolutionDir)out/ASF-Service.exe.config"
cp "$(SolutionDir)out/ASF-Service.exe" "$(SolutionDir)out/ASF.exe" cp "$(SolutionDir)out/ASF-Service.exe" "$(SolutionDir)out/ASF.exe"
</PostBuildEvent> </PostBuildEvent>

View File

@@ -127,7 +127,7 @@
. "$(SolutionDir)mono_envsetup.sh" . "$(SolutionDir)mono_envsetup.sh"
fi 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 "$(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>
</PropertyGroup> </PropertyGroup>

View File

@@ -212,7 +212,7 @@
. "$(SolutionDir)mono_envsetup.sh" . "$(SolutionDir)mono_envsetup.sh"
fi fi
mono --llvm --server -O=all "$(SolutionDir)tools/ILRepack/ILRepack.exe" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(SolutionDir)out/ASF-GUI.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll" mono "$(SolutionDir)tools/ILRepack/ILRepack.exe" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(SolutionDir)out/ASF-GUI.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll"
rm "$(SolutionDir)out/ASF-GUI.exe.config" rm "$(SolutionDir)out/ASF-GUI.exe.config"
</PostBuildEvent> </PostBuildEvent>
</PropertyGroup> </PropertyGroup>

3
cc.sh
View File

@@ -5,7 +5,6 @@ BUILD="Release"
AOT=0 AOT=0
CLEAN=0 CLEAN=0
MONO_ARGS=("--aot" "--llvm" "--server" "-O=all")
XBUILD_ARGS=("/nologo") XBUILD_ARGS=("/nologo")
BINARIES=("ArchiSteamFarm/bin/Release/ArchiSteamFarm.exe") BINARIES=("ArchiSteamFarm/bin/Release/ArchiSteamFarm.exe")
SOLUTION="ArchiSteamFarm.sln" SOLUTION="ArchiSteamFarm.sln"
@@ -66,7 +65,7 @@ if [[ "$AOT" -eq 1 && "$BUILD" = "Release" ]]; then
continue continue
fi fi
mono "${MONO_ARGS[@]}" "$BINARY" mono --aot "$BINARY"
done done
fi fi

View File

@@ -58,4 +58,7 @@ if VERSION_GREATER_EQUAL "$MONO_VERSION" "4.6.0"; then
MONO_DEBUG_IF_AVAILABLE "no-compact-seq-points" MONO_DEBUG_IF_AVAILABLE "no-compact-seq-points"
fi fi
export MONO_DNS=1
export MONO_ENV_OPTIONS="--server -O=all"
echo "Mono environment setup finished!" echo "Mono environment setup finished!"

2
run.sh
View File

@@ -6,7 +6,7 @@ BUILD="Release"
UNTIL_CLEAN_EXIT=0 UNTIL_CLEAN_EXIT=0
ASF_ARGS=("") ASF_ARGS=("")
MONO_ARGS=("--llvm" "--server" "-O=all") MONO_ARGS=("")
PRINT_USAGE() { PRINT_USAGE() {
echo "Usage: $0 [--until-clean-exit] [--cryptkey=] [--path=] [--server] [debug/release]" echo "Usage: $0 [--until-clean-exit] [--cryptkey=] [--path=] [--server] [debug/release]"