Removing all symlinks to simplify Windows builds

- Symlinks just end up hurting in the end
- Also moved non-ic keyboard build scripts to Others
- Removed MD1, MD1.1 and MDErgo1 as those links haven't been used in a
long time

Author: haata

.travis.yml

@@ -21,7 +21,9 @@ env:
   # Keyboard Tests
   - DIR=Keyboards SCRIPT=ic_keyboards.bash # Input Club Keyboards
   - DIR=Keyboards SCRIPT=ic_keyboards.bash EnableHostOnlyBuild=true HostTest=kll.py # Input Club Keyboards - Host-Side Build
-  - DIR=Keyboards SCRIPT=others.bash
+
+  # Misc Keyboard Tests
+  - DIR=Keyboards/Others SCRIPT=others.bash
 
   # Debug Build Tests
   - DIR=Keyboards/Testing SCRIPT=all_tests.bash

Dockerfiles/Dockerfile

@@ -0,0 +1,35 @@
+FROM ubuntu:bionic
+
+RUN apt-get update && \
+    apt-get install -qy locales
+
+RUN echo "LANG=en_US.UTF-8" > /etc/locale.conf
+RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
+ENV LANG en_US.UTF-8
+ENV LC_ALL en_US.UTF-8
+ENV LANGUAGE en_US:en
+RUN locale-gen
+
+RUN apt-get install -qy git cmake ctags tmux libusb-1.0-0-dev binutils-arm-none-eabi lsb-core \
+    gcc-arm-none-eabi libnewlib-arm-none-eabi dfu-util python3 python3-pil git ninja-build python3-pip && \
+    rm -rf /var/lib/apt/lists/* && \
+    pip3 install pipenv kll
+
+VOLUME /controller
+WORKDIR /controller/Keyboards
+CMD /bin/bash
+
+# 1. Build the image after the initial cloning of this repo
+# docker build -t controller .. # notice the dots at the end
+# cd ..
+
+# 2. Run the image from within the repository root
+# docker run -it --rm -v "$(pwd):/controller" controller
+
+# 3. Build the firmware
+# ./ergodox.bash
+
+# 4. Exit the container and load the firmware
+#   a. exit
+#   b. cd ./Keyboards/ICED-L.gcc/
+#   c. ./load

Dockerfiles/Dockerfile.ubuntu

@@ -50,13 +50,13 @@ To generate the environment, only need to do this once, or whenever you update t
 
 ```bash
 cd controller/Dockerfiles
-docker build -t controller .
+docker build -f Dockerfile.ubuntu -t controller.ubuntu .
 cd ..
 ```
 
 To enter the build environment.
 ```bash
-docker run -it --rm -v "$(pwd):/controller" controller
+docker run -it --rm -v "$(pwd):/controller" controller.ubuntu
 ```
 
 To exit the docker environment.

Dockerfiles/Dockerfile.ubuntu

@@ -63,11 +63,14 @@ Compiler="gcc"
 # Shouldn't need to touch this section
 
 # Check if the library can be found
-if [ ! -f "${BASH_SOURCE%/*}/cmake.bash" ]; then
+if [ ! -f "${BASH_SOURCE%/*}/../cmake.bash" ]; then
 	echo "ERROR: Cannot find 'cmake.bash'"
 	exit 1
 fi
 
+# Override CMakeLists path
+CMakeListsPath="../../.."
+
 # Load the library
-source "${BASH_SOURCE%/*}/cmake.bash"
+source "${BASH_SOURCE%/*}/../cmake.bash"
 

Dockerfiles/README.md

@@ -63,11 +63,14 @@ Compiler="gcc"
 # Shouldn't need to touch this section
 
 # Check if the library can be found
-if [ ! -f "${BASH_SOURCE%/*}/cmake.bash" ]; then
+if [ ! -f "${BASH_SOURCE%/*}/../cmake.bash" ]; then
 	echo "ERROR: Cannot find 'cmake.bash'"
 	exit 1
 fi
 
+# Override CMakeLists path
+CMakeListsPath="../../.."
+
 # Load the library
-source "${BASH_SOURCE%/*}/cmake.bash"
+source "${BASH_SOURCE%/*}/../cmake.bash"
 

Keyboards/k-type.p2.bash renamed to Keyboards/Others/k-type.p2.bash

@@ -12,13 +12,13 @@
 # Shouldn't need to touch this section
 
 # Check if the library can be found
-if [ ! -f common.bash ]; then
+if [ ! -f "${BASH_SOURCE%/*}/../common.bash" ]; then
 	echo "ERROR: Cannot find 'common.bash'"
 	exit 1
 fi
 
 # Load common functions
-source "common.bash"
+source "${BASH_SOURCE%/*}/../common.bash"
 
 
 

Keyboards/k-type.p3.bash renamed to Keyboards/Others/k-type.p3.bash

@@ -60,11 +60,14 @@ Compiler="gcc"
 # Shouldn't need to touch this section
 
 # Check if the library can be found
-if [ ! -f "${BASH_SOURCE%/*}/cmake.bash" ]; then
+if [ ! -f "${BASH_SOURCE%/*}/../cmake.bash" ]; then
 	echo "ERROR: Cannot find 'cmake.bash'"
 	exit 1
 fi
 
+# Override CMakeLists path
+CMakeListsPath="../../.."
+
 # Load the library
-source "${BASH_SOURCE%/*}/cmake.bash"
+source "${BASH_SOURCE%/*}/../cmake.bash"
 

Keyboards/others.bash renamed to Keyboards/Others/others.bash

@@ -65,11 +65,14 @@ Compiler="gcc"
 # Shouldn't need to touch this section
 
 # Check if the library can be found
-if [ ! -f "${BASH_SOURCE%/*}/cmake.bash" ]; then
+if [ ! -f "${BASH_SOURCE%/*}/../cmake.bash" ]; then
 	echo "ERROR: Cannot find 'cmake.bash'"
 	exit 1
 fi
 
+# Override CMakeLists path
+CMakeListsPath="../../.."
+
 # Load the library
-source "${BASH_SOURCE%/*}/cmake.bash"
+source "${BASH_SOURCE%/*}/../cmake.bash"
 

Keyboards/ps2_converter.bash renamed to Keyboards/Others/ps2_converter.bash

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Uses filename to determine which build script to use
+# Jacob Alexander 2018
+
+Basename=$(basename $0)
+
+# Extract layout
+Layout=$(echo $Basename | cut -d'.' -f2)
+
+# Extract build script
+BuildScript=$(echo $Basename | cut -d'.' -f1).bash
+
+# Run build
+source "${BASH_SOURCE%/*}/${BuildScript}"
+

Keyboards/template.bash renamed to Keyboards/Others/template.bash

@@ -8,10 +8,7 @@
 
 
 # Default to Alphabet
-Layout=$(basename $0 | cut -d'.' -f2)
-if [ "${Layout}" = "bash" ]; then
-	Layout=alphabet
-fi
+Layout=${Layout:-alphabet}
 
 
 # VID:PID Mapping

Keyboards/infinity.alphabet.bash

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Uses filename to determine which build script to use
+# Jacob Alexander 2018
+
+Basename=$(basename $0)
+
+# Extract layout
+Layout=$(echo $Basename | cut -d'.' -f2)
+
+# Extract build script
+BuildScript=$(echo $Basename | cut -d'.' -f1).bash
+
+# Run build
+source "${BASH_SOURCE%/*}/${BuildScript}"
+

Keyboards/infinity.alphabet.bash

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Uses filename to determine which build script to use
+# Jacob Alexander 2018
+
+Basename=$(basename $0)
+
+# Extract layout
+Layout=$(echo $Basename | cut -d'.' -f2)
+
+# Extract build script
+BuildScript=$(echo $Basename | cut -d'.' -f1).bash
+
+# Run build
+source "${BASH_SOURCE%/*}/${BuildScript}"
+

Keyboards/infinity.bash

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Uses filename to determine which build script to use
+# Jacob Alexander 2018
+
+Basename=$(basename $0)
+
+# Extract layout
+Layout=$(echo $Basename | cut -d'.' -f2)
+
+# Extract build script
+BuildScript=$(echo $Basename | cut -d'.' -f1).bash
+
+# Run build
+source "${BASH_SOURCE%/*}/${BuildScript}"
+

Keyboards/infinity.hacker.bash

@@ -8,10 +8,7 @@
 
 
 # Default to Alphabet
-Layout=$(basename $0 | cut -d'.' -f2)
-if [ "${Layout}" = "bash" ]; then
-	Layout=alphabet
-fi
+Layout=${Layout:-alphabet}
 
 
 # VID:PID Mapping

Keyboards/infinity.hacker.bash

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Uses filename to determine which build script to use
+# Jacob Alexander 2018
+
+Basename=$(basename $0)
+
+# Extract layout
+Layout=$(echo $Basename | cut -d'.' -f2)
+
+# Extract build script
+BuildScript=$(echo $Basename | cut -d'.' -f1).bash
+
+# Run build
+source "${BASH_SOURCE%/*}/${BuildScript}"
+

Keyboards/infinity.standard.bash

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Uses filename to determine which build script to use
+# Jacob Alexander 2018
+
+Basename=$(basename $0)
+
+# Extract layout
+Layout=$(echo $Basename | cut -d'.' -f2)
+
+# Extract build script
+BuildScript=$(echo $Basename | cut -d'.' -f1).bash
+
+# Run build
+source "${BASH_SOURCE%/*}/${BuildScript}"
+

Keyboards/infinity.standard.bash

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Uses filename to determine which build script to use
+# Jacob Alexander 2018
+
+Basename=$(basename $0)
+
+# Extract layout
+Layout=$(echo $Basename | cut -d'.' -f2)
+
+# Extract build script
+BuildScript=$(echo $Basename | cut -d'.' -f1).bash
+
+# Run build
+source "${BASH_SOURCE%/*}/${BuildScript}"
+

Keyboards/infinity_led.alphabet.bash

@@ -7,10 +7,7 @@
 
 
 # Default to TrueFox
-Layout=$(basename $0 | cut -d'.' -f2)
-if [ "${Layout}" = "bash" ]; then
-	Layout=truefox
-fi
+Layout=${Layout:-truefox}
 
 
 # VID:PID Mapping

Keyboards/infinity_led.alphabet.bash

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Uses filename to determine which build script to use
+# Jacob Alexander 2018
+
+Basename=$(basename $0)
+
+# Extract layout
+Layout=$(echo $Basename | cut -d'.' -f2)
+
+# Extract build script
+BuildScript=$(echo $Basename | cut -d'.' -f1).bash
+
+# Run build
+source "${BASH_SOURCE%/*}/${BuildScript}"
+

Keyboards/infinity_led.bash

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Uses filename to determine which build script to use
+# Jacob Alexander 2018
+
+Basename=$(basename $0)
+
+# Extract layout
+Layout=$(echo $Basename | cut -d'.' -f2)
+
+# Extract build script
+BuildScript=$(echo $Basename | cut -d'.' -f1).bash
+
+# Run build
+source "${BASH_SOURCE%/*}/${BuildScript}"
+