Skip to content

Commit 84b7c48

Browse files
author
Martin Schwamberger
committed
Update ios script
1 parent b7c421a commit 84b7c48

1 file changed

Lines changed: 15 additions & 7 deletions

File tree

build-ios.sh

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,17 @@ function distribute_ios() {
102102
# Alter rsa.h to make Swift happy
103103
sed -i .bak 's/const BIGNUM \*I/const BIGNUM *i/g' "$DIR/include/openssl/rsa.h"
104104

105+
echo "Combine library files"
105106
for f in $FILES; do
107+
local OUTPUT_FILE=$DIR/lib/$f
106108
lipo -create \
107109
"$BUILD_DIR/iPhoneSimulator-i386/$f" \
108110
"$BUILD_DIR/iPhoneSimulator-x86_64/$f" \
109111
"$BUILD_DIR/iPhoneOS-arm64/$f" \
110112
"$BUILD_DIR/iPhoneOS-armv7/$f" \
111113
"$BUILD_DIR/iPhoneOS-armv7s/$f" \
112-
-output "$DIR/lib/$f"
114+
-output $OUTPUT_FILE
115+
echo "Created $OUTPUT_FILE"
113116
done
114117

115118
echo "Create iOS-Framework"
@@ -118,13 +121,18 @@ function distribute_ios() {
118121
mkdir -p $FRAMEWORK_DIR/Ssl.framework/Headers
119122
mkdir -p $FRAMEWORK_DIR/Crypto.framework
120123

121-
cp -LR $DIR/include/openssl/ $FRAMEWORK_DIR/Openssl.framework/Headers/
122-
cp -LR $DIR/include/openssl/ $FRAMEWORK_DIR/Ssl.framework/Headers/
124+
copy -LR $DIR/include/openssl/ $FRAMEWORK_DIR/Openssl.framework/Headers/
125+
copy -LR $DIR/include/openssl/ $FRAMEWORK_DIR/Ssl.framework/Headers/
123126

124-
cp $DIR/lib/libssl.a $FRAMEWORK_DIR/Openssl.framework/ssl
125-
cp $DIR/lib/libssl.a $FRAMEWORK_DIR/Ssl.framework/ssl
126-
cp $DIR/lib/libcrypto.a $FRAMEWORK_DIR/Openssl.framework/crypto
127-
cp $DIR/lib/libcrypto.a $FRAMEWORK_DIR/Crypto.framework/crypto
127+
copy $DIR/lib/libssl.a $FRAMEWORK_DIR/Openssl.framework/ssl
128+
copy $DIR/lib/libssl.a $FRAMEWORK_DIR/Ssl.framework/ssl
129+
copy $DIR/lib/libcrypto.a $FRAMEWORK_DIR/Openssl.framework/crypto
130+
copy $DIR/lib/libcrypto.a $FRAMEWORK_DIR/Crypto.framework/crypto
131+
}
132+
133+
function copy() {
134+
echo "Copy >> $1 >> $2"
135+
cp $1 $2
128136
}
129137

130138
## --------------------

0 commit comments

Comments
 (0)