Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

reverted steam related structure to the previous state, travis' configuration test

This commit is contained in:
filux 2017-01-21 02:40:15 +01:00
parent e8e58b6988
commit a2f21f3a28
7 changed files with 15 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -57,7 +57,8 @@ before_install:
script:
# ALL THE BUILD COMMANDS HERE
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then mk/linux/build-mg.sh -c 4; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CC" != "clang" ]; then mk/linux/build-mg.sh -c 4; else mk/linux/build-mg.sh -w -c 4; fi
# ^ -w may be removed on more modern dist: than trusty, problems related with 'new wx+clang+old gcc'
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then mk/macos/build-mg.sh -c 4; fi
# https://docs.travis-ci.com/user/notifications/#IRC-notification

3
mk/steamworks_sdk/sdk/tools/ContentBuilder/content/.gitignore vendored
View File

@ -1,3 +0,0 @@
/base_content/
/linux_x64/
/linux_x86/

4
mk/steamworks_sdk/sdk/tools/ContentBuilder/content/base_content/.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore

4
mk/steamworks_sdk/sdk/tools/ContentBuilder/content/linux_x64/.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore

1
mk/steamworks_sdk/sdk/tools/ContentBuilder/content/linux_x64/bin Symbolic link
View File

@ -0,0 +1 @@
lib/

4
mk/steamworks_sdk/sdk/tools/ContentBuilder/content/linux_x64/lib/.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore

50
mk/steamworks_sdk/sdk/tools/ContentBuilder/prepare_files_for_linux.sh
View File

@ -1,50 +0,0 @@
#!/bin/bash
# Use this script to prepare MegaGlest files for linux on steam
# ----------------------------------------------------------------------------
# Written by filux <heross(@@)o2.pl>
# Copyright (c) 2017 under GNU GPL v3.0+
CURRENTDIR="$(dirname "$(readlink -f "$0")")"
cd "$CURRENTDIR"
megaglest_linux_path="$CURRENTDIR/../../../../linux"
BINARY_DIR="$("$megaglest_linux_path/make-binary-archive.sh" --show-result-path2)"
DATA_DIR="$("$megaglest_linux_path/make-data-archive.sh" --show-result-path2)"
VERSION="$("$megaglest_linux_path/mg-version.sh" --version)"
kernel="$(uname -s | tr '[A-Z]' '[a-z]')"
architecture="$(uname -m | tr '[A-Z]' '[a-z]')"
# Grab the version
echo "Linux project root path [$megaglest_linux_path]"
echo "About to prepare files for steam and for $VERSION"
# Stop if anything produces an error.
set -ex
cd "$CURRENTDIR"
INSTALLDATADIR="content/base_content"
rm -rf "$INSTALLDATADIR"; sleep 0.1s; mkdir "$INSTALLDATADIR"
if [ "$architecture" = "x86_64" ]; then INSTALLBINDIR="content/linux_x64/"
else INSTALLBINDIR="content/linux_x86/"; fi
rm -rf "$INSTALLBINDIR"; sleep 0.1s; mkdir "$INSTALLBINDIR"
echo "Copying MegaGlest binary files..."
"$megaglest_linux_path/make-binary-archive.sh" --installer
cd "$BINARY_DIR"
cp -r * "$CURRENTDIR/$INSTALLBINDIR"
# create symlink from "lib" to "bin" where steam is able to find libs on the very end of its searching
cd "$CURRENTDIR/$INSTALLBINDIR"
ln -s "lib" "bin"
if [ "$1" != "--binary-only" ]; then
echo "Copying MegaGlest data files..."
"$megaglest_linux_path/make-data-archive.sh" --installer
cd "$DATA_DIR"
cp -r * "$CURRENTDIR/$INSTALLDATADIR"
fi
cd "$CURRENTDIR"
set +ex
echo "Successfully prepared files!"
exit 0