Skip to content

Commit 7aa753a

Browse files
elblakeelblake
committed
Update files.
1 parent c3618b4 commit 7aa753a

15 files changed

Lines changed: 198 additions & 37 deletions

‎plugins_src/scripting/Makefile‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ clean:
6666
rm -f $(TARGET_FILES)
6767
rm -f core
6868

69+
ESCRIPT=escript
70+
6971
$(EBIN)/%.beam: $(ESRC)/%.erl
7072
$(ERLC) $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
7173

@@ -98,28 +100,22 @@ $(INIT_SCRIPT_SCM_EBIN)/%.scm: $(INIT_SCRIPT_SCM_SRC)/%.scm
98100
$(INIT_SCRIPT_PY_EBIN)/w3d_we.py: $(INIT_SCRIPT_PY_SRC)/w3d_we.1.py \
99101
$(INIT_SCRIPT_SRC)/callable.conf \
100102
$(INIT_SCRIPT_SRC)/py-modnames
101-
cat $(INIT_SCRIPT_PY_SRC)/w3d_we.1.py \
102-
> "$(INIT_SCRIPT_PY_EBIN)/w3d_we.py"
103-
escript tools/gen-wrapper-script.escript \
104-
$(INIT_SCRIPT_SRC)/callable.conf \
105-
$(INIT_SCRIPT_SRC)/py-modnames py \
106-
>> "$(INIT_SCRIPT_PY_EBIN)/w3d_we.py"
103+
./tools/gen-init-we-script.sh \
104+
"$(INIT_SCRIPT_PY_SRC)/w3d_we.1.py" \
105+
- \
106+
"$(INIT_SCRIPT_SRC)/callable.conf" \
107+
"$(INIT_SCRIPT_SRC)/py-modnames" py \
108+
> "$(INIT_SCRIPT_PY_EBIN)/w3d_we.py"
107109

108110
# Generate init.scm file from callable.conf
109111
$(INIT_SCRIPT_SCM_EBIN)/init.scm: $(INIT_SCRIPT_SCM_SRC)/init.1.scm \
110112
$(INIT_SCRIPT_SRC)/callable.conf \
111113
$(INIT_SCRIPT_SRC)/scm-modnames \
112114
$(INIT_SCRIPT_SCM_SRC)/init.2.scm
113-
cat $(INIT_SCRIPT_SCM_SRC)/init.1.scm \
114-
> "$(INIT_SCRIPT_SCM_EBIN)/init.scm"
115-
escript tools/gen-wrapper-script.escript \
116-
$(INIT_SCRIPT_SRC)/callable.conf \
117-
$(INIT_SCRIPT_SRC)/scm-modnames scm \
118-
>> "$(INIT_SCRIPT_SCM_EBIN)/init.scm"
119-
cat $(INIT_SCRIPT_SCM_SRC)/init.2.scm \
120-
>> "$(INIT_SCRIPT_SCM_EBIN)/init.scm"
121-
122-
123-
#$(EBIN)/wpc_scripting_shapes.beam: $(WINGS_E3D)/e3d.hrl
124-
115+
./tools/gen-init-we-script.sh \
116+
"$(INIT_SCRIPT_SCM_SRC)/init.1.scm" \
117+
"$(INIT_SCRIPT_SCM_SRC)/init.2.scm" \
118+
"$(INIT_SCRIPT_SRC)/callable.conf" \
119+
"$(INIT_SCRIPT_SRC)/scm-modnames" scm \
120+
> "$(INIT_SCRIPT_SCM_EBIN)/init.scm"
125121

‎plugins_src/scripting/docs/Makefile‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
#
2+
# Makefile --
3+
#
4+
# Makefile for building scripting documentation
5+
#
6+
# Copyright (c) 2025 Edward Blake
7+
#
8+
# See the file "license.terms" for information on usage and redistribution
9+
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
10+
#
11+
12+
AWK=awk
13+
MKDIR=mkdir -p
14+
PACK_MANUAL=../../../tools/pack_manual
115

216
FILES= \
317
en/INDEX \
@@ -68,18 +82,18 @@ SCRIPTINITDIR=../../../plugins/scripting/wpc_scripting_shapes_init
6882
all: ${SCRIPTINITDIR}/scripting-reference-en.manual
6983

7084
generated/en:
71-
mkdir -p generated/en
85+
$(MKDIR) generated/en
7286

7387
generated/en/scm-we.txt: generated/en funs
74-
awk -v type=scm -f ../tools/gen-funs-doc.awk < funs > generated/en/scm-we.txt
88+
$(AWK) -v type=scm -f ../tools/gen-funs-doc.awk < funs > generated/en/scm-we.txt
7589

