Merge launcher branch

19 files changed, 157 insertions, 110 deletions

diff --git a/scripts/ci/linux/assemble.sh b/scripts/ci/linux/assemble.sh
new file mode 100644
index 0000000..5215591
--- /dev/null
+++ b/scripts/ci/linux/assemble.sh
@@ -0,0 +1,43 @@
+#!/bin/sh -e
+
+mkdir client_distribution
+mkdir client_distribution/assets
+
+./dist/asset_packer -c scripts/packing.config assets/opensb client_distribution/assets/opensb.pak
+cp -r assets/user client_distribution/assets/
+
+mkdir client_distribution/mods
+touch client_distribution/mods/mods_go_here
+
+mkdir client_distribution/linux
+cp \
+  dist/starbound \
+  dist/starbound_server \
+  dist/btree_repacker \
+  dist/asset_packer \
+  dist/asset_unpacker \
+  dist/dump_versioned_json \
+  dist/make_versioned_json \
+  dist/*.so \
+  scripts/ci/linux/sbinit.config \
+  scripts/ci/linux/run-client.sh \
+  scripts/ci/linux/run-server.sh \
+  client_distribution/linux/
+
+mkdir server_distribution
+mkdir server_distribution/assets
+
+mkdir server_distribution/mods
+touch server_distribution/mods/mods_go_here
+
+./dist/asset_packer -c scripts/packing.config -s assets/opensb server_distribution/assets/opensb.pak
+
+mkdir server_distribution/linux
+
+cp \
+  dist/starbound_server \
+  dist/btree_repacker \
+  dist/*.so \
+  scripts/ci/linux/run-server.sh \
+  scripts/ci/linux/sbinit.config \
+  server_distribution/linux/
diff --git a/scripts/ci/linux/build.sh b/scripts/ci/linux/build.sh
deleted file mode 100644
index b70f6de..0000000
--- a/scripts/ci/linux/build.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh -e
-
-mkdir -p build
-
-cd build
-rm -f CMakeCache.txt
-
-cmake \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DSTAR_ENABLE_STATIC_LIBGCC_LIBSTDCXX=ON \
-  -DSTAR_USE_JEMALLOC=ON \
-  -DSTAR_ENABLE_STEAM_INTEGRATION=ON \
-  -DCMAKE_INCLUDE_PATH=../lib/linux/include \
-  -DCMAKE_LIBRARY_PATH=../lib/linux \
-  ../source
-
-make -j2
-
-cd ..
-
-mv dist linux_binaries
-cp lib/linux/*.so linux_binaries/
diff --git a/scripts/ci/linux/sbinit.config b/scripts/ci/linux/sbinit.config
index 45918a1..e7715fc 100644
--- a/scripts/ci/linux/sbinit.config
+++ b/scripts/ci/linux/sbinit.config
@@ -1,6 +1,5 @@
 {
   "assetDirectories" : [
-    "./data/",
     "../assets/",
     "../mods/"
   ],
diff --git a/scripts/ci/linux/test.sh b/scripts/ci/linux/test.sh
deleted file mode 100644
index 0bc8e7c..0000000
--- a/scripts/ci/linux/test.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-cd linux_binaries
-
-cp ../scripts/linux/sbinit.config .
-
-./core_tests
-./game_tests
diff --git a/scripts/ci/macos/Starbound.app/Contents/Info.plist b/scripts/ci/macos/Starbound.app/Contents/Info.plist
index 44fcdca..695fcb9 100644
--- a/scripts/ci/macos/Starbound.app/Contents/Info.plist
+++ b/scripts/ci/macos/Starbound.app/Contents/Info.plist
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
   <key>CFBundleGetInfoString</key>
-  <string>Starbound</string>
+  <string>OpenStarbound</string>
   <key>CFBundleExecutable</key>
   <string>starbound</string>
   <key>CFBundleIdentifier</key>
   <string>com.chucklefish</string>
   <key>CFBundleName</key>
-  <string>starbound</string>
+  <string>OpenStarbound</string>
   <key>CFBundleIconFile</key>
   <string>starbound</string>
   <key>CFBundleInfoDictionaryVersion</key>
diff --git a/scripts/ci/macos/Starbound.app/Contents/Resources/starbound.icns b/scripts/ci/macos/Starbound.app/Contents/Resources/starbound.icns
index d6c93ff..b9fb8d4 100644
--- a/scripts/ci/macos/Starbound.app/Contents/Resources/starbound.icns
+++ b/scripts/ci/macos/Starbound.app/Contents/Resources/starbound.icns
diff --git a/scripts/ci/macos/assemble.sh b/scripts/ci/macos/assemble.sh
new file mode 100644
index 0000000..8858cf4
--- /dev/null
+++ b/scripts/ci/macos/assemble.sh
@@ -0,0 +1,27 @@
+#!/bin/sh -e
+
+mkdir client_distribution
+mkdir client_distribution/assets
+
+./dist/asset_packer -c scripts/packing.config assets/opensb client_distribution/assets/opensb.pak
+cp -r assets/user client_distribution/assets/
+
+mkdir client_distribution/mods
+touch client_distribution/mods/mods_go_here
+
+mkdir client_distribution/osx
+cp -LR scripts/ci/macos/Starbound.app client_distribution/osx/
+mkdir client_distribution/osx/Starbound.app/Contents/MacOS
+cp dist/starbound client_distribution/osx/Starbound.app/Contents/MacOS/
+cp dist/*.dylib client_distribution/osx/Starbound.app/Contents/MacOS/
+cp \
+  dist/starbound_server \
+  dist/btree_repacker \
+  dist/asset_packer \
+  dist/asset_unpacker \
+  dist/dump_versioned_json \
+  dist/make_versioned_json \
+  dist/planet_mapgen \
+  scripts/ci/macos/sbinit.config \
+  scripts/ci/macos/run-server.sh \
+  client_distribution/osx/
\ No newline at end of file
diff --git a/scripts/ci/macos/build.sh b/scripts/ci/macos/build.sh
deleted file mode 100644
index 7517843..0000000
--- a/scripts/ci/macos/build.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh -e
-
-mkdir -p build
-cd build
-
-rm -f CMakeCache.txt
-
-cmake \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DSTAR_ENABLE_STATIC_LIBGCC_LIBSTDCXX=ON \
-  -DSTAR_USE_JEMALLOC=OFF \
-  -DSTAR_ENABLE_STEAM_INTEGRATION=ON \
-  -DSTAR_ENABLE_DISCORD_INTEGRATION=ON \
-  -DCMAKE_INCLUDE_PATH=../lib/osx/include \
-  -DCMAKE_LIBRARY_PATH=../lib/osx \
-  -DCMAKE_OSX_SYSROOT=/ \
-  -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 \
-  ../source
-
-make -j2
-
-cd ..
-
-mv dist macos_binaries
-cp lib/osx/*.dylib macos_binaries/
diff --git a/scripts/ci/macos/sbinit.config b/scripts/ci/macos/sbinit.config
index 45918a1..e7715fc 100644
--- a/scripts/ci/macos/sbinit.config
+++ b/scripts/ci/macos/sbinit.config
@@ -1,6 +1,5 @@
 {
   "assetDirectories" : [
-    "./data/",
     "../assets/",
     "../mods/"
   ],
diff --git a/scripts/ci/macos/test.sh b/scripts/ci/macos/test.sh
deleted file mode 100644
index 3843325..0000000
--- a/scripts/ci/macos/test.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-cd macos_binaries
-
-cp ../scripts/osx/sbinit.config .
-
-./core_tests
-./game_tests
-
diff --git a/scripts/ci/windows/assemble.bat b/scripts/ci/windows/assemble.bat
new file mode 100644
index 0000000..ca79522
--- /dev/null
+++ b/scripts/ci/windows/assemble.bat
@@ -0,0 +1,18 @@
+@echo off
+set dst=windows
+
+if exist %dst% rmdir %dst% /S /Q
+
+mkdir %dst%
+mkdir %dst%\storage
+mkdir %dst%\mods
+mkdir %dst%\assets
+
+set bin=%dst%\win
+mkdir %bin%
+
+.\dist\asset_packer.exe -c scripts\packing.config assets\opensb %dst%\assets\opensb.pak
+
+for /f "delims=" %%f in (scripts\ci\windows\files.txt) do (
+    xcopy "%%f" "%bin%\" /Y
+)
\ No newline at end of file
diff --git a/scripts/ci/windows/build.bat b/scripts/ci/windows/build.bat
deleted file mode 100644
index cfd209a..0000000
--- a/scripts/ci/windows/build.bat
+++ /dev/null
@@ -1,32 +0,0 @@
-set QT_PREFIX_PATH="C:\Qt\5.7\msvc2015_64"
-set CMAKE_PREFIX_PATH="C:\Program Files\CMake"
-set PATH=%PATH%;%CMAKE_PREFIX_PATH%\bin;%QT_PREFIX_PATH%\bin
-
-mkdir build
-cd build || exit /b 1
-
-del /f CMakeCache.txt
-
-cmake.exe ^
-  -G"Visual Studio 17 2022" ^
-  -T"v143" ^
-  -DCMAKE_PREFIX_PATH=%QT_PREFIX_PATH% ^
-  -DSTAR_USE_JEMALLOC=OFF ^
-  -DSTAR_ENABLE_STEAM_INTEGRATION=ON ^
-  -DSTAR_ENABLE_DISCORD_INTEGRATION=ON ^
-  -DSTAR_BUILD_QT_TOOLS=OFF ^
-  -DCMAKE_INCLUDE_PATH="..\lib\windows\include" ^
-  -DCMAKE_LIBRARY_PATH="..\lib\windows" ^
-  ..\source || exit /b 1
-
-cmake.exe --build . --config RelWithDebInfo || exit /b 1
-
-cd ..
-
-move dist windows_binaries || exit /b 1
-
-if exist windows_binaries\mod_uploader.exe (
-  windeployqt.exe windows_binaries\mod_uploader.exe || exit /b 1
-)
-
-copy lib\windows\*.dll windows_binaries\ || exit /b 1
diff --git a/scripts/ci/windows/files.txt b/scripts/ci/windows/files.txt
new file mode 100644
index 0000000..bb05cea
--- /dev/null
+++ b/scripts/ci/windows/files.txt
@@ -0,0 +1,13 @@
+dist\btree_repacker.exe
+dist\dump_versioned_json.exe
+dist\make_versioned_json.exe
+dist\asset_unpacker.exe
+dist\asset_packer.exe
+dist\starbound.exe
+dist\starbound.pdb
+dist\starbound_server.exe
+dist\starbound_server.pdb
+dist\*.dll
+lib\windows\discord_game_sdk.dll
+lib\windows\steam_api64.dll
+scripts\ci\windows\sbinit.config
\ No newline at end of file
diff --git a/scripts/ci/windows/sbinit.config b/scripts/ci/windows/sbinit.config
index 06917cf..aeecdad 100644
--- a/scripts/ci/windows/sbinit.config
+++ b/scripts/ci/windows/sbinit.config
@@ -1,6 +1,5 @@
 {
   "assetDirectories" : [
-    ".\\data\\",
     "..\\assets\\",
     "..\\mods\\"
   ],
diff --git a/scripts/ci/windows/test.bat b/scripts/ci/windows/test.bat
deleted file mode 100644
index d995088..0000000
--- a/scripts/ci/windows/test.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-cd windows_binaries
-
-set PATH="%PATH%;..\lib\windows"
-
-copy ..\scripts\windows\sbinit.config .
-
-.\core_tests || exit /b 1
-.\game_tests || exit /b 1
diff --git a/scripts/ci/windows/tidy.bat b/scripts/ci/windows/tidy.bat
new file mode 100644
index 0000000..0b23ece
--- /dev/null
+++ b/scripts/ci/windows/tidy.bat
@@ -0,0 +1,5 @@
+@echo off
+
+for %%f in (dist\*.pdb) do (
+    echo %%f | find "starbound" > nul || del %%f
+)
\ No newline at end of file
diff --git a/scripts/inno/setup.iss b/scripts/inno/setup.iss
new file mode 100644
index 0000000..907a951
--- /dev/null
+++ b/scripts/inno/setup.iss
@@ -0,0 +1,48 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "OpenStarbound"
+#define MyAppVersion "1.0"
+#define MyAppExeName "starbound.exe"
+
+[Setup]
+SourceDir={#SourcePath}\..\..\
+; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{08791089-2868-4FE5-ACC8-4473ACA67ED7}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+DefaultDirName={autopf}\{#MyAppName}
+DisableProgramGroupPage=yes
+; Uncomment the following line to run in non administrative install mode (install for current user only.)
+;PrivilegesRequired=lowest
+PrivilegesRequiredOverridesAllowed=dialog
+OutputBaseFilename=OpenStarbound
+SetupIconFile=scripts\inno\starbound.ico
+Compression=lzma2/ultra64
+SolidCompression=yes
+WizardStyle=modern
+ArchitecturesInstallIn64BitMode=x64
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "windows\win\{#MyAppExeName}"; DestDir: "{app}\win\"; Flags: ignoreversion
+Source: "windows\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Dirs]
+Name: "{app}"; Permissions: users-modify
+
+[Icons]
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\win\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+
diff --git a/scripts/inno/starbound.ico b/scripts/inno/starbound.ico
new file mode 100644
index 0000000..999d921
--- /dev/null
+++ b/scripts/inno/starbound.ico
diff --git a/scripts/steam_appid.txt b/scripts/steam_appid.txt
index ba0ecc1..95ce075 100644
--- a/scripts/steam_appid.txt
+++ b/scripts/steam_appid.txt
@@ -1 +1 @@
-367540
+211820