Tcl Nano
Check-in [51030d9980]
Login
HomeTimelineDownloadsBrowse SourceSearchTickets
Overview
Comment:Move upstream packages into a "vendor" directory
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | monocypher
Files: files | file ages | folders
SHA3-256: 51030d99809e21bcb08dfc273784396e2f8ef7cd21ac6f213143f61e2f91b917
User & Date: rkeene on 2019-01-10 20:54:45
Other Links: branch diff | manifest | tags
Context
2019-01-10
21:03
Update Makefile to make changing directories of vendor projects easier check-in: 57397abd17 user: rkeene tags: monocypher
20:54
Move upstream packages into a "vendor" directory check-in: 51030d9980 user: rkeene tags: monocypher
09:55
Minor cleanup check-in: 78b6dd6345 user: rkeene tags: monocypher
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified .fossil-settings/ignore-glob from [59abf1089d] to [c75060f1f0].

︙
11
12
13
14
15
16
17
18

19
20
21
22

11
12
13
14
15
16
17

18
19
20
21
22








-
+





aclocal.m4
config.guess
config.sub
configure
install-sh
config.log
config.status
argon2
vendor/argon2
build/argon2/out
build/argon2/INST
build/work
build/tcl

Modified Makefile.in from [074532d27e] to [15be8b26a5]. 

1
2
3
4
5

6
7
8
9
10
11
12

1
2
3
4

5
6
7
8
9
10
11
12





-
+








CC            := @CC@
AR            := @AR@
RANLIB        := @RANLIB@
CFLAGS        := @CFLAGS@ @SHOBJFLAGS@
CPPFLAGS      := -I. -I@srcdir@ -I@srcdir@/monocypher/ -I@srcdir@/argon2/ @CPPFLAGS@ @SHOBJCPPFLAGS@ @DEFS@ @TCL_DEFS@
CPPFLAGS      := -I. -I@srcdir@ -I@srcdir@/vendor/monocypher/ -I@srcdir@/vendor/argon2/ @CPPFLAGS@ @SHOBJCPPFLAGS@ @DEFS@ @TCL_DEFS@
LDFLAGS       := @LDFLAGS@
LIBS          := @LIBS@
SHOBJLDFLAGS  := @SHOBJLDFLAGS@
VPATH         := @srcdir@
srcdir        := @srcdir@
prefix        := @prefix@
exec_prefix   := @exec_prefix@
︙
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
62
63

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








-
+

-
+

-
+


-
+





-
-
+
+

-
-
+
+








	-@REMOVESYMS@ nano-amalgamation.o
	$(AR) rc @EXTENSION_TARGET@ nano-amalgamation.o
	-$(RANLIB) @EXTENSION_TARGET@
endif

# The amalgamation is used when compiling statically so that the same ABI can be exposed
# to upstream projects rather than requiring them to filter out our symbols
nano-amalgamation.c: @srcdir@/nano.c @srcdir@/randombytes.c @srcdir@/monocypher/monocypher.c @srcdir@/argon2.c Makefile
nano-amalgamation.c: @srcdir@/nano.c @srcdir@/randombytes.c @srcdir@/vendor/monocypher/monocypher.c @srcdir@/argon2.c Makefile
	rm -f nano-amalgamation.c
	cat @srcdir@/nano.c @srcdir@/randombytes.c @srcdir@/monocypher/monocypher.c @srcdir@/argon2/argon2.c > nano-amalgamation.c
	cat @srcdir@/nano.c @srcdir@/randombytes.c @srcdir@/vendor/monocypher/monocypher.c @srcdir@/vendor/argon2/argon2.c > nano-amalgamation.c

nano-amalgamation.o: nano-amalgamation.c @srcdir@/monocypher/monocypher.h @srcdir@/argon2/argon2.h @srcdir@/randombytes.h nano.tcl.h Makefile
nano-amalgamation.o: nano-amalgamation.c @srcdir@/vendor/monocypher/monocypher.h @srcdir@/vendor/argon2/argon2.h @srcdir@/randombytes.h nano.tcl.h Makefile
	$(CC) $(CPPFLAGS) $(CFLAGS) -o nano-amalgamation.o -c nano-amalgamation.c

nano.o: @srcdir@/nano.c @srcdir@/monocypher/monocypher.h @srcdir@/argon2/argon2.h @srcdir@/randombytes.h nano.tcl.h Makefile
nano.o: @srcdir@/nano.c @srcdir@/vendor/monocypher/monocypher.h @srcdir@/vendor/argon2/argon2.h @srcdir@/randombytes.h nano.tcl.h Makefile
	$(CC) $(CPPFLAGS) $(CFLAGS) -o nano.o -c @srcdir@/nano.c

randombytes.o: @srcdir@/randombytes.c @srcdir@/randombytes.h
	$(CC) $(CPPFLAGS) $(CFLAGS) -o randombytes.o -c @srcdir@/randombytes.c

monocypher.o: @srcdir@/monocypher/monocypher.c @srcdir@/monocypher/monocypher.h
	$(CC) $(CPPFLAGS) $(CFLAGS) -o monocypher.o -c @srcdir@/monocypher/monocypher.c
monocypher.o: @srcdir@/vendor/monocypher/monocypher.c @srcdir@/vendor/monocypher/monocypher.h
	$(CC) $(CPPFLAGS) $(CFLAGS) -o monocypher.o -c @srcdir@/vendor/monocypher/monocypher.c

argon2.o: @srcdir@/argon2/argon2.c @srcdir@/argon2/argon2.h
	$(CC) $(CPPFLAGS) $(CFLAGS) -o argon2.o -c @srcdir@/argon2/argon2.c
argon2.o: @srcdir@/vendor/argon2/argon2.c @srcdir@/vendor/argon2/argon2.h
	$(CC) $(CPPFLAGS) $(CFLAGS) -o argon2.o -c @srcdir@/vendor/argon2/argon2.c

pkgIndex.tcl: pkgIndex.tcl-@TCLEXT_BUILD@
	cp pkgIndex.tcl-@TCLEXT_BUILD@ pkgIndex.tcl

nano.tcl.h: @srcdir@/nano.tcl Makefile
	od -A n -v -t xC < '@srcdir@/nano.tcl' > nano.tcl.h.new.1
	sed 's@  *@@g;s@..@0x&, @g' < nano.tcl.h.new.1 > nano.tcl.h.new.2
︙
96
97
98
99
100
101
102
103

104
105
106

96
97
98
99
100
101
102

103
104
105
106








-
+




	rm -f config.log config.status
	rm -f nano.tcl.h nano.tcl.h.new.1 nano.tcl.h.new.2
	rm -rf coverage.dir

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

.PHONY: all test clean distclean mrproper

Modified autogen.sh from [daaff1df63] to [5177f2c1f8].

︙
77
78
79
80
81
82
83
84

85
86
87
88
89
90
91

77
78
79
80
81
82
83

84
85
86
87
88
89
90
91








-
+









autoconf

rm -rf autom4te.cache

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

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

Name change from monocypher/monocypher.c to vendor/monocypher/monocypher.c.

︙

Name change from monocypher/monocypher.h to vendor/monocypher/monocypher.h.

︙

Name change from monocypher/version to vendor/monocypher/version.

Powered by Fossil · RSS