Merge branch 'develop' of https://github.com/IBM-Swift/swift-buildpack into develop

Author: rolivieri

bin/compile

@@ -29,7 +29,7 @@ fi
 # Global variables
 BUILD_DIR=$1
 CACHE_DIR=$2
-DEFAULT_SWIFT_VERSION=3.0
+DEFAULT_SWIFT_VERSION=3.0.1
 CLANG_VERSION=3.8.0
 compile_buildpack_dir=$(cd $(dirname $0); cd ..; pwd)
 compile_buildpack_bin=$compile_buildpack_dir/bin
@@ -134,7 +134,7 @@ mkdir -p $CACHE_DIR
 cd $CACHE_DIR
 
 # Download and unpack Swift binaries
-download_dependency $SWIFT_NAME_VERSION $SWIFT_VERSION "tar.gz" $DEFAULT_SWIFT_VERSION
+download_dependency $SWIFT_NAME_VERSION $SWIFT_VERSION "tar.gz" "swift-$DEFAULT_SWIFT_VERSION"
 SWIFT_PATH=$CACHE_DIR/$(echo $SWIFT_NAME_VERSION/swift*)
 
 # Download and unpack clang

compile-extensions/bin/download_dependency

@@ -26,6 +26,7 @@ original_url      = ARGV[0]
 install_directory = ARGV[1]
 if ARGV.size == 3
   default_swift_version = ARGV[2]
+  requested_swift_version = original_url.gsub(/.tar.gz/, '')
 end
 
 # Define utility functions
@@ -49,31 +50,30 @@ debug "DEBUG: dependency_md5 '#{dependency_md5}'"
 
 if translated_uri.nil?
   # Assumption is that the requested dependency is a Swift development or release snapshot
-  custom_swift_version = original_url.gsub(/.tar.gz/, '')
   STDERR.puts "WARNING: You are requesting a custom version of Swift (defined in your .swift-version)"
   STDERR.puts "WARNING: Default supported Swift version: #{default_swift_version}"
-  STDERR.puts "WARNING: Custom Swift version for your app: #{custom_swift_version}"
+  STDERR.puts "WARNING: Requested Swift version for your app: #{requested_swift_version}"
   STDERR.puts "WARNING: The buildpack will attempt to download requested version from Swift.org"
 
   # Determine snapshot type, swift version, url...
-  if custom_swift_version.downcase.include? "development"
+  if requested_swift_version.downcase.include? "development"
     snapshot_type = "development"
   else
-    snapshot_type = custom_swift_version.downcase
+    snapshot_type = requested_swift_version.downcase
     if snapshot_type.include? "preview"
       # Preview snapshot... nothing to update
     else
       # Assuming release snapshot
       if !(snapshot_type.include? "release")
         snapshot_type = "#{snapshot_type}-release"
-        custom_swift_version = "#{custom_swift_version}-RELEASE"
+        requested_swift_version = "#{requested_swift_version}-RELEASE"
       end
     end
   end
   debug "DEBUG: snapshot_type #{snapshot_type}"
 
-  swift_file = "#{custom_swift_version}-ubuntu14.04.tar.gz"
-  translated_uri = "https://swift.org/builds/#{snapshot_type}/ubuntu1404/#{custom_swift_version}/#{swift_file}"
+  swift_file = "#{requested_swift_version}-ubuntu14.04.tar.gz"
+  translated_uri = "https://swift.org/builds/#{snapshot_type}/ubuntu1404/#{requested_swift_version}/#{swift_file}"
   debug "DEBUG: Using the following URL for downloading the specified dependency: #{translated_uri}"
   status_code = `curl -I -s #{translated_uri} | head -n 1 | cut -d ' ' -f2`
   status_code = status_code.strip
@@ -84,6 +84,11 @@ if translated_uri.nil?
     STDERR.puts "ERROR: Could not find/download requested custom Swift version from Swift.org: #{translated_uri}"
     exit 3
   end
+else
+  if !(default_swift_version.nil? || default_swift_version.empty?) && !(default_swift_version.eql? requested_swift_version)
+    STDERR.puts "WARNING: Default supported Swift version: #{default_swift_version}"
+    STDERR.puts "WARNING: Requested Swift version for your app: #{requested_swift_version}"
+  end
 end
 
 in_cache = false
@@ -107,7 +112,7 @@ debug "DEBUG: generated_md5 '#{generated_md5}'"
 puts in_cache
 
 if dependency_md5.nil?
-  debug "DEBUG: md5 value for dependency could not be validated; more than likely the dependency is not found in the MANIFEST file"
+  debug "DEBUG: md5 value for dependency could not be validated; more than likely the dependency is not found in the MANIFEST file."
   exit 0
 else
   if dependency_md5 == generated_md5

manifest.yml

@@ -31,6 +31,12 @@ dependencies:
     md5: 88edb298674199f015235aa4eaa058fe
     cf_stacks:
       - cflinuxfs2
+  - name: swift
+    version: 3.0.1
+    uri: https://swift.org/builds/swift-3.0.1-release/ubuntu1404/swift-3.0.1-RELEASE/swift-3.0.1-RELEASE-ubuntu14.04.tar.gz
+    md5: 4a5d82edb2f31aa3373b15faa973d2e1
+    cf_stacks:
+      - cflinuxfs2
   - name: clang
     version: 3.8.0
     uri: http://llvm.org/releases/3.8.0/clang+llvm-3.8.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz