Commit 7f9c50f0 authored by Christoffer Ackelman's avatar Christoffer Ackelman

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

parent ea3a6844
This diff is collapsed.
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
</div> </div>
</div> </div>
<canvas id="flowcanvas" width="1200" height="800"></canvas> <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="pwr.ts"></script>
<script type="text/babel" src="cli.ts"></script> <script type="text/babel" src="cli.ts"></script>
<script type="text/babel" src="gdh.ts"></script> <script type="text/babel" src="gdh.ts"></script>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</div> </div>
</div> </div>
<canvas id="flowcanvas" width="1200" height="800"></canvas> <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="pwr.ts"></script>
<script type="text/babel" src="gdh.ts"></script> <script type="text/babel" src="gdh.ts"></script>
<script type="text/babel" src="draw.ts"></script> <script type="text/babel" src="draw.ts"></script>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<body> <body>
<canvas id="flowcanvas" width="1200" height="800"></canvas> <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="pwr.ts"></script>
<script type="text/babel" src="cli.ts"></script> <script type="text/babel" src="cli.ts"></script>
<script type="text/babel" src="gdh.ts"></script> <script type="text/babel" src="gdh.ts"></script>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<button id="logout_button" type="button" class="leftmenu-button">Logout</button> <button id="logout_button" type="button" class="leftmenu-button">Logout</button>
</div> </div>
</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="crypt.ts"></script>
<script type="text/babel" src="pwr.ts"></script> <script type="text/babel" src="pwr.ts"></script>
<script type="text/babel" src="gdh.ts"></script> <script type="text/babel" src="gdh.ts"></script>
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</div> </div>
</div> </div>
<canvas id="flowcanvas" width="1200" height="800"></canvas> <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="pwr.ts"></script>
<script type="text/babel" src="cli.ts"></script> <script type="text/babel" src="cli.ts"></script>
<script type="text/babel" src="gdh.ts"></script> <script type="text/babel" src="gdh.ts"></script>
......
...@@ -21,6 +21,7 @@ source_dirs := $(co_source) ...@@ -21,6 +21,7 @@ source_dirs := $(co_source)
-include jsw_local.mk -include jsw_local.mk
vpath %.js $(co_source) vpath %.js $(co_source)
vpath %.ts $(co_source)
vpath %.html $(co_source) vpath %.html $(co_source)
vpath %.png $(co_source) vpath %.png $(co_source)
...@@ -33,6 +34,15 @@ js_sources := $(sort \ ...@@ -33,6 +34,15 @@ js_sources := $(sort \
) \ ) \
) )
ts_sources := $(sort \
$(foreach file, \
$(foreach dir, \
$(source_dirs), \
$(wildcard $(dir)/*.ts) \
), $(notdir $(file)) \
) \
)
html_sources := $(sort \ html_sources := $(sort \
$(foreach file, \ $(foreach file, \
$(foreach dir, \ $(foreach dir, \
...@@ -61,10 +71,12 @@ css_sources := $(sort \ ...@@ -61,10 +71,12 @@ css_sources := $(sort \
) )
export_js := $(addprefix $(web_dir)/,$(js_sources)) export_js := $(addprefix $(web_dir)/,$(js_sources))
export_ts := $(addprefix $(web_dir)/,$(ts_sources))
export_html := $(addprefix $(web_dir)/,$(html_sources)) export_html := $(addprefix $(web_dir)/,$(html_sources))
export_png := $(addprefix $(web_dir)/,$(png_sources)) export_png := $(addprefix $(web_dir)/,$(png_sources))
export_css := $(addprefix $(web_dir)/,$(css_sources)) export_css := $(addprefix $(web_dir)/,$(css_sources))
clean_js := $(patsubst %.js,clean_%.js, $(js_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_html := $(patsubst %.html,clean_%.html, $(html_sources))
clean_png := $(patsubst %.png,clean_%.png, $(png_sources)) clean_png := $(patsubst %.png,clean_%.png, $(png_sources))
clean_css := $(patsubst %.css,clean_%.css, $(css_sources)) clean_css := $(patsubst %.css,clean_%.css, $(css_sources))
...@@ -75,13 +87,13 @@ all : init copy lib exe | silent ...@@ -75,13 +87,13 @@ all : init copy lib exe | silent
init : init :
copy : $(export_js) $(export_html) $(export_png) $(export_css) | silent copy : $(export_js) $(export_ts) $(export_html) $(export_png) $(export_css) | silent
lib : lib :
exe : exe :
clean : $(clean_js) $(clean_html) $(clean_png) $(clean_css) clean : $(clean_js) $(clean_ts) $(clean_html) $(clean_png) $(clean_css)
clean_copy: $(clean) clean_copy: $(clean)
...@@ -94,6 +106,10 @@ $(clean_js) : clean_%.js : %.js ...@@ -94,6 +106,10 @@ $(clean_js) : clean_%.js : %.js
@ echo "Removing js: $(web_dir)/$*.js" @ echo "Removing js: $(web_dir)/$*.js"
@ $(rm) $(rmflags) $(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 $(clean_html) : clean_%.html : %.html
@ echo "Removing html: $(web_dir)/$*.html" @ echo "Removing html: $(web_dir)/$*.html"
@ $(rm) $(rmflags) $(web_dir)/$*.html @ $(rm) $(rmflags) $(web_dir)/$*.html
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment