diff --git a/.travis.yml b/.travis.yml index 792d21e4a..dadc67cf9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ install: - sudo apt-get install python-virtualenv lua5.1 -y - sudo add-apt-repository -y ppa:bartbes/love-stable - sudo apt-get update -y - - sudo apt-get install -y love + - sudo apt-get install -y love=0.10.2 - mkdir -p $TRAVIS_BUILD_DIR/share/love/ env: global: diff --git a/Makefile b/Makefile index 7f939eb73..37ccbaedd 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,10 @@ UNAME := $(shell uname) ifeq ($(UNAME), Darwin) - TMXTAR = tmx2lua.osx.tar + OPTION = osx/tmx2lua LOVE = bin/love.app/Contents/MacOS/love else - TMXTAR = tmx2lua.linux.tar + OPTION = linux/tmx2lua LOVE = /usr/bin/love endif @@ -35,23 +35,26 @@ src/maps/%.lua: src/maps/%.tmx bin/tmx2lua bin/tmx2lua: mkdir -p bin - $(wget) http://hawkthorne.github.com/tmx2lua/downloads/$(TMXTAR) - tar -xvf $(TMXTAR) - rm -f $(TMXTAR) - mv tmx2lua bin + $(wget) https://github.com/hawkthorne/tmx2lua/archive/master.zip + unzip master.zip + rm -rf master.zip + make -C tmx2lua-master install + make -C tmx2lua-master + mv tmx2lua-master/$(OPTION) bin + rm -rf tmx2lua-master bin/love.app/Contents/MacOS/love: mkdir -p bin - $(wget) https://bitbucket.org/rude/love/downloads/love-0.10.1-macosx-x64.zip - unzip -q love-0.10.1-macosx-x64.zip - rm -f love-0.10.1-macosx-x64.zip + $(wget) https://github.com/love2d/love/releases/download/0.10.2/love-0.10.2-macosx-x64.zip + unzip -q love-0.10.2-macosx-x64.zip + rm -f love-0.10.2-macosx-x64.zip mv love.app bin cp osx/Info.plist bin/love.app/Contents /usr/bin/love: sudo add-apt-repository -y ppa:bartbes/love-stable sudo apt-get update -y -f - sudo apt-get install -y love + sudo apt-get install -y love=0.10.2 ###################################################### # THE REST OF THESE TARGETS ARE FOR RELEASE AUTOMATION @@ -73,10 +76,10 @@ src/positions/%.lua: psds/positions/%.png overlay2lua src/positions/config.json $< win32/love.exe: - $(wget) https://bitbucket.org/rude/love/downloads/love-0.10.1-win32.zip - unzip -q love-0.10.1-win32.zip - mv love-0.10.1-win32 win32 - rm -f love-0.10.1-win32.zip + $(wget) https://github.com/love2d/love/releases/download/0.10.2/love-0.10.2-win32.zip + unzip -q love-0.10.2-win32.zip + mv love-0.10.2-win32 win32 + rm -f love-0.10.2-win32.zip rm win32/changes.txt win32/game.ico win32/license.txt win32/love.ico win32/readme.txt win32/hawkthorne.exe: build/hawkthorne.love win32/love.exe diff --git a/make.ps1 b/make.ps1 index c347c6b33..b843db6a4 100644 --- a/make.ps1 +++ b/make.ps1 @@ -16,8 +16,8 @@ if($check -eq $false){ } $webclient = New-Object System.Net.WebClient -$lovedir = "bin\love-0.10.1-win32\" -$check = Test-Path "bin\love-0.10.1-win32\love.exe" +$lovedir = "bin\love-0.10.2-win32\" +$check = Test-Path "bin\love-0.10.2-win32\love.exe" #add love to the path if necessary $foundlove = $env:Path.Contains($lovedir) @@ -27,13 +27,13 @@ if($foundlove -eq $false){ if($check -eq $false){ - $filename = (Get-Location).Path + "\bin\love-0.10.1-win32.zip" + $filename = (Get-Location).Path + "\bin\love-0.10.2-win32.zip" $check = Test-Path $filename if($check -eq $false){ Write-Host "Downloading love2d..." - $url = "https://bitbucket.org/rude/love/downloads/love-0.10.1-win32.zip" + $url = "https://github.com/love2d/love/releases/download/0.10.2/love-0.10.2-win32.zip" $webclient.DownloadFile($url,$filename) } @@ -83,11 +83,11 @@ foreach($fileName in $fileEntries) if($args[0] -eq "run"){ Write-Host "Running Journey to the Center of Hawkthorne..." if($args.Length -ne 1){ - .\bin\love-0.10.1-win32\love.exe src $args[1..($args.Length-1)] + .\bin\love-0.10.2-win32\love.exe src $args[1..($args.Length-1)] }else{ - .\bin\love-0.10.1-win32\love.exe src + .\bin\love-0.10.2-win32\love.exe src } }elseif($args[0] -eq "test"){ Write-Host "Testing Journey to the Center of Hawkthorne..." - .\bin\love-0.10.1-win32\love.exe src --test --console + .\bin\love-0.10.2-win32\love.exe src --test --console } diff --git a/src/conf.lua b/src/conf.lua index 283cff3a0..a92113a29 100644 --- a/src/conf.lua +++ b/src/conf.lua @@ -2,7 +2,7 @@ function love.conf(t) t.title = "Journey to the Center of Hawkthorne v0.0.0" t.url = "http://projecthawkthorne.com" t.author = "https://github.com/hawkthorne?tab=members" - t.version = "0.10.0" + t.version = "0.10.2" t.identity = "hawkthorne" t.window.width = 1056 t.window.height = 672 diff --git a/templates/conf.lua b/templates/conf.lua index b2f33b421..76882c1f7 100644 --- a/templates/conf.lua +++ b/templates/conf.lua @@ -2,7 +2,7 @@ function love.conf(t) t.title = "Journey to the Center of Hawkthorne v{{ version }}" t.url = "http://projecthawkthorne.com" t.author = "https://github.com/hawkthorne?tab=members" - t.version = "0.10.0" + t.version = "0.10.2" t.identity = "hawkthorne_release" t.window.width = 1056 t.window.height = 672