chore(build): Improvements to build scripts

Author: mmstick

Makefile

@@ -28,32 +28,14 @@ sources = src/*.ts *.css
 all: depcheck compile
 
 clean:
-	rm -rf _build schemas/gschemas.compiled target
-
-transpile: $(sources) clean
-	tsc
-	for proj in $(PROJECTS); do tsc --p src/$${proj}; done
+	rm -rf _build target
 
 # Configure local settings on system
 configure:
-	if ! command -v gnome-extensions >/dev/null; then \
-		echo 'You must install gnome-extensions to configure or enable via this script' \
-		'(`gnome-shell` on Debian systems, `gnome-extensions` on openSUSE systems.)'; \
-		exit 1; \
-	fi
 	sh scripts/configure.sh
 
-convert: transpile
-	sh scripts/transpile.sh
-
-compile: convert metadata.json schemas
-	rm -rf _build
-	mkdir -p _build
-	cp -r metadata.json icons schemas target/*.js *.css _build
-	for proj in $(PROJECTS); do \
-		mkdir -p _build/$${proj}; \
-		cp -r target/$${proj}/*.js _build/$${proj}; \
-	done
+compile: $(sources) clean
+	env PROJECTS="$(PROJECTS)" sh scripts/transpile.sh
 
 # Rebuild, install, reconfigure local settings, restart shell, and listen to journalctl logs
 debug: depcheck compile install install-system76-plugins configure enable restart-shell listen
@@ -75,7 +57,7 @@ disable:
 listen:
 	journalctl -o cat -n 0 -f "$$(which gnome-shell)" | grep -v warning
 
-local-install: depcheck compile install configure restart-shell enable
+local-install: depcheck compile install install-system76-plugins configure enable restart-shell
 
 install:
 	rm -rf $(INSTALLBASE)/$(INSTALLNAME)
@@ -107,12 +89,5 @@ update-repository:
 	git reset --hard origin/master
 	git clean -fd
 
-schemas: schemas/gschemas.compiled
-	touch $@
-
-schemas/gschemas.compiled: schemas/*.gschema.xml
-	glib-compile-schemas schemas
-
 zip-file: all
 	cd _build && zip -qr "../$(UUID)_$(VERSION).zip" .
-

scripts/configure.sh

@@ -98,6 +98,12 @@ set_keybindings() {
     dconf write ${KEYS_GNOME_WM}/close "['<Super>q', '<Alt>F4']"
 }
 
+if ! command -v gnome-extensions >/dev/null; then
+    echo 'You must install gnome-extensions to configure or enable via this script'
+    '(`gnome-shell` on Debian systems, `gnome-extensions` on openSUSE systems.)'
+    exit 1
+fi
+
 set_keybindings
 
 # Use a window placement behavior which works better for tiling

scripts/transpile.sh

@@ -1,12 +1,40 @@
 #!/bin/sh
+set -ex
 
-for file in $(find target -name '*.js'); do
-    sed -i \
-        -e 's#export function#function#g' \
+pwd=$(pwd)
+
+# In goes standard JS. Out comes GJS-compatible JS
+transpile() {
+    cat ${src} | sed -e 's#export function#function#g' \
         -e 's#export var#var#g' \
         -e 's#export const#var#g' \
         -e 's#Object.defineProperty(exports, "__esModule", { value: true });#var exports = {};#g' \
-        "${file}"
-    sed -i -E 's/export class (\w+)/var \1 = class \1/g' "${file}"
-    sed -i -E "s/import \* as (\w+) from '(\w+)'/const \1 = Me.imports.\2/g" "${file}"
-done
+        | sed -E 's/export class (\w+)/var \1 = class \1/g' \
+        | sed -E "s/import \* as (\w+) from '(\w+)'/const \1 = Me.imports.\2/g" > ${dest}
+}
+
+rm -rf _build
+
+glib-compile-schemas schemas &
+
+# Transpile to JavaScript
+
+for proj in ${PROJECTS}; do
+    mkdir -p _build/${proj}
+    tsc --p src/${proj} &
+done
+
+tsc &
+
+wait
+
+# Convert JS to GJS-compatible scripts
+
+cp -r metadata.json icons schemas *.css _build &
+
+for src in $(find target -name '*.js'); do
+    dest=$(echo $src | sed s#target#_build#g)
+    transpile &
+done
+
+wait

src/color_dialog/tsconfig.json

@@ -10,8 +10,6 @@
             "es2015"
         ],
         "pretty": true,
-        "sourceMap": true,
-        "declaration": true,
         "removeComments": true,
         "incremental": true,
         "noUnusedLocals": true,

src/floating_exceptions/tsconfig.json

@@ -10,8 +10,6 @@
             "es2015"
         ],
         "pretty": true,
-        "sourceMap": true,
-        "declaration": true,
         "removeComments": true,
         "incremental": true,
     },

tsconfig.json

@@ -11,8 +11,6 @@
             "es2015"
         ],
         "pretty": true,
-        "sourceMap": true,
-        "declaration": true,
         "removeComments": true,
         "incremental": true,
         "noUnusedLocals": true,