Merge pull request #26 from electro-smith/fix/win_clean_build

Fix/win clean build
electro-smith · Dec 12, 2020 · 1205df3 · 1205df3
2 parents 1636ce2 + 3a3452c
commit 1205df3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/source/changelog.md b/source/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.2.2-beta
+
+- Fixes for windows compatibility
+
 ## v0.2.1-beta
 
 - Automatic zeroing / normalling of unused audio outputs

diff --git a/source/libdaisy b/source/libdaisy
diff --git a/source/oopsy.js b/source/oopsy.js
@@ -240,8 +240,10 @@ int main(void) {
 	// now try to make:
 	try {
 		try {
-			console.log(execSync("make clean", { cwd: build_path }).toString())
 			if (os.platform() == "win32") {
+                // Don't use `make clean`, as `rm` is not default on Windows
+                // /Q suppresses the Y/n prompt
+			    console.log(execSync("del /Q build", { cwd: build_path }).toString())
 				// Gather up make output to run command per line as child process
 				let build_cmd = execSync("make -n", { cwd: build_path }).toString().split(os.EOL)
 				build_cmd.forEach(line => {
@@ -250,6 +252,7 @@ int main(void) {
 						execSync(line, { cwd: build_path }).toString()
 				})
 			} else {
+			    console.log(execSync("make clean", { cwd: build_path }).toString())
 				console.log(execSync("export PATH=$PATH:/usr/local/bin && make", { cwd: build_path }).toString())
 			}