Enable static linking for examples

Author: stevapple

Examples/CloudFunctions/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.3
 
 import PackageDescription
 

Examples/CloudFunctions/scripts/build-and-package.sh

@@ -41,7 +41,7 @@ echo "-------------------------------------------------------------------------"
 echo "Building \"$executable\" SCF"
 echo "-------------------------------------------------------------------------"
 docker run --rm -v "$workspace":/workspace -w /workspace/Examples/CloudFunctions builder \
-       bash -cl "swift build --product $executable -c release"
+       bash -cl "swift build --product $executable -c release -Xswiftc -static-executable"
 echo "done"
 
 echo "-------------------------------------------------------------------------"

Examples/CloudFunctions/scripts/deploy.sh

@@ -33,7 +33,7 @@ read -p "COS bucket to upload (name-appid, eg: examplebucket-1250000000): " cos_
 read -p "COS bucket region (eg: ap-beijing): " cos_region
 cos_region=${cos_region:-ap-beijing} # default for easy testing
 
-coscmd -b "$cos_bucket" -r "$cos_region" upload ".build/scf/$executable/cloud-function.zip" "$executable.zip"
+coscmd -b "$cos_bucket" -r "$cos_region" upload ".build/scf/$executable.zip" "$executable.zip"
 
 echo "-------------------------------------------------------------------------"
 echo "Updating SCF function to use \"$executable\""

Examples/CloudFunctions/scripts/package.sh

@@ -34,10 +34,6 @@ target=".build/scf/$executable"
 rm -rf "$target"
 mkdir -p "$target"
 
-cp ".build/release/$executable" "$target/"
-# add the target deps based on ldd
-ldd ".build/release/$executable" | grep swift | awk '{print $3}' | xargs cp -Lv -t "$target"
-
+cp ".build/release/$executable" "$target/bootstrap"
 cd "$target"
-ln -s "$executable" "bootstrap"
-zip --symlinks cloud-function.zip *
+zip ../$executable.zip *

Examples/CloudFunctions/scripts/serverless/APIGateway/serverless.yml

@@ -4,8 +4,6 @@ inputs:
   name: apigateway-swift-scf
   src:
     src: ../../../.build/scf/APIGateway
-    exclude:
-      - cloud-function.zip
   runtime: CustomRuntime
   region: ap-beijing
   description: Swift SCF demo for APIGateway

Examples/CloudFunctions/scripts/serverless/Benchmark/serverless.yml

@@ -4,8 +4,6 @@ inputs:
   name: benchmark-swift-scf
   src:
     src: ../../../.build/scf/Benchmark
-    exclude:
-      - cloud-function.zip
   runtime: CustomRuntime
   region: ap-beijing
   description: Swift SCF demo for benchmark

Examples/CloudFunctions/scripts/serverless/CurrencyExchange/serverless.yml

@@ -4,8 +4,6 @@ inputs:
   name: currency-swift-scf
   src:
     src: ../../../.build/scf/CurrencyExchange
-    exclude:
-      - cloud-function.zip
   runtime: CustomRuntime
   region: ap-beijing
   description: Swift SCF demo (currency exchange)

Examples/CloudFunctions/scripts/serverless/ErrorHandling/serverless.yml

@@ -4,8 +4,6 @@ inputs:
   name: errorhandling-swift-scf
   src:
     src: ../../../.build/scf/ErrorHandling
-    exclude:
-      - cloud-function.zip
   runtime: CustomRuntime
   region: ap-beijing
   description: Swift SCF demo (error handling)

Examples/CloudFunctions/scripts/serverless/HelloWorld/serverless.yml

@@ -4,8 +4,6 @@ inputs:
   name: helloworld-swift-scf
   src:
     src: ../../../.build/scf/HelloWorld
-    exclude:
-      - cloud-function.zip
   runtime: CustomRuntime
   region: ap-beijing
   description: Swift SCF demo (hello world)

Examples/LocalDebugging/MyCloudFunction/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.3
 
 import PackageDescription
 

Examples/LocalDebugging/MyCloudFunction/scripts/deploy.sh

@@ -46,7 +46,7 @@ echo "-------------------------------------------------------------------------"
 echo "Building \"$executable\" SCF"
 echo "-------------------------------------------------------------------------"
 docker run --rm -v `pwd`/../../..:/workspace -w /workspace/Examples/LocalDebugging/MyCloudFunction builder \
-       bash -cl "swift build --product $executable -c release"
+       bash -cl "swift build --product $executable -c release -Xswiftc -static-executable"
 echo "done"
 
 echo "-------------------------------------------------------------------------"
@@ -59,7 +59,7 @@ echo "done"
 echo "-------------------------------------------------------------------------"
 echo "Uploading \"$executable\" function to COS"
 echo "-------------------------------------------------------------------------"
-coscmd -b "$cos_bucket" -r "$cos_region" upload ".build/scf/$executable/cloud-function.zip" "$executable.zip"
+coscmd -b "$cos_bucket" -r "$cos_region" upload ".build/scf/$executable.zip" "$executable.zip"
 
 echo "-------------------------------------------------------------------------"
 echo "Updating \"$function_name\" to the latest \"$executable\""

Examples/LocalDebugging/MyCloudFunction/scripts/package.sh

@@ -34,10 +34,6 @@ target=".build/scf/$executable"
 rm -rf "$target"
 mkdir -p "$target"
 
-cp ".build/release/$executable" "$target/"
-# add the target deps based on ldd
-ldd ".build/release/$executable" | grep swift | awk '{print $3}' | xargs cp -Lv -t "$target"
-
+cp ".build/release/$executable" "$target/bootstrap"
 cd "$target"
-ln -s "$executable" "bootstrap"
-zip --symlinks cloud-function.zip *
+zip ../$executable.zip *

Examples/LocalDebugging/Shared/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription