Check-in [1c97659369]
Overview
Comment:Support passing a path to tcllib
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 1c97659369194f8cca9cc847249f61bcd0dc269f8d4d269e7acfef01a3a90856
User & Date: rkeene on 2018-11-19 19:37:52
Other Links: manifest | tags
Context
2018-11-19
19:41
Updated upstream copies of autoconf macros check-in: 60e7dd63f7 user: rkeene tags: trunk
19:37
Support passing a path to tcllib check-in: 1c97659369 user: rkeene tags: trunk
19:36
State blocks don't actually contain the state block pre-amble when stored/transmitted check-in: a0b0b2d10b user: rkeene tags: trunk
Changes

Modified Makefile.in from [705a260c81] to [9775c9b8f5].

61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
nano.tcl.h: @srcdir@/nano.tcl Makefile
	od -A n -v -t xC < '@srcdir@/nano.tcl' > nano.tcl.h.new.1
	sed 's@  *@@g;s@..@0x&, @g' < nano.tcl.h.new.1 > nano.tcl.h.new.2
	rm -f nano.tcl.h.new.1
	mv nano.tcl.h.new.2 nano.tcl.h

test: @EXTENSION_TARGET@ pkgIndex.tcl
	@srcdir@/test/test.tcl .

ifeq (@ENABLE_COVERAGE@,true)
coverage.dir: test
	rm -f nano-coverage.info
	lcov --capture --directory . --output-file nano-coverage.info
	mkdir coverage.dir
	genhtml nano-coverage.info --output-directory coverage.dir







|







61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
nano.tcl.h: @srcdir@/nano.tcl Makefile
	od -A n -v -t xC < '@srcdir@/nano.tcl' > nano.tcl.h.new.1
	sed 's@  *@@g;s@..@0x&, @g' < nano.tcl.h.new.1 > nano.tcl.h.new.2
	rm -f nano.tcl.h.new.1
	mv nano.tcl.h.new.2 nano.tcl.h

test: @EXTENSION_TARGET@ pkgIndex.tcl
	@srcdir@/test/test.tcl --libpath . --libpath @TCLLIB_PATH@

ifeq (@ENABLE_COVERAGE@,true)
coverage.dir: test
	rm -f nano-coverage.info
	lcov --capture --directory . --output-file nano-coverage.info
	mkdir coverage.dir
	genhtml nano-coverage.info --output-directory coverage.dir

Modified configure.ac from [a3c88ad991] to [db3898d047].

110
111
112
113
114
115
116









117
118
119
120
121
122
123

dnl Random number generation mechanisms
AC_CHECK_FUNC(getrandom,, [
	AC_CHECK_FUNC(getentropy,, [
		AC_CHECK_FUNC(CryptGenRandom)
	])
])










dnl Sync the RPATH if requested
if test "$TCLEXT_BUILD" != 'static'; then
	DC_SYNC_RPATH([yes])
fi

dnl Setup a stable ABI







>
>
>
>
>
>
>
>
>







110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132

dnl Random number generation mechanisms
AC_CHECK_FUNC(getrandom,, [
	AC_CHECK_FUNC(getentropy,, [
		AC_CHECK_FUNC(CryptGenRandom)
	])
])

dnl Handle specifying where TCLLIB is, for testing
AC_SUBST(TCLLIB_PATH)
TCLLIB_PATH='/dev/null'
AC_ARG_WITH([tcllib-path], AS_HELP_STRING([--with-tcllib-path=<path>], [Specify a path to Tcllib for the test suite]), [
	if test "$withval" != "no" -a "$withval" != "yes"; then
		TCLLIB_PATH="${withval}"
	fi
])

dnl Sync the RPATH if requested
if test "$TCLEXT_BUILD" != 'static'; then
	DC_SYNC_RPATH([yes])
fi

dnl Setup a stable ABI

Modified test/test.tcl from [d944e8b307] to [bdbaa835f7].

1
2



3



4
5
6
7
8
9
10
#! /usr/bin/env tclsh




lappend auto_path [file normalize [lindex $argv 0]]




package require nano

proc test_selftest {} {
	::nano::internal::selfTest
	return true
}


>
>
>
|
>
>
>







1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
#! /usr/bin/env tclsh

foreach {arg val} $argv {
	switch -exact -- $arg {
		"--libpath" {
			lappend auto_path [file normalize $val]
		}
	}
}

package require nano

proc test_selftest {} {
	::nano::internal::selfTest
	return true
}