Fossil SCM

Cherry-pick [c5b86115de]: Update version of OpenSSL that is referred to in the makefiles. Cherry-pick [565ba734d2]: Fix "fossil extras" when a "extra" entry matches partly with current directory name (reported by j. van den hoff).

jan.nijtmans 2014-04-09 21:55 branch-1.28 merge
Commit c779b6890464caeabac0c112cb2ef708e9b46b91
Parent 97608a6b57f290d…
15 files changed +2 +2 +2 +4 -4 +4 -4 +4 -4 +2 -2 +2 -2 +2 -2 +2 -2 +2 -2 +2 -2 +2 -2 +2 -2 +2 -2
~ src/file.c ~ src/file.c ~ src/file.c ~ src/makemake.tcl ~ src/makemake.tcl ~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.mingw.mistachkin ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc ~ win/Makefile.msc ~ win/Makefile.msc
M src/file.c
+2
--- src/file.c
+++ src/file.c
@@ -914,10 +914,12 @@
914914
 for(j=i+1; zPwd[j]; j++){
915915
 if( zPwd[j]=='/' ){
916916
 blob_append(pOut, "/..", 3);
917917
 }
918918
 }
919
+ while( i>0 && (zPwd[i]!='/')) --i;
920
+ blob_append(pOut, zPath+i, j-i);
919921
 }
920922
 if( slash && i>0 && zPath[strlen(zPath)-1]=='/'){
921923
 blob_append(pOut, "/", 1);
922924
 }
923925
 blob_reset(&tmp);
924926
--- src/file.c
+++ src/file.c
@@ -914,10 +914,12 @@
914 for(j=i+1; zPwd[j]; j++){
915 if( zPwd[j]=='/' ){
916 blob_append(pOut, "/..", 3);
917 }
918 }
 
 
919 }
920 if( slash && i>0 && zPath[strlen(zPath)-1]=='/'){
921 blob_append(pOut, "/", 1);
922 }
923 blob_reset(&tmp);
924
--- src/file.c
+++ src/file.c
@@ -914,10 +914,12 @@
914 for(j=i+1; zPwd[j]; j++){
915 if( zPwd[j]=='/' ){
916 blob_append(pOut, "/..", 3);
917 }
918 }
919 while( i>0 && (zPwd[i]!='/')) --i;
920 blob_append(pOut, zPath+i, j-i);
921 }
922 if( slash && i>0 && zPath[strlen(zPath)-1]=='/'){
923 blob_append(pOut, "/", 1);
924 }
925 blob_reset(&tmp);
926
M src/file.c
+2
--- src/file.c
+++ src/file.c
@@ -914,10 +914,12 @@
914914
 for(j=i+1; zPwd[j]; j++){
915915
 if( zPwd[j]=='/' ){
916916
 blob_append(pOut, "/..", 3);
917917
 }
918918
 }
919
+ while( i>0 && (zPwd[i]!='/')) --i;
920
+ blob_append(pOut, zPath+i, j-i);
919921
 }
920922
 if( slash && i>0 && zPath[strlen(zPath)-1]=='/'){
921923
 blob_append(pOut, "/", 1);
922924
 }
923925
 blob_reset(&tmp);
924926
--- src/file.c
+++ src/file.c
@@ -914,10 +914,12 @@
914 for(j=i+1; zPwd[j]; j++){
915 if( zPwd[j]=='/' ){
916 blob_append(pOut, "/..", 3);
917 }
918 }
 
 
919 }
920 if( slash && i>0 && zPath[strlen(zPath)-1]=='/'){
921 blob_append(pOut, "/", 1);
922 }
923 blob_reset(&tmp);
924
--- src/file.c
+++ src/file.c
@@ -914,10 +914,12 @@
914 for(j=i+1; zPwd[j]; j++){
915 if( zPwd[j]=='/' ){
916 blob_append(pOut, "/..", 3);
917 }
918 }
919 while( i>0 && (zPwd[i]!='/')) --i;
920 blob_append(pOut, zPath+i, j-i);
921 }
922 if( slash && i>0 && zPath[strlen(zPath)-1]=='/'){
923 blob_append(pOut, "/", 1);
924 }
925 blob_reset(&tmp);
926
M src/file.c
+2
--- src/file.c
+++ src/file.c
@@ -914,10 +914,12 @@
914914
 for(j=i+1; zPwd[j]; j++){
915915
 if( zPwd[j]=='/' ){
916916
 blob_append(pOut, "/..", 3);
917917
 }
918918
 }
