Tcl Source Code

Check-in [bc0f534cb0]
Login

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

Overview
Comment:Dependancies from androwish upstream
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | androwish
Files: files | file ages | folders
SHA1: bc0f534cb04b989119957ca142ce9e472ff1dec6
User & Date: jan.nijtmans 2015-08-31 17:30:01
Context
2015-09-02
07:16
Merge trunk check-in: 938195c9ae user: jan.nijtmans tags: androwish
2015-08-31
17:30
Dependancies from androwish upstream check-in: bc0f534cb0 user: jan.nijtmans tags: androwish
10:22
Merge trunk, but remove experimental tip-389-impl merge. check-in: 6d59f33bbb user: jan.nijtmans tags: androwish
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to Android.mk.

1
2
3
4
5
6
7
8
9
10
11
12
13


14
15
16
17
18
19
20
LOCAL_PATH := $(call my-dir)

###########################
#
# Tcl shared library
#
###########################

include $(CLEAR_VARS)

tcl_path := $(LOCAL_PATH)

include $(tcl_path)/tcl-config.mk



LOCAL_MODULE := tcl

LOCAL_ARM_MODE := arm

LOCAL_C_INCLUDES := $(tcl_includes) $(LOCAL_PATH)/libtommath














>
>







1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
LOCAL_PATH := $(call my-dir)

###########################
#
# Tcl shared library
#
###########################

include $(CLEAR_VARS)

tcl_path := $(LOCAL_PATH)

include $(tcl_path)/tcl-config.mk

LOCAL_ADDITIONAL_DEPENDENCIES += $(tcl_path)/tcl-config.mk

LOCAL_MODULE := tcl

LOCAL_ARM_MODE := arm

LOCAL_C_INCLUDES := $(tcl_includes) $(LOCAL_PATH)/libtommath

Changes to tcl-config.mk.

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
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50

51
52
53
54
55
56
57
58
59
60
tcl_includes := $(tcl_path)/generic $(tcl_path)/unix

tcl_cflags := \
        -DHAVE_SYS_SELECT_H=1 \
        -DHAVE_LIMITS_H=1 \
        -DHAVE_UNISTD_H=1 \
        -DHAVE_SYS_PARAM_H=1 \
        -D_LARGEFILE64_SOURCE=1 \
        -DTCL_WIDE_INT_TYPE="long long" \
        -DTCL_SHLIB_EXT="\".so\"" \
        -DHAVE_CAST_TO_UNION=1 \
        -DHAVE_GETCWD=1 \
        -DHAVE_OPENDIR=1 \
	-DHAVE_MKSTEMP=1 \
	-DHAVE_MKSTEMPS=1 \
        -DHAVE_STRSTR=1 \
        -DHAVE_STRTOL=1 \
        -DHAVE_STRTOLL=1 \
        -DHAVE_STRTOULL=1 \
        -DHAVE_TMPNAM=1 \
        -DHAVE_WAITPID=1 \
	-DHAVE_STRUCT_ADDRINFO=1 \
	-DHAVE_STRUCT_IN6_ADDR=1 \
	-DHAVE_STRUCT_SOCKADDR_IN6=1 \
	-DHAVE_STRUCT_SOCKADDR_STORAGE=1 \

        -DUSE_TERMIOS=1 \
        -DHAVE_MKTIME=1 \
        -DUSE_INTERP_ERRORLINE=1 \
        -DHAVE_SYS_TIME_H=1 \
        -DTIME_WITH_SYS_TIME=1 \
        -DHAVE_TM_ZONE=1 \
        -DHAVE_GMTIME_R=1 \
        -DHAVE_LOCALTIME_R=1 \
        -DHAVE_TM_GMTOFF=1 \
        -DHAVE_TIMEZONE_VAR=1 \
        -DHAVE_ST_BLKSIZE=1 \
        -DSTDC_HEADERS=1 \
	-DHAVE_INTPTR_T=1 \
	-DHAVE_UINTPTR_T=1 \
	-DHAVE_SIGNED_CHAR=1 \
        -DHAVE_SYS_IOCTL_H=1 \
        -DHAVE_MEMCPY=1 \
        -DHAVE_MEMMOVE=1 \
        -DVOID=void \
        -DNO_UNION_WAIT=1 \
        -DHAVE_ZLIB=1 \
	-DMP_PREC=4 \
	-DTCL_TOMMATH=1 \
	-D_REENTRANT=1 \
	-D_THREADSAFE=1 \

	-DTCL_THREADS=1 \
	-DTCL_PTHREAD_ATFORK=1 \
	-DUSE_THREAD_ALLOC=1 \
	-DTCL_CFGVAL_ENCODING="\"utf-8\"" \
	-DTCL_UNLOAD_DLLS=1 \
	-DTCL_CFG_OPTIMIZED=1 \
        -DZIPFS_IN_TCL=1 \
	-DTCL_PACKAGE_PATH="\"/assets\"" \
	-DTCL_LIBRARY="\"/assets/tcl8.6\""




|
|
|
|
|
|
|
|
|
|


|
|
|
|
|
|




>
|
|
|
|
|
|
|
|
|
|
|
|



|
|
|
|
|
|




>






|



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
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
tcl_includes := $(tcl_path)/generic $(tcl_path)/unix

tcl_cflags := \
	-DHAVE_SYS_SELECT_H=1 \
	-DHAVE_LIMITS_H=1 \
	-DHAVE_UNISTD_H=1 \
	-DHAVE_SYS_PARAM_H=1 \
	-D_LARGEFILE64_SOURCE=1 \
	-DTCL_WIDE_INT_TYPE="long long" \
	-DTCL_SHLIB_EXT="\".so\"" \
	-DHAVE_CAST_TO_UNION=1 \
	-DHAVE_GETCWD=1 \
	-DHAVE_OPENDIR=1 \
	-DHAVE_MKSTEMP=1 \
	-DHAVE_MKSTEMPS=1 \
	-DHAVE_STRSTR=1 \
	-DHAVE_STRTOL=1 \
	-DHAVE_STRTOLL=1 \
	-DHAVE_STRTOULL=1 \
	-DHAVE_TMPNAM=1 \
	-DHAVE_WAITPID=1 \
	-DHAVE_STRUCT_ADDRINFO=1 \
	-DHAVE_STRUCT_IN6_ADDR=1 \
	-DHAVE_STRUCT_SOCKADDR_IN6=1 \
	-DHAVE_STRUCT_SOCKADDR_STORAGE=1 \
	-DHAVE_GETHOSTBYNAME_R=1 \
	-DUSE_TERMIOS=1 \
	-DHAVE_MKTIME=1 \
	-DUSE_INTERP_ERRORLINE=1 \
	-DHAVE_SYS_TIME_H=1 \
	-DTIME_WITH_SYS_TIME=1 \
	-DHAVE_TM_ZONE=1 \
	-DHAVE_GMTIME_R=1 \
	-DHAVE_LOCALTIME_R=1 \
	-DHAVE_TM_GMTOFF=1 \
	-DHAVE_TIMEZONE_VAR=1 \
	-DHAVE_ST_BLKSIZE=1 \
	-DSTDC_HEADERS=1 \
	-DHAVE_INTPTR_T=1 \
	-DHAVE_UINTPTR_T=1 \
	-DHAVE_SIGNED_CHAR=1 \
	-DHAVE_SYS_IOCTL_H=1 \
	-DHAVE_MEMCPY=1 \
	-DHAVE_MEMMOVE=1 \
	-DVOID=void \
	-DNO_UNION_WAIT=1 \
	-DHAVE_ZLIB=1 \
	-DMP_PREC=4 \
	-DTCL_TOMMATH=1 \
	-D_REENTRANT=1 \
	-D_THREADSAFE=1 \
	-DTCL_UTF_MAX=6 \
	-DTCL_THREADS=1 \
	-DTCL_PTHREAD_ATFORK=1 \
	-DUSE_THREAD_ALLOC=1 \
	-DTCL_CFGVAL_ENCODING="\"utf-8\"" \
	-DTCL_UNLOAD_DLLS=1 \
	-DTCL_CFG_OPTIMIZED=1 \
	-DZIPFS_IN_TCL=1 \
	-DTCL_PACKAGE_PATH="\"/assets\"" \
	-DTCL_LIBRARY="\"/assets/tcl8.6\""

Changes to win/Makefile.in.

292
293
294
295
296
297
298
299

300
301
302
303
304
305
306
	tclThreadStorage.$(OBJEXT) \
	tclTimer.$(OBJEXT) \
	tclTomMathInterface.$(OBJEXT) \
	tclTrace.$(OBJEXT) \
	tclUtf.$(OBJEXT) \
	tclUtil.$(OBJEXT) \
	tclVar.$(OBJEXT) \
	tclZlib.$(OBJEXT)


TOMMATH_OBJS = \
	bncore.${OBJEXT} \
	bn_reverse.${OBJEXT} \
	bn_fast_s_mp_mul_digs.${OBJEXT} \
	bn_fast_s_mp_sqr.${OBJEXT} \
	bn_mp_add.${OBJEXT} \







|
>







292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
	tclThreadStorage.$(OBJEXT) \
	tclTimer.$(OBJEXT) \
	tclTomMathInterface.$(OBJEXT) \
	tclTrace.$(OBJEXT) \
	tclUtf.$(OBJEXT) \
	tclUtil.$(OBJEXT) \
	tclVar.$(OBJEXT) \
	tclZlib.$(OBJEXT) \
	zipfs.$(OBJEXT)

TOMMATH_OBJS = \
	bncore.${OBJEXT} \
	bn_reverse.${OBJEXT} \
	bn_fast_s_mp_mul_digs.${OBJEXT} \
	bn_fast_s_mp_sqr.${OBJEXT} \
	bn_mp_add.${OBJEXT} \
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
clean: cleanhelp clean-packages
	$(RM) *.lib *.a *.exp *.dll *.$(RES) *.${OBJEXT} *~ \#* TAGS a.out
	$(RM) $(TCLSH) $(CAT32)
	$(RM) *.pch *.ilk *.pdb

distclean: distclean-packages clean
	$(RM) Makefile config.status config.cache config.log tclConfig.sh \
		tcl.hpj config.status.lineno

#
# Bundled package targets
#

PKG_CFG_ARGS		= @PKG_CFG_ARGS@
PKG_DIR			= ./pkgs







|







738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
clean: cleanhelp clean-packages
	$(RM) *.lib *.a *.exp *.dll *.$(RES) *.${OBJEXT} *~ \#* TAGS a.out
	$(RM) $(TCLSH) $(CAT32)
	$(RM) *.pch *.ilk *.pdb

distclean: distclean-packages clean
	$(RM) Makefile config.status config.cache config.log tclConfig.sh \
		tcl.hpj config.status.lineno tclsh.exe.manifest

#
# Bundled package targets
#

PKG_CFG_ARGS		= @PKG_CFG_ARGS@
PKG_DIR			= ./pkgs