Check-in [66d6dc7631]
Overview
Comment:Automatically generate the version script from the exported symbols file
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 66d6dc763116b35bf49127f9da36e2d419608dfd119fcc0b137f5256096047a0
User & Date: rkeene on 2018-07-05 15:09:17
Other Links: manifest | tags
Context
2018-07-05
16:19
Consolidated constants check-in: 8ea3e826f3 user: rkeene tags: trunk
15:09
Automatically generate the version script from the exported symbols file check-in: 66d6dc7631 user: rkeene tags: trunk
15:02
Improvements to handling of patched dependencies check-in: b90a759587 user: rkeene tags: trunk
Changes

Modified .fossil-settings/ignore-glob from [0c2901e700] to [f9b9628d3b].

1
2
3
4
5
6

7
8
9
10
11
12
13
nano.so
nano.o
randombytes.o
blake2b.o
tweetnacl.o
nano.syms

nano.tcl.h
Makefile
pkgIndex.tcl-shared
pkgIndex.tcl-static
pkgIndex.tcl
aclocal.m4
config.guess






>







1
2
3
4
5
6
7
8
9
10
11
12
13
14
nano.so
nano.o
randombytes.o
blake2b.o
tweetnacl.o
nano.syms
nano.vers
nano.tcl.h
Makefile
pkgIndex.tcl-shared
pkgIndex.tcl-static
pkgIndex.tcl
aclocal.m4
config.guess

Modified Makefile.in from [545578bbef] to [0822926eb7].

69
70
71
72
73
74
75

76
77

78
79
	rm -f Makefile pkgIndex.tcl-shared pkgIndex.tcl-static nano.syms
	rm -f pkgIndex.tcl
	rm -f config.log config.status
	rm -f nano.tcl.h nano.tcl.h.new.1 nano.tcl.h.new.2

mrproper: distclean
	rm -f configure aclocal.m4 config.guess config.sub install-sh

	rm -rf tweetnacl blake2b
	rm -rf build/tweetnacl/out build/blake2b/out


.PHONY: all test clean distclean mrproper







>

|
>


69
70
71
72
73
74
75
76
77
78
79
80
81
	rm -f Makefile pkgIndex.tcl-shared pkgIndex.tcl-static nano.syms
	rm -f pkgIndex.tcl
	rm -f config.log config.status
	rm -f nano.tcl.h nano.tcl.h.new.1 nano.tcl.h.new.2

mrproper: distclean
	rm -f configure aclocal.m4 config.guess config.sub install-sh
	rm -f nano.vers
	rm -rf tweetnacl blake2b
	$(MAKE) -C build/tweetnacl distclean
	$(MAKE) -C build/blake2b distclean

.PHONY: all test clean distclean mrproper

Modified autogen.sh from [6bbaee76b1] to [50eb64ee31].

1


2
3
4
5
6
7
8
#! /usr/bin/env bash



update='0'
if [ "$1" = '-update' ]; then
	update='1'
fi

commands=(

>
>







1
2
3
4
5
6
7
8
9
10
#! /usr/bin/env bash

set -e

update='0'
if [ "$1" = '-update' ]; then
	update='1'
fi

commands=(
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
done
if [ "${failed}" = '1' ]; then
	exit 1
fi

cd "$(dirname "$(which "$0")")" || exit 1

mkdir aclocal >/dev/null 2>/dev/null

files=()

for url in "${urls[@]}"; do
	file="aclocal/$(echo "${url}" | sed 's@^.*/@@')"

	if [ -f "${file}" ]; then







|







30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
done
if [ "${failed}" = '1' ]; then
	exit 1
fi

cd "$(dirname "$(which "$0")")" || exit 1

mkdir aclocal >/dev/null 2>/dev/null || :

files=()

for url in "${urls[@]}"; do
	file="aclocal/$(echo "${url}" | sed 's@^.*/@@')"

	if [ -f "${file}" ]; then
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













if diff aclocal.m4.new aclocal.m4 >/dev/null 2>/dev/null; then
	rm -f aclocal.m4.new
else
	mv aclocal.m4.new aclocal.m4
fi

automake --add-missing --copy --force-missing >/dev/null 2>/dev/null
if ! [ -f install-sh -o -f install.sh -o -f shtool ]; then
	echo "automake failed" >&2
	exit 1
fi

autoconf

rm -rf autom4te.cache

set -e

# Assemble tweetnacl
rm -rf tweetnacl
make -C build/tweetnacl install PREFIX="$(pwd)/tweetnacl"

# Assemble blake2b
rm -rf blake2b
make -C build/blake2b install PREFIX="$(pwd)/blake2b"



















|









<
<







>
>
>
>
>
>
>
>
>
>
>
>
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

if diff aclocal.m4.new aclocal.m4 >/dev/null 2>/dev/null; then
	rm -f aclocal.m4.new
else
	mv aclocal.m4.new aclocal.m4
fi

automake --add-missing --copy --force-missing >/dev/null 2>/dev/null || :
if ! [ -f install-sh -o -f install.sh -o -f shtool ]; then
	echo "automake failed" >&2
	exit 1
fi

autoconf

rm -rf autom4te.cache



# Assemble tweetnacl
rm -rf tweetnacl
make -C build/tweetnacl install PREFIX="$(pwd)/tweetnacl"

# Assemble blake2b
rm -rf blake2b
make -C build/blake2b install PREFIX="$(pwd)/blake2b"

# Assemble version script
rm -f nano.vers
(
	echo '{'
	echo $'\tglobal:'
	sed 's/@SYMPREFIX@/\t\t/g;s/$/;/' nano.syms.in
	echo $'\tlocal:'
	echo $'\t\t*;'
	echo '};'
) > nano.vers

Deleted nano.vers version [45908ce570].

1
2
3
4
5
6
{
	global:
		Nano_Init;
	local:
		*;
};
<
<
<
<
<
<