919
+ while( i>0 && (zPwd[i]!='/')) --i;
920
+ blob_append(pOut, zPath+i, j-i);
919921
 }
920922
 if( slash && i>0 && zPath[strlen(zPath)-1]=='/'){
921923
 blob_append(pOut, "/", 1);
922924
 }
923925
 blob_reset(&tmp);
924926
--- src/file.c
+++ src/file.c
@@ -914,10 +914,12 @@
914 for(j=i+1; zPwd[j]; j++){
915 if( zPwd[j]=='/' ){
916 blob_append(pOut, "/..", 3);
917 }
918 }
 
 
919 }
920 if( slash && i>0 && zPath[strlen(zPath)-1]=='/'){
921 blob_append(pOut, "/", 1);
922 }
923 blob_reset(&tmp);
924
--- src/file.c
+++ src/file.c
@@ -914,10 +914,12 @@
914 for(j=i+1; zPwd[j]; j++){
915 if( zPwd[j]=='/' ){
916 blob_append(pOut, "/..", 3);
917 }
918 }
919 while( i>0 && (zPwd[i]!='/')) --i;
920 blob_append(pOut, zPath+i, j-i);
921 }
922 if( slash && i>0 && zPath[strlen(zPath)-1]=='/'){
923 blob_append(pOut, "/", 1);
924 }
925 blob_reset(&tmp);
926
M src/makemake.tcl
+4 -4
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -450,12 +450,12 @@
450450
 #### The directories where the OpenSSL include and library files are located.
451451
 # The recommended usage here is to use the Sysinternals junction tool
452452
 # to create a hard link between an "openssl-1.x" sub-directory of the
453453
 # Fossil source code directory and the target OpenSSL source directory.
454454
 #
455
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
456
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
455
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
456
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
457457
458458
 #### Either the directory where the Tcl library is installed or the Tcl
459459
 # source code directory resides (depending on the value of the macro
460460
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
461461
 # this directory must have "include" and "lib" sub-directories. If
@@ -1020,12 +1020,12 @@
10201020
10211021
 # Uncomment to enable SSL support
10221022
 # FOSSIL_ENABLE_SSL = 1
10231023
10241024
 !ifdef FOSSIL_ENABLE_SSL
1025
-SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
1026
-SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
1025
+SSLINCDIR = $(B)\compat\openssl-1.0.1g\include
1026
+SSLLIBDIR = $(B)\compat\openssl-1.0.1g\out32
10271027
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
10281028
 !endif
10291029
10301030
 # zlib options
10311031
 ZINCDIR = $(B)\compat\zlib
10321032
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -450,12 +450,12 @@
450 #### The directories where the OpenSSL include and library files are located.
451 # The recommended usage here is to use the Sysinternals junction tool
452 # to create a hard link between an "openssl-1.x" sub-directory of the
453 # Fossil source code directory and the target OpenSSL source directory.
454 #
455 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
456 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
457
458 #### Either the directory where the Tcl library is installed or the Tcl
459 # source code directory resides (depending on the value of the macro
460 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
461 # this directory must have "include" and "lib" sub-directories. If
@@ -1020,12 +1020,12 @@
1020
1021 # Uncomment to enable SSL support
1022 # FOSSIL_ENABLE_SSL = 1
1023
1024 !ifdef FOSSIL_ENABLE_SSL
1025 SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
1026 SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
1027 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1028 !endif
1029
1030 # zlib options
1031 ZINCDIR = $(B)\compat\zlib
1032
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -450,12 +450,12 @@
450 #### The directories where the OpenSSL include and library files are located.
451 # The recommended usage here is to use the Sysinternals junction tool
452 # to create a hard link between an "openssl-1.x" sub-directory of the
453 # Fossil source code directory and the target OpenSSL source directory.
454 #
455 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
456 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
457
458 #### Either the directory where the Tcl library is installed or the Tcl
459 # source code directory resides (depending on the value of the macro
460 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
461 # this directory must have "include" and "lib" sub-directories. If
@@ -1020,12 +1020,12 @@
1020
1021 # Uncomment to enable SSL support
1022 # FOSSIL_ENABLE_SSL = 1
1023
1024 !ifdef FOSSIL_ENABLE_SSL
1025 SSLINCDIR = $(B)\compat\openssl-1.0.1g\include
1026 SSLLIBDIR = $(B)\compat\openssl-1.0.1g\out32
1027 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1028 !endif
1029
1030 # zlib options
1031 ZINCDIR = $(B)\compat\zlib
1032
M src/makemake.tcl
+4 -4
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -450,12 +450,12 @@
450450
 #### The directories where the OpenSSL include and library files are located.
