diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder index 0e04e6d2..6007b8d1 100755 --- a/bin/kaleidoscope-builder +++ b/bin/kaleidoscope-builder @@ -131,9 +131,8 @@ firmware_size () { find_sketch () { SKETCH="${SKETCH:-${DEFAULT_SKETCH}}" - LIBRARY="${LIBRARY:-${SKETCH}}" - if [ -z "${SKETCH}" ] || [ -z "${LIBRARY}" ] || [ -z "${ROOT}" ] || [ -z "${SOURCEDIR}" ]; then - echo "SKETCH, LIBRARY, SOURCEDIR, and ROOT need to be set before including this file!" >&2 + if [ -z "${SKETCH}" ] || [ -z "${ROOT}" ] || [ -z "${SOURCEDIR}" ]; then + echo "SKETCH, SOURCEDIR, and ROOT need to be set before including this file!" >&2 exit 1 fi @@ -141,7 +140,6 @@ find_sketch () { SKETCH_FILE=$(basename "$SKETCH") for path in "${SKETCH_DIR}" \ - "examples/${LIBRARY}" \ "src" \ "."; do if [ -f "${path}/${SKETCH_FILE}.ino" ]; then @@ -473,7 +471,6 @@ build_all () { for plugin in ${plugins}; do export SKETCH="${plugin}" - export LIBRARY="${plugin}" $0 "${plugin}" build done } @@ -484,7 +481,6 @@ compile_all () { for plugin in ${plugins}; do export SKETCH="${plugin}" - export LIBRARY="${plugin}" $0 "${plugin}" compile done } @@ -723,10 +719,7 @@ for i in $(seq 1 $#); do shift done -LIBRARY="${SKETCH}" - export SKETCH -export LIBRARY for cmd in ${cmds}; do ${cmd} diff --git a/etc/kaleidoscope-builder.conf b/etc/kaleidoscope-builder.conf index 68a2090a..408f035c 100644 --- a/etc/kaleidoscope-builder.conf +++ b/etc/kaleidoscope-builder.conf @@ -1,10 +1,9 @@ # -*- shell-script -*- -## NEEDS: LIBRARY, SKETCH, ROOT, SOURCEDIR +## NEEDS: SKETCH, ROOT, SOURCEDIR ## Should be included when the current directory is the dir of the Sketch. SKETCH="${SKETCH:-${DEFAULT_SKETCH}}" -LIBRARY="${LIBRARY:-${SKETCH}}" ######## ######## Keyboard hardware definitions