From cc58ed129f68c01fa382496d29ddab1ac4e3f616 Mon Sep 17 00:00:00 2001 From: waltje Date: Wed, 25 Apr 2018 21:00:09 -0400 Subject: [PATCH] Fixed some Travis issues and other files. --- .travis-build.sh | 16 ++++++++++++---- .travis.yml | 5 +++-- BUILDING.md | 13 ++++++++++--- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/.travis-build.sh b/.travis-build.sh index 5938e78..ef718b5 100644 --- a/.travis-build.sh +++ b/.travis-build.sh @@ -9,7 +9,7 @@ # # Build script for the Travis CI remote builder service. # -# Version: @(#).travis-build.sh 1.0.2 2018/04/17 +# Version: @(#).travis-build.sh 1.0.3 2018/04/25 # # Author: Fred N. van Kempen, # @@ -62,11 +62,19 @@ # Build the project. make -f win/mingw/Makefile.MinGW BUILD=${TRAVIS_BUILD_NUMBER} + if [ $? = 1 ]; then + echo "Build failed, not uploading." - if [ $? = 0 ]; then - echo "Build #${TRAVIS_BUILD_NUMBER} OK, packing up." + exit 1 + fi - zip -9 ../${TARGET}.zip *.exe + echo "Build #${TRAVIS_BUILD_NUMBER} OK, packing up." + + zip -9 ../${TARGET}.zip *.exe + if [ $? = 1 ]; then + echo "ZIP failed, not uploading." + + exit 1 fi exit 0 diff --git a/.travis.yml b/.travis.yml index ecd6687..7486c91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ # # Project file for the Travis CI remote builder service. # -# Version: @(#).travis.yml 1.0.8 2018/04/17 +# Version: @(#).travis.yml 1.0.9 2018/04/25 # # Authors: Natalia Portillo, # Fred N. van Kempen, @@ -79,8 +79,9 @@ notifications: irc: channels: - "chat.freenode.net#varcem-dev" + - "chat.freenode.net#varcem" template: - - "Commit %{commit} by %{author} in %{branch} %{result} after %{duration}." + - "Build #%{build_number} for #%{commit} by %{author} in %{branch} %{result}." - "Commit changes: %{commit_subject}" - "Build details on %{build_url}" # - "Details on %{build_url}, changes on %{compare_url}" diff --git a/BUILDING.md b/BUILDING.md index b657958..e77c0a5 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -3,7 +3,7 @@ #### Fred N. van Kempen, -#### Last Updated: 03/26/2018 +#### Last Updated: 04/18/2018 These instructions guide you in building the **VARCem** emulator from @@ -17,7 +17,7 @@ platforms will be added as time permits. #### Get the sources. Get a copy of the source tree (by cloning the GIT repository, or by downloading a ZIP archive from GIT, or from the website) and -unpack (if needed) them into a folder: +unpack them (if needed) into a folder: `D:` @@ -27,7 +27,7 @@ unpack (if needed) them into a folder: `cd src` - `unzip varcem-0.1.3.zip` + `unzip varcem-0.1.5.zip` which puts the source tree into the *D:\VARCem\src* folder. @@ -121,3 +121,10 @@ With these steps, you have set up a build environment, suitable to build (and develop !) the VARCem project application(s) for Windows. +There is also a **Makefile.local** file, which you can use as a base for +yourself. Copy it to just **Makefile**, and use your favorite text editor +to update the settings the way you want them. You can now just type + + `make` + +and it should build.