Fossil SCM

Update to the latest autosetup(0.6.4)

drh 2012-02-17 17:57 trunk merge

Commit dd13b0e64d62ac0cffe72d0b043992467c97dbde

Parent 029870831aeb0e2…

10 files changed +1 -1 +59 -8 +14 +6 -6 +25 -5 +3 -2 +105 -109 +1 -8 +8 -9 +2 -1

~ autosetup/README.autosetup ~ autosetup/autosetup ~ autosetup/cc-db.tcl ~ autosetup/cc-shared.tcl ~ autosetup/cc.tcl ~ autosetup/find-tclsh ~ autosetup/jimsh0.c ~ autosetup/system.tcl ~ autosetup/test-tclsh ~ configure

M autosetup/README.autosetup

+1 -1

		--- a/autosetup/README.autosetup
		+++ b/autosetup/README.autosetup
		@@ -1 +1 @@
1		-This is autosetup v0.6.2. S
	1	+This is autosetup v0.6.4. S

	--- a/autosetup/README.autosetup
	+++ b/autosetup/README.autosetup
	@@ -1 +1 @@
1	This is autosetup v0.6.2. S

	--- a/autosetup/README.autosetup
	+++ b/autosetup/README.autosetup
	@@ -1 +1 @@
1	This is autosetup v0.6.4. S

M autosetup/autosetup

+59 -8

		--- a/autosetup/autosetup
		+++ b/autosetup/autosetup
		@@ -5,11 +5,62 @@
5	5	return $alias
6	6	}[error-location $msg]use cc cc-shareduplevel #0#!/bin/sh
7	7	${m}.tcl
8		-uplevel #0 [list source $source]put2put3 "Looking for $source"![string m 2>/dev/null} {
9		- set create_configure 1Use --initset cre#!/bin/sh
10		-4 => "creat # Jim uses system() for exec under mingw, so
11		- # we need to fetch the output ourselves
12		- set tmpfile auto[format %04x [rand 10000]].tmp
13		- set rc [catch [list exec {*}$readfile $tmpfile]
14		- file delete $tmpfile
15		- return -code $rc $result
	8	+uplevel #0 [list source $source]puts "Looking for $source"![string m 2>/dev/null} {
	9	+ set create_configure 1Use --initset create_configure 0if {$create_configureinstalled)} {
	10	+ user-notice "Warning: Initialising from the development version of autosetup"
	11	+
	12	+ "#!/bin/sh\nWRAPPER=\"\$0\h
	13	+autosetup \"\$@\"\n"
	14	+ } else {
	15	+ }
	16	+ }#!/bin/sh
	17	+.def {# Initial auto.def created by 'autosetup --init'
	18	+
	19	+use cc
	20	+
	21	+# Add any user options here
	22	+options {
	23	+}
	24	+
	25	+make-config-header config.h
	26	+make-template Makefile.in
	27	+}
	28	+ }#!/bin/sh
	29	+ I don't see Makefile.in. You will probably need to create one."
	30	+ }
	31	+
	32	+ exitN@6Yl,7:installM@A70,4O@800,2:{}LM@84u,8: catch {T@6rS,K@83h,P:--init >@stdout 2>@stderrG@1GW,mo@8bK,6:} elseH@9Jk,8:win)} {
	33	+x@9Po,b@9Ql,S@9Ki,d@9Rp,B:}
	34	+} else {
	35	+Q@9Sf,G:alias getenv envJQ@9Vb,1P:Similar to error-location, but called when user code generates an error
	36	+# In this case weI@9cU,1H:stack trace in user code, but not in autosetup code
	37	+# (unless --debug is enabled)o@9tT,1J:istcl)} {
	38	+ if {[regexp {file "([^ ])" line ([0-9])} $::errorInfo dummy file lineW@9lr,3U:file]:$line $msg\n$::errorInfo"
	39	+ }
	40	+ return $::errorInfo
	41	+ } else {
	42	+ # Prepend a live stacktrace to the error stacktrace, omitting the current level
	43	+ set stacktrace [concat [info stacktrace] [lrange [stacktrace] 3 end]]
	44	+L@7w0,1r:debug)} {
	45	+ # Omit any levels from autosetup or with no file
	46	+ set newstacktrace {}
	47	+ foreach {p f l} $stacktrace {P@8BT,X:autosetup" $f] \|\| $f eq ""} {
	48	+ J@9n0,8:p $f:$l"P@8Cl,5S:lappend newstacktrace $p $f $l
	49	+ }
	50	+ set stacktrace $newstacktrace
	51	+ }
	52	+
	53	+ # Convert filenames to relative paths
	54	+ set newstacktrace {}
	55	+ foreach {p f l} $stacktrace {
	56	+ lappend newstacktrace $p [relative-path $f] $l
	57	+ }
	58	+ lassign $newstacktrace p f l
	59	+ if {$f ne ""} {
	60	+ set prefix "$f:$l: "
	61	+ } else {
	62	+ set prefix ""
	63	+ }
	64	+
	65	+ return "${prefix}P@A5j,H:newstacktrace]"
	66	+ M@7c0,5:text-W@5nD,4:text2G@8jU,M@5Xi,qk@AA0,1Lhwf4;

	--- a/autosetup/autosetup
	+++ b/autosetup/autosetup
	@@ -5,11 +5,62 @@
5	return $alias
6	}[error-location $msg]use cc cc-shareduplevel #0#!/bin/sh
7	${m}.tcl
8	uplevel #0 [list source $source]put2put3 "Looking for $source"![string m 2>/dev/null} {
9	set create_configure 1Use --initset cre#!/bin/sh
10	4 => "creat # Jim uses system() for exec under mingw, so
11	# we need to fetch the output ourselves
12	set tmpfile auto[format %04x [rand 10000]].tmp
13	set rc [catch [list exec {*}$readfile $tmpfile]
14	file delete $tmpfile
15	return -code $rc $result

	--- a/autosetup/autosetup
	+++ b/autosetup/autosetup
	@@ -5,11 +5,62 @@
5	return $alias
6	}[error-location $msg]use cc cc-shareduplevel #0#!/bin/sh
7	${m}.tcl
8	uplevel #0 [list source $source]puts "Looking for $source"![string m 2>/dev/null} {
9	set create_configure 1Use --initset create_configure 0if {$create_configureinstalled)} {
10	user-notice "Warning: Initialising from the development version of autosetup"
11
12	"#!/bin/sh\nWRAPPER=\"\$0\h
13	autosetup \"\$@\"\n"
14	} else {
15	}
16	}#!/bin/sh
17	.def {# Initial auto.def created by 'autosetup --init'
18
19	use cc
20
21	# Add any user options here
22	options {
23	}
24
25	make-config-header config.h
26	make-template Makefile.in
27	}
28	}#!/bin/sh
29	I don't see Makefile.in. You will probably need to create one."
30	}
31
32	exitN@6Yl,7:installM@A70,4O@800,2:{}LM@84u,8: catch {T@6rS,K@83h,P:--init >@stdout 2>@stderrG@1GW,mo@8bK,6:} elseH@9Jk,8:win)} {
33	x@9Po,b@9Ql,S@9Ki,d@9Rp,B:}
34	} else {
35	Q@9Sf,G:alias getenv envJQ@9Vb,1P:Similar to error-location, but called when user code generates an error
36	# In this case weI@9cU,1H:stack trace in user code, but not in autosetup code
37	# (unless --debug is enabled)o@9tT,1J:istcl)} {
38	if {[regexp {file "([^ ])" line ([0-9])} $::errorInfo dummy file lineW@9lr,3U:file]:$line $msg\n$::errorInfo"
39	}
40	return $::errorInfo
41	} else {
42	# Prepend a live stacktrace to the error stacktrace, omitting the current level
43	set stacktrace [concat [info stacktrace] [lrange [stacktrace] 3 end]]
44	L@7w0,1r:debug)} {
45	# Omit any levels from autosetup or with no file
46	set newstacktrace {}
47	foreach {p f l} $stacktrace {P@8BT,X:autosetup" $f] \|\| $f eq ""} {
48	J@9n0,8:p $f:$l"P@8Cl,5S:lappend newstacktrace $p $f $l
49	}
50	set stacktrace $newstacktrace
51	}
52
53	# Convert filenames to relative paths
54	set newstacktrace {}
55	foreach {p f l} $stacktrace {
56	lappend newstacktrace $p [relative-path $f] $l
57	}
58	lassign $newstacktrace p f l
59	if {$f ne ""} {
60	set prefix "$f:$l: "
61	} else {
62	set prefix ""
63	}
64
65	return "${prefix}P@A5j,H:newstacktrace]"
66	M@7c0,5:text-W@5nD,4:text2G@8jU,M@5Xi,qk@AA0,1Lhwf4;

M autosetup/cc-db.tcl

+14

		--- a/autosetup/cc-db.tcl
		+++ b/autosetup/cc-db.tcl
		@@ -0,0 +1,14 @@
	1	+# Copyright (c) 2011 WorkWare Systems http://www.workware.net.au/
	2	+# All rights reserved
	3	+
	4	+# @synopsis:
	5	+#
	6	+# The 'cc-db' module provides a knowledgecbased of system idiosyncrasiese of system idiosyncracluded.
	7	+
	8	+use cc
	9	+
	10	+options {}
	11	+
	12	+# openbsd needs sys/types.h to detect some system headers
	13	+cc-include-needs sys/socket.h sys/types.h
	14	+cc-include-need

	--- a/autosetup/cc-db.tcl
	+++ b/autosetup/cc-db.tcl
	@@ -0,0 +1,14 @@

	--- a/autosetup/cc-db.tcl
	+++ b/autosetup/cc-db.tcl
	@@ -0,0 +1,14 @@
1	# Copyright (c) 2011 WorkWare Systems http://www.workware.net.au/
2	# All rights reserved
3
4	# @synopsis:
5	#
6	# The 'cc-db' module provides a knowledgecbased of system idiosyncrasiese of system idiosyncracluded.
7
8	use cc
9
10	options {}
11
12	# openbsd needs sys/types.h to detect some system headers
13	cc-include-needs sys/socket.h sys/types.h
14	cc-include-need

M autosetup/cc-shared.tcl

+6 -6

		--- a/autosetup/cc-shared.tcl
		+++ b/autosetup/cc-shared.tcl
		@@ -9,7 +9,8 @@
9	9	## SH_CFLAGS Flags to use compiling sources destined for a shared library
10	10	## SH_LDFLAGS Flags to use linking t the soname when cread libs - %s = version
11	11	## SHOBJ_CFLAGS Flags to use compiling sources destined for a shared object
12		-## ll symbols table, %s = path
	12	+## SHOBJ_LDFLAGS Flags to use linking a shared object, undefined symbols allowed
	13	+## SHOBJ_LDFLAGS_R - as above, but all symbols table, %s = path
13	14	## SH_LINKFLAGS Flags to use linking an executable which will load shared objects
14	15	## LD_LIBRARY_PATH Environment variable which specifie
15	16	module-options {}
		@@ -21,15 +22,14 @@
21	22	--solaris* {
22	23	# Copyright (c) 20mwed
23	24	## SHOBJ_LD-Kpic Flags to us-Kpic"-G"
24		-define LD_LIBthe toolch-strip-unneeded
	25	+define LD_LIBRARY_PATH LD_LIBRARY__LINK gcc onWl,+sference for identifying the toolch-strip-unneeded
25	26
26	27	# Note: Thiain
27	28	# http://sourceforge sparc* {
28		-AGS SHOBJ_LDFLAGS_rdynamicference for identify-fPICshared Flags to us-fPIC}
	29	+AGS Flags to use linking anwed
	30	+## SHOBJ_LDFLAGS_rdynamicference for identify-fPICshared Flags to us-fPIC}
