Merge pull request #9 from metasoarous/master

Merge latest changes from metasoarous/oz
metasoarous · Sep 3, 2020 · 72886cb · 72886cb
2 parents afc7a09 + 05f14d1
commit 72886cb
Show file tree

Hide file tree

Showing 25 changed files with 5,586 additions and 8,045 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,5 @@ trace.edn
 resources/oz/public/js/cljs-runtime/
 .shadow-cljs
 node_modules
+resources/oz/public/js/devcards.js
+resources/oz/public/js/manifest.edn
diff --git a/META-INF/pom.xml b/META-INF/pom.xml
diff --git a/Makefile b/Makefile
@@ -43,10 +43,9 @@ check-clean-tree:
 
 .PHONY: build
 build:
+	rm -rf resources/oz/public/js && \
 	npm install && \
 	shadow-cljs release app lib && \
-	mkdir -p META-INF/ && \
-	cp pom.xml META-INF/ && \
 	clojure -A:pack mach.pack.alpha.skinny --no-libs --project-path target/oz.jar
 
 .PHONY: release