templates for vendor/ and Makefile

We now use -std=c2x

Author: keiravillekode

bin/create-exercise

@@ -35,5 +35,5 @@ bin/configlet create --practice-exercise "${slug}" --author "${author}" --diffic
 filter='.exercises.practice = (.exercises.practice | sort_by(.difficulty, .slug))'
 jq "${filter}" config.json > config.sorted && mv config.sorted config.json
 
-cp exercises/practice/hello-world/Makefile exercises/practice/${slug}/Makefile
-cp -r exercises/practice/hello-world/vendor exercises/practice/${slug}/vendor
+cp templates/Makefile "exercises/practice/${slug}/Makefile"
+cp -r templates/vendor "exercises/practice/${slug}/vendor"

bin/update-from-templates

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+# This script updates all exercises with the contents from the `templates` directory.
+# If everything is up-to-date (i.e., the script did not make any changes), it returns with
+# an exit code of 0. Otherwise, a non-zero exit code is returned.
+
+set -eo pipefail
+
+die() { echo "$*" >&2; exit 3; }
+
+hash_dir() {
+    (cd "$1" && find . ! -name "*.o" -type f | sort --unique | xargs cat) | md5sum
+}
+
+if [[ $PWD != $(realpath "$(dirname "$0")/..") ]]; then
+    die "You must be in the track root directory."
+fi
+
+vendor_hash=$(hash_dir templates/vendor)
+
+num_updated=0
+for exercise_dir in exercises/practice/*; do
+    makefile=${exercise_dir}/Makefile
+    if ! cmp -s templates/Makefile "${makefile}"; then
+        echo "Updating ${makefile}"
+        cp templates/Makefile "${makefile}"
+        num_updated=$((num_updated + 1))
+    fi
+
+    current_vendor_hash=$(hash_dir "${exercise_dir}/vendor")
+    if [[ "${current_vendor_hash}" != "${vendor_hash}" ]]; then
+        echo "Updating ${exercise_dir}/vendor"
+        rm -rf "${exercise_dir}/vendor"
+        cp -r templates/vendor "${exercise_dir}"
+        num_updated=$((num_updated + 1))
+    fi
+done
+
+[[ ${num_updated} -eq 0 ]] || exit 1
+
+echo "Everything up-to-date."

exercises/practice/acronym/Makefile

@@ -1,6 +1,6 @@
 AS = nasm
 
-CFLAGS = -g -Wall -Wextra -pedantic -Werror
+CFLAGS = -g -Wall -Wextra -pedantic -Werror -std=c2x -Wno-gnu-binary-literal
 LDFLAGS =
 ASFLAGS = -g -F dwarf -Werror
 

exercises/practice/affine-cipher/Makefile

@@ -1,6 +1,6 @@
 AS = nasm
 
-CFLAGS = -g -Wall -Wextra -pedantic -Werror
+CFLAGS = -g -Wall -Wextra -pedantic -Werror -std=c2x -Wno-gnu-binary-literal
 LDFLAGS =
 ASFLAGS = -g -F dwarf -Werror
 

exercises/practice/all-your-base/Makefile

@@ -1,6 +1,6 @@
 AS = nasm
 
-CFLAGS = -g -Wall -Wextra -pedantic -Werror
+CFLAGS = -g -Wall -Wextra -pedantic -Werror -std=c2x -Wno-gnu-binary-literal
 LDFLAGS =
 ASFLAGS = -g -F dwarf -Werror
 

exercises/practice/allergies/Makefile

@@ -1,6 +1,6 @@
 AS = nasm
 
-CFLAGS = -g -Wall -Wextra -pedantic -Werror
+CFLAGS = -g -Wall -Wextra -pedantic -Werror -std=c2x -Wno-gnu-binary-literal
 LDFLAGS =
 ASFLAGS = -g -F dwarf -Werror
 

exercises/practice/armstrong-numbers/Makefile

@@ -1,6 +1,6 @@
 AS = nasm
 
-CFLAGS = -g -Wall -Wextra -pedantic -Werror
+CFLAGS = -g -Wall -Wextra -pedantic -Werror -std=c2x -Wno-gnu-binary-literal
 LDFLAGS =
 ASFLAGS = -g -F dwarf -Werror
 

exercises/practice/atbash-cipher/Makefile

@@ -1,6 +1,6 @@
 AS = nasm
 
-CFLAGS = -g -Wall -Wextra -pedantic -Werror
+CFLAGS = -g -Wall -Wextra -pedantic -Werror -std=c2x -Wno-gnu-binary-literal
 LDFLAGS =
 ASFLAGS = -g -F dwarf -Werror
 

exercises/practice/binary-search/Makefile

@@ -1,6 +1,6 @@
 AS = nasm
 
-CFLAGS = -g -Wall -Wextra -pedantic -Werror
+CFLAGS = -g -Wall -Wextra -pedantic -Werror -std=c2x -Wno-gnu-binary-literal
 LDFLAGS =
 ASFLAGS = -g -F dwarf -Werror
 

exercises/practice/bob/Makefile

@@ -1,6 +1,6 @@
 AS = nasm
 
-CFLAGS = -g -Wall -Wextra -pedantic -Werror
+CFLAGS = -g -Wall -Wextra -pedantic -Werror -std=c2x -Wno-gnu-binary-literal
 LDFLAGS =
 ASFLAGS = -g -F dwarf -Werror