29	31	* {
30	32	# Generic Unix settingsstems http://www.workwa# Copyrigference for identifying the toolchain
31	33	# http://sourceforge.net/apps/mediawiki/predef/ define SHOBJ_LDFLAGS_R -bobject
32	34	## SHOBJ_LDFLAGS Flags to us-fpshared Flags to us-fpicf/ define SHOBJ_LDFLAGS_R -bobject
33		-## SHOBJ_LDFLAGS Flags to us"-shared -nostartfiles"
34		- }
35		-}
	35	+## SHOBJ_LDFLAGS Flags to us

	--- a/autosetup/cc-shared.tcl
	+++ b/autosetup/cc-shared.tcl
	@@ -9,7 +9,8 @@
9	## SH_CFLAGS Flags to use compiling sources destined for a shared library
10	## SH_LDFLAGS Flags to use linking t the soname when cread libs - %s = version
11	## SHOBJ_CFLAGS Flags to use compiling sources destined for a shared object
12	## ll symbols table, %s = path

13	## SH_LINKFLAGS Flags to use linking an executable which will load shared objects
14	## LD_LIBRARY_PATH Environment variable which specifie
15	module-options {}
	@@ -21,15 +22,14 @@
21	--solaris* {
22	# Copyright (c) 20mwed
23	## SHOBJ_LD-Kpic Flags to us-Kpic"-G"
24	define LD_LIBthe toolch-strip-unneeded
25
26	# Note: Thiain
27	# http://sourceforge sparc* {
28	AGS SHOBJ_LDFLAGS_rdynamicference for identify-fPICshared Flags to us-fPIC}

29	* {
30	# Generic Unix settingsstems http://www.workwa# Copyrigference for identifying the toolchain
31	# http://sourceforge.net/apps/mediawiki/predef/ define SHOBJ_LDFLAGS_R -bobject
32	## SHOBJ_LDFLAGS Flags to us-fpshared Flags to us-fpicf/ define SHOBJ_LDFLAGS_R -bobject
33	## SHOBJ_LDFLAGS Flags to us"-shared -nostartfiles"
34	}
35	}

	--- a/autosetup/cc-shared.tcl
	+++ b/autosetup/cc-shared.tcl
	@@ -9,7 +9,8 @@
9	## SH_CFLAGS Flags to use compiling sources destined for a shared library
10	## SH_LDFLAGS Flags to use linking t the soname when cread libs - %s = version
11	## SHOBJ_CFLAGS Flags to use compiling sources destined for a shared object
12	## SHOBJ_LDFLAGS Flags to use linking a shared object, undefined symbols allowed
13	## SHOBJ_LDFLAGS_R - as above, but all symbols table, %s = path
14	## SH_LINKFLAGS Flags to use linking an executable which will load shared objects
15	## LD_LIBRARY_PATH Environment variable which specifie
16	module-options {}
	@@ -21,15 +22,14 @@
