Fossil SCM

Merge trunk. Add built objects to "ignore-glob" for testing purposes

jan.nijtmans 2015-07-10 09:47 enhancedUndo-test merge
Commit 2821e284c5337529e8c9f07b26d18f18f676ffcb
Parent a02d847edb8c2d1…
9 files changed -14 -14 +17 +17 +2 -2 +1 -1 +1 -1 +1 -1 +1 -1
- .fossil-settings/clean-glob - .fossil-settings/clean-glob ~ .fossil-settings/ignore-glob ~ .fossil-settings/ignore-glob ~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc ~ www/build.wiki
D .fossil-settings/clean-glob
-14
--- a/.fossil-settings/clean-glob
+++ b/.fossil-settings/clean-glob
@@ -1,14 +0,0 @@
1
-*.a
2
-*.lib
3
-*.manifest
4
-*.o
5
-bld/*
6
-w.a
7
-*.lib
8
-*.manifest
9
-*.o
10
-*.obj
11
-*.pdb
12
-*.res
13
-Makefile
14
-aut
--- a/.fossil-settings/clean-glob
+++ b/.fossil-settings/clean-glob
@@ -1,14 +0,0 @@
1 *.a
2 *.lib
3 *.manifest
4 *.o
5 bld/*
6 w.a
7 *.lib
8 *.manifest
9 *.o
10 *.obj
11 *.pdb
12 *.res
13 Makefile
14 aut
--- a/.fossil-settings/clean-glob
+++ b/.fossil-settings/clean-glob
@@ -1,14 +0,0 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
D .fossil-settings/clean-glob
-14
--- a/.fossil-settings/clean-glob
+++ b/.fossil-settings/clean-glob
@@ -1,14 +0,0 @@
1
-*.a
2
-*.lib
3
-*.manifest
4
-*.o
5
-bld/*
6
-w.a
7
-*.lib
8
-*.manifest
9
-*.o
10
-*.obj
11
-*.pdb
12
-*.res
13
-Makefile
14
-aut
--- a/.fossil-settings/clean-glob
+++ b/.fossil-settings/clean-glob
@@ -1,14 +0,0 @@
1 *.a
2 *.lib
3 *.manifest
4 *.o
5 bld/*
6 w.a
7 *.lib
8 *.manifest
9 *.o
10 *.obj
11 *.pdb
12 *.res
13 Makefile
14 aut
--- a/.fossil-settings/clean-glob
+++ b/.fossil-settings/clean-glob
@@ -1,14 +0,0 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
M .fossil-settings/ignore-glob
+17
--- .fossil-settings/ignore-glob
+++ .fossil-settings/ignore-glob
@@ -1,5 +1,22 @@
11
 compat/openssl*
22
 compat/tcl*
3
+*.a
4
+*.lib
5
+*.manifest
6
+*.o
7
+*.obj
8
+*.pdb
9
+*.res
10
+Makefile
11
+bld/*
12
+wbld/*
13
+win/*.c
14
+win/*.h
15
+win/*.exe
16
+win/headers
17
+win/linkopts
18
+autoconfig.h
19
+config.log
320
 fossil
421
 fossil.exe
522
 win/fossil.exe
623
--- .fossil-settings/ignore-glob
+++ .fossil-settings/ignore-glob
@@ -1,5 +1,22 @@
1 compat/openssl*
2 compat/tcl*
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3 fossil
4 fossil.exe
5 win/fossil.exe
6
--- .fossil-settings/ignore-glob
+++ .fossil-settings/ignore-glob
@@ -1,5 +1,22 @@
1 compat/openssl*
2 compat/tcl*
3 *.a
4 *.lib
5 *.manifest
6 *.o
7 *.obj
8 *.pdb
9 *.res
10 Makefile
11 bld/*
12 wbld/*
13 win/*.c
14 win/*.h
15 win/*.exe
16 win/headers
17 win/linkopts
18 autoconfig.h
19 config.log
20 fossil
21 fossil.exe
22 win/fossil.exe
23
M .fossil-settings/ignore-glob
+17
--- .fossil-settings/ignore-glob
+++ .fossil-settings/ignore-glob
@@ -1,5 +1,22 @@
11
 compat/openssl*
22
 compat/tcl*
3
+*.a
4
+*.lib
5
+*.manifest
6
+*.o
7
+*.obj
8
+*.pdb
9
+*.res
10
+Makefile
11
+bld/*
12
+wbld/*
13
+win/*.c
14
+win/*.h
15
+win/*.exe
16
+win/headers
17
+win/linkopts
18
+autoconfig.h
19
+config.log
320
 fossil
421
 fossil.exe
522
 win/fossil.exe
623
--- .fossil-settings/ignore-glob
+++ .fossil-settings/ignore-glob
@@ -1,5 +1,22 @@
1 compat/openssl*
2 compat/tcl*
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3 fossil
4 fossil.exe
5 win/fossil.exe
6
--- .fossil-settings/ignore-glob
+++ .fossil-settings/ignore-glob
@@ -1,5 +1,22 @@
1 compat/openssl*
2 compat/tcl*
3 *.a
4 *.lib
5 *.manifest
6 *.o
7 *.obj
8 *.pdb
9 *.res
10 Makefile
11 bld/*
12 wbld/*
13 win/*.c
14 win/*.h
15 win/*.exe
16 win/headers
17 win/linkopts
18 autoconfig.h
19 config.log
20 fossil
21 fossil.exe
22 win/fossil.exe
23
M src/makemake.tcl
+2 -2
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -597,11 +597,11 @@
597597
 #### The directories where the OpenSSL include and library files are located.
598598
 # The recommended usage here is to use the Sysinternals junction tool
599599
 # to create a hard link between an "openssl-1.x" sub-directory of the
600600
 # Fossil source code directory and the target OpenSSL source directory.
601601
 #
602
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2c
602
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d
603603
 OPENSSLINCDIR = $(OPENSSLDIR)/include
604604
 OPENSSLLIBDIR = $(OPENSSLDIR)
605605
606606
 #### Either the directory where the Tcl library is installed or the Tcl
607607
 # source code directory resides (depending on the value of the macro
@@ -1373,11 +1373,11 @@
13731373
 !ifndef FOSSIL_ENABLE_WINXP
13741374
 FOSSIL_ENABLE_WINXP = 0
13751375
 !endif
13761376
13771377
 !if $(FOSSIL_ENABLE_SSL)!=0
1378
-SSLDIR = $(B)\compat\openssl-1.0.2c
1378
+SSLDIR = $(B)\compat\openssl-1.0.2d
13791379
 SSLINCDIR = $(SSLDIR)\inc32
13801380
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
13811381
 SSLLIBDIR = $(SSLDIR)\out32dll
13821382
 !else
13831383
 SSLLIBDIR = $(SSLDIR)\out32
13841384
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -597,11 +597,11 @@
597 #### The directories where the OpenSSL include and library files are located.
598 # The recommended usage here is to use the Sysinternals junction tool
599 # to create a hard link between an "openssl-1.x" sub-directory of the
600 # Fossil source code directory and the target OpenSSL source directory.
601 #
602 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2c
603 OPENSSLINCDIR = $(OPENSSLDIR)/include
604 OPENSSLLIBDIR = $(OPENSSLDIR)
605
606 #### Either the directory where the Tcl library is installed or the Tcl
607 # source code directory resides (depending on the value of the macro
@@ -1373,11 +1373,11 @@
1373 !ifndef FOSSIL_ENABLE_WINXP
1374 FOSSIL_ENABLE_WINXP = 0
1375 !endif
1376
1377 !if $(FOSSIL_ENABLE_SSL)!=0
1378 SSLDIR = $(B)\compat\openssl-1.0.2c
1379 SSLINCDIR = $(SSLDIR)\inc32
1380 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1381 SSLLIBDIR = $(SSLDIR)\out32dll
1382 !else
1383 SSLLIBDIR = $(SSLDIR)\out32
1384
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -597,11 +597,11 @@
597 #### The directories where the OpenSSL include and library files are located.
598 # The recommended usage here is to use the Sysinternals junction tool
599 # to create a hard link between an "openssl-1.x" sub-directory of the
600 # Fossil source code directory and the target OpenSSL source directory.
601 #
602 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d
603 OPENSSLINCDIR = $(OPENSSLDIR)/include
604 OPENSSLLIBDIR = $(OPENSSLDIR)
605
606 #### Either the directory where the Tcl library is installed or the Tcl
607 # source code directory resides (depending on the value of the macro
@@ -1373,11 +1373,11 @@
1373 !ifndef FOSSIL_ENABLE_WINXP
1374 FOSSIL_ENABLE_WINXP = 0
1375 !endif
1376
1377 !if $(FOSSIL_ENABLE_SSL)!=0
1378 SSLDIR = $(B)\compat\openssl-1.0.2d
1379 SSLINCDIR = $(SSLDIR)\inc32
1380 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1381 SSLLIBDIR = $(SSLDIR)\out32dll
1382 !else
1383 SSLLIBDIR = $(SSLDIR)\out32
1384
M win/Makefile.mingw
+1 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -150,11 +150,11 @@
150150
 #### The directories where the OpenSSL include and library files are located.
151151
 # The recommended usage here is to use the Sysinternals junction tool
152152
 # to create a hard link between an "openssl-1.x" sub-directory of the
153153
 # Fossil source code directory and the target OpenSSL source directory.
154154
 #
155
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2c
155
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d
156156
 OPENSSLINCDIR = $(OPENSSLDIR)/include
157157
 OPENSSLLIBDIR = $(OPENSSLDIR)
158158
159159
 #### Either the directory where the Tcl library is installed or the Tcl
160160
 # source code directory resides (depending on the value of the macro
161161
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -150,11 +150,11 @@
150 #### The directories where the OpenSSL include and library files are located.
151 # The recommended usage here is to use the Sysinternals junction tool
152 # to create a hard link between an "openssl-1.x" sub-directory of the
153 # Fossil source code directory and the target OpenSSL source directory.
154 #
155 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2c
156 OPENSSLINCDIR = $(OPENSSLDIR)/include
157 OPENSSLLIBDIR = $(OPENSSLDIR)
158
159 #### Either the directory where the Tcl library is installed or the Tcl
160 # source code directory resides (depending on the value of the macro
161
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -150,11 +150,11 @@
150 #### The directories where the OpenSSL include and library files are located.
151 # The recommended usage here is to use the Sysinternals junction tool
152 # to create a hard link between an "openssl-1.x" sub-directory of the
153 # Fossil source code directory and the target OpenSSL source directory.
154 #
155 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d
156 OPENSSLINCDIR = $(OPENSSLDIR)/include
157 OPENSSLLIBDIR = $(OPENSSLDIR)
158
159 #### Either the directory where the Tcl library is installed or the Tcl
160 # source code directory resides (depending on the value of the macro
161
M win/Makefile.mingw.mistachkin
+1 -1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -150,11 +150,11 @@
150150
 #### The directories where the OpenSSL include and library files are located.
151151
 # The recommended usage here is to use the Sysinternals junction tool
152152
 # to create a hard link between an "openssl-1.x" sub-directory of the
153153
 # Fossil source code directory and the target OpenSSL source directory.
154154
 #
155
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2c
155
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d
156156
 OPENSSLINCDIR = $(OPENSSLDIR)/include
157157
 OPENSSLLIBDIR = $(OPENSSLDIR)
158158
159159
 #### Either the directory where the Tcl library is installed or the Tcl
160160
 # source code directory resides (depending on the value of the macro
161161
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -150,11 +150,11 @@
150 #### The directories where the OpenSSL include and library files are located.
151 # The recommended usage here is to use the Sysinternals junction tool
152 # to create a hard link between an "openssl-1.x" sub-directory of the
153 # Fossil source code directory and the target OpenSSL source directory.
154 #
155 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2c
156 OPENSSLINCDIR = $(OPENSSLDIR)/include
157 OPENSSLLIBDIR = $(OPENSSLDIR)
158
159 #### Either the directory where the Tcl library is installed or the Tcl
160 # source code directory resides (depending on the value of the macro
161
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -150,11 +150,11 @@
150 #### The directories where the OpenSSL include and library files are located.
151 # The recommended usage here is to use the Sysinternals junction tool
152 # to create a hard link between an "openssl-1.x" sub-directory of the
153 # Fossil source code directory and the target OpenSSL source directory.
154 #
155 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d
156 OPENSSLINCDIR = $(OPENSSLDIR)/include
157 OPENSSLLIBDIR = $(OPENSSLDIR)
158
159 #### Either the directory where the Tcl library is installed or the Tcl
160 # source code directory resides (depending on the value of the macro
161
M win/Makefile.msc
+1 -1
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -88,11 +88,11 @@
8888
 !ifndef FOSSIL_ENABLE_WINXP
8989
 FOSSIL_ENABLE_WINXP = 0
9090
 !endif
9191
9292
 !if $(FOSSIL_ENABLE_SSL)!=0
93
-SSLDIR = $(B)\compat\openssl-1.0.2c
93
+SSLDIR = $(B)\compat\openssl-1.0.2d
9494
 SSLINCDIR = $(SSLDIR)\inc32
9595
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
9696
 SSLLIBDIR = $(SSLDIR)\out32dll
9797
 !else
9898
 SSLLIBDIR = $(SSLDIR)\out32
9999
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -88,11 +88,11 @@
88 !ifndef FOSSIL_ENABLE_WINXP
89 FOSSIL_ENABLE_WINXP = 0
90 !endif
91
92 !if $(FOSSIL_ENABLE_SSL)!=0
93 SSLDIR = $(B)\compat\openssl-1.0.2c
94 SSLINCDIR = $(SSLDIR)\inc32
95 !if $(FOSSIL_DYNAMIC_BUILD)!=0
96 SSLLIBDIR = $(SSLDIR)\out32dll
97 !else
98 SSLLIBDIR = $(SSLDIR)\out32
99
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -88,11 +88,11 @@
88 !ifndef FOSSIL_ENABLE_WINXP
89 FOSSIL_ENABLE_WINXP = 0
90 !endif
91
92 !if $(FOSSIL_ENABLE_SSL)!=0
93 SSLDIR = $(B)\compat\openssl-1.0.2d
94 SSLINCDIR = $(SSLDIR)\inc32
95 !if $(FOSSIL_DYNAMIC_BUILD)!=0
96 SSLLIBDIR = $(SSLDIR)\out32dll
97 !else
98 SSLLIBDIR = $(SSLDIR)\out32
99
M www/build.wiki
+1 -1
--- www/build.wiki
+++ www/build.wiki
@@ -135,11 +135,11 @@
135135
 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
136136
 first <a href="https://www.openssl.org/source/">download the official
137137
 source code for OpenSSL</a> and extract it to an appropriately named
138138
 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
139139
 [/tree?ci=trunk&name=compat | compat] directory (e.g.
140
-"<b>compat/openssl-1.0.2c</b>"), then make sure that some recent
140
+"<b>compat/openssl-1.0.2d</b>"), then make sure that some recent
141141
 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
142142
 and finally run one of the following commands:
143143
 <blockquote><pre>
144144
 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
145145
 </pre></blockquote>
146146
--- www/build.wiki
+++ www/build.wiki
@@ -135,11 +135,11 @@
135 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
136 first <a href="https://www.openssl.org/source/">download the official
137 source code for OpenSSL</a> and extract it to an appropriately named
138 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
139 [/tree?ci=trunk&name=compat | compat] directory (e.g.
140 "<b>compat/openssl-1.0.2c</b>"), then make sure that some recent
141 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
142 and finally run one of the following commands:
143 <blockquote><pre>
144 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
145 </pre></blockquote>
146
--- www/build.wiki
+++ www/build.wiki
@@ -135,11 +135,11 @@
135 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
136 first <a href="https://www.openssl.org/source/">download the official
137 source code for OpenSSL</a> and extract it to an appropriately named
138 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
139 [/tree?ci=trunk&name=compat | compat] directory (e.g.
140 "<b>compat/openssl-1.0.2d</b>"), then make sure that some recent
141 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
142 and finally run one of the following commands:
143 <blockquote><pre>
144 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
145 </pre></blockquote>
146

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button