teaparty
Check-in [0b028fd897]
Login
HomeTimelineFilesTicketsWiki
Overview
Comment:Updated clean target to call build clean script Added finding TCLCONFIGDIR support Added build support for TLS on Solaris
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 0b028fd8975f40dda32feee51b3a87979367b2d0
User & Date: rkeene on 2010-02-05 01:34:51
Other Links: manifest | tags
Context
2010-02-05
01:44
Updated to store build log in output directory check-in: 30541f9462 user: rkeene tags: trunk
01:34
Updated clean target to call build clean script Added finding TCLCONFIGDIR support Added build support for TLS on Solaris check-in: 0b028fd897 user: rkeene tags: trunk
00:58
Added script to build all packages Updated ignores Updated Makefile to clean excess tarfiles check-in: 73113a9013 user: rkeene tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified server/work/Makefile from [71fa914848] to [e6f364d300].

︙
13
14
15
16
17
18
19

20
21

13
14
15
16
17
18
19
20
21
22








+



		mkdir "tclpkgs-src-current/$$dir"; \
		cp "$$dir/build.sh" "tclpkgs-src-current/$$dir"; \
	done

clean:
	rm -f tclpkgs-*.tar.*
	rm -rf tclpkgs-src-current
	./build_all.sh clean

.PHONY: all clean

Modified server/work/build_all.sh from [f1d1c68280] to [e331d246af].

︙
12
13
14
15
16
17
18


















19
20
21
22
23
24
25

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








+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+








	CLEANONLY=1
fi
if [ "$1" = "distclean" ]; then
	CLEANONLY=1
	DISTCLEAN=1
fi
export CLEANONLY DISTCLEAN

# Determine path to "tclConfig.sh"
TCLCONFIGDIR=$(
	(
		echo "${LD_LIBRARY_PATH}" | tr ':' "\n"
		cat /etc/ld.so.conf 2>/dev/null
		crle 2>/dev/null | grep '^ *Default Library Path' | sed 's@^ *Default Library Path[^:]*:[^:]*/@/@' | tr ':' "\n"
	) | grep '^/' | while read chklibdir; do
		if [ -f "${chklibdir}/tclConfig.sh" ]; then
			echo "${chklibdir}"
			break
		fi
	done
)
if [ -z "${TCLCONFIGDIR}" ]; then
	TCLCONFIGDIR="/usr/lib"
fi
export TCLCONFIGDIR

# Build all appropriate directories
faileddirs=""
for dir in */; do
	export dir

	if [ ! -f "${dir}/build.sh" ]; then
︙
43
44
45
46
47
48
49





50
51
52
53
54
55
56
57
58
59
60
61
62

61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85








+
+
+
+
+














	) || failed=1

	if [ "${failed}" = "1" ]; then
		rm -rf "${dir}/out"
		faileddirs="${faileddirs} ${dir}"
	fi
done

# Cleanup is done at this point
if [ "${CLEANONLY}" = "1" ]; then
	exit 0
fi

# Let the user know what failed to build
if [ -n "${faileddirs}" ]; then
	echo "The following failed to build:${failddirs}"
fi

# Create tarfile of built packages
PLATFORM="$(./platform)"
DATECODE="$(date +%Y%m%d%H%M)"
OUTFILEBASE="tclpkgs-${PLATFORM}-${DATECODE}"
tar -cf - */out */build.log | bzip2 -9c > "${OUTFILEBASE}.tar.bz2"

exit 0

Modified server/work/tls/build.sh from [9e4a5ea3ad] to [dc0eed1286].

︙
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

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








-
+


+
+
+
+
+
-
+
+
+

-
+

-
-













fi

(
	rm -rf build
	mkdir build
	cd build/ || exit 1

	tar -zxf "../${SRC}"
	gzip -dc "../${SRC}" | tar -xf -
	cd "${BUILDDIR}" || exit 1

	for chkssldir in $(pkg-config openssl --cflags | sed 's@ *-I *@|@g' | tr '|' "\n" | grep '^/'); do
		if [ -f "${chkssldir}/openssl/opensslv.h" -o -f "${chkssldir}/opensslv.h" ]; then
			SSLDIR=$(echo "${chkssldir}" | sed 's@/[^/]*/*$@@')
		fi
	done
	mkdir "${WORKDIR}"
	if [ -z "${SSLDIR}" ]; then
		SSLDIR="/usr"
	fi

	./configure --enable-shared --prefix="${WORKDIR}"
	./configure --enable-shared --with-tcl="${TCLCONFIGDIR}" --with-ssl-dir="${SSLDIR}"
	gmake || exit 1

	rm -rf "${WORKDIR}"
) || exit 1

(
	rm -rf "${PLATDIR}"
	mkdir -p "${PLATDIR}"

	cp "build/${BUILDDIR}/libtls1.6.so" "${PLATDIR}/"
	cp "build/${BUILDDIR}/pkgIndex.tcl" "${PLATDIR}/"
	cp "build/${BUILDDIR}/tls.tcl" "${PLATDIR}/"
) || exit 1

exit 0

Powered by Fossil · RSS