Page MenuHomePhabricator (Chris)
Files F118691

No OneTemporary
Actions

Authored By
Unknown
Size
5 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/.travis.yml b/.travis.yml
index 862e119..eebbb35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,49 +1,45 @@
language: cpp
git:
depth: 3
env:
global:
# BINTRAY_KEY
- secure: "WDcwmwVGvh2r07WLMf6dCNYCw+yY4j2huTEMjqPi1PmWWBwhzPogeUoaJRDIMW8JB6Iw9MOeGTuwbKkUQM0dQCYU/qdpIz4QkmqeKbi9d22wQhJYltcFGkA6vApKDXhnYhA2+8tiOOg5Q/2VCIAzb2pgcD/l92SwwJ0R2KvunWl0mOQIoL6bGb+1gpdekLLeLVL9XvXePthDY+9Pr1FMK0vO9iqzOEKzN4rMevkvvERcPFYV/zFH7ER8i8CT3TZPaLHDwCHWlrcv9e5iC/MIbZ+UKj+axFPEiFZudMWlhTN3oNPkJJCRzLSVYWnOMfOBhzoSBj3kQalznV6XeWoQWRQCZgWzUHVglXDcYfgyYelfXcVemNDEuscdiZXQgGLCVtDjTeug1a+IBgfCHPsUZC/MxDr/nX8TDLbWo/Xt38nIQLkWp+ZSG16kdK260QPP8PwAxrOo7oQDsZ1ySMZJQHDVoo/FLjOEuYswiQy5wnDPjtmgAllDtAKNvXfsBninu0K7jiMDC2Ff0B+hJFHnvYeQJ7QxRRaRhliAh0E/glmUv6rLD1L9ZgW7XlLvV0oMP8yOGTSjes7tsW7/NC0gDqED5KAdN614rDkm1peXeFFbmGGkB+5/UjmASexDEqRdOQdw51PKGn9D3FS12gA3vUEa5zi+6STNmUXs9vxjUfE="
matrix:
include:
- os: linux
- # try Ubuntu 14.04
- dist: trusty
+ # I have to update to Ubuntu 16.04
+ # since there is no Lua5.2 package for 14.04
+ dist: xenial
compiler: gcc
addons:
apt:
packages:
- libsdl2-dev
- libsdl2-image-dev
- - libsdl2-ttf-dev
- libsdl2-mixer-dev
+ - libfreetype6-dev
- libcurl4-openssl-dev
- libarchive-dev
- - liblua5.2-dev
+ - liblua5.3-dev
- desktop-file-utils
after_success:
- cd ..
- git show -s HEAD > nightly-build-version.txt
- wget -q https://github.com/AppImage/AppImages/raw/master/pkg2appimage -O ./pkg2appimage
- chmod a+x ./pkg2appimage
- export DOCKER_BUILD=1
- bash -ex ./pkg2appimage ./pkg2appimage.yml
- cd out
- |
for APPIMAGE in *.AppImage ; do
curl -T $APPIMAGE "-uacmepjz:$BINTRAY_KEY" "https://api.bintray.com/content/acmepjz/meandmyshadow/meandmyshadow/nightly-build/$APPIMAGE?publish=1&override=1"
done
- os: osx
compiler: clang
install:
- - brew install sdl2 sdl2_image sdl2_ttf sdl2_mixer libarchive
+ - brew install sdl2 sdl2_image sdl2_mixer freetype libarchive lua
- export PATH=/usr/local/opt/libarchive/bin:/usr/local/opt/libarchive/lib:/usr/local/opt/libarchive/include:$PATH
# libcurl (xcode builtin)
- # brew only has lua 5.1 and 5.3, so we need to compile it from source
- - export LUA52_VERSION=5.2.4
- - wget http://www.lua.org/ftp/lua-$LUA52_VERSION.tar.gz
- - tar zxf lua-$LUA52_VERSION.tar.gz
- - cd lua-$LUA52_VERSION && make macosx && sudo make install && cd ..
script:
- mkdir build && cd build && cmake .. && make
diff --git a/appveyor.yml b/appveyor.yml
index c5a4f0a..a093d56 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,68 +1,68 @@
version: 1.0.{build}
clone_depth: 3
shallow_clone: false
skip_commits:
message: /.*(\[skip appveyor\]|\[appveyor skip\]).*/
image:
- Visual Studio 2013
platform: Win32
configuration:
- Debug
- Release
install:
- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2013" set CMAKE_GENERATOR=Visual Studio 12 2013
- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" set CMAKE_GENERATOR=Visual Studio 14 2015
- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" set CMAKE_GENERATOR=Visual Studio 15 2017
- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2013" set VSVERSION=VS2013
- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" set VSVERSION=VS2015
- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" set VSVERSION=VS2017
# setup Visual Studio
- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2013" call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
# we just download our prebuilt 3rdparty dependencies
- set BINSUFFIX=%PLATFORM%-%VSVERSION%-%CONFIGURATION%
- - mkdir 3rdparty && cd 3rdparty
- - appveyor DownloadFile "https://github.com/acmepjz/meandmyshadow/releases/download/v0.5-devel002/3rdparty-%BINSUFFIX%.7z"
- - 7z x 3rdparty-%BINSUFFIX%.7z
- - cd ..
+ - appveyor DownloadFile "https://bintray.com/artifact/download/acmepjz/meandmyshadow/3rdparty-%BINSUFFIX%.7z"
+ - 7z x 3rdparty-%BINSUFFIX%.7z -o3rdparty
- set PATH=%APPVEYOR_BUILD_FOLDER%\3rdparty;%PATH%
artifacts:
- path: 'binonly-$(BINSUFFIX).7z'
- path: 'bin+data-$(BINSUFFIX).7z'
before_build:
# write nightly build version to a text file
- git show -s HEAD > nightly-build-version.txt
+ - d2u nightly-build-version.txt
+ - u2d nightly-build-version.txt
# generate makefile
- mkdir build && cd build
- cmake -G "%CMAKE_GENERATOR%" -D "LUA_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\3rdparty" ..
build:
project: build\meandmyshadow.sln
verbosity: normal
after_build:
- cd /d %APPVEYOR_BUILD_FOLDER%
# now we try to package the binary
- echo %APPVEYOR_BUILD_FOLDER%\3rdparty\*.dll > lst.txt
- echo %APPVEYOR_BUILD_FOLDER%\build\%CONFIGURATION%\*.exe >> lst.txt
- echo AUTHORS >> lst.txt
- echo ChangeLog >> lst.txt
- echo COPYING >> lst.txt
- echo README.md >> lst.txt
- echo nightly-build-version.txt >> lst.txt
- 7z a -t7z -mx=9 "binonly-%BINSUFFIX%.7z" @lst.txt
# this is with data
- echo data\ >> lst.txt
- echo docs\ >> lst.txt
- 7z a -t7z -mx=9 "bin+data-%BINSUFFIX%.7z" @lst.txt
deploy:
- provider: BinTray
username: acmepjz
api_key:
secure: 5v4Sk+26IeEJHHhwoVW+lXi133R8OVB4kSqcmgOUUf2G1xEDEm1t7dlhe6N/I/AD
subject: acmepjz
repo: meandmyshadow
package: meandmyshadow
version: nightly-build
publish: true
override: true
explode: false

File Metadata

Mime Type
text/x-diff
Expires
Sat, May 16, 7:16 PM (1 d, 11 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
63173
Default Alt Text
(5 KB)

Event Timeline