fix build script to also build html

legacy-screen
Ondřej Hruška 7 years ago
parent 20165f5306
commit 22101cc000
  1. 1
      .gitignore
  2. 21
      build.sh
  3. 2
      build_html.php
  4. 0
      out/.gitkeep

1
.gitignore vendored

@ -1,6 +1,7 @@
_env.php
js/*
css/*
out/*
!.gitkeep
node_modules/
*.~

@ -3,15 +3,15 @@
echo "Packing JS..."
cat jssrc/chibi.js \
jssrc/keymaster.js \
jssrc/utils.js \
jssrc/modal.js \
jssrc/notif.js \
jssrc/appcommon.js \
jssrc/lang.js \
jssrc/wifi.js \
jssrc/term_* \
jssrc/term.js > js/app-full.js
jssrc/keymaster.js \
jssrc/utils.js \
jssrc/modal.js \
jssrc/notif.js \
jssrc/appcommon.js \
jssrc/lang.js \
jssrc/wifi.js \
jssrc/term_* \
jssrc/term.js > js/app-full.js
yuicompressor js/app-full.js > js/app.js
@ -19,4 +19,7 @@ echo "Building CSS..."
sass --style=compressed sass/app.scss css/app.css
echo "Building HTML..."
php ./build_html.php
echo "ESPTerm front-end ready"

@ -16,7 +16,7 @@ function process_html($s) {
$no_tpl_files = ['help', 'cfg_wifi_conn'];
$dest = ESP_DEMO ? __DIR__ . '/../html_demo/' : __DIR__ . '/../html/';
$dest = __DIR__ . '/out/';
ob_start();
foreach($_pages as $_k => $p) {

Loading…
Cancel
Save