Commit 1440619b authored by Manuel Moos's avatar Manuel Moos
Browse files

Merge from 0.2.8.3

parents a6a469ae 63b89367
Pipeline #454390022 passed with stages
in 21 minutes and 48 seconds
......@@ -104,3 +104,16 @@ src/.project
src/.settings
autogen.sh
.vscode
*.o
*.a
*.dmg
*.tar.gz
*.zip
src/macosx/build_bundle.sh
desktop/armagetronad.desktop
docker/build/setup_ci_test.sh
docker/build/context/version.sh
docker/deploy/targets.sh
src/nTrueVersion.h
.changetag
fingerprint
......@@ -422,6 +422,18 @@ post_test:
script:
- make -C gitlab_build/docker/build appimagetests_ci || exit $?
# post-build tests that require our own runners (or a docker upgrade on GitLab)
post_test_extra:
stage: build_collect
rules:
- if: $CI_MERGE_REQUEST_ID
when: never
- if: $CI_COMMIT_REF_PROTECTED == "true"
when: on_success
- when: never
script:
- make -C gitlab_build/docker/build appimagetests_extra || exit $?
# pack up the downloadable build files in one handy artifact
pack:
stage: stage
......
......@@ -525,8 +525,6 @@ appimagetests: appimagetests.tag
appimagetests_ci.tag: \
test.appimage_client_64_ubuntu_latest \
test.appimage_client_64_ubuntu_oldest_skewed \
test.appimage_server_64_ubuntu_rolling \
test.appimage_client_64_ubuntu_rolling \
test.appimage_client_64_fedora_latest \
test.appimage_server_64_centos_oldest \
test.appimage_client_64_centos_oldest \
......@@ -537,6 +535,14 @@ appimagetests_ci.tag: \
appimagetests_ci: appimagetests_ci.tag
appimagetests_extra.tag: \
test.appimage_server_64_ubuntu_rolling \
test.appimage_client_64_ubuntu_rolling \
upload/.tag
echo > $@
appimagetests_extra: appimagetests_extra.tag
#***************************************************************
# windows source
......
......@@ -12,21 +12,19 @@ rm -rf "${BUNDLE}"
mkdir -p "${BUNDLE}" || exit $?
# add plist with @v@ -> value and progtitle replacements
REL_SRCDIR=`echo @srcdir@ | sed -e s,^@top_builddir@/,,` || exit $?
sed < "${REL_SRCDIR}/Info.plist" > "${BUNDLE}/Info.plist" \
sed < "@abs_srcdir@/Info.plist" > "${BUNDLE}/Info.plist" \
-e "s,Armagetron Advanced,${TITLE},g" \
-e "s,usr/bin/armagetronad,./@prefix@/bin/@progname@,g" \
|| exit $?
mkdir -p "${BUNDLE}/English.lproj" || exit $?
sed < "${REL_SRCDIR}/English.lproj/InfoPlist.strings.in" > "${BUNDLE}/English.lproj/InfoPlist.strings" \
sed < "@abs_srcdir@/English.lproj/InfoPlist.strings.in" > "${BUNDLE}/English.lproj/InfoPlist.strings" \
-e "s,Armagetron Advanced,${TITLE},g" \
-e "s,@vers[i]on@,@version@,g" \
-e "s,@year@,`date +%Y`,g" \
|| exit $?
# add icons
REL_TOP_SRCDIR=`echo @top_srcdir@ | sed -e s,^@top_builddir@/,,` || exit $?
cp "${REL_TOP_SRCDIR}/MacOS/Armagetron Advanced.icns" "${BUNDLE}/${TITLE}.icns"
cp "@abs_top_srcdir@/MacOS/Armagetron Advanced.icns" "${BUNDLE}/${TITLE}.icns"
# install game into bundle
DESTDIR="${BUNDLE}" make install || exit $?
......@@ -50,8 +48,8 @@ DESTDIR="${BUNDLE}" make install || exit $?
DMG_SRC=${BUNDLE}
DMG="${DIR}/@progname@-@version@.dmg"
rm -f "${DMG}"
ICON="${REL_TOP_SRCDIR}/MacOS/Armagetron Advanced.icns"
BG="${REL_TOP_SRCDIR}/MacOS/background.png"
ICON="@abs_top_srcdir@/MacOS/Armagetron Advanced.icns"
BG="@abs_top_srcdir@/MacOS/background.png"
create-dmg \
--volicon "$ICON" \
--app-drop-link 470 180 --window-pos 200 112 --window-size 650 330 \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment