From e24be232816fa419eeeb00cd0a364481d848a810 Mon Sep 17 00:00:00 2001 From: Brad Nelson Date: Thu, 14 Jul 2022 21:19:09 -0700 Subject: [PATCH] Incorporating web version, bumping version. --- Makefile | 20 ++++++++++++++++---- site/ESP32forth.html | 23 +++++++++++++++-------- site/classic.html | 12 ++++++------ site/index.html | 8 +++++--- site/internals.html | 9 +++++---- site/linux.html | 20 ++++++++++++++------ site/menu.html | 1 + site/static/eforth.css | 33 +++++++++++++++++++-------------- site/web.html | 30 ++++++++++++++++++++++++++++++ site/windows.html | 20 +++++++++++++++----- web/fini.fs | 9 ++++++--- web/terminal.html | 2 -- 12 files changed, 132 insertions(+), 55 deletions(-) create mode 100644 site/web.html diff --git a/Makefile b/Makefile index 8de82df..9d4a4a8 100644 --- a/Makefile +++ b/Makefile @@ -12,8 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -VERSION=7.0.6.20 -STABLE_VERSION=7.0.5.4 +VERSION=7.0.7.0 +STABLE_VERSION=7.0.6.19 +OLD_STABLE_VERSION=7.0.5.4 REVISION=$(shell git rev-parse HEAD | head -c 20) REVSHORT=$(shell echo $(REVISION) | head -c 7) @@ -495,6 +496,14 @@ publish-linux: $(POSIX)/ueforth $(POSIX)/ueforth \ $(ARCHIVE)/ueforth-$(VERSION).linux +publish-web: $(WEB)/ueforth.js + $(GSUTIL_CP) \ + $(WEB)/ueforth.js \ + $(ARCHIVE)/ueforth-$(VERSION)-$(REVSHORT).js + $(GSUTIL_CP) \ + $(WEB)/ueforth.js \ + $(ARCHIVE)/ueforth-$(VERSION).js + publish-windows: $(WINDOWS)/uEf32.exe $(WINDOWS)/uEf64.exe $(GSUTIL_CP) \ $(WINDOWS)/uEf32.exe \ @@ -515,7 +524,7 @@ publish-index: | $(GEN) $(GEN)/archive.html \ gs://eforth/releases/archive.html -publish: publish-esp32 publish-linux publish-windows publish-index +publish: publish-esp32 publish-linux publish-web publish-windows publish-index # ---- DEPLOY ---- @@ -528,7 +537,8 @@ REPLACE = tools/replace.js \ DESKTOP_COMMON=@site/desktop_common.html \ MENU=@site/menu.html \ VERSION=${VERSION} \ - STABLE_VERSION=${STABLE_VERSION} + STABLE_VERSION=${STABLE_VERSION} \ + OLD_STABLE_VERSION=${STABLE_VERSION} UE_REPLACE = $(REPLACE) FORTH=uEForth ESP_REPLACE = $(REPLACE) FORTH=ESP32forth @@ -545,6 +555,8 @@ $(DEPLOY)/app.yaml: $(RES)/eforth.ico \ cp site/*.go $(DEPLOY)/ cp site/*.yaml $(DEPLOY)/ cp site/.gcloudignore $(DEPLOY) + cp out/web/ueforth.js $(DEPLOY)/ + cat site/web.html | $(ESP_REPLACE) >$(DEPLOY)/web.html cat site/ESP32forth.html | $(ESP_REPLACE) >$(DEPLOY)/ESP32forth.html cat site/index.html | $(UE_REPLACE) >$(DEPLOY)/index.html cat site/linux.html | $(UE_REPLACE) >$(DEPLOY)/linux.html diff --git a/site/ESP32forth.html b/site/ESP32forth.html index c0d30f6..a5c4eed 100644 --- a/site/ESP32forth.html +++ b/site/ESP32forth.html @@ -16,15 +16,15 @@ limitations under the License. --> - -ESP32forth - + + ESP32forth + - -
-

ESP32forth

+ +

ESP32forth

{{MENU}} +

Download

@@ -32,14 +32,21 @@ limitations under the License.

ESP32forth-{{STABLE_VERSION}}.zip - Single .ino file ready for installation
- Version: {{STABLE_VERSION}} + Version: {{STABLE_VERSION}} (Stable) +

+ +

LONG TERM STABLE RELEASE

+

+ESP32forth-{{OLD_STABLE_VERSION}}.zip + - Single .ino file ready for installation
+ Version: {{OLD_STABLE_VERSION}} (Long-term Stable)

Beta Release

ESP32forth-{{VERSION}}.zip - Single .ino file ready for installation
- Version: {{VERSION}} + Version: {{VERSION}} (Beta)

diff --git a/site/classic.html b/site/classic.html index 67fc799..8e58e09 100644 --- a/site/classic.html +++ b/site/classic.html @@ -14,16 +14,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - - -Classic EForth - + + Classic EForth + +

Classic EForth

- {{MENU}} +

