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.
Commit
674bc278919d2702e2db9f4004f0f778eefa2f30
Parent
f0359882c9b5adf…
6 files changed
+4
-4
+4
-4
+3
-1
+2
-2
+4
-4
+4
-4
+4
-4
| --- src/descendants.c | ||
| +++ src/descendants.c | ||
| @@ -164,11 +164,11 @@ | ||
| 164 | 164 | Stmt ins; |
| 165 | 165 | Stmt q; |
| 166 | 166 | bag_init(&seen); |
| 167 | 167 | pqueue_init(&queue); |
| 168 | 168 | bag_insert(&seen, rid); |
| 169 | - pqueue_insert(&queue, rid, 0.0, 0); | |
| 169 | + pqueue_insert2(&queue, rid, 0.0, 0); | |
| 170 | 170 | db_prepare(&ins, "INSERT OR IGNORE INTO ok VALUES(:rid)"); |
| 171 | 171 | db_prepare(&q, |
| 172 | 172 | "SELECT a.pid, b.mtime FROM plink a LEFT JOIN plink b ON b.cid=a.pid" |
| 173 | 173 | " WHERE a.cid=:rid" |
| 174 | 174 | ); |
| @@ -179,11 +179,11 @@ | ||
| 179 | 179 | db_bind_int(&q, ":rid", rid); |
| 180 | 180 | while( db_step(&q)==SQLITE_ROW ){ |
| 181 | 181 | int pid = db_column_int(&q, 0); |
| 182 | 182 | double mtime = db_column_double(&q, 1); |
| 183 | 183 | if( bag_insert(&seen, pid) ){ |
| 184 | - pqueue_insert(&queue, pid, -mtime, 0); | |
| 184 | + pqueue_insert2(&queue, pid, -mtime, 0); | |
| 185 | 185 | } |
| 186 | 186 | } |
| 187 | 187 | db_reset(&q); |
| 188 | 188 | } |
| 189 | 189 | bag_clear(&seen); |
| @@ -239,11 +239,11 @@ | ||
| 239 | 239 | Stmt q; |
| 240 | 240 | |
| 241 | 241 | bag_init(&seen); |
| 242 | 242 | pqueue_init(&queue); |
| 243 | 243 | bag_insert(&seen, rid); |
| 244 | - pqueue_insert(&queue, rid, 0.0, 0); | |
| 244 | + pqueue_insert2(&queue, rid, 0.0, 0); | |
| 245 | 245 | db_prepare(&ins, "INSERT OR IGNORE INTO ok VALUES(:rid)"); |
| 246 | 246 | db_prepare(&q, "SELECT cid, mtime FROM plink WHERE pid=:rid"); |
| 247 | 247 | while( (N--)>0 && (rid = pqueue_extract(&queue, 0))!=0 ){ |
| 248 | 248 | db_bind_int(&ins, ":rid", rid); |
| 249 | 249 | db_step(&ins); |
| @@ -251,11 +251,11 @@ | ||
| 251 | 251 | db_bind_int(&q, ":rid", rid); |
| 252 | 252 | while( db_step(&q)==SQLITE_ROW ){ |
| 253 | 253 | int pid = db_column_int(&q, 0); |
| 254 | 254 | double mtime = db_column_double(&q, 1); |
| 255 | 255 | if( bag_insert(&seen, pid) ){ |
| 256 | - pqueue_insert(&queue, pid, mtime, 0); | |
| 256 | + pqueue_insert2(&queue, pid, mtime, 0); | |
| 257 | 257 | } |
| 258 | 258 | } |
| 259 | 259 | db_reset(&q); |
| 260 | 260 | } |
| 261 | 261 | bag_clear(&seen); |
| 262 | 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_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 |
+4
-4
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -359,20 +359,20 @@ | ||
| 359 | 359 | #### The directories where the zlib include and library files are located. |
| 360 | 360 | # The recommended usage here is to use the Sysinternals junction tool |
| 361 | 361 | # to create a hard link between an "zlib-1.x.y" sub-directory of the |
| 362 | 362 | # Fossil source code directory and the target zlib source directory. |
| 363 | 363 | # |
| 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 | |
| 366 | 366 | |
| 367 | 367 | #### The directories where the OpenSSL include and library files are located. |
| 368 | 368 | # The recommended usage here is to use the Sysinternals junction tool |
| 369 | 369 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 370 | 370 | # Fossil source code directory and the target OpenSSL source directory. |
| 371 | 371 | # |
| 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 | |
| 374 | 374 | |
| 375 | 375 | #### Either the directory where the Tcl library is installed or the Tcl |
| 376 | 376 | # source code directory resides (depending on the value of the macro |
| 377 | 377 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 378 | 378 | # this directory must have "include" and "lib" sub-directories. If |
| 379 | 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.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 @@ | ||
| 69 | 69 | p->sz = N; |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | /* |
| 73 | 73 | ** Insert element e into the queue. |
| 74 | +** This is now named pqueue_insert2 to avoid a symbol naming | |
| 75 | +** conflict with OpenSSL. | |
| 74 | 76 | */ |
| 75 | -void pqueue_insert(PQueue *p, int e, double v, void *pData){ | |
| 77 | +void pqueue_insert2(PQueue *p, int e, double v, void *pData){ | |
| 76 | 78 | int i, j; |
| 77 | 79 | if( p->cnt+1>p->sz ){ |
| 78 | 80 | pqueue_resize(p, p->cnt+5); |
| 79 | 81 | } |
| 80 | 82 | for(i=0; i<p->cnt; i++){ |
| 81 | 83 |
| --- 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 @@ | ||
| 44 | 44 | Stmt ins; /* INSERT INTO tagxref */ |
| 45 | 45 | Stmt eventupdate; /* UPDATE event */ |
| 46 | 46 | |
| 47 | 47 | assert( tagType==0 || tagType==2 ); |
| 48 | 48 | pqueue_init(&queue); |
| 49 | - pqueue_insert(&queue, pid, 0.0, 0); | |
| 49 | + pqueue_insert2(&queue, pid, 0.0, 0); | |
| 50 | 50 | |
| 51 | 51 | /* Query for children of :pid to which to propagate the tag. |
| 52 | 52 | ** Three returns: (1) rid of the child. (2) timestamp of child. |
| 53 | 53 | ** (3) True to propagate or false to block. |
| 54 | 54 | */ |
| @@ -86,11 +86,11 @@ | ||
| 86 | 86 | while( db_step(&s)==SQLITE_ROW ){ |
| 87 | 87 | int doit = db_column_int(&s, 2); |
| 88 | 88 | if( doit ){ |
| 89 | 89 | int cid = db_column_int(&s, 0); |
| 90 | 90 | double mtime = db_column_double(&s, 1); |
| 91 | - pqueue_insert(&queue, cid, mtime, 0); | |
| 91 | + pqueue_insert2(&queue, cid, mtime, 0); | |
| 92 | 92 | db_bind_int(&ins, ":rid", cid); |
| 93 | 93 | db_step(&ins); |
| 94 | 94 | db_reset(&ins); |
| 95 | 95 | if( tagid==TAG_BGCOLOR ){ |
| 96 | 96 | db_bind_int(&eventupdate, ":rid", cid); |
| 97 | 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_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 |
+4
-4
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -43,20 +43,20 @@ | ||
| 43 | 43 | #### The directories where the zlib include and library files are located. |
| 44 | 44 | # The recommended usage here is to use the Sysinternals junction tool |
| 45 | 45 | # to create a hard link between an "zlib-1.x.y" sub-directory of the |
| 46 | 46 | # Fossil source code directory and the target zlib source directory. |
| 47 | 47 | # |
| 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 | |
| 50 | 50 | |
| 51 | 51 | #### The directories where the OpenSSL include and library files are located. |
| 52 | 52 | # The recommended usage here is to use the Sysinternals junction tool |
| 53 | 53 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 54 | 54 | # Fossil source code directory and the target OpenSSL source directory. |
| 55 | 55 | # |
| 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 | |
| 58 | 58 | |
| 59 | 59 | #### Either the directory where the Tcl library is installed or the Tcl |
| 60 | 60 | # source code directory resides (depending on the value of the macro |
| 61 | 61 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 62 | 62 | # this directory must have "include" and "lib" sub-directories. If |
| 63 | 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.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 |
+4
-4
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -43,20 +43,20 @@ | ||
| 43 | 43 | #### The directories where the zlib include and library files are located. |
| 44 | 44 | # The recommended usage here is to use the Sysinternals junction tool |
| 45 | 45 | # to create a hard link between an "zlib-1.x.y" sub-directory of the |
| 46 | 46 | # Fossil source code directory and the target zlib source directory. |
| 47 | 47 | # |
| 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 | |
| 50 | 50 | |
| 51 | 51 | #### The directories where the OpenSSL include and library files are located. |
| 52 | 52 | # The recommended usage here is to use the Sysinternals junction tool |
| 53 | 53 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 54 | 54 | # Fossil source code directory and the target OpenSSL source directory. |
| 55 | 55 | # |
| 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 | |
| 58 | 58 | |
| 59 | 59 | #### Either the directory where the Tcl library is installed or the Tcl |
| 60 | 60 | # source code directory resides (depending on the value of the macro |
| 61 | 61 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 62 | 62 | # this directory must have "include" and "lib" sub-directories. If |
| 63 | 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.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 |