reorganize libwebpjs

chase-moskal · Dec 18, 2017 · 3df1bc0 · 3df1bc0
1 parent 7c13363
commit 3df1bc0
Show file tree

Hide file tree

Showing 22 changed files with 1,024 additions and 32 deletions.
diff --git a/.dockerignore b/.dockerignore
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 
-# /dist
+/dist
 /node_modules
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,5 +1,5 @@
-ISC License
 
+ISC License
 Copyright (c) 2017, Chase Moskal
 
 Permission to use, copy, modify, and/or distribute this software for any

diff --git a/README.md b/README.md
@@ -48,14 +48,17 @@ development
 -----------
 
 - **prerequisites**
-	- docker
+	- git
 	- node
+	- docker (if you want to rebuild libwebpjs)
 
-- **run the build script**
-	- `./build.sh` — use admin privileges (docker requires this)
+- **build libwebpjs** *(not necessary)*
+	- `./libwebpjs-build.sh` — use admin privileges (docker requires this)
 	- it runs the docker build of libwebp (takes a long time)
 	- it writes build artifacts to `dist/`
+	- `./libwebpjs-debug.sh` — useful to drop into the container to have a look around
 
-- **run the http server**
-	- `npm start`
+- **development based on top of libwebpjs**
+	- `npm install` — install dependencies and run build
+	- `npm start` — start http server
 	- visit http://localhost:8080/ to see google's web demo
diff --git a/build.sh b/build.sh
diff --git a/index.html b/index.html
@@ -1,2 +1,2 @@
 <!doctype html>
-<meta http-equiv="refresh" content="0; url=./dist/webpjs/"/>
+<meta http-equiv="refresh" content="0; url=./libwebpjs/dist/"/>
diff --git a/libwebpjs-build.sh b/libwebpjs-build.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+cd libwebpjs
+rm -rf dist
+docker build -t webphero .
+docker run --volume $PWD/dist:/dist --rm webphero /work/source/container-script.sh
+chmod -R 777 dist
diff --git a/debug.sh → libwebpjs-debug.sh b/debug.sh → libwebpjs-debug.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
 
+cd libwebpjs
 docker build -t webphero .
 docker run -it --rm webphero
diff --git a/libwebpjs/.dockerignore b/libwebpjs/.dockerignore
@@ -0,0 +1,2 @@
+
+/dist
diff --git a/Dockerfile → libwebpjs/Dockerfile b/Dockerfile → libwebpjs/Dockerfile
@@ -60,7 +60,7 @@ ADD . /work
 
 # replace libwebp emscripten cmake instructions
 RUN rm -rf /work/libwebp/CMakeLists.txt \
-  && cp /work/scripts/CMakeLists.txt /work/libwebp
+  && cp /work/source/CMakeLists.txt /work/libwebp
 
 RUN ["/bin/bash", "-c", "cd /work/emsdk-portable \
   && source ./emsdk_env.sh \

diff --git a/dist/webpjs/index.html → libwebpjs/dist/index.html b/dist/webpjs/index.html → libwebpjs/dist/index.html
diff --git a/dist/webpjs/index_wasm.html → libwebpjs/dist/index_wasm.html b/dist/webpjs/index_wasm.html → libwebpjs/dist/index_wasm.html
diff --git a/dist/webpjs/test_webp_js.webp → libwebpjs/dist/test_webp_js.webp b/dist/webpjs/test_webp_js.webp → libwebpjs/dist/test_webp_js.webp
diff --git a/dist/webpjs/test_webp_wasm.webp → libwebpjs/dist/test_webp_wasm.webp b/dist/webpjs/test_webp_wasm.webp → libwebpjs/dist/test_webp_wasm.webp
diff --git a/dist/webpjs/webp.js → libwebpjs/dist/webp.js b/dist/webpjs/webp.js → libwebpjs/dist/webp.js
diff --git a/dist/webpjs/webp_wasm.js → libwebpjs/dist/webp_wasm.js b/dist/webpjs/webp_wasm.js → libwebpjs/dist/webp_wasm.js
diff --git a/images/dice.original.png → libwebpjs/images/dice.original.png b/images/dice.original.png → libwebpjs/images/dice.original.png