diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fba0a80742fc5be71853a8d57fa82cc67f1c4831..f3aa59eba5bdaa3fb120cc031aab34b013cf39e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,10 +91,12 @@ build-macos: GIT_SUBMODULE_STRATEGY: recursive script: - ./gradlew jlink + - cd Mac-build + - ./mac_package.sh artifacts: name: "easy-installer-mac" paths: - - build/image/easy-installer-mac/* + - Mac-build/EasyInstaller.app build-aur: image: $CONTAINER_IMAGE/aur:$CONTAINER_TAG diff --git a/Mac-build/.DS_Store b/Mac-build/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..0f484756d5c2670a7487eced5a74585c42287ea9 Binary files /dev/null and b/Mac-build/.DS_Store differ diff --git a/Mac-build/EasyInstaller b/Mac-build/EasyInstaller new file mode 100644 index 0000000000000000000000000000000000000000..dbfbb56f2e03de5d31b4925e8c4f3905716f101a --- /dev/null +++ b/Mac-build/EasyInstaller @@ -0,0 +1,4 @@ +#!/bin/bash + +DIR="${0%/*}" +"$DIR/bin/java" -p "$DIR/../app" -m ecorp.easy.installer/ecorp.easy.installer.EasyInstaller "$@" diff --git a/Mac-build/mac_package.sh b/Mac-build/mac_package.sh new file mode 100755 index 0000000000000000000000000000000000000000..116dfbbb3afc39d572eb106e95e74eb044e66de1 --- /dev/null +++ b/Mac-build/mac_package.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +APPNAME=EasyInstaller +DIR="$APPNAME.app/Contents/MacOS" + +if [ -a "$APPNAME.app" ]; then + echo "$PWD/$APPNAME.app already exists :(" + exit 1 +fi + +mkdir -p "$DIR" +cp EasyInstaller "$DIR/$APPNAME" +chmod +x "$DIR/$APPNAME" + +cp -r ../build/image/easy-installer-mac/* "$DIR"