Skip to content

Commit

Permalink
Fixed build script to archive header files
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonacox committed Sep 15, 2019
1 parent 49c3d07 commit fddfde6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ The `build.sh` script calls the three build scripts below (openssl, nghttp and c
# EDIT this section to Select Versions #
########################################

OPENSSL="1.1.1b"
LIBCURL="7.64.1"
NGHTTP2="1.37.0"
OPENSSL="1.1.1d" # https://www.openssl.org/source/
LIBCURL="7.66.0" # https://curl.haxx.se/download.html
NGHTTP2="1.39.2" # https://nghttp2.org/

########################################

Expand Down
12 changes: 8 additions & 4 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
# EDIT this section to Select Versions #
########################################

OPENSSL="1.1.1c"
LIBCURL="7.65.3"
NGHTTP2="1.39.1"
OPENSSL="1.1.1d" # https://www.openssl.org/source/
LIBCURL="7.66.0" # https://curl.haxx.se/download.html
NGHTTP2="1.39.2" # https://nghttp2.org/

########################################

Expand Down Expand Up @@ -71,6 +71,8 @@ ARCHIVE="archive/libcurl-$LIBCURL-openssl-$OPENSSL-nghttp2-$NGHTTP2"
echo
echo "Creating archive in $ARCHIVE..."
mkdir -p "$ARCHIVE"
mkdir -p "$ARCHIVE/include/openssl"
mkdir -p "$ARCHIVE/include/curl"
cp curl/lib/*.a $ARCHIVE
cp openssl/iOS/lib/libcrypto.a $ARCHIVE/libcrypto_iOS.a
cp openssl/tvOS/lib/libcrypto.a $ARCHIVE/libcrypto_tvOS.a
Expand All @@ -79,6 +81,8 @@ cp openssl/iOS/lib/libssl.a $ARCHIVE/libssl_iOS.a
cp openssl/tvOS/lib/libssl.a $ARCHIVE/libssl_tvOS.a
cp openssl/Mac/lib/libssl.a $ARCHIVE/libssl_Mac.a
cp nghttp2/lib/*.a $ARCHIVE
cp openssl/iOS/include/openssl/* "$ARCHIVE/include/openssl"
cp curl/include/curl/* "$ARCHIVE/include/curl"
curl -s https://curl.haxx.se/ca/cacert.pem > $ARCHIVE/cacert.pem
echo
echo "Copying libraries into $EXAMPLE..."
Expand All @@ -89,7 +93,7 @@ cp curl/include/curl/* "$EXAMPLE/include/curl/"
cp curl/lib/libcurl_iOS.a "$EXAMPLE/libs/libcurl.a"
cp nghttp2/lib/libnghttp2_iOS.a "$EXAMPLE/libs/libnghttp2.a"
cp $ARCHIVE/cacert.pem "$EXAMPLE/cacert.pem"
cp -r "$EXAMPLE/include" "$ARCHIVE"
#cp -r "$EXAMPLE/include" "$ARCHIVE"
echo
echo "Archiving Mac binaries for curl and openssl..."
mv /tmp/curl $ARCHIVE
Expand Down

0 comments on commit fddfde6

Please sign in to comment.