snapshot of project "lynx", label v2-9-0dev_10p

5 files changed, 25 insertions, 8 deletions

diff --git a/PACKAGE/lynx-curssl.iss b/PACKAGE/lynx-curssl.iss
new file mode 100644
index 00000000..31822573
--- /dev/null
+++ b/PACKAGE/lynx-curssl.iss
@@ -0,0 +1,14 @@
+; $LynxId: lynx-curssl.iss,v 1.1 2022/12/29 00:38:46 tom Exp $

+;

+; This is an installer for Lynx built with "current" OpenSSL (3.0.x).

+;

+; The script assumes environment variables have been set, e.g., to point to

+; data which is used by the installer (see "lynx.lss" for details).

+

+#define NoScreenDll

+#define SslGlob1      "'libssl-3*.dll'"

+#define SslGlob2      "'libcrypto-3*.dll'"

+#define SetupBaseName "lynx-curssl"

+#define SourceExeName "lynx-curssl.exe"

+

+#include "lynx.iss"

diff --git a/PACKAGE/lynx-newssl.iss b/PACKAGE/lynx-newssl.iss
index ffb97ec7..c6ebc979 100644
--- a/PACKAGE/lynx-newssl.iss
+++ b/PACKAGE/lynx-newssl.iss
@@ -1,4 +1,4 @@
-; $LynxId: lynx-newssl.iss,v 1.5 2018/03/17 12:02:00 tom Exp $

+; $LynxId: lynx-newssl.iss,v 1.6 2022/12/29 00:38:07 tom Exp $

 ;

 ; This is an installer for Lynx built with "new" OpenSSL (1.1.x).

 ;

@@ -6,8 +6,8 @@
 ; data which is used by the installer (see "lynx.lss" for details).

 

 #define NoScreenDll

-#define SslGlob1      "'libssl-*.dll'"

-#define SslGlob2      "'libcrypto-*.dll'"

+#define SslGlob1      "'libssl-1*.dll'"

+#define SslGlob2      "'libcrypto-1*.dll'"

 #define SetupBaseName "lynx-newssl"

 #define SourceExeName "lynx-newssl.exe"

 

diff --git a/PACKAGE/lynx-oldssl.iss b/PACKAGE/lynx-oldssl.iss
index 7bbe0900..afe026a2 100644
--- a/PACKAGE/lynx-oldssl.iss
+++ b/PACKAGE/lynx-oldssl.iss
@@ -1,4 +1,4 @@
-; $LynxId: lynx-oldssl.iss,v 1.4 2018/03/16 20:30:46 tom Exp $

+; $LynxId: lynx-oldssl.iss,v 1.5 2022/12/28 22:37:15 tom Exp $

 ;

 ; This is an installer for Lynx built with "old" OpenSSL (before 1.1.x).

 ;

@@ -10,5 +10,6 @@
 #define SslGlob2      "'libeay32.dll'"

 #define SetupBaseName "lynx-oldssl"

 #define SourceExeName "lynx-oldssl.exe"

+#define RuntimeBundle "'msvcr120.dll'"

 

 #include "lynx.iss"

diff --git a/PACKAGE/lynx.iss b/PACKAGE/lynx.iss
index 19a5e28f..9a5a2e28 100644
--- a/PACKAGE/lynx.iss
+++ b/PACKAGE/lynx.iss
@@ -1,4 +1,4 @@
-; $LynxId: lynx.iss,v 1.36 2022/03/11 01:29:33 tom Exp $

+; $LynxId: lynx.iss,v 1.37 2022/12/29 00:23:53 tom Exp $

 ; vile:ts=4 sw=4 notabinsert fk=8bit

 ;

 ; This is the BASE script for different flavors of the installer for Lynx.

@@ -515,12 +515,14 @@ begin
                 // new-ssl matches "libssl-x-x-z", s/libssl/libcrypto/

                 SslFilename := 'libcrypto' + Copy(SslFilename, 7, Length(SslFilename));

                 CopyFromTo( SslDirectory, TargetDir, SslFilename );

+#ifdef RuntimeBundle

             // older releases of OpenSSL bundled the Visual Studio runtime

-            SslFilename := SslDirectory + '\' + 'msvcr120.dll';

+            SslFilename := SslDirectory + '\' + 'msvcr120.dll' ;

             if FileExists(SslFilename) then

                 begin

                 CopyFromTo( SslDirectory, TargetDir, 'msvcr120.dll' );

                 end

+#endif

             end

         else

             begin

diff --git a/userdefs.h b/userdefs.h
index 21a5b9a9..6ae53787 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: userdefs.h,v 1.364 2022/07/25 07:51:38 tom Exp $
+ * $LynxId: userdefs.h,v 1.365 2022/12/29 00:13:21 tom Exp $
  *
  * Lynx - Hypertext navigation system
  *
@@ -1459,7 +1459,7 @@
 #define LYNX_WWW_HOME "https://lynx.invisible-island.net/"
 #define LYNX_WWW_DIST "https://lynx.invisible-island.net/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Thu, 04 Nov 2021 20:11:32 -0400"
+#define LYNX_DATE "Wed, 28 Dec 2022 17:13:33 -0400"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */