STRLCPY/got-your-back

upgrade OpenSSL on Win, GYB 1.37
Jay Lee committed 4 years ago

e674e4d0

1 parent 9d95cdbc

Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)

■ ■ ■ ■ ■ ■

gyb.py

		skipped 23 lines
24	24		__program_name__ = 'Got Your Back: Gmail Backup'
25	25		__author__ = 'Jay Lee'
26	26		__email__ = '[email protected]'
27		-	__version__ = '1.36'
	27	+	__version__ = '1.37'
28	28		__license__ = 'Apache License 2.0 (https://www.apache.org/licenses/LICENSE-2.0)'
29	29		__website__ = 'https://git.io/gyb'
30	30		__db_schema_version__ = '6'
		skipped 2193 lines

■ ■ ■ ■ ■ ■

travis/windows-before-install.sh

		skipped 35 lines
36	36		export PATH=$PATH:/c/python/scripts
37	37
38	38		# OpenSSL
39		-	#echo "Installing OpenSSL..."
40		-	#export exefile=Win${BITS}OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe
41		-	#if [ ! -e $exefile ]; then
42		-	# echo "Downloading $exefile..."
43		-	# wget --quiet https://slproweb.com/download/$exefile
44		-	#fi
45		-	#until powershell ".\\${exefile} /silent /sp- /suppressmsgboxes /DIR=C:\\ssl"; do echo "trying openssl again..."; done
46		-	#until cp -v /c/ssl/libcrypto-1_1${OPENSSL_BITS}.dll /c/python/DLLs/; do echo "trying libcrypto copy again..."; sleep 3; done
47		-	#until cp -v /c/ssl/libssl-1_1${OPENSSL_BITS}.dll /c/python/DLLs/; do echo "trying libssl copy again..."; done
48		-	#if [[ "$PLATFORM" == "x86_64" ]]; then
49		-	# cp -v /c/python/DLLs/libssl-1_1-x64.dll /c/python/DLLs/libssl-1_1.dll
50		-	# cp -v /c/python/DLLs/libcrypto-1_1-x64.dll /c/python/DLLs/libcrypto-1_1.dll
51		-	#fi
	39	+	echo "Installing OpenSSL..."
	40	+	export exefile=Win${BITS}OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe
	41	+	if [ ! -e $exefile ]; then
	42	+	echo "Downloading $exefile..."
	43	+	wget --quiet https://slproweb.com/download/$exefile
	44	+	fi
	45	+	until powershell ".\\${exefile} /silent /sp- /suppressmsgboxes /DIR=C:\\ssl"; do echo "trying openssl again..."; done
	46	+	until cp -v /c/ssl/libcrypto-1_1${OPENSSL_BITS}.dll /c/python/DLLs/; do echo "trying libcrypto copy again..."; sleep 3; done
	47	+	until cp -v /c/ssl/libssl-1_1${OPENSSL_BITS}.dll /c/python/DLLs/; do echo "trying libssl copy again..."; done
	48	+	if [[ "$PLATFORM" == "x86_64" ]]; then
	49	+	cp -v /c/python/DLLs/libssl-1_1-x64.dll /c/python/DLLs/libssl-1_1.dll
	50	+	cp -v /c/python/DLLs/libcrypto-1_1-x64.dll /c/python/DLLs/libcrypto-1_1.dll
	51	+	fi
52	52
53	53		# WIX Toolset
54	54		until cinst -y wixtoolset; do echo "trying wix install again..."; done
		skipped 29 lines

upgrade OpenSSL on Win, GYB 1.37