From 800ec55dfca06b4630acf62cbb5f130c4031e4f1 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Sat, 14 Oct 2017 11:32:19 -1000 Subject: Make arguments redo, subproject elimination (#1784) * redo make args to use colons, better folder structuring system [skip ci] * don't put spaces after statements - hard lessons in makefile development * fix-up some other rules.mk * give travis a chance * reset KEYMAPS variable * start converting keyboards to new system * try making all with travis * redo make args to use colons, better folder structuring system [skip ci] * don't put spaces after statements - hard lessons in makefile development * fix-up some other rules.mk * give travis a chance * reset KEYMAPS variable * start converting keyboards to new system * try making all with travis * start to update readmes and keyboards * look in keyboard directories for board.mk * update visualizer rules * fix up some other keyboards/keymaps * fix arm board ld includes * fix board rules * fix up remaining keyboards * reset layout variable * reset keyboard_layouts * fix remainging keymaps/boards * update readmes, docs * add note to makefile error * update readmes * remove planck keymap warnings * update references and docs * test out tarvis build stages * don't use stages for now * don't use stages for now --- util/travis_build.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'util') diff --git a/util/travis_build.sh b/util/travis_build.sh index 3243447ab..87a543370 100644 --- a/util/travis_build.sh +++ b/util/travis_build.sh @@ -9,21 +9,24 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then BRANCH=$(git rev-parse --abbrev-ref HEAD) if [ $NEFM -gt 0 -o "$BRANCH" = "master" ]; then echo "Making all keymaps for all keyboards" - make all-keyboards AUTOGEN="true" + make all:all AUTOGEN="true" : $((exit_code = $exit_code + $?)) else - MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z0-9_]+)(?=\/)' | sort -u) + MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z0-9_\/]+)(?=\/)' | sort -u) for KB in $MKB ; do + if [[ $KB == *keymaps* ]]; then + continue + fi KEYMAP_ONLY=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/'${KB}'/keymaps/)' | wc -l) if [[ $KEYMAP_ONLY -gt 0 ]]; then echo "Making all keymaps for $KB" - make ${KB}-allsp-allkm AUTOGEN=true + make ${KB}:all AUTOGEN=true : $((exit_code = $exit_code + $?)) else MKM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards/'${KB}'/keymaps/)([a-zA-Z0-9_]+)(?=\/)' | sort -u) for KM in $MKM ; do echo "Making $KM for $KB" - make ${KB}-allsp-${KM} AUTOGEN=true + make ${KB}:${KM} AUTOGEN=true : $((exit_code = $exit_code + $?)) done fi -- cgit v1.2.3-24-g4f1b