451451
 # The recommended usage here is to use the Sysinternals junction tool
452452
 # to create a hard link between an "openssl-1.x" sub-directory of the
453453
 # Fossil source code directory and the target OpenSSL source directory.
454454
 #
455
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
456
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
455
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
456
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
457457
458458
 #### Either the directory where the Tcl library is installed or the Tcl
459459
 # source code directory resides (depending on the value of the macro
460460
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
461461
 # this directory must have "include" and "lib" sub-directories. If
@@ -1020,12 +1020,12 @@
10201020
10211021
 # Uncomment to enable SSL support
10221022
 # FOSSIL_ENABLE_SSL = 1
10231023
10241024
 !ifdef FOSSIL_ENABLE_SSL
1025
-SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
1026
-SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
1025
+SSLINCDIR = $(B)\compat\openssl-1.0.1g\include
1026
+SSLLIBDIR = $(B)\compat\openssl-1.0.1g\out32
10271027
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
10281028
 !endif
10291029
10301030
 # zlib options
10311031
 ZINCDIR = $(B)\compat\zlib
10321032
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -450,12 +450,12 @@
450 #### The directories where the OpenSSL include and library files are located.
451 # The recommended usage here is to use the Sysinternals junction tool
452 # to create a hard link between an "openssl-1.x" sub-directory of the
453 # Fossil source code directory and the target OpenSSL source directory.
454 #
455 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
456 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
457
458 #### Either the directory where the Tcl library is installed or the Tcl
459 # source code directory resides (depending on the value of the macro
460 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
461 # this directory must have "include" and "lib" sub-directories. If
@@ -1020,12 +1020,12 @@
1020
1021 # Uncomment to enable SSL support
1022 # FOSSIL_ENABLE_SSL = 1
1023
1024 !ifdef FOSSIL_ENABLE_SSL
1025 SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
1026 SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
1027 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1028 !endif
1029
1030 # zlib options
1031 ZINCDIR = $(B)\compat\zlib
1032
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -450,12 +450,12 @@
450 #### The directories where the OpenSSL include and library files are located.
451 # The recommended usage here is to use the Sysinternals junction tool
452 # to create a hard link between an "openssl-1.x" sub-directory of the
453 # Fossil source code directory and the target OpenSSL source directory.
454 #
455 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
456 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
457
458 #### Either the directory where the Tcl library is installed or the Tcl
459 # source code directory resides (depending on the value of the macro
460 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
461 # this directory must have "include" and "lib" sub-directories. If
@@ -1020,12 +1020,12 @@
1020
1021 # Uncomment to enable SSL support
1022 # FOSSIL_ENABLE_SSL = 1
1023
1024 !ifdef FOSSIL_ENABLE_SSL
1025 SSLINCDIR = $(B)\compat\openssl-1.0.1g\include
1026 SSLLIBDIR = $(B)\compat\openssl-1.0.1g\out32
1027 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1028 !endif
1029
1030 # zlib options
1031 ZINCDIR = $(B)\compat\zlib
1032
M src/makemake.tcl
+4 -4
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -450,12 +450,12 @@
450450
 #### The directories where the OpenSSL include and library files are located.
451451
 # The recommended usage here is to use the Sysinternals junction tool
452452
 # to create a hard link between an "openssl-1.x" sub-directory of the
453453
 # Fossil source code directory and the target OpenSSL source directory.
454454
 #
455
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
456
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
455
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
456
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
457457
458458
 #### Either the directory where the Tcl library is installed or the Tcl
459459
 # source code directory resides (depending on the value of the macro
460460
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
461461
 # this directory must have "include" and "lib" sub-directories. If
@@ -1020,12 +1020,12 @@
10201020
10211021
 # Uncomment to enable SSL support
10221022
 # FOSSIL_ENABLE_SSL = 1
10231023
10241024
 !ifdef FOSSIL_ENABLE_SSL
1025
-SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
1026
-SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
1025
+SSLINCDIR = $(B)\compat\openssl-1.0.1g\include
1026
+SSLLIBDIR = $(B)\compat\openssl-1.0.1g\out32
10271027
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
10281028
 !endif
10291029
10301030
 # zlib options
10311031
 ZINCDIR = $(B)\compat\zlib
10321032
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -450,12 +450,12 @@
450 #### The directories where the OpenSSL include and library files are located.
451 # The recommended usage here is to use the Sysinternals junction tool
452 # to create a hard link between an "openssl-1.x" sub-directory of the
453 # Fossil source code directory and the target OpenSSL source directory.
454 #
455 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
456 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
457
458 #### Either the directory where the Tcl library is installed or the Tcl
459 # source code directory resides (depending on the value of the macro
460 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
461 # this directory must have "include" and "lib" sub-directories. If
@@ -1020,12 +1020,12 @@
1020
1021 # Uncomment to enable SSL support
1022 # FOSSIL_ENABLE_SSL = 1
1023
1024 !ifdef FOSSIL_ENABLE_SSL
1025 SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
1026 SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
1027 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1028 !endif
1029
1030 # zlib options
1031 ZINCDIR = $(B)\compat\zlib
1032
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -450,12 +450,12 @@
450 #### The directories where the OpenSSL include and library files are located.
451 # The recommended usage here is to use the Sysinternals junction tool
452 # to create a hard link between an "openssl-1.x" sub-directory of the
453 # Fossil source code directory and the target OpenSSL source directory.
454 #
455 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
456 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
457
458 #### Either the directory where the Tcl library is installed or the Tcl
459 # source code directory resides (depending on the value of the macro
460 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
461 # this directory must have "include" and "lib" sub-directories. If
@@ -1020,12 +1020,12 @@
1020
1021 # Uncomment to enable SSL support
1022 # FOSSIL_ENABLE_SSL = 1
1023
1024 !ifdef FOSSIL_ENABLE_SSL
1025 SSLINCDIR = $(B)\compat\openssl-1.0.1g\include
1026 SSLLIBDIR = $(B)\compat\openssl-1.0.1g\out32
1027 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1028 !endif
1029
1030 # zlib options
1031 ZINCDIR = $(B)\compat\zlib
1032
M win/Makefile.mingw
+2 -2
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -84,12 +84,12 @@
8484
 #### The directories where the OpenSSL include and library files are located.
8585
 # The recommended usage here is to use the Sysinternals junction tool
8686
 # to create a hard link between an "openssl-1.x" sub-directory of the
8787
 # Fossil source code directory and the target OpenSSL source directory.
8888
 #
89
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
90
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
89
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
90
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
9191
9292
 #### Either the directory where the Tcl library is installed or the Tcl
9393
 # source code directory resides (depending on the value of the macro
9494
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
9595
 # this directory must have "include" and "lib" sub-directories. If
9696
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -84,12 +84,12 @@
84 #### The directories where the OpenSSL include and library files are located.
85 # The recommended usage here is to use the Sysinternals junction tool
86 # to create a hard link between an "openssl-1.x" sub-directory of the
87 # Fossil source code directory and the target OpenSSL source directory.
88 #
89 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
90 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
91
92 #### Either the directory where the Tcl library is installed or the Tcl
93 # source code directory resides (depending on the value of the macro
94 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
95 # this directory must have "include" and "lib" sub-directories. If
96
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -84,12 +84,12 @@
84 #### The directories where the OpenSSL include and library files are located.
85 # The recommended usage here is to use the Sysinternals junction tool
86 # to create a hard link between an "openssl-1.x" sub-directory of the
87 # Fossil source code directory and the target OpenSSL source directory.
88 #
89 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
90 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
91
92 #### Either the directory where the Tcl library is installed or the Tcl
93 # source code directory resides (depending on the value of the macro
94 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
95 # this directory must have "include" and "lib" sub-directories. If
96
M win/Makefile.mingw
+2 -2
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -84,12 +84,12 @@
8484
 #### The directories where the OpenSSL include and library files are located.
