Set openssl cmake paths on Windows (#18)

* Set openssl cmake paths on Windows

* Fix ssh, bump version

* Try use static libs

* Another attempt

* Make copy of library for debug mode

* Copy openssl pdb

* Use jom

* Single task

---------

Co-authored-by: Thad House <thadhouse1@gmail.com>

Author: PeterJohnson

build.gradle

@@ -2,10 +2,11 @@ import org.gradle.internal.os.OperatingSystem
 
 plugins {
   id "maven-publish"
+  id "de.undercouch.download" version "5.4.0"
 }
 
 // Project Version
-ext.pub_version = "0.95-7"
+ext.pub_version = "0.95-8"
 
 static def get_platform() {
   def platform

libssh.gradle

@@ -43,6 +43,8 @@ types.each { type ->
       args "-DOPENSSL_CRYPTO_LIBRARY=${project.openssl_install}/lib/libcrypto.a"
       args "-DOPENSSL_SSL_LIBRARY=${project.openssl_install}/lib/libssl.a"
       args "-DOPENSSL_INCLUDE_DIR=${project.openssl_install}/include"
+    } else if (project.platform.contains("windows")) {
+      args "-DOPENSSL_ROOT_DIR=${project.openssl_install}"
     }
 
     args "-DBUILD_SHARED_LIBS=OFF", "-DWITH_ZLIB=OFF", "-DWITH_EXAMPLES=OFF",
@@ -117,6 +119,13 @@ types.each { type ->
       // Add libraries to merge.
       args "$ssl_libs/libcrypto.lib"
       args "$ssh_libs/ssh.lib"
+
+      doLast {
+        copy {
+          from "$ssl_libs/ossl_static.pdb"
+          into "$ssh_libs"
+        }
+      }
     } else if (project.platform.contains("osx")) {
       // Use libtool to merge libraries.
       executable "libtool"

openssl.gradle

@@ -6,13 +6,25 @@ task prepareOpenSSLDirectories {
     }
 }
 
+project.tasks.create("downloadJom", Download) {
+  src 'https://qt.mirror.constant.com/official_releases/jom/jom_1_1_3.zip'
+  dest buildDir
+  overwrite false
+}
+
+project.tasks.create("unzipJom", Copy) {
+  dependsOn downloadJom
+  from zipTree("$buildDir/jom_1_1_3.zip")
+  into "$buildDir/jom"
+}
+
 // Runs the configure step.
 project.tasks.create("configureOpenSSL", Exec) {
   // OpenSSL is configured with Perl. We want to build static libraries and specify
   // a custom installation location.
   executable "perl"
   def configureLocation = project.file("$project.openssl_dir/Configure")
-  args configureLocation, "no-shared", "--prefix=${project.openssl_install}", "--libdir=lib"
+  args configureLocation, "no-shared", "no-tests", "--prefix=${project.openssl_install}", "--libdir=lib"
   workingDir project.openssl_build_dir
 
   // Add the arch specifier for Windows.
@@ -24,6 +36,8 @@ project.tasks.create("configureOpenSSL", Exec) {
     } else {
       args "VC-WIN64A"
     }
+    args "/FS"
+    dependsOn unzipJom
   } else if (project.platform == "osx-arm64") {
     args "darwin64-arm64-cc"
     environment "ARCHFLAGS", "-arch arm64"
@@ -55,39 +69,35 @@ project.tasks.create("configureOpenSSL", Exec) {
   dependsOn prepareOpenSSLDirectories
 }
 
-def make = project.platform.contains("windows") ? "nmake" : "make"
+def make = project.platform.contains("windows") ? "$buildDir/jom/jom.exe" : "make"
 
 // Runs the build step.
 project.tasks.create("buildOpenSSL", Exec) {
   // Make sure that we are configured.
   dependsOn "configureOpenSSL"
 
-  // OpenSSL is built with make on UNIX and nmake on Windows.
-  executable make
-  workingDir project.openssl_build_dir
-
-  // UNIX supports building with multiple workers.
-  if (!project.platform.contains("windows"))
-    args "-j${project.processors}"
-}
-
-// Runs the install step.
-project.tasks.create("installOpenSSL", Exec) {
-  // Make sure that we have built.
-  dependsOn "buildOpenSSL"
-
-  // OpenSSL is installed with make on UNIX and nmake on Windows.
+  // OpenSSL is built with make on UNIX and jom on Windows.
   executable make
-  args "install_sw"
+  args "install_dev"
   workingDir project.openssl_build_dir
 
-  // UNIX supports installing with multiple workers.
-  if (!project.platform.contains("windows"))
-    args "-j${project.processors}"
+  args "-j${project.processors}"
 }
 
 // Create a "mega-task" that builds everything.
 project.tasks.create("openSSL") {
-  dependsOn "installOpenSSL"
+  dependsOn "buildOpenSSL"
   outputs.dir(project.openssl_install)
+
+  if (project.platform.contains("windows")) {
+    doLast {
+      copy {
+        from "$project.openssl_install/lib/libcrypto.lib"
+        from "$project.openssl_install/lib/libssl.lib"
+        into "$project.openssl_install/lib"
+        rename("libcrypto.lib", "libcryptod.lib")
+        rename("libssl.lib", "libssld.lib")
+      }
+    }
+  }
 }