Fossil SCM

Bump versions of zlib and OpenSSL in the Windows makefiles. Also, rename the pqueue_insert function to avoid a symbol name collision with OpenSSL.

mistachkin 2012-02-10 22:53 trunk
Commit 674bc278919d2702e2db9f4004f0f778eefa2f30
--- src/descendants.c
+++ src/descendants.c
@@ -164,11 +164,11 @@
164164
Stmt ins;
165165
Stmt q;
166166
bag_init(&seen);
167167
pqueue_init(&queue);
168168
bag_insert(&seen, rid);
169
- pqueue_insert(&queue, rid, 0.0, 0);
169
+ pqueue_insert2(&queue, rid, 0.0, 0);
170170
db_prepare(&ins, "INSERT OR IGNORE INTO ok VALUES(:rid)");
171171
db_prepare(&q,
172172
"SELECT a.pid, b.mtime FROM plink a LEFT JOIN plink b ON b.cid=a.pid"
173173
" WHERE a.cid=:rid"
174174
);
@@ -179,11 +179,11 @@
179179
db_bind_int(&q, ":rid", rid);
180180
while( db_step(&q)==SQLITE_ROW ){
181181
int pid = db_column_int(&q, 0);
182182
double mtime = db_column_double(&q, 1);
183183
if( bag_insert(&seen, pid) ){
184
- pqueue_insert(&queue, pid, -mtime, 0);
184
+ pqueue_insert2(&queue, pid, -mtime, 0);
185185
}
186186
}
187187
db_reset(&q);
188188
}
189189
bag_clear(&seen);
@@ -239,11 +239,11 @@
239239
Stmt q;
240240
241241
bag_init(&seen);
242242
pqueue_init(&queue);
243243
bag_insert(&seen, rid);
244
- pqueue_insert(&queue, rid, 0.0, 0);
244
+ pqueue_insert2(&queue, rid, 0.0, 0);
245245
db_prepare(&ins, "INSERT OR IGNORE INTO ok VALUES(:rid)");
246246
db_prepare(&q, "SELECT cid, mtime FROM plink WHERE pid=:rid");
247247
while( (N--)>0 && (rid = pqueue_extract(&queue, 0))!=0 ){
248248
db_bind_int(&ins, ":rid", rid);
249249
db_step(&ins);
@@ -251,11 +251,11 @@
251251
db_bind_int(&q, ":rid", rid);
252252
while( db_step(&q)==SQLITE_ROW ){
253253
int pid = db_column_int(&q, 0);
254254
double mtime = db_column_double(&q, 1);
255255
if( bag_insert(&seen, pid) ){
256
- pqueue_insert(&queue, pid, mtime, 0);
256
+ pqueue_insert2(&queue, pid, mtime, 0);
257257
}
258258
}
259259
db_reset(&q);
260260
}
261261
bag_clear(&seen);
262262
--- src/descendants.c
+++ src/descendants.c
@@ -164,11 +164,11 @@
164 Stmt ins;
165 Stmt q;
166 bag_init(&seen);
167 pqueue_init(&queue);
168 bag_insert(&seen, rid);
169 pqueue_insert(&queue, rid, 0.0, 0);
170 db_prepare(&ins, "INSERT OR IGNORE INTO ok VALUES(:rid)");
171 db_prepare(&q,
172 "SELECT a.pid, b.mtime FROM plink a LEFT JOIN plink b ON b.cid=a.pid"
173 " WHERE a.cid=:rid"
174 );
@@ -179,11 +179,11 @@
179 db_bind_int(&q, ":rid", rid);
180 while( db_step(&q)==SQLITE_ROW ){
181 int pid = db_column_int(&q, 0);
182 double mtime = db_column_double(&q, 1);
183 if( bag_insert(&seen, pid) ){
184 pqueue_insert(&queue, pid, -mtime, 0);
185 }
186 }
187 db_reset(&q);
188 }
189 bag_clear(&seen);
@@ -239,11 +239,11 @@
239 Stmt q;
240
241 bag_init(&seen);
242 pqueue_init(&queue);
243 bag_insert(&seen, rid);
244 pqueue_insert(&queue, rid, 0.0, 0);
245 db_prepare(&ins, "INSERT OR IGNORE INTO ok VALUES(:rid)");
246 db_prepare(&q, "SELECT cid, mtime FROM plink WHERE pid=:rid");
247 while( (N--)>0 && (rid = pqueue_extract(&queue, 0))!=0 ){
248 db_bind_int(&ins, ":rid", rid);
249 db_step(&ins);
@@ -251,11 +251,11 @@
251 db_bind_int(&q, ":rid", rid);
252 while( db_step(&q)==SQLITE_ROW ){
253 int pid = db_column_int(&q, 0);
254 double mtime = db_column_double(&q, 1);
255 if( bag_insert(&seen, pid) ){
256 pqueue_insert(&queue, pid, mtime, 0);
257 }
258 }
259 db_reset(&q);
260 }
261 bag_clear(&seen);
262
--- src/descendants.c
+++ src/descendants.c
@@ -164,11 +164,11 @@
164 Stmt ins;
165 Stmt q;
166 bag_init(&seen);
167 pqueue_init(&queue);
168 bag_insert(&seen, rid);
169 pqueue_insert2(&queue, rid, 0.0, 0);
170 db_prepare(&ins, "INSERT OR IGNORE INTO ok VALUES(:rid)");
171 db_prepare(&q,
172 "SELECT a.pid, b.mtime FROM plink a LEFT JOIN plink b ON b.cid=a.pid"
173 " WHERE a.cid=:rid"
174 );
@@ -179,11 +179,11 @@
179 db_bind_int(&q, ":rid", rid);
180 while( db_step(&q)==SQLITE_ROW ){
181 int pid = db_column_int(&q, 0);
182 double mtime = db_column_double(&q, 1);
183 if( bag_insert(&seen, pid) ){
184 pqueue_insert2(&queue, pid, -mtime, 0);
185 }
186 }
187 db_reset(&q);
188 }
189 bag_clear(&seen);
@@ -239,11 +239,11 @@
239 Stmt q;
240
241 bag_init(&seen);
242 pqueue_init(&queue);
243 bag_insert(&seen, rid);
244 pqueue_insert2(&queue, rid, 0.0, 0);
245 db_prepare(&ins, "INSERT OR IGNORE INTO ok VALUES(:rid)");
246 db_prepare(&q, "SELECT cid, mtime FROM plink WHERE pid=:rid");
247 while( (N--)>0 && (rid = pqueue_extract(&queue, 0))!=0 ){
248 db_bind_int(&ins, ":rid", rid);
249 db_step(&ins);
@@ -251,11 +251,11 @@
251 db_bind_int(&q, ":rid", rid);
252 while( db_step(&q)==SQLITE_ROW ){
253 int pid = db_column_int(&q, 0);
254 double mtime = db_column_double(&q, 1);
255 if( bag_insert(&seen, pid) ){
256 pqueue_insert2(&queue, pid, mtime, 0);
257 }
258 }
259 db_reset(&q);
260 }
261 bag_clear(&seen);
262
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -359,20 +359,20 @@
359359
#### The directories where the zlib include and library files are located.
360360
# The recommended usage here is to use the Sysinternals junction tool
361361
# to create a hard link between an "zlib-1.x.y" sub-directory of the
362362
# Fossil source code directory and the target zlib source directory.
363363
#
364
-ZINCDIR = $(SRCDIR)/../zlib-1.2.5
365
-ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
364
+ZINCDIR = $(SRCDIR)/../zlib-1.2.6
365
+ZLIBDIR = $(SRCDIR)/../zlib-1.2.6
366366
367367
#### The directories where the OpenSSL include and library files are located.
368368
# The recommended usage here is to use the Sysinternals junction tool
369369
# to create a hard link between an "openssl-1.x" sub-directory of the
370370
# Fossil source code directory and the target OpenSSL source directory.
371371
#
372
-OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
373
-OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
372
+OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0g/include
373
+OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0g
374374
375375
#### Either the directory where the Tcl library is installed or the Tcl
376376
# source code directory resides (depending on the value of the macro
377377
# FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
378378
# this directory must have "include" and "lib" sub-directories. If
379379
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -359,20 +359,20 @@
359 #### The directories where the zlib include and library files are located.
360 # The recommended usage here is to use the Sysinternals junction tool
361 # to create a hard link between an "zlib-1.x.y" sub-directory of the
362 # Fossil source code directory and the target zlib source directory.
363 #
364 ZINCDIR = $(SRCDIR)/../zlib-1.2.5
365 ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
366
367 #### The directories where the OpenSSL include and library files are located.
368 # The recommended usage here is to use the Sysinternals junction tool
369 # to create a hard link between an "openssl-1.x" sub-directory of the
370 # Fossil source code directory and the target OpenSSL source directory.
371 #
372 OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
373 OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
374
375 #### Either the directory where the Tcl library is installed or the Tcl
376 # source code directory resides (depending on the value of the macro
377 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
378 # this directory must have "include" and "lib" sub-directories. If
379
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -359,20 +359,20 @@
359 #### The directories where the zlib include and library files are located.
360 # The recommended usage here is to use the Sysinternals junction tool
361 # to create a hard link between an "zlib-1.x.y" sub-directory of the
362 # Fossil source code directory and the target zlib source directory.
363 #
364 ZINCDIR = $(SRCDIR)/../zlib-1.2.6
365 ZLIBDIR = $(SRCDIR)/../zlib-1.2.6
366
367 #### The directories where the OpenSSL include and library files are located.
368 # The recommended usage here is to use the Sysinternals junction tool
369 # to create a hard link between an "openssl-1.x" sub-directory of the
370 # Fossil source code directory and the target OpenSSL source directory.
371 #
372 OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0g/include
373 OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0g
374
375 #### Either the directory where the Tcl library is installed or the Tcl
376 # source code directory resides (depending on the value of the macro
377 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
378 # this directory must have "include" and "lib" sub-directories. If
379
+3 -1
--- src/pqueue.c
+++ src/pqueue.c
@@ -69,12 +69,14 @@
6969
p->sz = N;
7070
}
7171
7272
/*
7373
** Insert element e into the queue.
74
+** This is now named pqueue_insert2 to avoid a symbol naming
75
+** conflict with OpenSSL.
7476
*/
75
-void pqueue_insert(PQueue *p, int e, double v, void *pData){
77
+void pqueue_insert2(PQueue *p, int e, double v, void *pData){
7678
int i, j;
7779
if( p->cnt+1>p->sz ){
7880
pqueue_resize(p, p->cnt+5);
7981
}
8082
for(i=0; i<p->cnt; i++){
8183
--- src/pqueue.c
+++ src/pqueue.c
@@ -69,12 +69,14 @@
69 p->sz = N;
70 }
71
72 /*
73 ** Insert element e into the queue.
 
 
74 */
75 void pqueue_insert(PQueue *p, int e, double v, void *pData){
76 int i, j;
77 if( p->cnt+1>p->sz ){
78 pqueue_resize(p, p->cnt+5);
79 }
80 for(i=0; i<p->cnt; i++){
81
--- src/pqueue.c
+++ src/pqueue.c
@@ -69,12 +69,14 @@
69 p->sz = N;
70 }
71
72 /*
73 ** Insert element e into the queue.
74 ** This is now named pqueue_insert2 to avoid a symbol naming
75 ** conflict with OpenSSL.
76 */
77 void pqueue_insert2(PQueue *p, int e, double v, void *pData){
78 int i, j;
79 if( p->cnt+1>p->sz ){
80 pqueue_resize(p, p->cnt+5);
81 }
82 for(i=0; i<p->cnt; i++){
83
+2 -2
--- src/tag.c
+++ src/tag.c
@@ -44,11 +44,11 @@
4444
Stmt ins; /* INSERT INTO tagxref */
4545
Stmt eventupdate; /* UPDATE event */
4646
4747
assert( tagType==0 || tagType==2 );
4848
pqueue_init(&queue);
49
- pqueue_insert(&queue, pid, 0.0, 0);
49
+ pqueue_insert2(&queue, pid, 0.0, 0);
5050
5151
/* Query for children of :pid to which to propagate the tag.
5252
** Three returns: (1) rid of the child. (2) timestamp of child.
5353
** (3) True to propagate or false to block.
5454
*/
@@ -86,11 +86,11 @@
8686
while( db_step(&s)==SQLITE_ROW ){
8787
int doit = db_column_int(&s, 2);
8888
if( doit ){
8989
int cid = db_column_int(&s, 0);
9090
double mtime = db_column_double(&s, 1);
91
- pqueue_insert(&queue, cid, mtime, 0);
91
+ pqueue_insert2(&queue, cid, mtime, 0);
9292
db_bind_int(&ins, ":rid", cid);
9393
db_step(&ins);
9494
db_reset(&ins);
9595
if( tagid==TAG_BGCOLOR ){
9696
db_bind_int(&eventupdate, ":rid", cid);
9797
--- src/tag.c
+++ src/tag.c
@@ -44,11 +44,11 @@
44 Stmt ins; /* INSERT INTO tagxref */
45 Stmt eventupdate; /* UPDATE event */
46
47 assert( tagType==0 || tagType==2 );
48 pqueue_init(&queue);
49 pqueue_insert(&queue, pid, 0.0, 0);
50
51 /* Query for children of :pid to which to propagate the tag.
52 ** Three returns: (1) rid of the child. (2) timestamp of child.
53 ** (3) True to propagate or false to block.
54 */
@@ -86,11 +86,11 @@
86 while( db_step(&s)==SQLITE_ROW ){
87 int doit = db_column_int(&s, 2);
88 if( doit ){
89 int cid = db_column_int(&s, 0);
90 double mtime = db_column_double(&s, 1);
91 pqueue_insert(&queue, cid, mtime, 0);
92 db_bind_int(&ins, ":rid", cid);
93 db_step(&ins);
94 db_reset(&ins);
95 if( tagid==TAG_BGCOLOR ){
96 db_bind_int(&eventupdate, ":rid", cid);
97
--- src/tag.c
+++ src/tag.c
@@ -44,11 +44,11 @@
44 Stmt ins; /* INSERT INTO tagxref */
45 Stmt eventupdate; /* UPDATE event */
46
47 assert( tagType==0 || tagType==2 );
48 pqueue_init(&queue);
49 pqueue_insert2(&queue, pid, 0.0, 0);
50
51 /* Query for children of :pid to which to propagate the tag.
52 ** Three returns: (1) rid of the child. (2) timestamp of child.
53 ** (3) True to propagate or false to block.
54 */
@@ -86,11 +86,11 @@
86 while( db_step(&s)==SQLITE_ROW ){
87 int doit = db_column_int(&s, 2);
88 if( doit ){
89 int cid = db_column_int(&s, 0);
90 double mtime = db_column_double(&s, 1);
91 pqueue_insert2(&queue, cid, mtime, 0);
92 db_bind_int(&ins, ":rid", cid);
93 db_step(&ins);
94 db_reset(&ins);
95 if( tagid==TAG_BGCOLOR ){
96 db_bind_int(&eventupdate, ":rid", cid);
97
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -43,20 +43,20 @@
4343
#### The directories where the zlib include and library files are located.
4444
# The recommended usage here is to use the Sysinternals junction tool
4545
# to create a hard link between an "zlib-1.x.y" sub-directory of the
4646
# Fossil source code directory and the target zlib source directory.
4747
#
48
-ZINCDIR = $(SRCDIR)/../zlib-1.2.5
49
-ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
48
+ZINCDIR = $(SRCDIR)/../zlib-1.2.6
49
+ZLIBDIR = $(SRCDIR)/../zlib-1.2.6
5050
5151
#### The directories where the OpenSSL include and library files are located.
5252
# The recommended usage here is to use the Sysinternals junction tool
5353
# to create a hard link between an "openssl-1.x" sub-directory of the
5454
# Fossil source code directory and the target OpenSSL source directory.
5555
#
56
-OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
57
-OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
56
+OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0g/include
57
+OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0g
5858
5959
#### Either the directory where the Tcl library is installed or the Tcl
6060
# source code directory resides (depending on the value of the macro
6161
# FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
6262
# this directory must have "include" and "lib" sub-directories. If
6363
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -43,20 +43,20 @@
43 #### The directories where the zlib include and library files are located.
44 # The recommended usage here is to use the Sysinternals junction tool
45 # to create a hard link between an "zlib-1.x.y" sub-directory of the
46 # Fossil source code directory and the target zlib source directory.
47 #
48 ZINCDIR = $(SRCDIR)/../zlib-1.2.5
49 ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
50
51 #### The directories where the OpenSSL include and library files are located.
52 # The recommended usage here is to use the Sysinternals junction tool
53 # to create a hard link between an "openssl-1.x" sub-directory of the
54 # Fossil source code directory and the target OpenSSL source directory.
55 #
56 OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
57 OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
58
59 #### Either the directory where the Tcl library is installed or the Tcl
60 # source code directory resides (depending on the value of the macro
61 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
62 # this directory must have "include" and "lib" sub-directories. If
63
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -43,20 +43,20 @@
43 #### The directories where the zlib include and library files are located.
44 # The recommended usage here is to use the Sysinternals junction tool
45 # to create a hard link between an "zlib-1.x.y" sub-directory of the
46 # Fossil source code directory and the target zlib source directory.
47 #
48 ZINCDIR = $(SRCDIR)/../zlib-1.2.6
49 ZLIBDIR = $(SRCDIR)/../zlib-1.2.6
50
51 #### The directories where the OpenSSL include and library files are located.
52 # The recommended usage here is to use the Sysinternals junction tool
53 # to create a hard link between an "openssl-1.x" sub-directory of the
54 # Fossil source code directory and the target OpenSSL source directory.
55 #
56 OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0g/include
57 OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0g
58
59 #### Either the directory where the Tcl library is installed or the Tcl
60 # source code directory resides (depending on the value of the macro
61 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
62 # this directory must have "include" and "lib" sub-directories. If
63
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -43,20 +43,20 @@
4343
#### The directories where the zlib include and library files are located.
4444
# The recommended usage here is to use the Sysinternals junction tool
4545
# to create a hard link between an "zlib-1.x.y" sub-directory of the
4646
# Fossil source code directory and the target zlib source directory.
4747
#
48
-ZINCDIR = $(SRCDIR)/../zlib-1.2.5
49
-ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
48
+ZINCDIR = $(SRCDIR)/../zlib-1.2.6
49
+ZLIBDIR = $(SRCDIR)/../zlib-1.2.6
5050
5151
#### The directories where the OpenSSL include and library files are located.
5252
# The recommended usage here is to use the Sysinternals junction tool
5353
# to create a hard link between an "openssl-1.x" sub-directory of the
5454
# Fossil source code directory and the target OpenSSL source directory.
5555
#
56
-OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
57
-OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
56
+OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0g/include
57
+OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0g
5858
5959
#### Either the directory where the Tcl library is installed or the Tcl
6060
# source code directory resides (depending on the value of the macro
6161
# FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
6262
# this directory must have "include" and "lib" sub-directories. If
6363
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -43,20 +43,20 @@
43 #### The directories where the zlib include and library files are located.
44 # The recommended usage here is to use the Sysinternals junction tool
45 # to create a hard link between an "zlib-1.x.y" sub-directory of the
46 # Fossil source code directory and the target zlib source directory.
47 #
48 ZINCDIR = $(SRCDIR)/../zlib-1.2.5
49 ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
50
51 #### The directories where the OpenSSL include and library files are located.
52 # The recommended usage here is to use the Sysinternals junction tool
53 # to create a hard link between an "openssl-1.x" sub-directory of the
54 # Fossil source code directory and the target OpenSSL source directory.
55 #
56 OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
57 OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
58
59 #### Either the directory where the Tcl library is installed or the Tcl
60 # source code directory resides (depending on the value of the macro
61 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
62 # this directory must have "include" and "lib" sub-directories. If
63
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -43,20 +43,20 @@
43 #### The directories where the zlib include and library files are located.
44 # The recommended usage here is to use the Sysinternals junction tool
45 # to create a hard link between an "zlib-1.x.y" sub-directory of the
46 # Fossil source code directory and the target zlib source directory.
47 #
48 ZINCDIR = $(SRCDIR)/../zlib-1.2.6
49 ZLIBDIR = $(SRCDIR)/../zlib-1.2.6
50
51 #### The directories where the OpenSSL include and library files are located.
52 # The recommended usage here is to use the Sysinternals junction tool
53 # to create a hard link between an "openssl-1.x" sub-directory of the
54 # Fossil source code directory and the target OpenSSL source directory.
55 #
56 OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0g/include
57 OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0g
58
59 #### Either the directory where the Tcl library is installed or the Tcl
60 # source code directory resides (depending on the value of the macro
61 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
62 # this directory must have "include" and "lib" sub-directories. If
63

Keyboard Shortcuts

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