Check-in [1ebcac2a8b]
Overview
SHA1:1ebcac2a8b0b2b59e93fa038ec71c1fbe7f0feb4
Date: 2010-09-26 04:38:28
User: rkeene
Comment:Added patches for TCLVFS on Tcl 8.6
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2010-09-26
04:38
[91e82d9be9] Added patch to allow Metakit to compile under Tcl 8.6, doesn't hurt compilation on other versions of Tcl so it is applied to all (user: rkeene, tags: trunk)
04:38
[1ebcac2a8b] Added patches for TCLVFS on Tcl 8.6 (user: rkeene, tags: trunk)
04:38
[3d4318cfe7] Added support for TCLVERS beginning with "cvs_" to indicate a CVS version of Tcl/Tk (user: rkeene, tags: trunk)
Changes

Modified tclvfs/build.sh from [f3b15d2312] to [f8e3e2d4f8].

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

TCLVFSVERS="20080503"
SRC="src/tclvfs-${TCLVFSVERS}.tar.gz"
SRCURL="http://sourceforge.net/projects/tclvfs/files/tclvfs/tclvfs-${TCLVFSVERS}/tclvfs-${TCLVFSVERS}.tar.gz/download"
BUILDDIR="$(pwd)/build/tclvfs-${TCLVFSVERS}"
OUTDIR="$(pwd)/out"
INSTDIR="$(pwd)/inst"

export TCLVFSVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR

rm -rf 'build' 'out' 'inst'
mkdir 'build' 'out' 'inst' || exit 1







if [ ! -f "${SRC}" ]; then
	mkdir 'src' >/dev/null 2>/dev/null

	wget -O "${SRC}" "${SRCURL}" || exit 1
fi

................................................................................
(
	cd 'build' || exit 1

	gzip -dc "../${SRC}" | tar -xf -

	cd "${BUILDDIR}" || exit 1











	cp generic/vfs.c .

	# Build static version
	./configure --disable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
	"${MAKE:-make}" || exit 1
	"${MAKE:-make}" install








>
|



>
>
>
>
>
>







 







>
>
>
>
>
>
>
>
>
>







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

TCLVFSVERS="20080503"
SRC="src/tclvfs-${TCLVFSVERS}.tar.gz"
SRCURL="http://sourceforge.net/projects/tclvfs/files/tclvfs/tclvfs-${TCLVFSVERS}/tclvfs-${TCLVFSVERS}.tar.gz/download"
BUILDDIR="$(pwd)/build/tclvfs-${TCLVFSVERS}"
OUTDIR="$(pwd)/out"
INSTDIR="$(pwd)/inst"
PATCHDIR="$(pwd)/patches"
export TCLVFSVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR PATCHDIR

rm -rf 'build' 'out' 'inst'
mkdir 'build' 'out' 'inst' || exit 1

TCL_VERSION="unknown"
if [ -f "${TCLCONFIGDIR}/tclConfig.sh" ]; then
	source "${TCLCONFIGDIR}/tclConfig.sh"
fi
export TCL_VERSION

if [ ! -f "${SRC}" ]; then
	mkdir 'src' >/dev/null 2>/dev/null

	wget -O "${SRC}" "${SRCURL}" || exit 1
fi

................................................................................
(
	cd 'build' || exit 1

	gzip -dc "../${SRC}" | tar -xf -

	cd "${BUILDDIR}" || exit 1

        # Apply required patches
	for patch in "${PATCHDIR}/all"/tclvfs-${TCLVFSVERS}-*.diff "${PATCHDIR}/${TCL_VERSION}"/tclvfs-${TCLVFSVERS}-*.diff; do
		if [ ! -f "${patch}" ]; then
			continue
		fi

		echo "Applying: ${patch}"
		patch -p1 < "${patch}"
	done                                                                                                                               

	cp generic/vfs.c .

	# Build static version
	./configure --disable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
	"${MAKE:-make}" || exit 1
	"${MAKE:-make}" install

Added tclvfs/patches/8.6/tclvfs-20080503-compilewithcvs.diff version [c9749c1b2e].

























>
>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
12
diff -uNr tclvfs-20080503-orig/generic/vfs.c tclvfs-20080503-rsk/generic/vfs.c
--- tclvfs-20080503-orig/generic/vfs.c	2006-08-30 14:38:03.000000000 -0500
+++ tclvfs-20080503-rsk/generic/vfs.c	2010-02-21 18:43:45.000000000 -0600
@@ -1656,7 +1656,7 @@
     return returnVal;
 }
 
-static CONST char**
+static const char* CONST*
 VfsFileAttrStrings(pathPtr, objPtrRef)
     Tcl_Obj* pathPtr;
     Tcl_Obj** objPtrRef;