-
Notifications
You must be signed in to change notification settings - Fork 150
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #84 from tkashkin/master
Merge master -> dev
- Loading branch information
Showing
20 changed files
with
324 additions
and
107 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,19 @@ | ||
| #!/bin/sh | ||
| #!/bin/bash | ||
|
|
||
| export LD_LIBRARY_PATH="${APPDIR}/usr/lib:${LD_LIBRARY_PATH}" | ||
| export PATH="${APPDIR}/usr/bin:${PATH}" | ||
| export XDG_DATA_DIRS="${APPDIR}/usr/share:${XDG_DATA_DIRS}" | ||
| echo "[AppRun ] GameHub AppImage" | ||
| echo "[AppRun ] AppDir: $APPDIR" | ||
|
|
||
| export GSETTINGS_SCHEMA_DIR="${APPDIR}/usr/share/glib-2.0/schemas/:${GSETTINGS_SCHEMA_DIR}" | ||
| export GTK_PATH="${APPDIR}/usr/lib/gtk-3.0" | ||
| export GTK_DATA_PREFIX="${APPDIR}/usr/" | ||
| #export GTK_THEME="Adwaita" | ||
| export LD_LIBRARY_PATH="$APPDIR/usr/lib:$LD_LIBRARY_PATH" | ||
| export PATH="$APPDIR/usr/bin:$PATH" | ||
| export XDG_DATA_DIRS="$APPDIR/usr/share:$XDG_DATA_DIRS" | ||
|
|
||
| "${APPDIR}/usr/bin/com.github.tkashkin.gamehub" "$@" | ||
| export GSETTINGS_SCHEMA_DIR="$APPDIR/usr/share/glib-2.0/schemas/:$GSETTINGS_SCHEMA_DIR" | ||
|
|
||
| export LD_LIBRARY_PATH="$APPDIR/usr/lib/x86_64-linux-gnu/webkit2gtk-4.0:$LD_LIBRARY_PATH" | ||
|
|
||
| [ -e "$APPDIR/checkrt.sh" ] && . "$APPDIR/checkrt.sh" || echo "[AppRun] Skipping CheckRT" | ||
|
|
||
| echo "[AppRun ] Starting GameHub" | ||
|
|
||
| cd "$APPDIR/usr" | ||
| "$APPDIR/usr/bin/com.github.tkashkin.gamehub" "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| #!/bin/bash | ||
|
|
||
| _CRT_LIB_PATH="" | ||
|
|
||
| echo "[CheckRT] Checking library versions" | ||
|
|
||
| _CRT_LIBS=( | ||
| 'libstdc++.so.6':'^GLIBCXX_[0-9]\.[0-9]' | ||
| 'libgcc_s.so.1':'^GCC_[0-9]\.[0-9]' | ||
| ) | ||
|
|
||
| _CRT_LIBS_PREFER_SYSTEM=( | ||
| 'libgtk-3.so.0':'^gtk_scrolled_window_set_propagate_natural_width' # GTK 3.22+ | ||
| ) | ||
|
|
||
| for lib in ${_CRT_LIBS[@]}; do | ||
| lib_filename=$(echo "$lib" | cut -d: -f1) | ||
| version_prefix=$(echo "$lib" | cut -d: -f2) | ||
| lib_dir="$APPDIR/usr/optlib/$lib_filename" | ||
| lib_path="$lib_dir/$lib_filename" | ||
| if [ -e "$lib_path" ]; then | ||
| lib=$(PATH="/sbin:$PATH" ldconfig -p | grep "$lib_filename" | awk 'NR==1 {print $NF}') | ||
| sym_sys=$(tr '\0' '\n' < "$lib" | grep -e "$version_prefix" | tail -n1) | ||
| sym_app=$(tr '\0' '\n' < "$lib_path" | grep -e "$version_prefix" | tail -n1) | ||
| echo "[CheckRT] $lib_filename: sys: $sym_sys; app: $sym_app" | ||
| if [ z$(printf "$sym_sys\n$sym_app" | sort -V | tail -1) != z"$sym_sys" ]; then | ||
| _CRT_LIB_PATH="$lib_dir:$_CRT_LIB_PATH" | ||
| fi | ||
| fi | ||
| done | ||
|
|
||
| for lib in ${_CRT_LIBS_PREFER_SYSTEM[@]}; do | ||
| lib_filename=$(echo "$lib" | cut -d: -f1) | ||
| version_prefix=$(echo "$lib" | cut -d: -f2) | ||
| lib_dir="$APPDIR/usr/optlib/$lib_filename" | ||
| lib_path="$lib_dir/$lib_filename" | ||
| if [ -e "$lib_path" ]; then | ||
| lib=$(PATH="/sbin:$PATH" ldconfig -p | grep "$lib_filename" | awk 'NR==1 {print $NF}') | ||
| sym_sys=$(tr '\0' '\n' < "$lib" | grep -e "$version_prefix" | tail -n1) | ||
| if [ -z "$sym_sys" ]; then | ||
| _CRT_LIB_PATH="$lib_dir:$_CRT_LIB_PATH" | ||
| else | ||
| echo "[CheckRT] Using system version of $lib_filename" | ||
| fi | ||
| fi | ||
| done | ||
|
|
||
| export LD_LIBRARY_PATH="$_CRT_LIB_PATH:$LD_LIBRARY_PATH" | ||
|
|
||
| if [ -e "$APPDIR/usr/optlib/exec.so" ]; then | ||
| export LD_PRELOAD="$APPDIR/usr/optlib/exec.so:$LD_PRELOAD" | ||
| fi | ||
|
|
||
| echo "[CheckRT] LD_LIBRARY_PATH: $LD_LIBRARY_PATH" | ||
| echo "[CheckRT] LD_PRELOAD: $LD_PRELOAD" |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,50 @@ | ||
| version: 0.11.1-{build}-{branch} | ||
|
|
||
| pull_requests: | ||
| do_not_increment_build_number: true | ||
|
|
||
| skip_tags: true | ||
|
|
||
| branches: | ||
| except: | ||
| - flatpak | ||
|
|
||
| image: | ||
| - Ubuntu1804 | ||
| - Ubuntu1604 | ||
|
|
||
| clone_folder: ~/GameHub | ||
| clone_folder: ~/build/GameHub | ||
| clone_depth: 1 | ||
|
|
||
| build_script: | ||
| - sh: dpkg-buildpackage -b -us -uc | ||
| - sh: bash appimage/build.sh build && bash appimage/build.sh appimage | ||
| - sh: bash appimage/build.sh build_deb | ||
| - sh: bash appimage/build.sh build | ||
| - sh: bash appimage/build.sh appimage | ||
| - sh: bash appimage/build.sh appimage_tweak | ||
| - sh: bash appimage/build.sh appimage_bundle_libs | ||
| - sh: bash appimage/build.sh appimage_checkrt | ||
| - sh: bash appimage/build.sh appimage_pack | ||
|
|
||
| install: | ||
| - sh: bash appimage/build.sh deps | ||
|
|
||
| test: off | ||
|
|
||
| artifacts: | ||
| - path: ~/com.github.tkashkin.gamehub*.deb | ||
| - path: build/*/*.deb | ||
| name: deb | ||
| - path: ~/com.github.tkashkin.gamehub*.ddeb | ||
| name: deb-dbgsym | ||
| - path: build/appimage/GameHub*.AppImage* | ||
| name: AppImage | ||
|
|
||
| deploy: | ||
| - provider: GitHub | ||
| description: | | ||
| CI build | ||
| * Use `bionic` packages for recent distros (>= Ubuntu 18.04) | ||
| * Use `xenial` packages for older distros (>= Ubuntu 16.04) | ||
| auth_token: | ||
| secure: J2LCcNeVYvzbvHRa/LChp+SmN6UKbg1ELsA4jmxnObCbX+ZyZ9DFH+S2aQIoA3dG | ||
| artifact: deb,AppImage | ||
| draft: false | ||
| prerelease: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.