Merge launcher branch

6 files changed, 29 insertions, 37 deletions

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
-