Commit: 1b2ff3a1820afe193f571f9cd268632cf6073b51 - Fs-scripts (git)

Commit MetaInfo

• Revision: 1b2ff3a1820afe193f571f9cd268632cf6073b51 (tree)
• Time: 2022-11-13 21:09:29
• Author: Fs <Fsu0413@vip....>
• Commiter: Fs

Log Message

macOS unified OpenSSL builds

Signed-off-by: Fs <[e-mail]>

Change Summary

• modified: Compile/lib/Configuration.lua
• modified: Compile/lib/Generate.lua
• modified: Compile/lib/opensslCompile/conf.lua

Incremental Difference

--- a/Compile/lib/Configuration.lua
+++ b/Compile/lib/Configuration.lua
@@ -510,20 +510,55 @@ conf.OpenSSL.generateConfTable = function(self, host, job)
 	-- dirty hack end
 	ret.download = {}
 
-	if confDetail.opensslAndroidAll then
-		-- currently this part of script runs only on whatever Linux host (CentOS8 / Rocky9 on my build environment) and no Windows compatibility is made.
+	-- DO REMEMBER TO USE tostring IF A VERSION STRING IS NEEDED!!
+	local hostToolchainVersion, targetToolchainVersion
+	local hostToolchainVersionQueryFuncName = "gcc"
+	local hostToolchainVersionQueryPath
+	local hostToolchainExecutableName = confHost.defaultToolchainExecutableName
+
+	if confDetail.toolchain ~= "PATH" then
+		local paths = confHost.toolchainPath[confDetail.toolchain]
+		if type(confHost.toolchainPath[confDetail.toolchain]) == "string" then
+			paths = {confHost.toolchainPath[confDetail.toolchain]}
+		end
+		hostToolchainVersionQueryPath = paths[1]
+		if string.sub(confDetail.toolchain, 1, 4) == "MSVC" then
+			hostToolchainVersionQueryFuncName = "msvc"
+			ret.msvcBat = paths[1]
+			table.remove(paths, 1)
+		elseif string.sub(confDetail.toolchain, 1, 9) == "MinGWLLVM" then
+			hostToolchainVersionQueryPath = paths[2]
+			hostToolchainExecutableName = "clang"
+		end
+		for _, x in ipairs(paths) do
+			table.insert(ret.path, x)
+		end
+	end
+
+	hostToolchainVersion = compilerVer[hostToolchainVersionQueryFuncName](confHost.makefileTemplate == "win", hostToolchainVersionQueryPath, hostToolchainExecutableName)
+
+	if confDetail.opensslUnifyType then
+		-- This part of script runs only on whatever Unix-like host (CentOS8 / Rocky9 / macOS on my build environment) and no Windows compatibility is made.
 		-- no plan for Windows support.
-		ret.buildContent = "OpenSSLAndroidAll"
-		ret.INSTALLROOT = ret.WORKSPACE .. confHost.pathSep .. "buildDir" .. confHost.pathSep .. confDetail.name
-		ret.INSTALLPATH = confDetail.name
+
+		-- Useful for building a unified package for Android / macOS
+
+		if confDetail.opensslUnifyType == "macOS" then
+			-- macOS build uses unified clang
+			targetToolchainVersion = hostToolchainVersion
+		end
+
+		ret.buildContent = "OpenSSLUnify" .. confDetail.opensslUnifyType
+		ret.INSTALLROOT = ret.WORKSPACE .. confHost.pathSep .. "buildDir" .. confHost.pathSep .. replaceVersion(confDetail.name, hostToolchainVersion, targetToolchainVersion)
+		ret.INSTALLPATH = replaceVersion(confDetail.name, hostToolchainVersion, targetToolchainVersion)
 		ret.OPENSSLDIRFUNCTION = ""
 
 		local repl = {}
 		repl.arch = {}
 
-		for arch, androidConf in pairs(confDetail.opensslAndroidAll) do
-			table.insert(ret.download, conf.OpenSSL:binaryFileDownloadPath(confHost, androidConf))
-			ret.OPENSSLDIRFUNCTION = ret.OPENSSLDIRFUNCTION .. "if [ \"x$1\" = \"x" .. arch .. "\" ]; then\n" .. "CURRENTARCHDIR=\"" .. conf.OpenSSL.configurations[androidConf].name .. "\"\nexport CURRENTARCHDIR\nel"
+		for arch, unifiedConf in pairs(confDetail.opensslUnifyArch) do
+			table.insert(ret.download, conf.OpenSSL:binaryFileDownloadPath(confHost, unifiedConf, targetToolchainVersion))
+			ret.OPENSSLDIRFUNCTION = ret.OPENSSLDIRFUNCTION .. "if [ \"x$1\" = \"x" .. arch .. "\" ]; then\n" .. "CURRENTARCHDIR=\"" .. replaceVersion(conf.OpenSSL.configurations[unifiedConf].name, hostToolchainVersion, targetToolchainVersion) .. "\"\nexport CURRENTARCHDIR\nel"
 			table.insert(repl.arch, arch)
 		end
 
@@ -539,33 +574,6 @@ conf.OpenSSL.generateConfTable = function(self, host, job)
 		ret.INSTALLCOMMANDLINE = " "
 		table.insert(ret.download, confDetail["sourcePackageUrl" .. confHost.makefileTemplate])
 
-		-- DO REMEMBER TO USE tostring IF A VERSION STRING IS NEEDED!!
-		local hostToolchainVersion, targetToolchainVersion
-		local hostToolchainVersionQueryFuncName = "gcc"
-		local hostToolchainVersionQueryPath
-		local hostToolchainExecutableName = confHost.defaultToolchainExecutableName
-
-		if confDetail.toolchain ~= "PATH" then
-			local paths = confHost.toolchainPath[confDetail.toolchain]
-			if type(confHost.toolchainPath[confDetail.toolchain]) == "string" then
-				paths = {confHost.toolchainPath[confDetail.toolchain]}
-			end
-			hostToolchainVersionQueryPath = paths[1]
-			if string.sub(confDetail.toolchain, 1, 4) == "MSVC" then
-				hostToolchainVersionQueryFuncName = "msvc"
-				ret.msvcBat = paths[1]
-				table.remove(paths, 1)
-			elseif string.sub(confDetail.toolchain, 1, 9) == "MinGWLLVM" then
-				hostToolchainVersionQueryPath = paths[2]
-				hostToolchainExecutableName = "clang"
-			end
-			for _, x in ipairs(paths) do
-				table.insert(ret.path, x)
-			end
-		end
-
-		hostToolchainVersion = compilerVer[hostToolchainVersionQueryFuncName](confHost.makefileTemplate == "win", hostToolchainVersionQueryPath, hostToolchainExecutableName)
-
 		ret.envSet = {}
 
 		local repl = {}

--- a/Compile/lib/Generate.lua
+++ b/Compile/lib/Generate.lua
@@ -75,6 +75,8 @@ for %%i in (aria2c curl wget) do (
 	)
 )
 
+rem TODO - set --no-conf parameter to aria2c
+
 set pd=o
 if "!DOWNLOADTOOL!" == "wget" set pd=O
 
@@ -186,6 +188,8 @@ for %%i in (aria2c curl wget) do (
 	)
 )
 
+rem TODO - set --no-conf parameter to aria2c
+
 set pd=o
 if "!DOWNLOADTOOL!" == "wget" set pd=O
 
