alx/ueforth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Incorporating web version, bumping version.

Browse Source
This commit is contained in:
Brad Nelson
2022-07-14 21:19:09 -07:00
parent 9b789a2aca
commit e24be23281
12 changed files with 132 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile
View File

@ -12,8 +12,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
VERSION=7.0.6.20 VERSION=7.0.7.0
STABLE_VERSION=7.0.5.4 STABLE_VERSION=7.0.6.19
OLD_STABLE_VERSION=7.0.5.4
REVISION=$(shell git rev-parse HEAD | head -c 20) REVISION=$(shell git rev-parse HEAD | head -c 20)
REVSHORT=$(shell echo $(REVISION) | head -c 7) REVSHORT=$(shell echo $(REVISION) | head -c 7)
@ -495,6 +496,14 @@ publish-linux: $(POSIX)/ueforth
$(POSIX)/ueforth \ $(POSIX)/ueforth \
$(ARCHIVE)/ueforth-$(VERSION).linux $(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 publish-windows: $(WINDOWS)/uEf32.exe $(WINDOWS)/uEf64.exe
$(GSUTIL_CP) \ $(GSUTIL_CP) \
$(WINDOWS)/uEf32.exe \ $(WINDOWS)/uEf32.exe \
@ -515,7 +524,7 @@ publish-index: | $(GEN)
$(GEN)/archive.html \ $(GEN)/archive.html \
gs://eforth/releases/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 ---- # ---- DEPLOY ----
@ -528,7 +537,8 @@ REPLACE = tools/replace.js \
DESKTOP_COMMON=@site/desktop_common.html \ DESKTOP_COMMON=@site/desktop_common.html \
MENU=@site/menu.html \ MENU=@site/menu.html \
VERSION=${VERSION} \ VERSION=${VERSION} \
STABLE_VERSION=${STABLE_VERSION} STABLE_VERSION=${STABLE_VERSION} \
OLD_STABLE_VERSION=${STABLE_VERSION}
UE_REPLACE = $(REPLACE) FORTH=uEForth UE_REPLACE = $(REPLACE) FORTH=uEForth
ESP_REPLACE = $(REPLACE) FORTH=ESP32forth ESP_REPLACE = $(REPLACE) FORTH=ESP32forth
@ -545,6 +555,8 @@ $(DEPLOY)/app.yaml: $(RES)/eforth.ico \
cp site/*.go $(DEPLOY)/ cp site/*.go $(DEPLOY)/
cp site/*.yaml $(DEPLOY)/ cp site/*.yaml $(DEPLOY)/
cp site/.gcloudignore $(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/ESP32forth.html | $(ESP_REPLACE) >$(DEPLOY)/ESP32forth.html
cat site/index.html | $(UE_REPLACE) >$(DEPLOY)/index.html cat site/index.html | $(UE_REPLACE) >$(DEPLOY)/index.html
cat site/linux.html | $(UE_REPLACE) >$(DEPLOY)/linux.html cat site/linux.html | $(UE_REPLACE) >$(DEPLOY)/linux.html

23
site/ESP32forth.html
View File

@ -16,15 +16,15 @@ limitations under the License.
--> -->
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>ESP32forth</title> <title>ESP32forth</title>
<link rel="stylesheet" href="static/eforth.css"> <link rel="stylesheet" href="static/eforth.css">
</head> </head>
<body>
<div>
<h1>ESP32forth</h1>
<body>
<h1>ESP32forth</h1>
{{MENU}} {{MENU}}
<div class="wrapper">
<h2>Download</h2> <h2>Download</h2>
@ -32,14 +32,21 @@ limitations under the License.
<p> <p>
<a href="https://eforth.storage.googleapis.com/releases/ESP32forth-{{STABLE_VERSION}}.zip">ESP32forth-{{STABLE_VERSION}}.zip</a> <a href="https://eforth.storage.googleapis.com/releases/ESP32forth-{{STABLE_VERSION}}.zip">ESP32forth-{{STABLE_VERSION}}.zip</a>
- Single .ino file ready for installation<br/> - Single .ino file ready for installation<br/>
<i>Version: {{STABLE_VERSION}}</i> <i>Version: {{STABLE_VERSION}} (Stable)</i>
</p>
<h3>LONG TERM STABLE RELEASE</h3>
<p>
<a href="https://eforth.storage.googleapis.com/releases/ESP32forth-{{OLD_STABLE_VERSION}}.zip">ESP32forth-{{OLD_STABLE_VERSION}}.zip</a>
- Single .ino file ready for installation<br/>
<i>Version: {{OLD_STABLE_VERSION}} (Long-term Stable)</i>
</p> </p>
<h3>Beta Release</h3> <h3>Beta Release</h3>
<p> <p>
<a href="https://eforth.storage.googleapis.com/releases/ESP32forth-{{VERSION}}.zip">ESP32forth-{{VERSION}}.zip</a> <a href="https://eforth.storage.googleapis.com/releases/ESP32forth-{{VERSION}}.zip">ESP32forth-{{VERSION}}.zip</a>
- Single .ino file ready for installation<br/> - Single .ino file ready for installation<br/>
<i>Version: {{VERSION}}</i> <i>Version: {{VERSION}} (Beta)</i>
</p> </p>
<hr/> <hr/>

12
site/classic.html
View File

@ -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 See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Classic EForth</title> <title>Classic EForth</title>
<link rel="stylesheet" href="static/eforth.css"> <link rel="stylesheet" href="static/eforth.css">
</head> </head>
<body> <body>
<h1>Classic EForth</h1> <h1>Classic EForth</h1>
{{MENU}} {{MENU}}
<div class="wrapper">
<p> <p>
EForth is a delightfully minimalist approach to Forth originated by Bill Muench and Dr. C. H. Ting. 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
<p> <p>
<a href="https://eforth.storage.googleapis.com/releases/ESP32forth-6.3.0.ino">ESP32forth-6.3.0.ino</a> <a href="https://eforth.storage.googleapis.com/releases/ESP32forth-6.3.0.ino">ESP32forth-6.3.0.ino</a>
- 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.
</p> </p>
<h3>Classic EForth Quirks</h3> <h3>Classic EForth Quirks</h3>

8
site/index.html
View File

@ -16,10 +16,11 @@ limitations under the License.
--> -->
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>EForth</title> <title>EForth</title>
<link rel="stylesheet" href="static/eforth.css"> <link rel="stylesheet" href="static/eforth.css">
</head> </head>
<body> <body>
<h1>EForth</h1> <h1>EForth</h1>
<script> <script>
@ -27,6 +28,7 @@ window.location.replace('./ESP32forth.html');
</script> </script>
{{MENU}} {{MENU}}
<div class="wrapper">
<p> <p>
Choose you platform above. Choose you platform above.

9
site/internals.html
View File

@ -16,14 +16,15 @@ limitations under the License.
--> -->
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>µEforth Internals</title> <title>µEforth Internals</title>
<link rel="stylesheet" href="static/eforth.css"> <link rel="stylesheet" href="static/eforth.css">
</head> </head>
<body> <body>
<h1>µEforth Internals</h1> <h1>µEforth Internals</h1>
{{MENU}} {{MENU}}
<div class="wrapper">
<p> <p>
µEforth (micro-Eforth) simplifies EForth even futher, by building just enough µEforth (micro-Eforth) simplifies EForth even futher, by building just enough

20
site/linux.html
View File

@ -16,14 +16,15 @@ limitations under the License.
--> -->
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>µEforth for Linux</title> <title>µEforth for Linux</title>
<link rel="stylesheet" href="static/eforth.css"> <link rel="stylesheet" href="static/eforth.css">
</head> </head>
<body> <body>
<h1>µEforth for Linux</h1> <h1>µEforth for Linux</h1>
{{MENU}} {{MENU}}
<div class="wrapper">
<h2>Download</h2> <h2>Download</h2>
@ -31,14 +32,21 @@ limitations under the License.
<p> <p>
<a href="https://eforth.storage.googleapis.com/releases/ueforth-{{STABLE_VERSION}}.linux">ueforth-{{STABLE_VERSION}}.linux</a> <a href="https://eforth.storage.googleapis.com/releases/ueforth-{{STABLE_VERSION}}.linux">ueforth-{{STABLE_VERSION}}.linux</a>
- Linux 64-bit Executable µEforth<br/> - Linux 64-bit Executable µEforth<br/>
<i>Version: {{STABLE_VERSION}}</i> <i>Version: {{STABLE_VERSION}} (Stable)</i>
</p>
<h3>LONG TERM STABLE RELEASE</h3>
<p>
<a href="https://eforth.storage.googleapis.com/releases/ueforth-{{OLD_STABLE_VERSION}}.linux">ueforth-{{OLD_STABLE_VERSION}}.linux</a>
- Linux 64-bit Executable µEforth<br/>
<i>Version: {{OLD_STABLE_VERSION}} (Long-term Stable)</i>
</p> </p>
<h3>Beta Release</h3> <h3>Beta Release</h3>
<p> <p>
<a href="https://eforth.storage.googleapis.com/releases/ueforth-{{VERSION}}.linux">ueforth-{{VERSION}}.linux</a> <a href="https://eforth.storage.googleapis.com/releases/ueforth-{{VERSION}}.linux">ueforth-{{VERSION}}.linux</a>
- Linux 64-bit Executable µEforth<br/> - Linux 64-bit Executable µEforth<br/>
<i>Version: {{VERSION}}</i> <i>Version: {{VERSION}} (Beta)</i>
</p> </p>
<hr/> <hr/>

1
site/menu.html
View File

@ -16,6 +16,7 @@ limitations under the License.
<div class="menu"> <div class="menu">
<span><a href="https://esp32forth.appspot.com/ESP32forth.html">ESP32forth</a></span> <span><a href="https://esp32forth.appspot.com/ESP32forth.html">ESP32forth</a></span>
<span><a href="https://eforth.appspot.com/web.html">Web</a></span>
<span><a href="https://eforth.appspot.com/linux.html">Linux</a></span> <span><a href="https://eforth.appspot.com/linux.html">Linux</a></span>
<span><a href="https://eforth.appspot.com/windows.html">Windows</a></span> <span><a href="https://eforth.appspot.com/windows.html">Windows</a></span>
<span><a href="https://eforth.appspot.com/internals.html">Internals</a></span> <span><a href="https://eforth.appspot.com/internals.html">Internals</a></span>

33
site/static/eforth.css
View File

@ -1,20 +1,25 @@
// Copyright 2021 Bradley D. Nelson /*
// * 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. * Licensed under the Apache License, Version 2.0 (the "License");
// You may obtain a copy of the License at * 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 *
// * 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, * Unless required by applicable law or agreed to in writing, software
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * distributed under the License is distributed on an "AS IS" BASIS,
// See the License for the specific language governing permissions and * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// limitations under the License. * See the License for the specific language governing permissions and
* limitations under the License.
*/
body { body {
margin: 0px;
}
.wrapper {
max-width: 800px; max-width: 800px;
margin-top: 0px; padding: 0px 10px;
} }
h1 { h1 {
border-top: 3px solid #777; border-top: 3px solid #777;

30
site/web.html Normal file
View File

@ -0,0 +1,30 @@
<!DOCTYPE html>
<!--
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.
-->
<head>
<meta charset="UTF-8">
<title>µEforth for Linux</title>
<link rel="stylesheet" href="static/eforth.css">
</head>
<body>
<h1>µEforth for Web</h1>
{{MENU}}
<div class="wrapper">
<pre id="console">
<script src="ueforth.js"></script>

20
site/windows.html
View File

@ -16,14 +16,15 @@ limitations under the License.
--> -->
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>µEforth for Windows</title> <title>µEforth for Windows</title>
<link rel="stylesheet" href="static/eforth.css"> <link rel="stylesheet" href="static/eforth.css">
</head> </head>
<body> <body>
<h1>µEforth for Windows</h1> <h1>µEforth for Windows</h1>
{{MENU}} {{MENU}}
<div class="wrapper">
<h2>Download</h2> <h2>Download</h2>
@ -36,13 +37,22 @@ limitations under the License.
<i>Version: {{STABLE_VERSION}} (Stable)</i> <i>Version: {{STABLE_VERSION}} (Stable)</i>
</p> </p>
<h3>LONG TERM STABLE RELEASE</h3>
<p>
<a href="https://eforth.storage.googleapis.com/releases/uEf32-{{OLD_STABLE_VERSION}}.exe">uEf32-{{OLD_STABLE_VERSION}}.exe</a>
- Window 32-bit EXE µEforth<br/>
<a href="https://eforth.storage.googleapis.com/releases/uEf64-{{OLD_STABLE_VERSION}}.exe">uEf64-{{OLD_STABLE_VERSION}}.exe</a>
- Window 64-bit EXE µEforth<br/>
<i>Version: {{OLD_STABLE_VERSION}} (Long-term Stable)</i>
</p>
<h3>Beta Release</h3> <h3>Beta Release</h3>
<p> <p>
<a href="https://eforth.storage.googleapis.com/releases/uEf32-{{VERSION}}.exe">uEf32-{{VERSION}}.exe</a> <a href="https://eforth.storage.googleapis.com/releases/uEf32-{{VERSION}}.exe">uEf32-{{VERSION}}.exe</a>
- Window 32-bit EXE µEforth<br/> - Window 32-bit EXE µEforth<br/>
<a href="https://eforth.storage.googleapis.com/releases/uEf64-{{VERSION}}.exe">uEf64-{{VERSION}}.exe</a> <a href="https://eforth.storage.googleapis.com/releases/uEf64-{{VERSION}}.exe">uEf64-{{VERSION}}.exe</a>
- Window 64-bit EXE µEforth<br/> - Window 64-bit EXE µEforth<br/>
<i>Version: {{VERSION}}</i> <i>Version: {{VERSION}} (Beta)</i>
</p> </p>
<hr/> <hr/>

9
web/fini.fs
View File

@ -34,9 +34,12 @@ r|
r" r"
if (!globalObj['write']) { if (!globalObj['write']) {
var con = document.createElement('pre'); var con = document.getElementById('console');
con.id = 'console'; if (con === null) {
document.body.appendChild(con); con = document.createElement('pre');
con.id = 'console';
document.body.appendChild(con);
}
window.inbuffer = []; window.inbuffer = [];
window.outbuffer = ''; window.outbuffer = '';
window.onkeypress = function(e) { window.onkeypress = function(e) {

2
web/terminal.html
View File

@ -16,5 +16,3 @@ limitations under the License.
--> -->
<script src="ueforth.js"></script> <script src="ueforth.js"></script>
<script type="forth">
needs ansi.fs