Updated build.sh to create release & removed old archives

Author: jasonacox

build.sh

@@ -69,21 +69,33 @@ EXAMPLE="examples/iOS Test App"
 ARCHIVE="archive/libcurl-$LIBCURL-openssl-$OPENSSL-nghttp2-$NGHTTP2"
 
 echo
-echo "Creating archive in $ARCHIVE..."
+echo "Creating archive in $ARCHIVE for release v$LIBCURL..."
 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
-cp openssl/Mac/lib/libcrypto.a $ARCHIVE/libcrypto_Mac.a
-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
+mkdir -p "$ARCHIVE/lib/iOS"
+mkdir -p "$ARCHIVE/lib/MacOS"
+mkdir -p "$ARCHIVE/lib/tvOS"
+mkdir -p "$ARCHIVE/bin"
+# archive libraries
+cp curl/lib/libcurl_iOS.a $ARCHIVE/lib/iOS/libcurl.a
+cp curl/lib/libcurl_tvOS.a $ARCHIVE/lib/tvOS/libcurl.a
+cp curl/lib/libcurl_Mac.a $ARCHIVE/lib/MacOS/libcurl.a
+cp openssl/iOS/lib/libcrypto.a $ARCHIVE/lib/iOS/libcrypto.a
+cp openssl/tvOS/lib/libcrypto.a $ARCHIVE/lib/tvOS/libcrypto.a
+cp openssl/Mac/lib/libcrypto.a $ARCHIVE/lib/MacOS/libcrypto.a
+cp openssl/iOS/lib/libssl.a $ARCHIVE/lib/iOS/libssl.a
+cp openssl/tvOS/lib/libssl.a $ARCHIVE/lib/tvOS/libssl.a
+cp openssl/Mac/lib/libssl.a $ARCHIVE/lib/MacOS/libssl.a
+cp nghttp2/lib/libnghttp2_iOS.a $ARCHIVE/lib/iOS/libnghttp2.a
+cp nghttp2/lib/libnghttp2_tvOS.a $ARCHIVE/lib/tvOS/libnghttp2.a
+cp nghttp2/lib/libnghttp2_Mac.a $ARCHIVE/lib/MacOS/libnghttp2.a
+# archive header files
 cp openssl/iOS/include/openssl/* "$ARCHIVE/include/openssl"
 cp curl/include/curl/* "$ARCHIVE/include/curl"
+# archive root certs
 curl -s https://curl.haxx.se/ca/cacert.pem > $ARCHIVE/cacert.pem
+sed -e "s/ZZZLIBCURL/$LIBCURL/g" -e "s/ZZZOPENSSL/$OPENSSL/g" -e "s/ZZZNGHTTP2/$NGHTTP2/g" archive/release-template.md > $ARCHIVE/README.md
 echo
 echo "Copying libraries into $EXAMPLE..."
 cp openssl/iOS/lib/libcrypto.a "$EXAMPLE/libs/libcrypto.a"
@@ -93,13 +105,12 @@ 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"
 echo
 echo "Archiving Mac binaries for curl and openssl..."
-mv /tmp/curl $ARCHIVE
-mv /tmp/openssl $ARCHIVE
+mv /tmp/curl $ARCHIVE/bin
+mv /tmp/openssl $ARCHIVE/bin
 echo
 echo "Testing Mac curl binary..."
-$ARCHIVE/curl -V
+$ARCHIVE/bin/curl -V
 
 rm -f $NOHTTP2