Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch sslLinkingFix Excluding Merge-Ins
This is equivalent to a diff from f0359882c9 to ff19cc215f
|
2012-02-10
| ||
| 23:04 | Pull over the changes to the 'building and installing' wiki page from msw-docco. There's some more docco changes pending in that branch which should be pulled by sanctioned developers. Closed-Leaf check-in: e98d793db2 user: martin.weber tags: msw-docco | |
| 23:03 | Merge in the Mistachkin SSL linking fix. check-in: f0635d4e03 user: drh tags: trunk | |
| 23:03 | Merge in documentation updates. check-in: 75ea5ac672 user: drh tags: trunk | |
| 23:01 | Revise workaround for OpenSSL symbol name collision problem. Closed-Leaf check-in: ff19cc215f user: mistachkin tags: sslLinkingFix | |
| 22:53 | Bump versions of zlib and OpenSSL in the Windows makefiles. Also, rename the pqueue_insert function to avoid a symbol name collision with OpenSSL. check-in: 674bc27891 user: mistachkin tags: sslLinkingFix | |
| 18:02 | climb up the trunk. From up here, clarify wording of the "building and installing" wiki page: you don't need to log in to get the source code for released versions of fossil, the download page will have a shiny source package for you to fetch. Leaf check-in: 587dd57fe1 user: martin.weber tags: msw-docco | |
| 15:26 | Attempting to do a better job of merging renames. check-in: f0359882c9 user: drh tags: trunk | |
| 14:31 | Detect subsequent edits to a file that was updated by merge. This fixes a problem introduced by check-in [b9227b85cbd78] and reported by ticket [67a47646ea38c7ed]. check-in: a932b74433 user: drh tags: trunk | |
Changes to src/makemake.tcl.
357 357 FOSSIL_TCL_SOURCE = 1 358 358 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 # this points to the Tcl source code directory, this directory must 380 380 # have "generic" and "win" sub-directories. The recommended usage ................................................................................ 407 407 # the finished binary for fossil. The BCC compiler above is used 408 408 # for building intermediate code-generator tools. 409 409 # 410 410 TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR) 411 411 412 412 # With HTTPS support 413 413 ifdef FOSSIL_ENABLE_SSL 414 +TCC += -Dpqueue_insert=pqueue_insert_fossil 414 415 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR) 415 416 endif 416 417 417 418 # With Tcl support 418 419 ifdef FOSSIL_ENABLE_TCL 419 420 ifdef FOSSIL_TCL_SOURCE 420 421 TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
Changes to win/Makefile.mingw.
41 41 FOSSIL_TCL_SOURCE = 1 42 42 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 # this points to the Tcl source code directory, this directory must 64 64 # have "generic" and "win" sub-directories. The recommended usage ................................................................................ 91 91 # the finished binary for fossil. The BCC compiler above is used 92 92 # for building intermediate code-generator tools. 93 93 # 94 94 TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR) 95 95 96 96 # With HTTPS support 97 97 ifdef FOSSIL_ENABLE_SSL 98 +TCC += -Dpqueue_insert=pqueue_insert_fossil 98 99 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR) 99 100 endif 100 101 101 102 # With Tcl support 102 103 ifdef FOSSIL_ENABLE_TCL 103 104 ifdef FOSSIL_TCL_SOURCE 104 105 TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
Changes to win/Makefile.mingw.mistachkin.
41 41 FOSSIL_TCL_SOURCE = 1 42 42 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 # this points to the Tcl source code directory, this directory must 64 64 # have "generic" and "win" sub-directories. The recommended usage ................................................................................ 91 91 # the finished binary for fossil. The BCC compiler above is used 92 92 # for building intermediate code-generator tools. 93 93 # 94 94 TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR) 95 95 96 96 # With HTTPS support 97 97 ifdef FOSSIL_ENABLE_SSL 98 +TCC += -Dpqueue_insert=pqueue_insert_fossil 98 99 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR) 99 100 endif 100 101 101 102 # With Tcl support 102 103 ifdef FOSSIL_ENABLE_TCL 103 104 ifdef FOSSIL_TCL_SOURCE 104 105 TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win