diff --git a/site/index.html b/site/index.html index c672978..359c5ec 100644 --- a/site/index.html +++ b/site/index.html @@ -16,7 +16,7 @@ limitations under the License. -->
-{{HEAD}} +#include "head.html"diff --git a/site/internals.html b/site/internals.html index e44beec..c97e8d8 100644 --- a/site/internals.html +++ b/site/internals.html @@ -16,13 +16,13 @@ limitations under the License. -->
- {{HEAD}} +#include "head.html"diff --git a/site/linux.html b/site/linux.html index 86efdad..901b50d 100644 --- a/site/linux.html +++ b/site/linux.html @@ -16,13 +16,13 @@ limitations under the License. -->
- {{HEAD}} +#include "head.html"TYPE and KEY are connected to
stdin and stdout.
-{{DESKTOP_COMMON}}
+#include "desktop_common.html"
diff --git a/site/pico-ice.html b/site/pico-ice.html
index 8f53d10..f547c91 100644
--- a/site/pico-ice.html
+++ b/site/pico-ice.html
@@ -16,13 +16,13 @@ limitations under the License.
-->
- {{HEAD}}
+#include "head.html"
baud rate = 115200, data bits = 8, s
pico-ice Words
-{{COMMON}}
+#include "common.html"
pico-ice Bindings
diff --git a/site/web.html b/site/web.html
index d3a99f5..40d20ae 100644
--- a/site/web.html
+++ b/site/web.html
@@ -16,13 +16,13 @@ limitations under the License.
-->
-{{HEAD}}
+#include "head.html"
µEforth for Web
µEforth for Web
-{{MENU}}
+#include "menu.html"
diff --git a/site/windows.html b/site/windows.html
index ba76d62..4b23920 100644
--- a/site/windows.html
+++ b/site/windows.html
@@ -16,13 +16,13 @@ limitations under the License.
-->
- {{HEAD}}
+#include "head.html"
µEforth for Windows
µEforth for Windows
-{{MENU}}
+#include "menu.html"
Download
@@ -69,8 +69,8 @@ limitations under the License.
µEforth Words
-{{COMMON}}
-{{FILES_COMMON}}
+#include "common.html"
+#include "files_common.html"
Windows
@@ -110,4 +110,4 @@ In addition, a terminal that responds to ANSI escape codes is created and connec
TYPE and KEY.
-{{DESKTOP_COMMON}}
+#include "desktop_common.html"
diff --git a/tools/configure.py b/tools/configure.py
index d7e63ef..3bae333 100755
--- a/tools/configure.py
+++ b/tools/configure.py
@@ -97,7 +97,7 @@ rule mkdir
rule importation
description = importation
depfile = $out.dd
- command = ../tools/importation.py $in $out -I . -I .. --name $name --header $header_mode --depsout $out.dd --set-version $version --set-revision $revision
+ command = ../tools/importation.py -i $in -o $out -I . -I .. --name $name --header $header_mode --depsout $out.dd -DVERSION=$version -DREVSION=$revision
build gen: mkdir
diff --git a/tools/importation.py b/tools/importation.py
index 0f9a2e5..3ead57c 100755
--- a/tools/importation.py
+++ b/tools/importation.py
@@ -7,11 +7,10 @@ import sys
parser = argparse.ArgumentParser(
prog='importation',
description='Imports header / fs files')
-parser.add_argument('input')
-parser.add_argument('output')
+parser.add_argument('-i', required=True)
+parser.add_argument('-o', required=True)
parser.add_argument('-I', action='append')
-parser.add_argument('--set-version')
-parser.add_argument('--set-revision')
+parser.add_argument('-D', action='append')
parser.add_argument('--depsout')
parser.add_argument('--no-out', action='store_true')
parser.add_argument('--keep-first-comment', action='store_true')
@@ -19,6 +18,7 @@ parser.add_argument('--name')
parser.add_argument('--header')
args = parser.parse_args()
bases = args.I or []
+replacements = args.D or []
results = []
imported = set([__file__])
@@ -36,6 +36,7 @@ def Import(filename):
sfilename = os.path.join(os.path.dirname(filename), sfilename)
Import(sfilename)
elif (filename.endswith('.h') or
+ filename.endswith('.html') or
filename.endswith('.ino') or
filename.endswith('.cc') or
filename.endswith('.cpp') or
@@ -54,14 +55,13 @@ def Import(filename):
results.append(line)
def Process():
- Import(args.input)
+ Import(args.i)
# Conversion version tags.
output = []
for line in results:
- if args.set_version:
- line = line.replace('{{VERSION}}', args.set_version)
- if args.set_revision:
- line = line.replace('{{REVISION}}', args.set_revision)
+ for r in replacements:
+ name, value = r.split('=', 1)
+ line = line.replace('{{' + name + 'VERSION}}', value)
output.append(line)
# Drop comments.
comment1 = False
@@ -85,11 +85,11 @@ def Process():
# Emit deps.
if args.depsout:
with open(args.depsout, 'w') as fh:
- fh.write(args.output + ': ' +
+ fh.write(args.o + ': ' +
' '.join([os.path.relpath(i) for i in imported]) + '\n')
# Emit expanded file.
if not args.no_out:
- with open(args.output, 'w') as fh:
+ with open(args.o, 'w') as fh:
if args.header == 'web':
fh.write('const ' + args.name + ' = `\n' +
'\n'.join(output) + '\n`;\n')
diff --git a/tools/replace.js b/tools/replace.js
deleted file mode 100755
index af326fb..0000000
--- a/tools/replace.js
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /usr/bin/env nodejs
-// 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.
-
-var fs = require('fs');
-
-function DropCopyright(source) {
- var lines = source.split('\n');
- var cleaned = [];
- for (var i = 0; i < lines.length; ++i) {
- if (lines[i] == '') {
- ++i;
- }
- ++i;
- }
- if (lines[i].search('Copyright') >= 0) {
- while (lines[i] != '') {
- ++i;
- }
- } else {
- cleaned.push(lines[i]);
- }
- }
- return cleaned.join('\n').trim();
-}
-
-var source = fs.readFileSync(process.stdin.fd).toString();
-var replacements = [];
-for (var i = 2; i < process.argv.length; ++i) {
- var item = process.argv[i];
- var m = item.match(/^([^=]+)=@(.+)$/);
- if (m) {
- var content = DropCopyright(fs.readFileSync(m[2]).toString());
- replacements.push(['{{' + m[1] + '}}', content]);
- continue;
- }
- var m = item.match(/^([^=]+)=(.+)$/);
- if (m) {
- replacements.push(['{{' + m[1] + '}}', m[2]]);
- continue;
- }
- throw 'Bad replacement ' + item;
-}
-
-for (;;) {
- var old_source = source;
- for (var i = 0; i < replacements.length; ++i) {
- source = source.replace(
- replacements[i][0],
- function() { return replacements[i][1]});
- }
- if (old_source == source) {
- break;
- }
-}
-
-process.stdout.write(source);