From a2f21f3a282eeeb87704540d674a5be1ee0da532 Mon Sep 17 00:00:00 2001 From: filux Date: Sat, 21 Jan 2017 02:40:15 +0100 Subject: [PATCH] reverted steam related structure to the previous state, travis' configuration test --- .travis.yml | 3 +- .../tools/ContentBuilder/content/.gitignore | 3 -- .../content/base_content/.gitignore | 4 ++ .../content/linux_x64/.gitignore | 4 ++ .../ContentBuilder/content/linux_x64/bin | 1 + .../content/linux_x64/lib/.gitignore | 4 ++ .../ContentBuilder/prepare_files_for_linux.sh | 50 ------------------- 7 files changed, 15 insertions(+), 54 deletions(-) delete mode 100644 mk/steamworks_sdk/sdk/tools/ContentBuilder/content/.gitignore create mode 100644 mk/steamworks_sdk/sdk/tools/ContentBuilder/content/base_content/.gitignore create mode 100644 mk/steamworks_sdk/sdk/tools/ContentBuilder/content/linux_x64/.gitignore create mode 120000 mk/steamworks_sdk/sdk/tools/ContentBuilder/content/linux_x64/bin create mode 100644 mk/steamworks_sdk/sdk/tools/ContentBuilder/content/linux_x64/lib/.gitignore delete mode 100755 mk/steamworks_sdk/sdk/tools/ContentBuilder/prepare_files_for_linux.sh diff --git a/.travis.yml b/.travis.yml index 315e67a81..bee932f40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/mk/steamworks_sdk/sdk/tools/ContentBuilder/content/.gitignore b/mk/steamworks_sdk/sdk/tools/ContentBuilder/content/.gitignore deleted file mode 100644 index 948ed0944..000000000 --- a/mk/steamworks_sdk/sdk/tools/ContentBuilder/content/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/base_content/ -/linux_x64/ -/linux_x86/ diff --git a/mk/steamworks_sdk/sdk/tools/ContentBuilder/content/base_content/.gitignore b/mk/steamworks_sdk/sdk/tools/ContentBuilder/content/base_content/.gitignore new file mode 100644 index 000000000..5e7d2734c --- /dev/null +++ b/mk/steamworks_sdk/sdk/tools/ContentBuilder/content/base_content/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore diff --git a/mk/steamworks_sdk/sdk/tools/ContentBuilder/content/linux_x64/.gitignore b/mk/steamworks_sdk/sdk/tools/ContentBuilder/content/linux_x64/.gitignore new file mode 100644 index 000000000..5e7d2734c --- /dev/null +++ b/mk/steamworks_sdk/sdk/tools/ContentBuilder/content/linux_x64/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore diff --git a/mk/steamworks_sdk/sdk/tools/ContentBuilder/content/linux_x64/bin b/mk/steamworks_sdk/sdk/tools/ContentBuilder/content/linux_x64/bin new file mode 120000 index 000000000..f1ff06d60 --- /dev/null +++ b/mk/steamworks_sdk/sdk/tools/ContentBuilder/content/linux_x64/bin @@ -0,0 +1 @@ +lib/ \ No newline at end of file diff --git a/mk/steamworks_sdk/sdk/tools/ContentBuilder/content/linux_x64/lib/.gitignore b/mk/steamworks_sdk/sdk/tools/ContentBuilder/content/linux_x64/lib/.gitignore new file mode 100644 index 000000000..5e7d2734c --- /dev/null +++ b/mk/steamworks_sdk/sdk/tools/ContentBuilder/content/linux_x64/lib/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore diff --git a/mk/steamworks_sdk/sdk/tools/ContentBuilder/prepare_files_for_linux.sh b/mk/steamworks_sdk/sdk/tools/ContentBuilder/prepare_files_for_linux.sh deleted file mode 100755 index f2724df2a..000000000 --- a/mk/steamworks_sdk/sdk/tools/ContentBuilder/prepare_files_for_linux.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -# Use this script to prepare MegaGlest files for linux on steam -# ---------------------------------------------------------------------------- -# Written by filux -# 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