8585
 # The recommended usage here is to use the Sysinternals junction tool
8686
 # to create a hard link between an "openssl-1.x" sub-directory of the
8787
 # Fossil source code directory and the target OpenSSL source directory.
8888
 #
89
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
90
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
89
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
90
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
9191
9292
 #### Either the directory where the Tcl library is installed or the Tcl
9393
 # source code directory resides (depending on the value of the macro
9494
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
9595
 # this directory must have "include" and "lib" sub-directories. If
9696
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -84,12 +84,12 @@
84 #### The directories where the OpenSSL include and library files are located.
85 # The recommended usage here is to use the Sysinternals junction tool
86 # to create a hard link between an "openssl-1.x" sub-directory of the
87 # Fossil source code directory and the target OpenSSL source directory.
88 #
89 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
90 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
91
92 #### Either the directory where the Tcl library is installed or the Tcl
93 # source code directory resides (depending on the value of the macro
94 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
95 # this directory must have "include" and "lib" sub-directories. If
96
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -84,12 +84,12 @@
84 #### The directories where the OpenSSL include and library files are located.
85 # The recommended usage here is to use the Sysinternals junction tool
86 # to create a hard link between an "openssl-1.x" sub-directory of the
87 # Fossil source code directory and the target OpenSSL source directory.
88 #
89 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
90 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
91
92 #### Either the directory where the Tcl library is installed or the Tcl
93 # source code directory resides (depending on the value of the macro
94 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
95 # this directory must have "include" and "lib" sub-directories. If
96
M win/Makefile.mingw
+2 -2
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -84,12 +84,12 @@
8484
 #### The directories where the OpenSSL include and library files are located.
8585
 # The recommended usage here is to use the Sysinternals junction tool
8686
 # to create a hard link between an "openssl-1.x" sub-directory of the
8787
 # Fossil source code directory and the target OpenSSL source directory.
8888
 #
89
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
90
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
89
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
90
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
9191
9292
 #### Either the directory where the Tcl library is installed or the Tcl
9393
 # source code directory resides (depending on the value of the macro
9494
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
9595
 # this directory must have "include" and "lib" sub-directories. If
9696
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -84,12 +84,12 @@
84 #### The directories where the OpenSSL include and library files are located.
85 # The recommended usage here is to use the Sysinternals junction tool
86 # to create a hard link between an "openssl-1.x" sub-directory of the
87 # Fossil source code directory and the target OpenSSL source directory.
88 #
89 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
90 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
91
92 #### Either the directory where the Tcl library is installed or the Tcl
93 # source code directory resides (depending on the value of the macro
94 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
95 # this directory must have "include" and "lib" sub-directories. If
96
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -84,12 +84,12 @@
84 #### The directories where the OpenSSL include and library files are located.
85 # The recommended usage here is to use the Sysinternals junction tool
86 # to create a hard link between an "openssl-1.x" sub-directory of the
87 # Fossil source code directory and the target OpenSSL source directory.
88 #
89 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
90 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
91
92 #### Either the directory where the Tcl library is installed or the Tcl
93 # source code directory resides (depending on the value of the macro
94 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
95 # this directory must have "include" and "lib" sub-directories. If
96
M win/Makefile.mingw.mistachkin
+2 -2
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -84,12 +84,12 @@
8484
 #### The directories where the OpenSSL include and library files are located.
8585
 # The recommended usage here is to use the Sysinternals junction tool
8686
 # to create a hard link between an "openssl-1.x" sub-directory of the
8787
 # Fossil source code directory and the target OpenSSL source directory.
8888
 #
89
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
90
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
89
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
90
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
9191
9292
 #### Either the directory where the Tcl library is installed or the Tcl
9393
 # source code directory resides (depending on the value of the macro
9494
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
9595
 # this directory must have "include" and "lib" sub-directories. If
