MySQL++

Check-in [b45b95eec3]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:The bootstrap script can now find bakefilize on Windows, which doesn't put that script in the PATH, probably due to mistakenly thinking that only *.exe should be in the PATH. They're ignoring the Cygwin case.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256:b45b95eec39ce5f489ea30676bf4bc9f2681c0a5b74311fee627a06beca54567
User & Date: tangent 2018-09-26 21:05:57
Context
2018-09-26
21:13
The test for bakefilize in the PATH broke on Windows due to space in the path name. Handling it separately now. check-in: f36f98c180 user: tangent tags: trunk
21:05
The bootstrap script can now find bakefilize on Windows, which doesn't put that script in the PATH, probably due to mistakenly thinking that only *.exe should be in the PATH. They're ignoring the Cygwin case. check-in: b45b95eec3 user: tangent tags: trunk
21:03
Exchanged explicit calls to several Autotools from bootstrap script for a single call to autoreconf. check-in: 4e0c38b0d8 user: tangent tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to bootstrap.

42
43
44
45
46
47
48
49
























50
51
52
53
54
55
56
57
58
59
60
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
86
87
88
89
90
91
92
93
94
95
			;;

		*)
			ARGS=0
			;;
	esac
done

























# Check for existence of needed tools, so we can give a better error
# message than the shell will.
tools="make"											# POSIX
tools="$tools aclocal autoconf autoheader libtoolize"	# autotools
tools="$tools bakefile bakefilize bakefile_gen"			# Bakefile
for tool in $tools
do
	if ! type -p $tool > /dev/null
	then
		echo "FAILED to find build tool '$tool'!"
		echo
		echo BOOTSTRAP FAILED!
		echo
		exit 1
	fi
done

# Find location of Bakefile's stock M4 autoconf macros
for d in /usr/share/aclocal /usr/local/share/aclocal \
	'/c/Program Files (x86)/Bakefile/autoconf'
do
	BAKEFILE_M4="$d"
	if [ -e "$BAKEFILE_M4/bakefile.m4" ] ; then break ; fi
done
if [ ! -e "$BAKEFILE_M4/bakefile.m4" ]
then
	echo
	echo "Failed to find bakefile.m4.  Add the directory containing"
	echo "this to the bootstrap script."
	echo
	exit 1
fi

# Do Bakefile stuff first.  Autoconf can't succeed without
# autoconf_in.m4, which Bakefile creates.
success=
set -x &&
	for d in 3 5 8 ; do mkdir -p vc200$d ; done &&
	bakefilize &&
	rm -f INSTALL &&
	bakefile_gen $BF_OPTIONS &&
	bakefile -f gnu -o Makefile.simple -DBUILDLIBRARY=no mysql++.bkl &&
	set +x &&
	success=shonuff

# Do the autotools stuff if Bakefile steps succeeded








>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>


|
|
|












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





|







42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
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
86
87
88
89
90
















91
92
93
94
95
96
97
98
99
100
101
102
103
			;;

		*)
			ARGS=0
			;;
	esac
done

# Find location of Bakefile stuff.
bakefilize=bakefilize
for d in /usr/share/aclocal /usr/local/share/aclocal \
	'/c/Program Files (x86)/Bakefile/autoconf'
do
	BAKEFILE_M4="$d"
	if [ -e "$BAKEFILE_M4/bakefile.m4" ]
	then
		if [ -x "$d/bakefilize" ]
		then
			bakefilize="$d/bakefilize"
		fi
		break
	fi
done
if [ ! -e "$BAKEFILE_M4/bakefile.m4" ]
then
	echo
	echo "Failed to find bakefile.m4.  Add the directory containing"
	echo "this to the bootstrap script."
	echo
	exit 1
fi

# Check for existence of needed tools, so we can give a better error
# message than the shell will.
tools="make"														# POSIX
tools="$tools aclocal autoconf autoheader autoreconf libtoolize"	# Autotools
tools="$tools bakefile $bakefilize bakefile_gen"					# Bakefile
for tool in $tools
do
	if ! type -p $tool > /dev/null
	then
		echo "FAILED to find build tool '$tool'!"
		echo
		echo BOOTSTRAP FAILED!
		echo
		exit 1
	fi
done

















# Do Bakefile stuff first.  Autoconf can't succeed without
# autoconf_in.m4, which Bakefile creates.
success=
set -x &&
	for d in 3 5 8 ; do mkdir -p vc200$d ; done &&
	$bakefilize &&
	rm -f INSTALL &&
	bakefile_gen $BF_OPTIONS &&
	bakefile -f gnu -o Makefile.simple -DBUILDLIBRARY=no mysql++.bkl &&
	set +x &&
	success=shonuff

# Do the autotools stuff if Bakefile steps succeeded