EForth is a delightfully minimalist approach to Forth originated by Bill Muench and Dr. C. H. Ting. @@ -37,7 +37,7 @@ ESP32forth - Version 6.3 for NodeMCU ESP32S - Tweaked for the Web

ESP32forth-6.3.0.ino - - This has Dr. Ting's v6.3 version with WebUI added in + - This has Dr. Ting's v6.3 version with WebUI added in to it.

Classic EForth Quirks

diff --git a/site/index.html b/site/index.html index 8289c19..04b713a 100644 --- a/site/index.html +++ b/site/index.html @@ -16,10 +16,11 @@ limitations under the License. --> - -EForth - + + EForth + +

EForth

{{MENU}} +

Choose you platform above. diff --git a/site/internals.html b/site/internals.html index d0a4ee5..7c596b7 100644 --- a/site/internals.html +++ b/site/internals.html @@ -16,14 +16,15 @@ limitations under the License. --> - -µEforth Internals - + + µEforth Internals + +

µEforth Internals

- {{MENU}} +

µEforth (micro-Eforth) simplifies EForth even futher, by building just enough diff --git a/site/linux.html b/site/linux.html index bc272b6..2e6b062 100644 --- a/site/linux.html +++ b/site/linux.html @@ -16,14 +16,15 @@ limitations under the License. --> - -µEforth for Linux - + + µEforth for Linux + +

µEforth for Linux

- {{MENU}} +

Download

@@ -31,14 +32,21 @@ limitations under the License.

ueforth-{{STABLE_VERSION}}.linux - Linux 64-bit Executable µEforth
- Version: {{STABLE_VERSION}} + Version: {{STABLE_VERSION}} (Stable) +

+ +

LONG TERM STABLE RELEASE

+

+ueforth-{{OLD_STABLE_VERSION}}.linux + - Linux 64-bit Executable µEforth
+ Version: {{OLD_STABLE_VERSION}} (Long-term Stable)

Beta Release

ueforth-{{VERSION}}.linux - Linux 64-bit Executable µEforth
- Version: {{VERSION}} + Version: {{VERSION}} (Beta)

diff --git a/site/menu.html b/site/menu.html index 1f8ffb1..1c4a4b0 100644 --- a/site/menu.html +++ b/site/menu.html @@ -16,6 +16,7 @@ limitations under the License.
ESP32forth + Web Linux Windows Internals diff --git a/site/static/eforth.css b/site/static/eforth.css index eec116e..18ebb02 100644 --- a/site/static/eforth.css +++ b/site/static/eforth.css @@ -1,20 +1,25 @@ -// Copyright 2021 Bradley D. Nelson -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * Copyright 2021 Bradley D. Nelson + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ body { + margin: 0px; +} +.wrapper { max-width: 800px; - margin-top: 0px; + padding: 0px 10px; } h1 { border-top: 3px solid #777; diff --git a/site/web.html b/site/web.html new file mode 100644 index 0000000..48075bd --- /dev/null +++ b/site/web.html @@ -0,0 +1,30 @@ + + + + + + µEforth for Linux + + + + +

µEforth for Web

+{{MENU}} +
+ +
+
diff --git a/site/windows.html b/site/windows.html
index 5040ad0..88b7ccb 100644
--- a/site/windows.html
+++ b/site/windows.html
@@ -16,14 +16,15 @@ limitations under the License.
 -->
 
 
-
-µEforth for Windows
-
+  
+  µEforth for Windows
+  
 
+
 
 
µEforth for Windows

-
 {{MENU}}
+

 
 
Download

 
@@ -36,13 +37,22 @@ limitations under the License.
    Version: {{STABLE_VERSION}} (Stable)
 

 
+
LONG TERM STABLE RELEASE

+

+uEf32-{{OLD_STABLE_VERSION}}.exe
+   - Window 32-bit EXE µEforth

+uEf64-{{OLD_STABLE_VERSION}}.exe
+   - Window 64-bit EXE µEforth

+   Version: {{OLD_STABLE_VERSION}} (Long-term Stable)
+

+
 
Beta Release

 

 uEf32-{{VERSION}}.exe
    - Window 32-bit EXE µEforth

 uEf64-{{VERSION}}.exe
    - Window 64-bit EXE µEforth

-   Version: {{VERSION}}
+   Version: {{VERSION}} (Beta)
 

 
 

diff --git a/web/fini.fs b/web/fini.fs
index 60a83a8..3445e14 100644
--- a/web/fini.fs
+++ b/web/fini.fs
@@ -34,9 +34,12 @@ r|
 
 r"
   if (!globalObj['write']) {
-    var con = document.createElement('pre');
-    con.id = 'console';
-    document.body.appendChild(con);
+    var con = document.getElementById('console');
+    if (con === null) {
+      con = document.createElement('pre');
+      con.id = 'console';
+      document.body.appendChild(con);
+    }
     window.inbuffer = [];
     window.outbuffer = '';
     window.onkeypress = function(e) {
diff --git a/web/terminal.html b/web/terminal.html
index e03f5c3..5c9c17f 100644
--- a/web/terminal.html
+++ b/web/terminal.html
@@ -16,5 +16,3 @@ limitations under the License.
 -->
 
 
-