Update console site build process

diff --git a/Console/Makefile b/Console/Makefile
index 3ebb1e513bf1af30d41337f19747759ed0f3a106..3d74588f2be0dbdc3a6c796f81cef3ab1deb50dd 100644 (file)
--- a/Console/Makefile
+++ b/Console/Makefile
@@ -2,16 +2,30 @@ clean:
        @echo Cleaning...
        @-rm -rf ./build
 
-site:
+dirs:
        @mkdir -p ./build
        @mkdir -p ./build/css
        @mkdir -p ./build/gfx
        @mkdir -p ./build/images
-       # @mkdir -p ./build/pkgs
+
+pages:
        python ./build.py
+
+pages-debug:
+       python ./build.py --no-gz
+       
+data:
+       @echo Including assets...
        @cp assets/css/* build/css/
        @cp assets/gfx/* build/gfx/
        # @cp assets/images/* build/images/
        # @cp assets/scripts/* build/scripts/
        # @cp -r ../../Reticulum/docs/manual/* build/reticulum_manual/
        # @cp -r ../../Reticulum/docs/Reticulum\ Manual.pdf build/reticulum_manual/
+
+site: dirs data pages
+
+local: dirs data pages-debug
+
+serve:
+       python -m http.server 7777 --bind 127.0.0.1 --directory ./build

diff --git a/Console/build.py b/Console/build.py
index e1cd33a40826f8e2a57c95fb428456705172b947..d379877b6be273d08e7afb6a1e3c6042c334d131 100644 (file)
--- a/Console/build.py
+++ b/Console/build.py
@@ -1,5 +1,6 @@
 import markdown
 import os
+import sys
 import shutil
 
 packages = {
@@ -207,4 +208,5 @@ for mdf in source_files:
             wf.write(html.encode(OUTPUT_ENCODING))
 
 fetch_reticulum_site()
-gz_all()
\ No newline at end of file
+if not "--no-gz" in sys.argv:
+    gz_all()