Web: Added Babel to the repo, so that the client doesn't need to download it.

7f9c50f0 · Christoffer Ackelman · ea3a6844 · 7f9c50f0 · 7f9c50f0 · 7f9c50f0
Commit 7f9c50f0 authored May 27, 2019 by Christoffer Ackelman
7 changed files
--- a/java/jsw/co/src/babel.min.js
+++ b/java/jsw/co/src/babel.min.js
--- a/java/jsw/ev/src/ev.html
+++ b/java/jsw/ev/src/ev.html
@@ -45,7 +45,7 @@
    </div>
  </div>
  <canvas id="flowcanvas" width="1200" height="800"></canvas>
-  <script src="https://unpkg.com/@babel/standalone/babel.min.js"></script>
+  <script src="babel.min.js"></script>
  <script type="text/babel" src="pwr.ts"></script>
  <script type="text/babel" src="cli.ts"></script>
  <script type="text/babel" src="gdh.ts"></script>

--- a/java/jsw/flow/src/flow.html
+++ b/java/jsw/flow/src/flow.html
@@ -21,7 +21,7 @@
    </div>
  </div>
  <canvas id="flowcanvas" width="1200" height="800"></canvas>
-  <script src="https://unpkg.com/@babel/standalone/babel.min.js"></script>
+  <script src="babel.min.js"></script>
  <script type="text/babel" src="pwr.ts"></script>
  <script type="text/babel" src="gdh.ts"></script>
  <script type="text/babel" src="draw.ts"></script>

--- a/java/jsw/ge/src/ge.html
+++ b/java/jsw/ge/src/ge.html
@@ -7,7 +7,7 @@

 <body>
  <canvas id="flowcanvas" width="1200" height="800"></canvas>
-  <script src="https://unpkg.com/@babel/standalone/babel.min.js"></script>
+  <script src="babel.min.js"></script>
  <script type="text/babel" src="pwr.ts"></script>
  <script type="text/babel" src="cli.ts"></script>
  <script type="text/babel" src="gdh.ts"></script>

--- a/java/jsw/opwind/src/opwind_menu.html
+++ b/java/jsw/opwind/src/opwind_menu.html
@@ -20,7 +20,7 @@
      <button id="logout_button" type="button" class="leftmenu-button">Logout</button>
    </div>
  </div>
-  <script src="https://unpkg.com/@babel/standalone/babel.min.js"></script>
+  <script src="babel.min.js"></script>
  <script type="text/babel" src="crypt.ts"></script>
  <script type="text/babel" src="pwr.ts"></script>
  <script type="text/babel" src="gdh.ts"></script>

--- a/java/jsw/xtt/src/xtt.html
+++ b/java/jsw/xtt/src/xtt.html
@@ -33,7 +33,7 @@
    </div>
  </div>
  <canvas id="flowcanvas" width="1200" height="800"></canvas>
-  <script src="https://unpkg.com/@babel/standalone/babel.min.js"></script>
+  <script src="babel.min.js"></script>
  <script type="text/babel" src="pwr.ts"></script>
  <script type="text/babel" src="cli.ts"></script>
  <script type="text/babel" src="gdh.ts"></script>

--- a/src/tools/bld/src/jsw_generic.mk
+++ b/src/tools/bld/src/jsw_generic.mk
@@ -21,6 +21,7 @@ source_dirs := $(co_source)
 -include jsw_local.mk

 vpath %.js $(co_source)
+vpath %.ts $(co_source)
 vpath %.html $(co_source)
 vpath %.png $(co_source)

@@ -33,6 +34,15 @@ js_sources := $(sort \
             ) \
           )

+ts_sources := $(sort \
+             $(foreach file, \
+               $(foreach dir, \
+                 $(source_dirs), \
+                 $(wildcard $(dir)/*.ts) \
+               ), $(notdir $(file)) \
+             ) \
+           )
+
 html_sources := $(sort \
             $(foreach file, \
               $(foreach dir, \
@@ -61,10 +71,12 @@ css_sources := $(sort \
           )

 export_js := $(addprefix $(web_dir)/,$(js_sources))
+export_ts := $(addprefix $(web_dir)/,$(ts_sources))
 export_html := $(addprefix $(web_dir)/,$(html_sources))
 export_png := $(addprefix $(web_dir)/,$(png_sources))
 export_css := $(addprefix $(web_dir)/,$(css_sources))
 clean_js := $(patsubst %.js,clean_%.js, $(js_sources))
+clean_ts := $(patsubst %.ts,clean_%.ts, $(ts_sources))
 clean_html := $(patsubst %.html,clean_%.html, $(html_sources))
 clean_png := $(patsubst %.png,clean_%.png, $(png_sources))
 clean_css := $(patsubst %.css,clean_%.css, $(css_sources))
@@ -75,13 +87,13 @@ all : init copy lib exe | silent

 init :

-copy : $(export_js) $(export_html) $(export_png) $(export_css) | silent
+copy : $(export_js) $(export_ts) $(export_html) $(export_png) $(export_css) | silent

 lib :

 exe :

-clean : $(clean_js) $(clean_html) $(clean_png) $(clean_css)
+clean : $(clean_js) $(clean_ts) $(clean_html) $(clean_png) $(clean_css)

 clean_copy: $(clean)

@@ -94,6 +106,10 @@ $(clean_js) : clean_%.js : %.js
 	@ echo "Removing js: $(web_dir)/$*.js"
 	@ $(rm) $(rmflags) $(web_dir)/$*.js

+$(clean_ts) : clean_%.ts : %.ts
+	@ echo "Removing ts: $(web_dir)/$*.ts"
+	@ $(rm) $(rmflags) $(web_dir)/$*.ts
+
 $(clean_html) : clean_%.html : %.html
 	@ echo "Removing html: $(web_dir)/$*.html"
 	@ $(rm) $(rmflags) $(web_dir)/$*.html