@@ -275,8 +279,11 @@ gen.unix.download = "$DOWNLOADTOOL -$DOWNLOADP"
 -- EXTRAINSTALL
 -- INSTALLPATHWITHDATE
 gen.unix.template4Qt = [[
+
 set -x
 
+unset JAVA_HOME
+
 DOWNLOADTOOL=
 
 for i in aria2c wget curl; do
@@ -295,6 +302,10 @@ if [ "x$DOWNLOADTOOL" = "x" ]; then
 	exit 1
 fi
 
+if [ "x$DOWNLOADTOOL" = "xaria2c" ]; then
+	DOWNLOADTOOL="aria2c --no-conf"
+fi
+
 DOWNLOADP="o"
 if [ "x$DOWNLOADTOOL" = "xwget" ]; then
 	DOWNLOADP="O"
@@ -420,6 +431,8 @@ popd
 gen.unix.template4OpenSSL = [[
 set -x
 
+unset JAVA_HOME
+
 DOWNLOADTOOL=
 
 for i in aria2c wget curl; do
@@ -438,6 +451,10 @@ if [ "x$DOWNLOADTOOL" = "x" ]; then
 	exit 1
 fi
 
+if [ "x$DOWNLOADTOOL" = "xaria2c" ]; then
+	DOWNLOADTOOL="aria2c --no-conf"
+fi
+
 DOWNLOADP="o"
 if [ "x$DOWNLOADTOOL" = "xwget" ]; then
 	DOWNLOADP="O"
@@ -520,9 +537,11 @@ exit 0
 -- WORKSPACE
 -- INSTALLROOT
 -- INSTALLPATH
-gen.unix.template4OpenSSLAndroidAll = [[
+gen.unix.template4OpenSSLUnifyAndroid = [[
 set -x
 
+unset JAVA_HOME
+
 DOWNLOADTOOL=
 
 for i in aria2c wget curl; do
@@ -541,6 +560,10 @@ if [ "x$DOWNLOADTOOL" = "x" ]; then
 	exit 1
 fi
 
+if [ "x$DOWNLOADTOOL" = "xaria2c" ]; then
+	DOWNLOADTOOL="aria2c --no-conf"
+fi
+
 DOWNLOADP="o"
 if [ "x$DOWNLOADTOOL" = "xwget" ]; then
 	DOWNLOADP="O"
@@ -575,8 +598,8 @@ done
 &DELETEUNCOMPRESSED&
 
 getOpenSSLDir() {
-&OPENSSLDIRFUNCTION&
-return 0
+	&OPENSSLDIRFUNCTION&
+	return 0
 }
 
 &PATHSET&
@@ -587,23 +610,156 @@ rm -rf &INSTALLROOT&
 mkdir &INSTALLROOT&
 cd &INSTALLROOT&
 
-mkdir lib
-mkdir bin
+mkdir lib bin
 
 for ar in &ARCHITECTURES&; do
 	getOpenSSLDir "$ar"
 	if [ $? -ne 0 ]; then
 		exit 1
 	fi
+	# It is certain that we built OpenSSL to static library
+	# so all we need are following files
 	cp ../$CURRENTARCHDIR/lib/libssl.a ./lib/libssl_$ar.a
 	cp ../$CURRENTARCHDIR/lib/libcrypto.a ./lib/libcrypto_$ar.a
 	cp ../$CURRENTARCHDIR/bin/openssl ./bin/openssl_$ar
-	if [ "x$ar" = "xarm64-v8a" ]; then
+	if ! [ -d include ]; then
+		cp -R ../$CURRENTARCHDIR/include ./include
+	fi
+	if ! [ -d ssl ]; then
+		cp -R ../$CURRENTARCHDIR/ssl ./ssl
+	fi
+done
+
+cd &INSTALLROOT&/..
+
+$TAR -cf - &INSTALLPATH& | $SEVENZIP a -txz -m0=LZMA2:d256m:fb273 -mmt=3 -myx -si -- &INSTALLPATH&.tar.xz
+$SEVENZIP a -t7z -m0=LZMA2:d256m:fb273 -mmt=3 -myx -mqs -ms=on -- &INSTALLPATH&.7z &INSTALLPATH&
+
+exit 0
+
+]]
+
+-- PATHSET
+-- ENVSET
+-- OPENSSLDIRFUNCTION
+-- ARCHITECTURES
+-- WORKSPACE
+-- INSTALLROOT
+-- INSTALLPATH
+gen.unix.template4OpenSSLUnifymacOS = [[
+set -x
+
+unset JAVA_HOME
+
+DOWNLOADTOOL=
+
+for i in aria2c wget curl; do
+	p="--help"
+	if [ x$i = xaria2c ]; then
+		p="-h"
+	fi
+	if $i $p >/dev/null 2>/dev/null; then
+		DOWNLOADTOOL=$i
+		break
+	fi
+done
+
+if [ "x$DOWNLOADTOOL" = "x" ]; then
+	echo "no download tool" >&2
+	exit 1
+fi
+
+if [ "x$DOWNLOADTOOL" = "xaria2c" ]; then
+	DOWNLOADTOOL="aria2c --no-conf"
+fi
+
+DOWNLOADP="o"
+if [ "x$DOWNLOADTOOL" = "xwget" ]; then
+	DOWNLOADP="O"
+fi
+
+&DOWNLOADPACKAGE&
+
+TAR=
+
+for i in bsdtar tar; do
+	if $i --help; then
+		TAR=$i
+		break
+	fi
+done
+
+if [ "x$TAR" = "x" ]; then
+	echo "tar not found" >&2
+	exit 1
+fi
+
+SEVENZIP=
+
+for i in 7zr 7za 7z; do
+	if $i >/dev/null 2>/dev/null; then
+		SEVENZIP=$i
+		break
+	fi
+done
+
+&UNCOMPRESSPACKAGE&
+&DELETEUNCOMPRESSED&
+
+getOpenSSLDir() {
+	&OPENSSLDIRFUNCTION&
+	return 0
+}
+
+MakeOpenSSLLibLinks()
+{
+	while [ "$#" -gt 0 ]; do
+		ln -s "$1" "$2"
+		shift
+		shift
+	done
+}
+
+&PATHSET&
+
+&ENVSET&
+
+rm -rf &INSTALLROOT&
+mkdir &INSTALLROOT&
+cd &INSTALLROOT&
+
+# We builds only OpenSSL 3 on macOS so following are only for OpenSSL 3.
+
+mkdir lib bin
+mkdir lib/ossl-modules
+
+LIPONAMES="bin/openssl lib/libssl.3.dylib lib/libcrypto.3.dylib lib/libssl.a lib/libcrypto.a lib/ossl-modules/legacy.dylib"
+
+for ar in &ARCHITECTURES&; do
+	getOpenSSLDir "$ar"
+	if [ $? -ne 0 ]; then
+		exit 1
+	fi
+	if ! [ -d include ]; then
 		cp -R ../$CURRENTARCHDIR/include ./include
+	fi
+	if ! [ -d ssl ]; then
 		cp -R ../$CURRENTARCHDIR/ssl ./ssl
 	fi
 done
 
+for n in $LIPONAMES; do
+	EXECUTABLELIST=
+	for ar in &ARCHITECTURES&; do
+		getOpenSSLDir "$ar"
+		EXECUTABLELIST=$EXECUTABLELIST\ "../$CURRENTARCHDIR/$n"
+	done
+
+	lipo $EXECUTABLELIST -create -output "$n"
+done
+
+MakeOpenSSLLibLinks libssl.3.dylib lib/libssl.dylib libcrypto.3.dylib lib/libcrypto.dylib
+
 cd &INSTALLROOT&/..
 
 $TAR -cf - &INSTALLPATH& | $SEVENZIP a -txz -m0=LZMA2:d256m:fb273 -mmt=3 -myx -si -- &INSTALLPATH&.tar.xz
@@ -655,7 +811,7 @@ gen.generate = function(self, para)
 		return
 	end
 
-	if template == "OpenSSLAndroidAll" then
+	if string.sub(template, 1, 12) == "OpenSSLUnify" then
 		if para.template ~= "unix" then
 			print("[Generate.generate] ERROR: Generation of OpenSSL Android All builds is not available in para.template ~= \"unix\"")
 			os.exit(1)

--- a/Compile/lib/opensslCompile/conf.lua
+++ b/Compile/lib/opensslCompile/conf.lua
@@ -338,7 +338,8 @@ conf.o1aalnl = {
 	name = "OpenSSL1.1.1s-Android-ALL-NDKr21eAPI21",
 	opensslVersion = "1.1.1s",
 	host = "CentOS8",
-	opensslAndroidAll = {
+	opensslUnifyType = "Android",
+	opensslUnifyArch = {
 		["armeabi-v7a"] = "o1aa3nl",
 		["arm64-v8a"] = "o1aa6nl",
 		["x86"] = "o1ax3nl",
@@ -441,7 +442,8 @@ conf.o1aaln321 = {
 	name = "OpenSSL1.1.1s-Android-ALL-NDKr23cAPI21",
 	opensslVersion = "1.1.1s",
 	host = "CentOS8",
-	opensslAndroidAll = {
+	opensslUnifyType = "Android",
+	opensslUnifyArch = {
 		["armeabi-v7a"] = "o1aa3n321",
 		["arm64-v8a"] = "o1aa6n321",
 		["x86"] = "o1ax3n321",
@@ -605,10 +607,11 @@ conf.o3wx6s5 = {
 
 --------------------------------------------------------------------
 
+-- cross build this configuration for easy unify
 conf.o3mx6 = {
 	name = "OpenSSL3.0.7-macOS-x86_64-AppleClang&TARGETTOOLVERSION&",
 	opensslVersion = "3.0.7",
-	host = "macOS1015",
+	host = "macOSM1",
 	libPath = { "lib/libssl.3.dylib", "lib/libcrypto.3.dylib" },
 	staticlibPath = { "lib/libssl.a", "lib/libcrypto.a" },
 	configureParameter = [[
@@ -639,6 +642,19 @@ conf.o3ma6 = {
 	]],
 }
 
+conf.o3mal = {
+	name = "OpenSSL3.0.7-macOS-ALL-AppleClang&TARGETTOOLVERSION&",
+	opensslVersion = "3.0.7",
+	host = "macOSM1",
+	libPath = { "lib/libssl.3.dylib", "lib/libcrypto.3.dylib" },
+	staticlibPath = { "lib/libssl.a", "lib/libcrypto.a" },
+	opensslUnifyType = "macOS",
+	opensslUnifyArch = {
+		["arm64"] = "o3ma6",
+		["x86_64"] = "o3mx6",
+	},
+}
+
 --------------------------------------------------------------------
 
 conf.o3aa3n324 = {
@@ -734,7 +750,8 @@ conf.o3aaln324 = {
 	name = "OpenSSL3.0.7-Android-ALL-NDKr23cAPI24",
 	opensslVersion = "3.0.7",
 	host = "CentOS8",
-	opensslAndroidAll = {
+	opensslUnifyType = "Android",
+	opensslUnifyArch = {
 		["armeabi-v7a"] = "o3aa3n324",
 		["arm64-v8a"] = "o3aa6n324",
 		["x86"] = "o3ax3n324",
@@ -836,7 +853,8 @@ conf.o3aaln527 = {
 	name = "OpenSSL3.0.7-Android-ALL-NDKr25API27",
 	opensslVersion = "3.0.7",
 	host = "Rocky9",
-	opensslAndroidAll = {
+	opensslUnifyType = "Android",
+	opensslUnifyArch = {
 		["armeabi-v7a"] = "o3aa3n527",
 		["arm64-v8a"] = "o3aa6n527",
 		["x86"] = "o3ax3n527",