Wapp

Check-in [dd273e0756]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Add support for building wapptclsh with TclTLS.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | tcltls
Files: files | file ages | folders
SHA3-256: dd273e07561323a864c324b3c12ae1196914583ed759d435c333e0fb796c7628
User & Date: drh 2019-07-22 12:49:33.229
Context
2019-07-29
19:51
Documentation updates. No changes to code. (Leaf check-in: 255f9ed52a user: drh tags: tcltls)
2019-07-22
12:49
Add support for building wapptclsh with TclTLS. (check-in: dd273e0756 user: drh tags: tcltls)
2019-06-13
14:24
Add a link to the "Simple Live Demos" page to the README.md file. (check-in: 4d00e13e65 user: drh tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to Makefile. 
1
2
3

4
5
6












7
8
9
10
11
12
13
14
15
16
17

#!/usr/bin/make

CC = gcc -Os -static

TCLLIB = /home/drh/tcl/lib/libtcl8.7.a -lm -lz -lpthread -ldl
TCLINC = /home/drh/tcl/include
TCLSH = tclsh













all: wapptclsh

wapptclsh: wapptclsh.c
	$(CC) -I. -I$(TCLINC) -o $@ wapptclsh.c $(TCLLIB)

wapptclsh.c:	wapptclsh.c.in wapp.tcl wapptclsh.tcl tclsqlite3.c mkccode.tcl
	$(TCLSH) mkccode.tcl wapptclsh.c.in >$@

clean:	
	rm wapptclsh wapptclsh.c




>
|


>
>
>
>
>
>
>
>
>
>
>
>




|





|

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30

#!/usr/bin/make

CC = gcc -Os -static
TCLLIB1 = 
TCLLIB2 = /home/drh/tcl/lib/libtcl8.7.a -lm -lz -lpthread -ldl
TCLINC = /home/drh/tcl/include
TCLSH = tclsh

# Comment out the following to disable TLS support.
#
# The tcltls.a library can be build from sources obtained from
#
#      https://core.tcl-lang.org/tcltls/wiki/Download
#
# Use "./configure --disable-shared".  You will also need to install static
# OpenSSL libraries.
#
CC += -DWAPP_ENABLE_TCLTLS
TCLLIB1 = /home/drh/tcl/lib/tcltls.a -lssl -lcrypto

all: wapptclsh

wapptclsh: wapptclsh.c
	$(CC) -I. -I$(TCLINC) -o $@ wapptclsh.c $(TCLLIB1) $(TCLLIB2)

wapptclsh.c:	wapptclsh.c.in wapp.tcl wapptclsh.tcl tclsqlite3.c mkccode.tcl
	$(TCLSH) mkccode.tcl wapptclsh.c.in >$@

clean:	
	rm -f wapptclsh wapptclsh.c
Changes to wapptclsh.c.in.
︙︙
42
43
44
45
46
47
48




49
50
51
52
53
54
55



56
57

*/
static const char zWappTclshInit[] = 
BEGIN_STRING
INCLUDE $ROOT/wapptclsh.tcl
END_STRING
;





/*
** Return the text of the script to run.  Or, return NULL to run an
** interactive shell.
*/
const char *wapptclsh_init_proc(Tcl_Interp *interp){
  Tcl_GlobalEval(interp, zWapp);  /* Load the wapp.tcl extension */
  Tcl_GlobalEval(interp, zWappTclshInit); /* Load the main loop script */



  return Tcl_GetVar(interp, "main_script", TCL_GLOBAL_ONLY);
}








>
>
>
>







>
>
>



42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64

*/
static const char zWappTclshInit[] = 
BEGIN_STRING
INCLUDE $ROOT/wapptclsh.tcl
END_STRING
;

#ifdef WAPP_ENABLE_TCLTLS
extern int Tls_Init(Tcl_Interp*);
#endif

/*
** Return the text of the script to run.  Or, return NULL to run an
** interactive shell.
*/
const char *wapptclsh_init_proc(Tcl_Interp *interp){
  Tcl_GlobalEval(interp, zWapp);  /* Load the wapp.tcl extension */
  Tcl_GlobalEval(interp, zWappTclshInit); /* Load the main loop script */
#ifdef WAPP_ENABLE_TCLTLS
  Tls_Init(interp);
#endif
  return Tcl_GetVar(interp, "main_script", TCL_GLOBAL_ONLY);
}