From d1935e686c6396519a1ff9b1b429cd55adcf8d11 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Thu, 23 Jan 2020 00:31:26 -0500 Subject: add full internal support for non-standard four-part versions --- src/SMAPI.Toolkit.CoreInterfaces/ISemanticVersion.cs | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/SMAPI.Toolkit.CoreInterfaces') diff --git a/src/SMAPI.Toolkit.CoreInterfaces/ISemanticVersion.cs b/src/SMAPI.Toolkit.CoreInterfaces/ISemanticVersion.cs index b8572d50..b228b2d1 100644 --- a/src/SMAPI.Toolkit.CoreInterfaces/ISemanticVersion.cs +++ b/src/SMAPI.Toolkit.CoreInterfaces/ISemanticVersion.cs @@ -61,5 +61,8 @@ namespace StardewModdingAPI /// Get a string representation of the version. string ToString(); + + /// Whether the version uses non-standard extensions, like four-part game versions on some platforms. + bool IsNonStandard(); } } -- cgit From 3f1d7b1d2238d775638b4e471fc626ca26a3849a Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Fri, 31 Jan 2020 22:27:12 -0500 Subject: rework build settings a bit --- build/lib/System.Numerics.dll | Bin 54272 -> 0 bytes build/lib/System.Runtime.Caching.dll | Bin 71168 -> 0 bytes build/prepare-install-package.targets | 88 ++++++++------- src/SMAPI.Installer/README.txt | 44 -------- src/SMAPI.Installer/SMAPI.Installer.csproj | 15 +-- src/SMAPI.Installer/assets/README.txt | 44 ++++++++ src/SMAPI.Installer/assets/System.Numerics.dll | Bin 0 -> 54272 bytes .../assets/System.Runtime.Caching.dll | Bin 0 -> 71168 bytes src/SMAPI.Installer/assets/unix-install.sh | 24 ++++ src/SMAPI.Installer/assets/unix-launcher.sh | 125 +++++++++++++++++++++ src/SMAPI.Installer/assets/windows-exe-config.xml | 5 + src/SMAPI.Installer/assets/windows-install.bat | 8 ++ src/SMAPI.Installer/unix-install.sh | 24 ---- src/SMAPI.Installer/unix-launcher.sh | 125 --------------------- src/SMAPI.Installer/windows-exe-config.xml | 5 - src/SMAPI.Installer/windows-install.bat | 8 -- .../SMAPI.Mods.ConsoleCommands.csproj | 1 - .../SMAPI.Mods.SaveBackup.csproj | 1 - .../SMAPI.Toolkit.CoreInterfaces.csproj | 3 +- src/SMAPI.Toolkit/SMAPI.Toolkit.csproj | 3 +- src/SMAPI/SMAPI.csproj | 3 +- 21 files changed, 256 insertions(+), 270 deletions(-) delete mode 100644 build/lib/System.Numerics.dll delete mode 100644 build/lib/System.Runtime.Caching.dll delete mode 100644 src/SMAPI.Installer/README.txt create mode 100644 src/SMAPI.Installer/assets/README.txt create mode 100644 src/SMAPI.Installer/assets/System.Numerics.dll create mode 100644 src/SMAPI.Installer/assets/System.Runtime.Caching.dll create mode 100644 src/SMAPI.Installer/assets/unix-install.sh create mode 100644 src/SMAPI.Installer/assets/unix-launcher.sh create mode 100644 src/SMAPI.Installer/assets/windows-exe-config.xml create mode 100644 src/SMAPI.Installer/assets/windows-install.bat delete mode 100644 src/SMAPI.Installer/unix-install.sh delete mode 100644 src/SMAPI.Installer/unix-launcher.sh delete mode 100644 src/SMAPI.Installer/windows-exe-config.xml delete mode 100644 src/SMAPI.Installer/windows-install.bat (limited to 'src/SMAPI.Toolkit.CoreInterfaces') diff --git a/build/lib/System.Numerics.dll b/build/lib/System.Numerics.dll deleted file mode 100644 index fed0f92c..00000000 Binary files a/build/lib/System.Numerics.dll and /dev/null differ diff --git a/build/lib/System.Runtime.Caching.dll b/build/lib/System.Runtime.Caching.dll deleted file mode 100644 index a062391d..00000000 Binary files a/build/lib/System.Runtime.Caching.dll and /dev/null differ diff --git a/build/prepare-install-package.targets b/build/prepare-install-package.targets index 61b12039..790b8bad 100644 --- a/build/prepare-install-package.targets +++ b/build/prepare-install-package.targets @@ -7,18 +7,22 @@ --> - $(SolutionDir)\.. - $(RootPath)\bin\$(Configuration) - $(CompiledRootPath)\SMAPI - $(CompiledRootPath)\SMAPI.Toolkit\net4.5 - $(CompiledRootPath)\Mods - $(SolutionDir)\..\bin\SMAPI installer - $(SolutionDir)\..\bin\SMAPI installer for developers windows unix + + $(SolutionDir) + $(SolutionDir)\..\bin + + $(BuildRootPath)\SMAPI\bin\$(Configuration) + $(BuildRootPath)\SMAPI.Toolkit\bin\$(Configuration)\net4.5 + $(BuildRootPath)\SMAPI.Mods.ConsoleCommands\bin\$(Configuration) + $(BuildRootPath)\SMAPI.Mods.SaveBackup\bin\$(Configuration) + + $(OutRootPath)\SMAPI installer + $(OutRootPath)\SMAPI installer for developers - + @@ -26,50 +30,50 @@ - - - - + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - + + - - + + diff --git a/src/SMAPI.Installer/README.txt b/src/SMAPI.Installer/README.txt deleted file mode 100644 index 0da49a46..00000000 --- a/src/SMAPI.Installer/README.txt +++ /dev/null @@ -1,44 +0,0 @@ - ___ ___ ___ ___ ___ - / /\ /__/\ / /\ / /\ / /\ - / /:/_ | |::\ / /::\ / /::\ / /:/ - / /:/ /\ | |:|:\ / /:/\:\ / /:/\:\ / /:/ - / /:/ /::\ __|__|:|\:\ / /:/~/::\ / /:/~/:/ / /::\ ___ -/__/:/ /:/\:\ /__/::::| \:\ /__/:/ /:/\:\ /__/:/ /:/ /__/:/\:\ /\ -\ \:\/:/~/:/ \ \:\~~\__\/ \ \:\/:/__\/ \ \:\/:/ \__\/ \:\/:/ - \ \::/ /:/ \ \:\ \ \::/ \ \::/ \__\::/ - \__\/ /:/ \ \:\ \ \:\ \ \:\ / /:/ - /__/:/ \ \:\ \ \:\ \ \:\ /__/:/ - \__\/ \__\/ \__\/ \__\/ \__\/ - - -SMAPI lets you run Stardew Valley with mods. Don't forget to download mods separately. - - -Player's guide --------------------------------- -See https://stardewvalleywiki.com/Modding:Player_Guide for help installing SMAPI, adding mods, etc. - - -Manual install --------------------------------- -THIS IS NOT RECOMMENDED FOR MOST PLAYERS. See instructions above instead. -If you really want to install SMAPI manually, here's how. - -1. Unzip "internal/windows-install.dat" (on Windows) or "internal/unix-install.dat" (on Linux/Mac). - You can change '.dat' to '.zip', it's just a normal zip file renamed to prevent confusion. -2. Copy the files from the folder you just unzipped into your game folder. The - `StardewModdingAPI.exe` file should be right next to the game's executable. -3. - - Windows only: if you use Steam, see the install guide above to enable achievements and - overlay. Otherwise, just run StardewModdingAPI.exe in your game folder to play with mods. - - - Linux/Mac only: rename the "StardewValley" file (no extension) to "StardewValley-original", and - "StardewModdingAPI" (no extension) to "StardewValley". Now just launch the game as usual to - play with mods. - -When installing on Linux or Mac: -- Make sure Mono is installed (normally the installer checks for you). While it's not required, - many mods won't work correctly without it. (Specifically, mods which load PNG images may crash or - freeze the game.) -- To configure the color scheme, edit the `smapi-internal/config.json` file and see instructions - there for the 'ColorScheme' setting. diff --git a/src/SMAPI.Installer/SMAPI.Installer.csproj b/src/SMAPI.Installer/SMAPI.Installer.csproj index 3f01c8fe..79e19d89 100644 --- a/src/SMAPI.Installer/SMAPI.Installer.csproj +++ b/src/SMAPI.Installer/SMAPI.Installer.csproj @@ -8,7 +8,6 @@ latest Exe x86 - $(SolutionDir)\..\bin\$(Configuration)\Installer false @@ -17,19 +16,7 @@ - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - + PreserveNewest diff --git a/src/SMAPI.Installer/assets/README.txt b/src/SMAPI.Installer/assets/README.txt new file mode 100644 index 00000000..0da49a46 --- /dev/null +++ b/src/SMAPI.Installer/assets/README.txt @@ -0,0 +1,44 @@ + ___ ___ ___ ___ ___ + / /\ /__/\ / /\ / /\ / /\ + / /:/_ | |::\ / /::\ / /::\ / /:/ + / /:/ /\ | |:|:\ / /:/\:\ / /:/\:\ / /:/ + / /:/ /::\ __|__|:|\:\ / /:/~/::\ / /:/~/:/ / /::\ ___ +/__/:/ /:/\:\ /__/::::| \:\ /__/:/ /:/\:\ /__/:/ /:/ /__/:/\:\ /\ +\ \:\/:/~/:/ \ \:\~~\__\/ \ \:\/:/__\/ \ \:\/:/ \__\/ \:\/:/ + \ \::/ /:/ \ \:\ \ \::/ \ \::/ \__\::/ + \__\/ /:/ \ \:\ \ \:\ \ \:\ / /:/ + /__/:/ \ \:\ \ \:\ \ \:\ /__/:/ + \__\/ \__\/ \__\/ \__\/ \__\/ + + +SMAPI lets you run Stardew Valley with mods. Don't forget to download mods separately. + + +Player's guide +-------------------------------- +See https://stardewvalleywiki.com/Modding:Player_Guide for help installing SMAPI, adding mods, etc. + + +Manual install +-------------------------------- +THIS IS NOT RECOMMENDED FOR MOST PLAYERS. See instructions above instead. +If you really want to install SMAPI manually, here's how. + +1. Unzip "internal/windows-install.dat" (on Windows) or "internal/unix-install.dat" (on Linux/Mac). + You can change '.dat' to '.zip', it's just a normal zip file renamed to prevent confusion. +2. Copy the files from the folder you just unzipped into your game folder. The + `StardewModdingAPI.exe` file should be right next to the game's executable. +3. + - Windows only: if you use Steam, see the install guide above to enable achievements and + overlay. Otherwise, just run StardewModdingAPI.exe in your game folder to play with mods. + + - Linux/Mac only: rename the "StardewValley" file (no extension) to "StardewValley-original", and + "StardewModdingAPI" (no extension) to "StardewValley". Now just launch the game as usual to + play with mods. + +When installing on Linux or Mac: +- Make sure Mono is installed (normally the installer checks for you). While it's not required, + many mods won't work correctly without it. (Specifically, mods which load PNG images may crash or + freeze the game.) +- To configure the color scheme, edit the `smapi-internal/config.json` file and see instructions + there for the 'ColorScheme' setting. diff --git a/src/SMAPI.Installer/assets/System.Numerics.dll b/src/SMAPI.Installer/assets/System.Numerics.dll new file mode 100644 index 00000000..fed0f92c Binary files /dev/null and b/src/SMAPI.Installer/assets/System.Numerics.dll differ diff --git a/src/SMAPI.Installer/assets/System.Runtime.Caching.dll b/src/SMAPI.Installer/assets/System.Runtime.Caching.dll new file mode 100644 index 00000000..a062391d Binary files /dev/null and b/src/SMAPI.Installer/assets/System.Runtime.Caching.dll differ diff --git a/src/SMAPI.Installer/assets/unix-install.sh b/src/SMAPI.Installer/assets/unix-install.sh new file mode 100644 index 00000000..6d0c86ce --- /dev/null +++ b/src/SMAPI.Installer/assets/unix-install.sh @@ -0,0 +1,24 @@ +#!/bin/bash +# Run the SMAPI installer through Mono on Linux or Mac. + +# Move to script's directory +cd "`dirname "$0"`" + +# get cross-distro version of POSIX command +COMMAND="" +if command -v command >/dev/null 2>&1; then + COMMAND="command -v" +elif type type >/dev/null 2>&1; then + COMMAND="type" +fi + +# if $TERM is not set to xterm, mono will bail out when attempting to write to the console. +export TERM=xterm + +# validate Mono & run installer +if $COMMAND mono >/dev/null 2>&1; then + mono internal/unix-install.exe +else + echo "Oops! Looks like Mono isn't installed. Please install Mono from https://mono-project.com, reboot, and run this installer again." + read +fi diff --git a/src/SMAPI.Installer/assets/unix-launcher.sh b/src/SMAPI.Installer/assets/unix-launcher.sh new file mode 100644 index 00000000..b72eed22 --- /dev/null +++ b/src/SMAPI.Installer/assets/unix-launcher.sh @@ -0,0 +1,125 @@ +#!/usr/bin/env bash +# MonoKickstart Shell Script +# Written by Ethan "flibitijibibo" Lee +# Modified for SMAPI by various contributors + +# Move to script's directory +cd "$(dirname "$0")" || exit $? + +# Get the system architecture +UNAME=$(uname) +ARCH=$(uname -m) + +# MonoKickstart picks the right libfolder, so just execute the right binary. +if [ "$UNAME" == "Darwin" ]; then + # ... Except on OSX. + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:./osx/ + + # El Capitan is a total idiot and wipes this variable out, making the + # Steam overlay disappear. This sidesteps "System Integrity Protection" + # and resets the variable with Valve's own variable (they provided this + # fix by the way, thanks Valve!). Note that you will need to update your + # launch configuration to the script location, NOT just the app location + # (i.e. Kick.app/Contents/MacOS/Kick, not just Kick.app). + # -flibit + if [ "$STEAM_DYLD_INSERT_LIBRARIES" != "" ] && [ "$DYLD_INSERT_LIBRARIES" == "" ]; then + export DYLD_INSERT_LIBRARIES="$STEAM_DYLD_INSERT_LIBRARIES" + fi + + # this was here before + ln -sf mcs.bin.osx mcs + + # fix "DllNotFoundException: libgdiplus.dylib" errors when loading images in SMAPI + if [ -f libgdiplus.dylib ]; then + rm libgdiplus.dylib + fi + if [ -f /Library/Frameworks/Mono.framework/Versions/Current/lib/libgdiplus.dylib ]; then + ln -s /Library/Frameworks/Mono.framework/Versions/Current/lib/libgdiplus.dylib libgdiplus.dylib + fi + + # launch SMAPI + cp StardewValley.bin.osx StardewModdingAPI.bin.osx + open -a Terminal ./StardewModdingAPI.bin.osx "$@" +else + # choose launcher + LAUNCHER="" + if [ "$ARCH" == "x86_64" ]; then + ln -sf mcs.bin.x86_64 mcs + cp StardewValley.bin.x86_64 StardewModdingAPI.bin.x86_64 + LAUNCHER="./StardewModdingAPI.bin.x86_64 $*" + else + ln -sf mcs.bin.x86 mcs + cp StardewValley.bin.x86 StardewModdingAPI.bin.x86 + LAUNCHER="./StardewModdingAPI.bin.x86 $*" + fi + + # get cross-distro version of POSIX command + COMMAND="" + if command -v command 2>/dev/null; then + COMMAND="command -v" + elif type type 2>/dev/null; then + COMMAND="type" + fi + + # select terminal (prefer xterm for best compatibility, then known supported terminals) + for terminal in xterm gnome-terminal kitty terminator xfce4-terminal konsole terminal termite alacritty mate-terminal x-terminal-emulator; do + if $COMMAND "$terminal" 2>/dev/null; then + # Find the true shell behind x-terminal-emulator + if [ "$(basename "$(readlink -f $(which "$terminal"))")" != "x-terminal-emulator" ]; then + export LAUNCHTERM=$terminal + break; + else + export LAUNCHTERM="$(basename "$(readlink -f $(which x-terminal-emulator))")" + # Remember that we're using x-terminal-emulator just in case it points outside the $PATH + export XTE=1 + break; + fi + fi + done + + # if no terminal was found, run in current shell or with no output + if [ -z "$LAUNCHTERM" ]; then + sh -c 'TERM=xterm $LAUNCHER' + if [ $? -eq 127 ]; then + $LAUNCHER --no-terminal + fi + exit + fi + + # run in selected terminal and account for quirks + case $LAUNCHTERM in + terminator) + # Terminator converts -e to -x when used through x-terminal-emulator for some reason + if $XTE; then + terminator -e "sh -c 'TERM=xterm $LAUNCHER'" + else + terminator -x "sh -c 'TERM=xterm $LAUNCHER'" + fi + ;; + kitty) + # Kitty overrides the TERM varible unless you set it explicitly + kitty -o term=xterm $LAUNCHER + ;; + alacritty) + # Alacritty doesn't like the double quotes or the variable + if [ "$ARCH" == "x86_64" ]; then + alacritty -e sh -c 'TERM=xterm ./StardewModdingAPI.bin.x86_64 $*' + else + alacritty -e sh -c 'TERM=xterm ./StardewModdingAPI.bin.x86 $*' + fi + ;; + xterm|xfce4-terminal|gnome-terminal|terminal|termite|mate-terminal) + $LAUNCHTERM -e "sh -c 'TERM=xterm $LAUNCHER'" + ;; + konsole) + konsole -p Environment=TERM=xterm -e "$LAUNCHER" + ;; + *) + # If we don't know the terminal, just try to run it in the current shell. + sh -c 'TERM=xterm $LAUNCHER' + # if THAT fails, launch with no output + if [ $? -eq 127 ]; then + $LAUNCHER --no-terminal + fi + esac +fi diff --git a/src/SMAPI.Installer/assets/windows-exe-config.xml b/src/SMAPI.Installer/assets/windows-exe-config.xml new file mode 100644 index 00000000..386c7f1a --- /dev/null +++ b/src/SMAPI.Installer/assets/windows-exe-config.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/SMAPI.Installer/assets/windows-install.bat b/src/SMAPI.Installer/assets/windows-install.bat new file mode 100644 index 00000000..d02dd4c6 --- /dev/null +++ b/src/SMAPI.Installer/assets/windows-install.bat @@ -0,0 +1,8 @@ +@echo off +echo %~dp0 | findstr /C:"%TEMP%" 1>nul +if not errorlevel 1 ( + echo Oops! It looks like you're running the installer from inside a zip file. Make sure you unzip the download first. + pause +) else ( + start /WAIT /B internal/windows-install.exe +) diff --git a/src/SMAPI.Installer/unix-install.sh b/src/SMAPI.Installer/unix-install.sh deleted file mode 100644 index 6d0c86ce..00000000 --- a/src/SMAPI.Installer/unix-install.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# Run the SMAPI installer through Mono on Linux or Mac. - -# Move to script's directory -cd "`dirname "$0"`" - -# get cross-distro version of POSIX command -COMMAND="" -if command -v command >/dev/null 2>&1; then - COMMAND="command -v" -elif type type >/dev/null 2>&1; then - COMMAND="type" -fi - -# if $TERM is not set to xterm, mono will bail out when attempting to write to the console. -export TERM=xterm - -# validate Mono & run installer -if $COMMAND mono >/dev/null 2>&1; then - mono internal/unix-install.exe -else - echo "Oops! Looks like Mono isn't installed. Please install Mono from https://mono-project.com, reboot, and run this installer again." - read -fi diff --git a/src/SMAPI.Installer/unix-launcher.sh b/src/SMAPI.Installer/unix-launcher.sh deleted file mode 100644 index b72eed22..00000000 --- a/src/SMAPI.Installer/unix-launcher.sh +++ /dev/null @@ -1,125 +0,0 @@ -#!/usr/bin/env bash -# MonoKickstart Shell Script -# Written by Ethan "flibitijibibo" Lee -# Modified for SMAPI by various contributors - -# Move to script's directory -cd "$(dirname "$0")" || exit $? - -# Get the system architecture -UNAME=$(uname) -ARCH=$(uname -m) - -# MonoKickstart picks the right libfolder, so just execute the right binary. -if [ "$UNAME" == "Darwin" ]; then - # ... Except on OSX. - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:./osx/ - - # El Capitan is a total idiot and wipes this variable out, making the - # Steam overlay disappear. This sidesteps "System Integrity Protection" - # and resets the variable with Valve's own variable (they provided this - # fix by the way, thanks Valve!). Note that you will need to update your - # launch configuration to the script location, NOT just the app location - # (i.e. Kick.app/Contents/MacOS/Kick, not just Kick.app). - # -flibit - if [ "$STEAM_DYLD_INSERT_LIBRARIES" != "" ] && [ "$DYLD_INSERT_LIBRARIES" == "" ]; then - export DYLD_INSERT_LIBRARIES="$STEAM_DYLD_INSERT_LIBRARIES" - fi - - # this was here before - ln -sf mcs.bin.osx mcs - - # fix "DllNotFoundException: libgdiplus.dylib" errors when loading images in SMAPI - if [ -f libgdiplus.dylib ]; then - rm libgdiplus.dylib - fi - if [ -f /Library/Frameworks/Mono.framework/Versions/Current/lib/libgdiplus.dylib ]; then - ln -s /Library/Frameworks/Mono.framework/Versions/Current/lib/libgdiplus.dylib libgdiplus.dylib - fi - - # launch SMAPI - cp StardewValley.bin.osx StardewModdingAPI.bin.osx - open -a Terminal ./StardewModdingAPI.bin.osx "$@" -else - # choose launcher - LAUNCHER="" - if [ "$ARCH" == "x86_64" ]; then - ln -sf mcs.bin.x86_64 mcs - cp StardewValley.bin.x86_64 StardewModdingAPI.bin.x86_64 - LAUNCHER="./StardewModdingAPI.bin.x86_64 $*" - else - ln -sf mcs.bin.x86 mcs - cp StardewValley.bin.x86 StardewModdingAPI.bin.x86 - LAUNCHER="./StardewModdingAPI.bin.x86 $*" - fi - - # get cross-distro version of POSIX command - COMMAND="" - if command -v command 2>/dev/null; then - COMMAND="command -v" - elif type type 2>/dev/null; then - COMMAND="type" - fi - - # select terminal (prefer xterm for best compatibility, then known supported terminals) - for terminal in xterm gnome-terminal kitty terminator xfce4-terminal konsole terminal termite alacritty mate-terminal x-terminal-emulator; do - if $COMMAND "$terminal" 2>/dev/null; then - # Find the true shell behind x-terminal-emulator - if [ "$(basename "$(readlink -f $(which "$terminal"))")" != "x-terminal-emulator" ]; then - export LAUNCHTERM=$terminal - break; - else - export LAUNCHTERM="$(basename "$(readlink -f $(which x-terminal-emulator))")" - # Remember that we're using x-terminal-emulator just in case it points outside the $PATH - export XTE=1 - break; - fi - fi - done - - # if no terminal was found, run in current shell or with no output - if [ -z "$LAUNCHTERM" ]; then - sh -c 'TERM=xterm $LAUNCHER' - if [ $? -eq 127 ]; then - $LAUNCHER --no-terminal - fi - exit - fi - - # run in selected terminal and account for quirks - case $LAUNCHTERM in - terminator) - # Terminator converts -e to -x when used through x-terminal-emulator for some reason - if $XTE; then - terminator -e "sh -c 'TERM=xterm $LAUNCHER'" - else - terminator -x "sh -c 'TERM=xterm $LAUNCHER'" - fi - ;; - kitty) - # Kitty overrides the TERM varible unless you set it explicitly - kitty -o term=xterm $LAUNCHER - ;; - alacritty) - # Alacritty doesn't like the double quotes or the variable - if [ "$ARCH" == "x86_64" ]; then - alacritty -e sh -c 'TERM=xterm ./StardewModdingAPI.bin.x86_64 $*' - else - alacritty -e sh -c 'TERM=xterm ./StardewModdingAPI.bin.x86 $*' - fi - ;; - xterm|xfce4-terminal|gnome-terminal|terminal|termite|mate-terminal) - $LAUNCHTERM -e "sh -c 'TERM=xterm $LAUNCHER'" - ;; - konsole) - konsole -p Environment=TERM=xterm -e "$LAUNCHER" - ;; - *) - # If we don't know the terminal, just try to run it in the current shell. - sh -c 'TERM=xterm $LAUNCHER' - # if THAT fails, launch with no output - if [ $? -eq 127 ]; then - $LAUNCHER --no-terminal - fi - esac -fi diff --git a/src/SMAPI.Installer/windows-exe-config.xml b/src/SMAPI.Installer/windows-exe-config.xml deleted file mode 100644 index 386c7f1a..00000000 --- a/src/SMAPI.Installer/windows-exe-config.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/SMAPI.Installer/windows-install.bat b/src/SMAPI.Installer/windows-install.bat deleted file mode 100644 index d02dd4c6..00000000 --- a/src/SMAPI.Installer/windows-install.bat +++ /dev/null @@ -1,8 +0,0 @@ -@echo off -echo %~dp0 | findstr /C:"%TEMP%" 1>nul -if not errorlevel 1 ( - echo Oops! It looks like you're running the installer from inside a zip file. Make sure you unzip the download first. - pause -) else ( - start /WAIT /B internal/windows-install.exe -) diff --git a/src/SMAPI.Mods.ConsoleCommands/SMAPI.Mods.ConsoleCommands.csproj b/src/SMAPI.Mods.ConsoleCommands/SMAPI.Mods.ConsoleCommands.csproj index ce35bf73..526d406b 100644 --- a/src/SMAPI.Mods.ConsoleCommands/SMAPI.Mods.ConsoleCommands.csproj +++ b/src/SMAPI.Mods.ConsoleCommands/SMAPI.Mods.ConsoleCommands.csproj @@ -5,7 +5,6 @@ StardewModdingAPI.Mods.ConsoleCommands net45 latest - $(SolutionDir)\..\bin\$(Configuration)\Mods\ConsoleCommands false x86 diff --git a/src/SMAPI.Mods.SaveBackup/SMAPI.Mods.SaveBackup.csproj b/src/SMAPI.Mods.SaveBackup/SMAPI.Mods.SaveBackup.csproj index 2d031408..970ccea8 100644 --- a/src/SMAPI.Mods.SaveBackup/SMAPI.Mods.SaveBackup.csproj +++ b/src/SMAPI.Mods.SaveBackup/SMAPI.Mods.SaveBackup.csproj @@ -5,7 +5,6 @@ StardewModdingAPI.Mods.SaveBackup net45 latest - $(SolutionDir)\..\bin\$(Configuration)\Mods\SaveBackup false x86 diff --git a/src/SMAPI.Toolkit.CoreInterfaces/SMAPI.Toolkit.CoreInterfaces.csproj b/src/SMAPI.Toolkit.CoreInterfaces/SMAPI.Toolkit.CoreInterfaces.csproj index 1b9c04ff..accc9175 100644 --- a/src/SMAPI.Toolkit.CoreInterfaces/SMAPI.Toolkit.CoreInterfaces.csproj +++ b/src/SMAPI.Toolkit.CoreInterfaces/SMAPI.Toolkit.CoreInterfaces.csproj @@ -5,9 +5,8 @@ StardewModdingAPI Provides toolkit interfaces which are available to SMAPI mods. net4.5;netstandard2.0 - ..\..\bin\$(Configuration)\SMAPI.Toolkit.CoreInterfaces - ..\..\bin\$(Configuration)\SMAPI.Toolkit.CoreInterfaces\$(TargetFramework)\SMAPI.Toolkit.CoreInterfaces.xml latest + bin\$(Configuration)\$(TargetFramework)\SMAPI.Toolkit.CoreInterfaces.xml x86 diff --git a/src/SMAPI.Toolkit/SMAPI.Toolkit.csproj b/src/SMAPI.Toolkit/SMAPI.Toolkit.csproj index 3bb7e313..eaf8510b 100644 --- a/src/SMAPI.Toolkit/SMAPI.Toolkit.csproj +++ b/src/SMAPI.Toolkit/SMAPI.Toolkit.csproj @@ -5,9 +5,8 @@ StardewModdingAPI.Toolkit A library which encapsulates mod-handling logic for mod managers and tools. Not intended for use by mods. net4.5;netstandard2.0 - ..\..\bin\$(Configuration)\SMAPI.Toolkit - ..\..\bin\$(Configuration)\SMAPI.Toolkit\$(TargetFramework)\SMAPI.Toolkit.xml latest + bin\$(Configuration)\$(TargetFramework)\SMAPI.Toolkit.xml x86 StardewModdingAPI.Toolkit diff --git a/src/SMAPI/SMAPI.csproj b/src/SMAPI/SMAPI.csproj index 3bb73295..1376c8a2 100644 --- a/src/SMAPI/SMAPI.csproj +++ b/src/SMAPI/SMAPI.csproj @@ -8,8 +8,7 @@ latest x86 Exe - $(SolutionDir)\..\bin\$(Configuration)\SMAPI - $(SolutionDir)\..\bin\$(Configuration)\SMAPI\StardewModdingAPI.xml + bin\$(Configuration)\StardewModdingAPI.xml false true icon.ico -- cgit