9696
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -84,12 +84,12 @@
84 #### The directories where the OpenSSL include and library files are located.
85 # The recommended usage here is to use the Sysinternals junction tool
86 # to create a hard link between an "openssl-1.x" sub-directory of the
87 # Fossil source code directory and the target OpenSSL source directory.
88 #
89 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
90 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
91
92 #### Either the directory where the Tcl library is installed or the Tcl
93 # source code directory resides (depending on the value of the macro
94 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
95 # this directory must have "include" and "lib" sub-directories. If
96
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -84,12 +84,12 @@
84 #### The directories where the OpenSSL include and library files are located.
85 # The recommended usage here is to use the Sysinternals junction tool
86 # to create a hard link between an "openssl-1.x" sub-directory of the
87 # Fossil source code directory and the target OpenSSL source directory.
88 #
89 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
90 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
91
92 #### Either the directory where the Tcl library is installed or the Tcl
93 # source code directory resides (depending on the value of the macro
94 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
95 # this directory must have "include" and "lib" sub-directories. If
96
M win/Makefile.mingw.mistachkin
+2 -2
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -84,12 +84,12 @@
8484
 #### The directories where the OpenSSL include and library files are located.
8585
 # The recommended usage here is to use the Sysinternals junction tool
8686
 # to create a hard link between an "openssl-1.x" sub-directory of the
8787
 # Fossil source code directory and the target OpenSSL source directory.
8888
 #
89
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
90
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
89
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
90
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
9191
9292
 #### Either the directory where the Tcl library is installed or the Tcl
9393
 # source code directory resides (depending on the value of the macro
9494
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
9595
 # this directory must have "include" and "lib" sub-directories. If
9696
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -84,12 +84,12 @@
84 #### The directories where the OpenSSL include and library files are located.
85 # The recommended usage here is to use the Sysinternals junction tool
86 # to create a hard link between an "openssl-1.x" sub-directory of the
87 # Fossil source code directory and the target OpenSSL source directory.
88 #
89 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
90 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
91
92 #### Either the directory where the Tcl library is installed or the Tcl
93 # source code directory resides (depending on the value of the macro
94 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
95 # this directory must have "include" and "lib" sub-directories. If
96
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -84,12 +84,12 @@
84 #### The directories where the OpenSSL include and library files are located.
85 # The recommended usage here is to use the Sysinternals junction tool
86 # to create a hard link between an "openssl-1.x" sub-directory of the
87 # Fossil source code directory and the target OpenSSL source directory.
88 #
89 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
90 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
91
92 #### Either the directory where the Tcl library is installed or the Tcl
93 # source code directory resides (depending on the value of the macro
94 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
95 # this directory must have "include" and "lib" sub-directories. If
96
M win/Makefile.mingw.mistachkin
+2 -2
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -84,12 +84,12 @@
8484
 #### The directories where the OpenSSL include and library files are located.
8585
 # The recommended usage here is to use the Sysinternals junction tool
8686
 # to create a hard link between an "openssl-1.x" sub-directory of the
8787
 # Fossil source code directory and the target OpenSSL source directory.
8888
 #
89
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
90
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
89
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
90
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
9191
9292
 #### Either the directory where the Tcl library is installed or the Tcl
9393
 # source code directory resides (depending on the value of the macro
9494
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
9595
 # this directory must have "include" and "lib" sub-directories. If
9696
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -84,12 +84,12 @@
84 #### The directories where the OpenSSL include and library files are located.
85 # The recommended usage here is to use the Sysinternals junction tool
86 # to create a hard link between an "openssl-1.x" sub-directory of the
87 # Fossil source code directory and the target OpenSSL source directory.
88 #
89 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
90 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
91
92 #### Either the directory where the Tcl library is installed or the Tcl
93 # source code directory resides (depending on the value of the macro
94 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
95 # this directory must have "include" and "lib" sub-directories. If
96
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -84,12 +84,12 @@
84 #### The directories where the OpenSSL include and library files are located.
85 # The recommended usage here is to use the Sysinternals junction tool
86 # to create a hard link between an "openssl-1.x" sub-directory of the
87 # Fossil source code directory and the target OpenSSL source directory.
88 #
89 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
90 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
91
92 #### Either the directory where the Tcl library is installed or the Tcl
93 # source code directory resides (depending on the value of the macro
94 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
95 # this directory must have "include" and "lib" sub-directories. If
96
M win/Makefile.msc
+2 -2
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -23,12 +23,12 @@
2323
2424
 # Uncomment to enable SSL support
