KitCreator
Check-in [dca99d9485]
Login
HomeDownloadsSource CodeTicketsWiki
Overview
Comment:Third attempt: Provide a Tcl 8.4 wrapper, tested using tclsh8.4 as TCLSH_NATIVE
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: dca99d948508284a19bb4c3eacfc9f2ecb10d91a
User & Date: ssoberni on 2015-10-23 21:38:39
Other Links: manifest | tags
Context
2015-10-28
15:18
Added NSF package to web page check-in: 6fa06ab16c user: rkeene tags: trunk
2015-10-23
21:38
Third attempt: Provide a Tcl 8.4 wrapper, tested using tclsh8.4 as TCLSH_NATIVE check-in: dca99d9485 user: ssoberni tags: trunk
20:43
Give it another try. Mac builds are cross-compilations check-in: df5accddbb user: ssoberni tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified nsf/build.sh from [007052aec1] to [08cdee6d2a].

︙
95
96
97
98
99
100
101
102









103
104
105
106
107
108
109


110
111
112
113
114
115
116



117
118
119
120
121
122
123

95
96
97
98
99
100
101

102
103
104
105
106
107
108
109
110
111
112
113
114
115


116
117
118






119
120
121
122
123
124
125
126
127
128








-
+
+
+
+
+
+
+
+
+





-
-
+
+

-
-
-
-
-
-
+
+
+








	if [ "${isshared}" = '0' ]; then
	    sed 's@USE_TCL_STUBS@XXX_TCL_STUBS@g' configure > configure.new
	else
	    sed 's@XXX_TCL_STUBS@USE_TCL_STUBS@g' configure > configure.new
	fi
	cat configure.new > configure
	rm -f configure.new
	

	# Fix mkIndex.tcl for TCLSH_NATIVE being 8.4 (till next NSF release)
	cat library/lib/mkIndex.tcl > library/lib/mkIndex.tcl.orig
	cat << _EOF_ > library/lib/mkIndex.tcl
if {[info commands ::tcl::tm::roots] eq ""} {
	namespace eval ::tcl::tm { proc roots args {;}} 
}
source [file join [file dirname [info script]] mkIndex.tcl.orig]
_EOF_
	(
	    # Build
	    echo "Running: ./configure $tryopt --disable-symbols --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
	    ./configure $tryopt --disable-symbols --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}

	    echo "Running: ${MAKE:-make}"
	    ${MAKE:-make} || exit 1
	    echo "Running: ${MAKE:-make} TCLSH=${TCLSH_NATIVE}"
	    ${MAKE:-make} TCLSH=${TCLSH_NATIVE} || exit 1

	    echo "Running: ${MAKE:-make} install"
	    ${MAKE:-make} install || (
		## cross-compiling? use TCLSH_NATIVE
		echo "Running: ${MAKE:-make} install TCLSH=${TCLSH_NATIVE}"
		${MAKE:-make} install TCLSH=${TCLSH_NATIVE} || exit 1
	    ) || exit 1
	    echo "Running: ${MAKE:-make} install TCLSH=${TCLSH_NATIVE}"
	    ${MAKE:-make} install TCLSH=${TCLSH_NATIVE} || exit 1
	    
	) || continue
	
	break
    done
    
    mkdir "${OUTDIR}/lib" || exit 1
    cp -r "${INSTDIR}/lib"/nsf*/serialize "${OUTDIR}/lib/nsf${NSFVERS}-serialize"
︙

Powered by Fossil · RSS