Check-in [2086fbe318]
Overview
Comment:Moved copying in of automake/autoconf files to autogen from build
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 2086fbe31877f3ad9c9d35e65aa966afeb6a836a
User & Date: rkeene on 2012-07-30 05:07:01
Other Links: manifest | tags
Context
2012-07-30
16:02
Updated email address in CACKey for OSX Build Script check-in: 003e5de0f0 user: kvanals tags: trunk
05:07
Moved copying in of automake/autoconf files to autogen from build check-in: 2086fbe318 user: rkeene tags: trunk
05:06
Updated to cache certificate information

Added a C_FindObject() speed test macro

Updated to reset slot less frequently check-in: a5af46b2b5 user: rkeene tags: trunk

Changes

Modified autogen.sh from [c540dfc874] to [daf2ac0fe1].

1
2
3
4
5
6
7
8












#! /bin/sh

rm -f aclocal.m4

${MAKE:-make} -C aclocal
autoconf; autoheader

rm -rf autom4te.cache/




















>
>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
#! /bin/sh

rm -f aclocal.m4

${MAKE:-make} -C aclocal
autoconf; autoheader

rm -rf autom4te.cache/

for basefile in install-sh config.sub config.guess; do
	for path in /usr/share/automake-*; do
		file="${path}/${basefile}"
		if [ -f "${file}" ]; then
			cp "${file}" .
			chmod 755 "./${basefile}"

			break
		fi
	done
done

Modified build/build.sh from [d3813a4238] to [48fe009c68].

1
2
3
4

5
6
7
8
9
10
11
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
#! /bin/sh

find . -type f -name '.*.sw?' | xargs rm -f
find . -type f -name '.nfs*' | xargs rm -f


if [ "${SNAPSHOT}" = "1" ]; then
	sed "s@\(AC_INIT([^)]*\))@\1.${VERS})@" configure.ac > configure.ac.new
	cat configure.ac.new > configure.ac
	rm -f configure.ac.new
fi

./autogen.sh || exit 1

if [ ! -x configure ]; then
	exit 1
fi

for basefile in install-sh config.sub config.guess; do
	for path in /usr/share/automake-*; do
		file="${path}/${basefile}"
		if [ -f "${file}" ]; then
			cp "${file}" .
			chmod 755 "./${basefile}"

			break
		fi
	done
done

if [ "${SNAPSHOT}" != "1" ]; then
	mv build build_delete

	mkdir build || exit 1
	cp -rp build_delete/cackey_win32_build build/
	cp -rp build_delete/cackey_win64_build build/
fi

exit 0




>













<
<
<
<
<
<
<
<
<
<
<
<









1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18












19
20
21
22
23
24
25
26
27
#! /bin/sh

find . -type f -name '.*.sw?' | xargs rm -f
find . -type f -name '.nfs*' | xargs rm -f
find . -type f -name '*~' | xargs rm -f

if [ "${SNAPSHOT}" = "1" ]; then
	sed "s@\(AC_INIT([^)]*\))@\1.${VERS})@" configure.ac > configure.ac.new
	cat configure.ac.new > configure.ac
	rm -f configure.ac.new
fi

./autogen.sh || exit 1

if [ ! -x configure ]; then
	exit 1
fi













if [ "${SNAPSHOT}" != "1" ]; then
	mv build build_delete

	mkdir build || exit 1
	cp -rp build_delete/cackey_win32_build build/
	cp -rp build_delete/cackey_win64_build build/
fi

exit 0