2525
 # FOSSIL_ENABLE_SSL = 1
2626
2727
 !ifdef FOSSIL_ENABLE_SSL
28
-SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
29
-SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
28
+SSLINCDIR = $(B)\compat\openssl-1.0.1g\include
29
+SSLLIBDIR = $(B)\compat\openssl-1.0.1g\out32
3030
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
3131
 !endif
3232
3333
 # zlib options
3434
 ZINCDIR = $(B)\compat\zlib
3535
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -23,12 +23,12 @@
23
24 # Uncomment to enable SSL support
25 # FOSSIL_ENABLE_SSL = 1
26
27 !ifdef FOSSIL_ENABLE_SSL
28 SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
29 SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
30 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
31 !endif
32
33 # zlib options
34 ZINCDIR = $(B)\compat\zlib
35
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -23,12 +23,12 @@
23
24 # Uncomment to enable SSL support
25 # FOSSIL_ENABLE_SSL = 1
26
27 !ifdef FOSSIL_ENABLE_SSL
28 SSLINCDIR = $(B)\compat\openssl-1.0.1g\include
29 SSLLIBDIR = $(B)\compat\openssl-1.0.1g\out32
30 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
31 !endif
32
33 # zlib options
34 ZINCDIR = $(B)\compat\zlib
35
M win/Makefile.msc
+2 -2
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -23,12 +23,12 @@
2323
2424
 # Uncomment to enable SSL support
2525
 # FOSSIL_ENABLE_SSL = 1
2626
2727
 !ifdef FOSSIL_ENABLE_SSL
28
-SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
29
-SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
28
+SSLINCDIR = $(B)\compat\openssl-1.0.1g\include
29
+SSLLIBDIR = $(B)\compat\openssl-1.0.1g\out32
3030
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
3131
 !endif
3232
3333
 # zlib options
3434
 ZINCDIR = $(B)\compat\zlib
3535
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -23,12 +23,12 @@
23
24 # Uncomment to enable SSL support
25 # FOSSIL_ENABLE_SSL = 1
26
27 !ifdef FOSSIL_ENABLE_SSL
28 SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
29 SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
30 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
31 !endif
32
33 # zlib options
34 ZINCDIR = $(B)\compat\zlib
35
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -23,12 +23,12 @@
23
24 # Uncomment to enable SSL support
25 # FOSSIL_ENABLE_SSL = 1
26
27 !ifdef FOSSIL_ENABLE_SSL
28 SSLINCDIR = $(B)\compat\openssl-1.0.1g\include
29 SSLLIBDIR = $(B)\compat\openssl-1.0.1g\out32
30 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
31 !endif
32
33 # zlib options
34 ZINCDIR = $(B)\compat\zlib
35
M win/Makefile.msc
+2 -2
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -23,12 +23,12 @@
2323
2424
 # Uncomment to enable SSL support
2525
 # FOSSIL_ENABLE_SSL = 1
2626
2727
 !ifdef FOSSIL_ENABLE_SSL
28
-SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
29
-SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
28
+SSLINCDIR = $(B)\compat\openssl-1.0.1g\include
29
+SSLLIBDIR = $(B)\compat\openssl-1.0.1g\out32
3030
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
3131
 !endif
3232
3333
 # zlib options
3434
 ZINCDIR = $(B)\compat\zlib
3535
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -23,12 +23,12 @@
23
24 # Uncomment to enable SSL support
25 # FOSSIL_ENABLE_SSL = 1
26
27 !ifdef FOSSIL_ENABLE_SSL
28 SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
29 SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
30 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
31 !endif
32
33 # zlib options
34 ZINCDIR = $(B)\compat\zlib
35
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -23,12 +23,12 @@
23
24 # Uncomment to enable SSL support
25 # FOSSIL_ENABLE_SSL = 1
26
27 !ifdef FOSSIL_ENABLE_SSL
28 SSLINCDIR = $(B)\compat\openssl-1.0.1g\include
29 SSLLIBDIR = $(B)\compat\openssl-1.0.1g\out32
30 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
31 !endif
32
33 # zlib options
34 ZINCDIR = $(B)\compat\zlib
35

Keyboard Shortcuts

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