client: Remove stub C++ client

Makefile

@@ -22,19 +22,6 @@ client: client_vendor
 client_deps:
 	npm install --progress false --depth 0
 
-wasm:
-	mkdir -p www/wasm
-	$(MAKE) -C client_cpp
-	rm -f www/wasm/main.*
-	cp client_cpp/*.wasm client_cpp/*.js www/wasm
-ifeq ($(DEBUG),1)
-	cp client_cpp/*.wast client_cpp/*.wasm.map www/wasm
-endif
-
-wasm_clean:
-	$(MAKE) -C client_cpp clean
-	rm -f www/wasm/*.js www/wasm/*.wasm www/wasm/*.map www/wasm/*.wast
-
 watch:
 	$(gulp) -w
 
@@ -55,7 +42,7 @@ server:
 client_clean:
 	rm -rf www/js www/css/*.css www/css/maps node_modules
 
-clean: client_clean wasm_clean
+clean: client_clean
 	rm -rf .build .ffmpeg .package target meguca-*.zip meguca-*.tar.xz meguca meguca.exe server/pkg
 ifeq ($(is_windows), true)
 	rm -rf /.meguca_build *.dll

README.md

@@ -71,12 +71,3 @@ the client
 detection and Dockerized test suites, respectively
 * To run server unit tests (unless Dockerized) add database creation rights to
 your PostgreSQL role
-
-### C++ client
-For developing the new C++ client
-
-* Run `git submodule update --init --recursive`
-* Install [Emscripten](http://kripken.github.io/emscripten-site/docs/getting_started/downloads.html)
-* Ensure Emscripten environment variables by running `source emsdk_env.sh` in your shell
-* Use `DEBUG=1 make wasm` and `make wasm_clean` to compile the C++ client and clean build directories
-* To use the C++ client for meguca add the `?wasm=true` query string to the end of the URL

clientScripts/loader.js

@@ -111,8 +111,10 @@
 		window.crypto.subtle = window.crypto.webkitSubtle;
 	}
 
-	var wasm = /[\?&]wasm=true/.test(location.search),
-		head = document.getElementsByTagName('head')[0];
+	// TODO: Uncomment for WASM client rewrite
+	// var wasm = /[\?&]wasm=true/.test(location.search);
+
+	var head = document.getElementsByTagName('head')[0];
 
 	if (polyfills.length) {
 		for (i = 0; i < polyfills.length; i++) {
@@ -167,22 +169,23 @@
 				Array.prototype[Symbol.iterator];
 		}
 
-		if (wasm) {
-			window.Module = {};
-			fetch("/assets/wasm/main.wasm").then(function (res) {
-				return res.arrayBuffer();
-			}).then(function (bytes) {
-				// TODO: Parallel downloads of main.js and main.wasm
-				var script = document.createElement('script');
-				script.src = "/assets/wasm/main.js";
-				Module.wasmBinary = bytes;
-				document.head.appendChild(script);
-			});
-		} else {
-			loadScript("js/main").onload = function () {
-				require("main");
-			};
-		}
+		// TODO: Uncomment for WASM client rewrite
+		// if (wasm) {
+		// 	window.Module = {};
+		// 	fetch("/assets/wasm/main.wasm").then(function (res) {
+		// 		return res.arrayBuffer();
+		// 	}).then(function (bytes) {
+		// 		// TODO: Parallel downloads of main.js and main.wasm
+		// 		var script = document.createElement('script');
+		// 		script.src = "/assets/wasm/main.js";
+		// 		Module.wasmBinary = bytes;
+		// 		document.head.appendChild(script);
+		// 	});
+		// } else {
+		loadScript("js/main").onload = function () {
+			require("main");
+		};
+		// }
 
 		if ('serviceWorker' in navigator && (
 			location.protocol === "https:" ||