diff --git a/scripts/gitlab-ci/assemble.sh b/attic/gitlab-ci/assemble.sh similarity index 100% rename from scripts/gitlab-ci/assemble.sh rename to attic/gitlab-ci/assemble.sh diff --git a/scripts/gitlab-ci/linux/build.sh b/attic/gitlab-ci/linux/build.sh similarity index 100% rename from scripts/gitlab-ci/linux/build.sh rename to attic/gitlab-ci/linux/build.sh diff --git a/scripts/gitlab-ci/linux/run-client.sh b/attic/gitlab-ci/linux/run-client.sh similarity index 100% rename from scripts/gitlab-ci/linux/run-client.sh rename to attic/gitlab-ci/linux/run-client.sh diff --git a/scripts/gitlab-ci/linux/run-server.sh b/attic/gitlab-ci/linux/run-server.sh similarity index 100% rename from scripts/gitlab-ci/linux/run-server.sh rename to attic/gitlab-ci/linux/run-server.sh diff --git a/scripts/gitlab-ci/linux/sbinit.config b/attic/gitlab-ci/linux/sbinit.config similarity index 100% rename from scripts/gitlab-ci/linux/sbinit.config rename to attic/gitlab-ci/linux/sbinit.config diff --git a/scripts/gitlab-ci/linux/test.sh b/attic/gitlab-ci/linux/test.sh similarity index 100% rename from scripts/gitlab-ci/linux/test.sh rename to attic/gitlab-ci/linux/test.sh diff --git a/scripts/gitlab-ci/macos/Starbound.app/Contents/Info.plist b/attic/gitlab-ci/macos/Starbound.app/Contents/Info.plist similarity index 100% rename from scripts/gitlab-ci/macos/Starbound.app/Contents/Info.plist rename to attic/gitlab-ci/macos/Starbound.app/Contents/Info.plist diff --git a/scripts/gitlab-ci/macos/Starbound.app/Contents/Resources/starbound.icns b/attic/gitlab-ci/macos/Starbound.app/Contents/Resources/starbound.icns similarity index 100% rename from scripts/gitlab-ci/macos/Starbound.app/Contents/Resources/starbound.icns rename to attic/gitlab-ci/macos/Starbound.app/Contents/Resources/starbound.icns diff --git a/scripts/gitlab-ci/macos/build.sh b/attic/gitlab-ci/macos/build.sh similarity index 100% rename from scripts/gitlab-ci/macos/build.sh rename to attic/gitlab-ci/macos/build.sh diff --git a/scripts/gitlab-ci/macos/run-server.sh b/attic/gitlab-ci/macos/run-server.sh similarity index 100% rename from scripts/gitlab-ci/macos/run-server.sh rename to attic/gitlab-ci/macos/run-server.sh diff --git a/scripts/gitlab-ci/macos/sbinit.config b/attic/gitlab-ci/macos/sbinit.config similarity index 100% rename from scripts/gitlab-ci/macos/sbinit.config rename to attic/gitlab-ci/macos/sbinit.config diff --git a/scripts/gitlab-ci/macos/test.sh b/attic/gitlab-ci/macos/test.sh similarity index 100% rename from scripts/gitlab-ci/macos/test.sh rename to attic/gitlab-ci/macos/test.sh diff --git a/scripts/gitlab-ci/repack_steamfree.sh b/attic/gitlab-ci/repack_steamfree.sh similarity index 100% rename from scripts/gitlab-ci/repack_steamfree.sh rename to attic/gitlab-ci/repack_steamfree.sh diff --git a/scripts/gitlab-ci/windows/build.bat b/attic/gitlab-ci/windows/build.bat similarity index 100% rename from scripts/gitlab-ci/windows/build.bat rename to attic/gitlab-ci/windows/build.bat diff --git a/scripts/gitlab-ci/windows/sbinit.config b/attic/gitlab-ci/windows/sbinit.config similarity index 100% rename from scripts/gitlab-ci/windows/sbinit.config rename to attic/gitlab-ci/windows/sbinit.config diff --git a/scripts/gitlab-ci/windows/test.bat b/attic/gitlab-ci/windows/test.bat similarity index 100% rename from scripts/gitlab-ci/windows/test.bat rename to attic/gitlab-ci/windows/test.bat diff --git a/scripts/ci/linux/build.sh b/scripts/ci/linux/build.sh new file mode 100644 index 0000000..b70f6de --- /dev/null +++ b/scripts/ci/linux/build.sh @@ -0,0 +1,22 @@ +#!/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/run-client.sh b/scripts/ci/linux/run-client.sh new file mode 100644 index 0000000..b7cb8ba --- /dev/null +++ b/scripts/ci/linux/run-client.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +cd "`dirname \"$0\"`" + +LD_LIBRARY_PATH="$LD_LIBRARY_PATH:./" ./starbound "$@" diff --git a/scripts/ci/linux/run-server.sh b/scripts/ci/linux/run-server.sh new file mode 100644 index 0000000..79b02fd --- /dev/null +++ b/scripts/ci/linux/run-server.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +cd "`dirname \"$0\"`" + +terms=" +x-terminal-emulator +konsole +gnome-terminal.wrapper +xfce4-terminal.wrapper +koi8rxterm +lxterm +uxterm +xterm" + +for term in $terms; do + $term -e ./starbound_server $@ + if [ $? -eq 0 ]; then + exit 0; + fi +done + +exit 1 diff --git a/scripts/ci/linux/sbinit.config b/scripts/ci/linux/sbinit.config new file mode 100644 index 0000000..45918a1 --- /dev/null +++ b/scripts/ci/linux/sbinit.config @@ -0,0 +1,9 @@ +{ + "assetDirectories" : [ + "./data/", + "../assets/", + "../mods/" + ], + + "storageDirectory" : "../storage/" +} \ No newline at end of file diff --git a/scripts/ci/linux/test.sh b/scripts/ci/linux/test.sh new file mode 100644 index 0000000..0bc8e7c --- /dev/null +++ b/scripts/ci/linux/test.sh @@ -0,0 +1,8 @@ +#!/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 new file mode 100644 index 0000000..44fcdca --- /dev/null +++ b/scripts/ci/macos/Starbound.app/Contents/Info.plist @@ -0,0 +1,27 @@ + + + + + CFBundleGetInfoString + Starbound + CFBundleExecutable + starbound + CFBundleIdentifier + com.chucklefish + CFBundleName + starbound + CFBundleIconFile + starbound + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + APPL + LSEnvironment + + MinimumSystemVersion + 10.9.0 + + SDL_FILESYSTEM_BASE_DIR_TYPE + parent + + diff --git a/scripts/ci/macos/Starbound.app/Contents/Resources/starbound.icns b/scripts/ci/macos/Starbound.app/Contents/Resources/starbound.icns new file mode 100644 index 0000000..d6c93ff Binary files /dev/null and b/scripts/ci/macos/Starbound.app/Contents/Resources/starbound.icns differ diff --git a/scripts/ci/macos/build.sh b/scripts/ci/macos/build.sh new file mode 100644 index 0000000..7517843 --- /dev/null +++ b/scripts/ci/macos/build.sh @@ -0,0 +1,25 @@ +#!/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/run-server.sh b/scripts/ci/macos/run-server.sh new file mode 100644 index 0000000..e043263 --- /dev/null +++ b/scripts/ci/macos/run-server.sh @@ -0,0 +1,11 @@ +#!/bin/sh -e + +cd "`dirname \"$0\"`" + +osascript <