22	--solaris* {
23	# Copyright (c) 20mwed
24	## SHOBJ_LD-Kpic Flags to us-Kpic"-G"
25	define LD_LIBRARY_PATH LD_LIBRARY__LINK gcc onWl,+sference for identifying the toolch-strip-unneeded
26
27	# Note: Thiain
28	# http://sourceforge sparc* {
29	AGS Flags to use linking anwed
30	## SHOBJ_LDFLAGS_rdynamicference for identify-fPICshared Flags to us-fPIC}
31	* {
32	# Generic Unix settingsstems http://www.workwa# Copyrigference for identifying the toolchain
33	# http://sourceforge.net/apps/mediawiki/predef/ define SHOBJ_LDFLAGS_R -bobject
34	## SHOBJ_LDFLAGS Flags to us-fpshared Flags to us-fpicf/ define SHOBJ_LDFLAGS_R -bobject
35	## SHOBJ_LDFLAGS Flags to us

M autosetup/cc.tcl

+25 -5

		--- a/autosetup/cc.tcl
		+++ b/autosetup/cc.tcl
		@@ -41,11 +41,31 @@
41	41	# e.g. "struct stat.st_mtime"
42	42	proc cctest_member {struct_member} {
43	43	# split at the first dot
44		- regexp {^([^.]+)[.](.*)$} $lassign me;\n#endif"
45		-}
46		-
47		-# @cc-ch
48		-# e.g. "struct stypeses a variable with the 4 8 1 2 16 32} {
	44	+ regexp {^([^.]+)[.](.*)$} $lassign [split $struct_member .]rn sizeof(_s.$member);"
	45	+}
	46	+
	47	+# Checks for the existence of the given define by compiling
	48	+#
	49	+proc cctest_define {name} {
	50	+ cctest -code "#ifndef $name\n#er not defined\n#endif"
	51	+}
	52	+
	53	+# Checks for the existence of the given name either as
	54	+# a macro (#define) or an rvalue (such as an enum)
	55	+#
	56	+proc cctest_decl {name} {
	57	+ cctest -code "#ifndef $name\n(void)$name;\n#endif"
	58	+}
	59	+
	60	+# @cc-check-sizeof type ...
	61	+#
	62	+# Checks the size of thven types (between 1 and 32, inclusive).
	63	+# Defines a variable with the size'required'he size determined, or 'unknown'"depfile} {
	64	+ dict set iling
	65	+#
	66	+proc cctest_define {nafile $depfile 1 1 : -1\] = { 1 known
	67	+ # Try the most common sizes first
	68	+ foreach i {4 8 1 2 16 32} {
49	69	if {[cctest -code "static int _x\[sizeof($type) == $i ? 1 : -1\] = { 1 };"]} {
50	70	set size $i
51	71	break

	--- a/autosetup/cc.tcl
	+++ b/autosetup/cc.tcl
	@@ -41,11 +41,31 @@
41	# e.g. "struct stat.st_mtime"
42	proc cctest_member {struct_member} {
43	# split at the first dot
44	regexp {^([^.]+)[.](.*)$} $lassign me;\n#endif"
45	}
46
47	# @cc-ch
48	# e.g. "struct stypeses a variable with the 4 8 1 2 16 32} {




















49	if {[cctest -code "static int _x\[sizeof($type) == $i ? 1 : -1\] = { 1 };"]} {
50	set size $i
51	break

	--- a/autosetup/cc.tcl
	+++ b/autosetup/cc.tcl
	@@ -41,11 +41,31 @@
41	# e.g. "struct stat.st_mtime"
42	proc cctest_member {struct_member} {
43	# split at the first dot
44	regexp {^([^.]+)[.](.*)$} $lassign [split $struct_member .]rn sizeof(_s.$member);"
45	}
46
47	# Checks for the existence of the given define by compiling
48	#
49	proc cctest_define {name} {
50	cctest -code "#ifndef $name\n#er not defined\n#endif"
51	}
52
53	# Checks for the existence of the given name either as
54	# a macro (#define) or an rvalue (such as an enum)
55	#
56	proc cctest_decl {name} {
57	cctest -code "#ifndef $name\n(void)$name;\n#endif"
58	}
59
60	# @cc-check-sizeof type ...
61	#
62	# Checks the size of thven types (between 1 and 32, inclusive).
63	# Defines a variable with the size'required'he size determined, or 'unknown'"depfile} {
64	dict set iling
65	#
66	proc cctest_define {nafile $depfile 1 1 : -1\] = { 1 known
67	# Try the most common sizes first
68	foreach i {4 8 1 2 16 32} {
69	if {[cctest -code "static int _x\[sizeof($type) == $i ? 1 : -1\] = { 1 };"]} {
70	set size $i
71	break

M autosetup/find-tclsh

+3 -2

		--- a/autosetup/find-tclsh
		+++ b/autosetup/find-tclsh
		@@ -1,9 +1,10 @@
1	1	#!/bin/sh
2	2	# Looks for a suitable tclsh or jimsh in the PATH
3	3	# If not foundstrap jimsh d=`dirname "$0"`
4		-{ "$d/jimshd/${1-ac"; } 2>&imsh0"
	4	+{ "$d/jimshd/${1-ac"; } 2>&1done
	5	+echo 1>&2 bootstrap jimsh0"
5	6	for cc in tclsh8.7; do
6		- { $tclsh "$d/c"; } 2>&1 >/dev "$d/${1-a jimsh0exit 0
	7	+ { $tclsh "$d/c"; } 2>&1 >/dev "$d/${1-autosetup--tclsh}"; } 2>/devexit 0
7	8	done
8	9	echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0"
9	10	for cc in ${CC_FOR_BUILD:-PATH="$PATH:$d2>/dev/null

	--- a/autosetup/find-tclsh
	+++ b/autosetup/find-tclsh
	@@ -1,9 +1,10 @@
1	#!/bin/sh
2	# Looks for a suitable tclsh or jimsh in the PATH
3	# If not foundstrap jimsh d=`dirname "$0"`
4	{ "$d/jimshd/${1-ac"; } 2>&imsh0"

5	for cc in tclsh8.7; do
6	{ $tclsh "$d/c"; } 2>&1 >/dev "$d/${1-a jimsh0exit 0
7	done
8	echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0"
9	for cc in ${CC_FOR_BUILD:-PATH="$PATH:$d2>/dev/null

	--- a/autosetup/find-tclsh
	+++ b/autosetup/find-tclsh
	@@ -1,9 +1,10 @@
1	#!/bin/sh
2	# Looks for a suitable tclsh or jimsh in the PATH
3	# If not foundstrap jimsh d=`dirname "$0"`
4	{ "$d/jimshd/${1-ac"; } 2>&1done
5	echo 1>&2 bootstrap jimsh0"
6	for cc in tclsh8.7; do
7	{ $tclsh "$d/c"; } 2>&1 >/dev "$d/${1-autosetup--tclsh}"; } 2>/devexit 0
8	done
9	echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0"
10	for cc in ${CC_FOR_BUILD:-PATH="$PATH:$d2>/dev/null

M autosetup/jimsh0.c

+105 -109

		--- a/autosetup/jimsh0.c
		+++ b/autosetup/jimsh0.c
		@@ -13,132 +13,128 @@
13	13	#define HAVE_MKDIR_ONE_ARG
14	14	#define HAVE_SYSTEM
15	15	#elif defined(__MINGW32__)
16		-#defi HAVE_DIRENT_H
	16	+#define TCL_PLATFORM_OS "mingw"
	17	+#define TCL_PLATFORM_PLATFORM "windows"
	18	+#define TCL_PLATFORM_PATH_SEPARATOR ";"
	19	+#define HAVE_MKDIR_ONE_ARG
	20	+#define HAVE_SYSTEM
	21	+#define HAVE_SYS_TIME_H
	22	+#define HAVE_DIRENT_H
17	23	#define HAVE_UNISTD_H
18	24	#define HAVE_UMASK
19	25	#include elseSEPARATOR ":"
20	26	#ifdef _ATFORM_PLATFORM "unix"
21		-#define TCL_PLATFORM_PATH_SEPARMKSTEMP
	27	+#define TCL_PLATFORM_PATH_SEPARATOR ":"
	28	+#ifdef _MINIX
	29	+#define vfork VE_WAITPID
	30	+#Vndif
	31	+#define HAVE_WAITPID
	32	+#define HAVE_ISATE_WAITPID
	33	+#define HAVE_ISATTY
	34	+#define HAVE_MKSTEMP
22	35	#define HAVE_LINK
23	36	#define HAVE_SYS_TIME_H
24	37	#define HAVE_DITFORM "unix"
25	38	#define TCL_PLATFndif
26		-#define JIM_VERS3cl. See http://jim.berlios.de/ */
27		-#define _GNU_SOURCEREFERENCES single source file,/* /**
28		- * UTF-8 utility functions
29		- *
30		- * (c) 2010 Steve Bennett <[email protected]>
31		- *
32		- * See LICENCE for licence details.
33		- */
	39	+#define JIM_VERSION 75if
34	40
35		-/**
36		- * Converts the given unicode codepoint (0 - 0xffff) to utf-8
37		- * and stores the result at 'p'.
38		- *
39		- * Returns the number of utf-8 characters (1-3).
40		- */
41		-intJim Tcl. See http://jim.tcl.tk/ */
	41	+
	42	+#5if
	43	+
	44	+
	45	+#if defined(_WIN32) \|\| defined(WIN32)
	46	+
	47	+#define HAVE_DLOPEN
	48	+void *dlopen(const rror(void);
	49	+
	50	+
	51	+#if defined(__MINGW32__)
	52	+ #(disable:4146)
	53	+#endif
	54	+
	55	+#include <limits.h>
	56	+#define jim_wide _iint refCount;
	57	+ charemptyObjhttp://jim.berlios.de/ 3cl. See htHAVE_MKDIR_ONE_AR3cl. See http://jim.berlios.de/ */
	58	+et result { if {$pattern in {. ..}$pattern{[[?]*}\n"
	59	+" set files[file isdir set files [list} else {\n"
	60	+" set files \" continue\n"
	61	+"
	62	+#define HAVE_SYSTEM3cl. See htglob.expandbraces {pattern} {\n"
	63	+"\n"
	64	+"\n"
	65	+" if {[set fb [string first \"\\{\" $pattern]] < 0list}\n"
	66	+" if {[set nb [string firstlist}\n"
	67	+" set beforeine HAVE_SYSTEM
	68	+#elif defin3cl. See http://jim.b$fb+1 $nb-1]\n"
	69	+" set afterine HAVE_SYSTEM
	70	+#elif de3cl. lmap part [split $braced ,] {\n"
	71	+" set pat $before$part$after\n"
	72	+" proc glob.glob if {$dir eq $pattern} {\n"
	73	+\n"
	74	+" set dir foreach dir $dirlismatch \"*/\" $dir]}ep \"\"\n"
	75	+" } elseif {$dir eq \".\"} {\n"
	76	+" set globdir \"\"\n"
	77	+" set sep \"\"set sep /foreach pat [glob.expandbracesreaddir_pattern $dir $pat] {\n"
	78	+" globdir$sep$name http://jim.berl3cl. See http://jimset nocomplain 0-nocomplain\"} {\n"
	79	+"lappend result {*}[glob.globnocomplain == 0flush/
	80	+#define _GNU_SOURCEREFERENCES erlios.de/ long offsetfseekfilenflush."3cl. See http://jim.berlios.de/ /
	81	+#define _GNU_SOURCEREFERENCES single source file,/* This is single source file, bootstrap version of Jim Tcl. See http://jim.tcl.tk/ */
42	82	#define JIM_TCL_COMPAT_H
43		-#define/* No utf-8 support. 1 byte = 1 char */
44		-#define utf8_strlen(S, B) TCL_LIBRARY "."
45		-#define j
46		-#defineS, CP) (*(CP) = #define jim_eexecxec
	83	+#define TCL_LIBRARY "."
	84	+#define jim_ext_stdlib
	85	+#define jimregexpxec
	86	+#define jim_efilexec
	87	+#define jim_eexecxec
47	88	#define jim_eclockxec
48	89	#define jim_ee TCL_PLATFORM_OS "windows"
49	90	#define TCL_PLATFORM_PLATFORM "windows"
50		-#define TCL_PLAT/**
51		- * Returns the length of the utf-8 sequence starting with 'c'.
52		- *
53		- * Returns 1-4, or -1 if this is not a valid start byte.
54		- *
55		- * Note that charlen=4 is not supported by the rest of the API.
56		- */
57		-int utf8_charlen(int c);
	91	+#define TCL_PLATFORM_PATH_SEPARATOR ";"
	92	+#define HAVE_MKDIR_ONE_ARG
	93	+#define HAVE_SYSTEM
	94	+#elif defined(__MINGW32__)
	95	+#define TCL_PLATFORM_OS "mingw"
	96	+#define TCL_PLATFORM_PLATFORM "windows"
	97	+#define TCL_PLATFORM_PATH_SEPARATOR ";"
	98	+#define HAVE_MKDIR_ONE_ARG
	99	+#define HAVE_SYSTEM
	100	+#define HAVE_SYS_TIME_H
	101	+#define HAVE_DIRENT_H
	102	+#define HAVE_UNISTD_H
	103	+#define HAVE_UMASK
	104	+#include elseSEPARATOR ":"
	105	+#ifdef _ATFORM_PLATFORM "unix"
	106	+#define TCL_PLATFORM_PATH_SEPARATOR ":"
	107	+#ifdef _MINIX
	108	+#define vfork VE_WAITPID
	109	+#Vndif
	110	+#define HAVE_WAITPID
	111	+#define HAVE_ISATE_WAITPID
	112	+#define HAVE_ISATTY
	113	+#define HAVE_MKSTEMP
	114	+#define HAVE_LINK
	115	+#define HAVE_SYS_TIME_H
	116	+#define HAVE_DITFORM "unix"
	117	+#define TCL_PLATFndif
	118	+#define JIM_VERSION 75if
58	119
59		-/**
60		- * Returns the number of characters in the utf-8
61		- * string of the given byte length.
62		- *
63		- * Any bytes which are not part of an valid utf-8
64		- * sequence are treated as individual characters.
65		- *
66		- * The string must be null terminated.
67		- *
68		- * Does not support unicode code points > \uffff
69		- */
70		-int utf8_strlen(bytelen);
71	120
72		-/**
73		- * Returns the byte index of the given character in the utf-8 string.
74		- *
75		- * The string must be null terminated.
76		- *
77		- * This will return the byte length of a utf-8 string
78		- * if given the char charindex);
	121	+#if defined(_WIN32) \|\| defined(WIN32)
79	122
80		-/**
81		- * Returns the unicode codepoint corresponding to the
82		- * utf-8 sequence 'str'.
83		- *
84		- * Stores the result in *uc and returns the number of bytes
85		- * consumed.
86		- *
87		- * If 'str' is null terminated, then an invalid utf-8 sequence
88		- * at the end of the string will be returned as individual bytes.
89		- *
90		- * If it is not null terminated, the length must be checked first.
91		- *
92		- * Does not support unicode c*uc);
	123	+#define HAVE_DLOPEN
	124	+void *dlopen(const rror(void);
93	125
94		-/**
95		- * Returns the number of bytes before 'str' that the previous
96		- * utf-8 character sequence starts (which may be the middle of a sequence).
97		- *
98		- * Looks back at most 'len' bytes backwards, which must be > 0.
99		- * If no start char is found, returns -len
100		- */
101		-int utf8_prev_len(
102		-/**
103		- * Returns the upper-case variant of the given unicode codepoint.
104		- *
105		- * Does not support unicode code points > \uffff
106		- */
107		-int utf8_upper(int uc);
108	126
109		-/**
110		- * Returns the lower-case variant of the given unicode codepoint.
111		- *
112		- * NOTE: Use utf8_upper() in preference for case-insensitive matching.
113		- *
114		- * Does not support unicode code points > \uffff
115		- */
116		-int utf8_lower(int uc);
117		-
	127	+#if defined(__MINGW32__)
	128	+ #(disable:4146)
118	129	#endif
119	130
120		-#endif
121		-/* Jim - A small embeddable Tcl interpreter
122		- *
123		- * Copyright 2005 Salvatore Sanfilippo <[email protected]>
124		- * Copyright 2005 Clemens Hintze <[email protected]>
125		- * Copyright 2005 patthoyts - Pat Thoyts <[email protected]>
126		- * Copyright 2008 oharboe - �yvind Harboe - [email protected]
127		- * Copyright 2008 Andrew Lunn <[email protected]>
128		- * Copyright 2008 Duane Ellis <[email protected]>
129		- * Copyright 2008 Uwe Klein <[email protected]>
130		- *
131		- * Redistribution and use in source and binary forms, with or without
132		- * modification, are permitted provided that the following conditions
133		- * are met:
134		- *
135		- * 1. Redistributions of source code must retain the above copyright
136		- * notice, this list of conditions and the following disclaimer.
137		- * 2. Redistributions in binary form must reproduce the above
138		- * copyright notice, this list of conditions and the following
139		- * disclaimer in the documentation and/or other materials
140		- * provided with the distribution.
141		- *
142		- * THIS SOFTWARE IS PROVIDED BY THE JIM TCL PROJECT ``AS IS'' AND ANY
143		- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
144		- * THE IMPLIED WARRANTIES OF MERCHANTABILI
	131	+#include <limits.h>
	132	+#define jim_wide _iint refCount;
	133	+ charile,/* This is single souNULL3cl. See http://jim.berlios.de/ */
	134	+#define _GNU_SOURCEREFERENCES single source file,/* This ieSEPARATOR ":"#ifdef _MINIX
	135	+#defineAVE_DITFORM "unix"
	136	+#define TCL_PLATFndif
	137	+#define JIM_VERSION 75if
	138	+
	139	+
	140	+#if defined(_WIN32) \|\|

	--- a/autosetup/jimsh0.c
	+++ b/autosetup/jimsh0.c
	@@ -13,132 +13,128 @@
13	#define HAVE_MKDIR_ONE_ARG
14	#define HAVE_SYSTEM
15	#elif defined(__MINGW32__)
16	#defi HAVE_DIRENT_H






17	#define HAVE_UNISTD_H
18	#define HAVE_UMASK
19	#include elseSEPARATOR ":"
20	#ifdef _ATFORM_PLATFORM "unix"
21	#define TCL_PLATFORM_PATH_SEPARMKSTEMP







22	#define HAVE_LINK
23	#define HAVE_SYS_TIME_H
24	#define HAVE_DITFORM "unix"
25	#define TCL_PLATFndif
26	#define JIM_VERS3cl. See http://jim.berlios.de/ */
27	#define _GNU_SOURCEREFERENCES single source file,/* /**
28	* UTF-8 utility functions
29	*
30	* (c) 2010 Steve Bennett <[email protected]>
31	*
32	* See LICENCE for licence details.
33	*/
34
35	/**
36	* Converts the given unicode codepoint (0 - 0xffff) to utf-8
37	* and stores the result at 'p'.
38	*
39	* Returns the number of utf-8 characters (1-3).
40	*/
41	intJim Tcl. See http://jim.tcl.tk/ */


































42	#define JIM_TCL_COMPAT_H
43	#define/* No utf-8 support. 1 byte = 1 char */
44	#define utf8_strlen(S, B) TCL_LIBRARY "."
45	#define j
46	#defineS, CP) (*(CP) = #define jim_eexecxec

47	#define jim_eclockxec
48	#define jim_ee TCL_PLATFORM_OS "windows"
49	#define TCL_PLATFORM_PLATFORM "windows"
50	#define TCL_PLAT/**
51	* Returns the length of the utf-8 sequence starting with 'c'.
52	*
53	* Returns 1-4, or -1 if this is not a valid start byte.
54	*
55	* Note that charlen=4 is not supported by the rest of the API.
56	*/
57	int utf8_charlen(int c);




















58
59	/**
60	* Returns the number of characters in the utf-8
61	* string of the given byte length.
62	*
63	* Any bytes which are not part of an valid utf-8
64	* sequence are treated as individual characters.
65	*
66	* The string must be null terminated.
67	*
68	* Does not support unicode code points > \uffff
69	*/
70	int utf8_strlen(bytelen);
71
72	/**
73	* Returns the byte index of the given character in the utf-8 string.
74	*
75	* The string must be null terminated.
76	*
77	* This will return the byte length of a utf-8 string
78	* if given the char charindex);
79
80	/**
81	* Returns the unicode codepoint corresponding to the
82	* utf-8 sequence 'str'.
83	*
84	* Stores the result in *uc and returns the number of bytes
85	* consumed.
86	*
87	* If 'str' is null terminated, then an invalid utf-8 sequence
88	* at the end of the string will be returned as individual bytes.
89	*
90	* If it is not null terminated, the length must be checked first.
91	*
92	* Does not support unicode c*uc);
93
94	/**
95	* Returns the number of bytes before 'str' that the previous
96	* utf-8 character sequence starts (which may be the middle of a sequence).
97	*
98	* Looks back at most 'len' bytes backwards, which must be > 0.
99	* If no start char is found, returns -len
100	*/
101	int utf8_prev_len(
102	/**
103	* Returns the upper-case variant of the given unicode codepoint.
104	*
105	* Does not support unicode code points > \uffff
106	*/
107	int utf8_upper(int uc);
108
109	/**
110	* Returns the lower-case variant of the given unicode codepoint.
111	*
112	* NOTE: Use utf8_upper() in preference for case-insensitive matching.
113	*
114	* Does not support unicode code points > \uffff
115	*/
116	int utf8_lower(int uc);
117
118	#endif
119
120	#endif
121	/* Jim - A small embeddable Tcl interpreter
122	*
123	* Copyright 2005 Salvatore Sanfilippo <[email protected]>
124	* Copyright 2005 Clemens Hintze <[email protected]>
125	* Copyright 2005 patthoyts - Pat Thoyts <[email protected]>
126	* Copyright 2008 oharboe - �yvind Harboe - [email protected]
127	* Copyright 2008 Andrew Lunn <[email protected]>
128	* Copyright 2008 Duane Ellis <[email protected]>
129	* Copyright 2008 Uwe Klein <[email protected]>
130	*
131	* Redistribution and use in source and binary forms, with or without
132	* modification, are permitted provided that the following conditions
133	* are met:
134	*
135	* 1. Redistributions of source code must retain the above copyright
136	* notice, this list of conditions and the following disclaimer.
137	* 2. Redistributions in binary form must reproduce the above
138	* copyright notice, this list of conditions and the following
139	* disclaimer in the documentation and/or other materials
140	* provided with the distribution.
141	*
142	* THIS SOFTWARE IS PROVIDED BY THE JIM TCL PROJECT ``AS IS'' AND ANY
143	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
144	* THE IMPLIED WARRANTIES OF MERCHANTABILI

	--- a/autosetup/jimsh0.c
	+++ b/autosetup/jimsh0.c
	@@ -13,132 +13,128 @@
13	#define HAVE_MKDIR_ONE_ARG
14	#define HAVE_SYSTEM
15	#elif defined(__MINGW32__)
16	#define TCL_PLATFORM_OS "mingw"
17	#define TCL_PLATFORM_PLATFORM "windows"
18	#define TCL_PLATFORM_PATH_SEPARATOR ";"
19	#define HAVE_MKDIR_ONE_ARG
20	#define HAVE_SYSTEM
21	#define HAVE_SYS_TIME_H
22	#define HAVE_DIRENT_H
23	#define HAVE_UNISTD_H
24	#define HAVE_UMASK
25	#include elseSEPARATOR ":"
26	#ifdef _ATFORM_PLATFORM "unix"
27	#define TCL_PLATFORM_PATH_SEPARATOR ":"
28	#ifdef _MINIX
29	#define vfork VE_WAITPID
30	#Vndif
31	#define HAVE_WAITPID
32	#define HAVE_ISATE_WAITPID
33	#define HAVE_ISATTY
34	#define HAVE_MKSTEMP
35	#define HAVE_LINK
36	#define HAVE_SYS_TIME_H
37	#define HAVE_DITFORM "unix"
38	#define TCL_PLATFndif
39	#define JIM_VERSION 75if







40
41
42	#5if
43
44
45	#if defined(_WIN32) \|\| defined(WIN32)
46
47	#define HAVE_DLOPEN
48	void *dlopen(const rror(void);
49
50
51	#if defined(__MINGW32__)
52	#(disable:4146)
53	#endif
54
55	#include <limits.h>
56	#define jim_wide _iint refCount;
57	charemptyObjhttp://jim.berlios.de/ 3cl. See htHAVE_MKDIR_ONE_AR3cl. See http://jim.berlios.de/ */
58	et result { if {$pattern in {. ..}$pattern{[[?]*}\n"
59	" set files[file isdir set files [list} else {\n"
60	" set files \" continue\n"
61	"
62	#define HAVE_SYSTEM3cl. See htglob.expandbraces {pattern} {\n"
63	"\n"
64	"\n"
65	" if {[set fb [string first \"\\{\" $pattern]] < 0list}\n"
66	" if {[set nb [string firstlist}\n"
67	" set beforeine HAVE_SYSTEM
68	#elif defin3cl. See http://jim.b$fb+1 $nb-1]\n"
69	" set afterine HAVE_SYSTEM
70	#elif de3cl. lmap part [split $braced ,] {\n"
71	" set pat $before$part$after\n"
72	" proc glob.glob if {$dir eq $pattern} {\n"
73	\n"
74	" set dir foreach dir $dirlismatch \"*/\" $dir]}ep \"\"\n"
75	" } elseif {$dir eq \".\"} {\n"
76	" set globdir \"\"\n"
77	" set sep \"\"set sep /foreach pat [glob.expandbracesreaddir_pattern $dir $pat] {\n"
78	" globdir$sep$name http://jim.berl3cl. See http://jimset nocomplain 0-nocomplain\"} {\n"
79	"lappend result {*}[glob.globnocomplain == 0flush/
80	#define _GNU_SOURCEREFERENCES erlios.de/ long offsetfseekfilenflush."3cl. See http://jim.berlios.de/ /
81	#define _GNU_SOURCEREFERENCES single source file,/* This is single source file, bootstrap version of Jim Tcl. See http://jim.tcl.tk/ */
82	#define JIM_TCL_COMPAT_H
83	#define TCL_LIBRARY "."
84	#define jim_ext_stdlib
85	#define jimregexpxec
86	#define jim_efilexec
87	#define jim_eexecxec
88	#define jim_eclockxec
89	#define jim_ee TCL_PLATFORM_OS "windows"
90	#define TCL_PLATFORM_PLATFORM "windows"
91	#define TCL_PLATFORM_PATH_SEPARATOR ";"
92	#define HAVE_MKDIR_ONE_ARG
93	#define HAVE_SYSTEM
94	#elif defined(__MINGW32__)
95	#define TCL_PLATFORM_OS "mingw"
96	#define TCL_PLATFORM_PLATFORM "windows"
97	#define TCL_PLATFORM_PATH_SEPARATOR ";"
98	#define HAVE_MKDIR_ONE_ARG
99	#define HAVE_SYSTEM
100	#define HAVE_SYS_TIME_H
101	#define HAVE_DIRENT_H
102	#define HAVE_UNISTD_H
103	#define HAVE_UMASK
104	#include elseSEPARATOR ":"
105	#ifdef _ATFORM_PLATFORM "unix"
106	#define TCL_PLATFORM_PATH_SEPARATOR ":"
107	#ifdef _MINIX
108	#define vfork VE_WAITPID
109	#Vndif
110	#define HAVE_WAITPID
111	#define HAVE_ISATE_WAITPID
112	#define HAVE_ISATTY
113	#define HAVE_MKSTEMP
114	#define HAVE_LINK
115	#define HAVE_SYS_TIME_H
116	#define HAVE_DITFORM "unix"
117	#define TCL_PLATFndif
118	#define JIM_VERSION 75if
119












120
121	#if defined(_WIN32) \|\| defined(WIN32)






122
123	#define HAVE_DLOPEN
124	void *dlopen(const rror(void);











125














126
127	#if defined(__MINGW32__)
128	#(disable:4146)







129	#endif
130
131	#include <limits.h>
132	#define jim_wide _iint refCount;
133	charile,/* This is single souNULL3cl. See http://jim.berlios.de/ */
134	#define _GNU_SOURCEREFERENCES single source file,/* This ieSEPARATOR ":"#ifdef _MINIX
135	#defineAVE_DITFORM "unix"
136	#define TCL_PLATFndif
137	#define JIM_VERSION 75if
138
139
140	#if defined(_WIN32) \|\|

M autosetup/system.tcl

+1 -8

		--- a/autosetup/system.tcl
		+++ b/autosetup/system.tcl
		@@ -70,11 +70,4 @@
70	70	program-transform-name:
71	71	}
72	72
73		-# @check-feature set prefixdefine[get-env exec-prefix \${prefix}]]\${exec_prefix}/bin
74		- sbindir \${exec_prefix}/sbin
75		- libexecdir \${exec_prefix}/libexec
76		- libdir \${exec_prefix}/lib
77		- datadir \${prefix}/share
78		- sysconfdir \${prefix}/etc
79		- sharedstatedir \${prefix}\${prefix}/var
80		- infodir \${prefix}\${prefix}/share Copyright (c) ht (c) 2010 WorkWare Sys
	73	+# @check-feature set prefix

	--- a/autosetup/system.tcl
	+++ b/autosetup/system.tcl
	@@ -70,11 +70,4 @@
70	program-transform-name:
71	}
72
73	# @check-feature set prefixdefine[get-env exec-prefix \${prefix}]]\${exec_prefix}/bin
74	sbindir \${exec_prefix}/sbin
75	libexecdir \${exec_prefix}/libexec
76	libdir \${exec_prefix}/lib
77	datadir \${prefix}/share
78	sysconfdir \${prefix}/etc
79	sharedstatedir \${prefix}\${prefix}/var
80	infodir \${prefix}\${prefix}/share Copyright (c) ht (c) 2010 WorkWare Sys

	--- a/autosetup/system.tcl
	+++ b/autosetup/system.tcl
	@@ -70,11 +70,4 @@
70	program-transform-name:
71	}
72
73	# @check-feature set prefix

M autosetup/test-tclsh

+8 -9

		--- a/autosetup/test-tclsh
		+++ b/autosetup/test-tclsh
		@@ -5,17 +5,16 @@
5	5
6	6	if {[catch {info version} version] == 0} {
7	7	# This is Jim Tcl
8		- if {$version >= 0.70} {
9		- # Ensure that rege
10		- # Older versions of jimsh mayinfo patchlevel]]} {
	8	+ if {$version >= 0.72} {
	9	+ # Ensure that regexp works
	10	+ regexp (a.*?) a
	11	+ puts [info nameofexecutable]
	12	+ exit 0
	13	+ }
	14	+} elseif {[catch {info tclversion} version] == 0} {
	15	+ if {$version >= 8.5 && ![string match 8.5a* [info patchlevel]]} {
11	16	puts [info nameofexecutable]
12	17	exit 0
13	18	}
14	19	}
15	20	exit 1
16		-puts [file join [p]
17		- exit 0
18		- }
19		-} elseif {[catch {info tclversion} version] == 0} {
20		- if {$version >= 8.5 && ![string match 8.5a* [info patchlevel]]} {
21		- puts [info nameofexecut

	--- a/autosetup/test-tclsh
	+++ b/autosetup/test-tclsh
	@@ -5,17 +5,16 @@
5
6	if {[catch {info version} version] == 0} {
7	# This is Jim Tcl
8	if {$version >= 0.70} {
9	# Ensure that rege
10	# Older versions of jimsh mayinfo patchlevel]]} {





11	puts [info nameofexecutable]
12	exit 0
13	}
14	}
15	exit 1
16	puts [file join [p]
17	exit 0
18	}
19	} elseif {[catch {info tclversion} version] == 0} {
20	if {$version >= 8.5 && ![string match 8.5a* [info patchlevel]]} {
21	puts [info nameofexecut

	--- a/autosetup/test-tclsh
	+++ b/autosetup/test-tclsh
	@@ -5,17 +5,16 @@
5
6	if {[catch {info version} version] == 0} {
7	# This is Jim Tcl
8	if {$version >= 0.72} {
9	# Ensure that regexp works
10	regexp (a.*?) a
11	puts [info nameofexecutable]
12	exit 0
13	}
14	} elseif {[catch {info tclversion} version] == 0} {
15	if {$version >= 8.5 && ![string match 8.5a* [info patchlevel]]} {
16	puts [info nameofexecutable]
17	exit 0
18	}
19	}
20	exit 1

M configure

+2 -1

		--- a/configure
		+++ b/configure
		@@ -1,3 +1,4 @@
1	1	#!/bin/sh
2	2	dir=autosetup"
3		-# exec "`$dir/find-tcl
	3	+#@@INITCHECK@@#
	4	+WRAPPER="$0"; export WRAPPER; exec "`$dir/find-tcl

	--- a/configure
	+++ b/configure
	@@ -1,3 +1,4 @@
1	#!/bin/sh
2	dir=autosetup"
3	# exec "`$dir/find-tcl

	--- a/configure
	+++ b/configure
	@@ -1,3 +1,4 @@
1	#!/bin/sh
2	dir=autosetup"
3	#@@INITCHECK@@#
4	WRAPPER="$0"; export WRAPPER; exec "`$dir/find-tcl

Fossil SCM

Keyboard Shortcuts