7690
generated/en/py-we.txt: generated/en funs
77-
awk -v type=py -f ../tools/gen-funs-doc.awk < funs > generated/en/py-we.txt
91+
$(AWK) -v type=py -f ../tools/gen-funs-doc.awk < funs > generated/en/py-we.txt
7892

7993
${SCRIPTINITDIR}/scripting-reference-en.manual: $(FILES) \
8094
generated/en/scm-we.txt \
8195
generated/en/py-we.txt
82-
../../../tools/pack_manual en \
96+
$(PACK_MANUAL) en \
8397
--out ${SCRIPTINITDIR}/scripting-reference-en.manual
8498

8599

‎plugins_src/scripting/docs/en/README.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Python Scripting
1111

1212
CONTRIBUTORS FOR DOCUMENTATION
1313

14-
Edward Blake started the documentation of the scripting
15-
plugin for the first release.
14+
Edward Blake has written the documentation for the first
15+
release of the scripting plugin.
1616

1717

1818

‎plugins_src/scripting/init_scripts/callable.conf‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
2+
%%
3+
%% Scripting for Shapes
4+
%%
5+
%% Copyright 2025 Edward Blake
6+
%%
7+
%% See the file "license.terms" for information on usage and redistribution
8+
%% of this file, and for a DISCLAIMER OF ALL WARRANTIES.
9+
%%
10+
%% $Id$
11+
%%
12+
113
%% List of callable wings functions
214
[
315
{{wings_collapse,collapse_edge,1},{[int,we],we}},

‎plugins_src/scripting/init_scripts/defaults.conf‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11

2+
%%
3+
%% Scripting for Shapes
4+
%%
5+
%% Copyright 2025 Edward Blake
6+
%%
7+
%% See the file "license.terms" for information on usage and redistribution
8+
%% of this file, and for a DISCLAIMER OF ALL WARRANTIES.
9+
%%
10+
%% $Id$
11+
%%
12+
213
%%
314
%% Set defaults before the user specific preferences are set.
415

‎plugins_src/scripting/init_scripts/py-modnames‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
2+
%%
3+
%% Scripting for Shapes
4+
%%
5+
%% Copyright 2025 Edward Blake
6+
%%
7+
%% See the file "license.terms" for information on usage and redistribution
8+
%% of this file, and for a DISCLAIMER OF ALL WARRANTIES.
9+
%%
10+
%% $Id$
11+
%%
12+
113
%% How modules are named in the generated python script files.
214
[
315
{wings_collapse, [collapse]},

‎plugins_src/scripting/init_scripts/python.script-init-conf‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11

2+
%%
3+
%% Scripting for Shapes
4+
%%
5+
%% Copyright 2025 Edward Blake
6+
%%
7+
%% See the file "license.terms" for information on usage and redistribution
8+
%% of this file, and for a DISCLAIMER OF ALL WARRANTIES.
9+
%%
10+
%% $Id$
11+
%%
12+
213
%%
314
%% Sets the default python binary filenames
415
%%

‎plugins_src/scripting/init_scripts/scheme.script-init-conf‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11

2+
%%
3+
%% Scripting for Shapes
4+
%%
5+
%% Copyright 2025 Edward Blake
6+
%%
7+
%% See the file "license.terms" for information on usage and redistribution
8+
%% of this file, and for a DISCLAIMER OF ALL WARRANTIES.
9+
%%
10+
%% $Id$
11+
%%
12+
213
%%
314
%% Sets the default gauche binary filenames
415
%%

‎plugins_src/scripting/init_scripts/scm-modnames‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
2+
%%
3+
%% Scripting for Shapes
4+
%%
5+
%% Copyright 2025 Edward Blake
6+
%%
7+
%% See the file "license.terms" for information on usage and redistribution
8+
%% of this file, and for a DISCLAIMER OF ALL WARRANTIES.
9+
%%
10+
%% $Id$
11+
%%
12+
113
%% How modules are named in the generated python script files.
214
[
315
{wings_collapse, [we,collapse]},

‎plugins_src/scripting/scripting_engines.erl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%% Read script engine config files and set up the arguments for when
55
%% a script interpreter is invoked.
66
%%
7-
%% Copyright 2024 Edward Blake
7+
%% Copyright 2024-2025 Edward Blake
88
%%
99
%% See the file "license.terms" for information on usage and redistribution
1010
%% of this file, and for a DISCLAIMER OF ALL WARRANTIES.

0 commit comments

Comments
 (0)