don't print warning for prebuild step when finished

README.md

@@ -1,4 +1,5 @@
-# cocoapods-binary
+
+<p align="center"><img src="/test/logo.png" width="622"></p>
 
 [![Build Status](https://travis-ci.org/leavez/cocoapods-binary.svg?branch=master)](https://travis-ci.org/leavez/cocoapods-binary)
 

lib/cocoapods-binary/Integration.rb

@@ -2,6 +2,8 @@ require_relative 'helper/podfile_options'
 require_relative 'helper/feature_switches'
 require_relative 'helper/prebuild_sandbox'
 require_relative 'helper/passer'
+require_relative 'helper/names'
+
 
 
 # NOTE:
@@ -24,13 +26,9 @@ module Pod
 
                 # make a symlink to target folder
                 prebuild_sandbox = Pod::PrebuildSandbox.from_standard_sandbox(standard_sanbox)
-                real_file_folder = prebuild_sandbox.framework_folder_path_for_pod_name(self.name)
-
-                target_folder = standard_sanbox.pod_dir(self.name)
-                target_folder.rmtree if target_folder.exist?
-                target_folder.mkdir
-
-                # make a relatvie symbol link for all children
+                # if spec used in multiple platforms, it may return multiple paths
+                target_names = prebuild_sandbox.existed_target_names_for_pod_name(self.name)
+                
                 def walk(path, &action)
                     path.children.each do |child|
                         result = action.call(child, &action)
@@ -50,31 +48,51 @@ module Pod
                     target = target_folder + source.relative_path_from(basefolder)
                     make_link(source, target)
                 end
+                
+                target_names.each do |name|
 
-                # symbol link copy all substructure
-                walk(real_file_folder) do |child|
-                    source = child
-                    # only make symlink to file and `.framework` folder
-                    if child.directory? and child.extname == ".framework"
-                        mirror_with_symlink(source, real_file_folder, target_folder)
-                        next false  # return false means don't go deeper
-                    elsif child.file?
-                        mirror_with_symlink(source, real_file_folder, target_folder)
-                        next true
-                    else
-                        next true
+                    # symbol link copy all substructure
+                    real_file_folder = prebuild_sandbox.framework_folder_path_for_target_name(name)
+                    
+                    # If have only one platform, just place int the root folder of this pod.
+                    # If have multiple paths, we use a sperated folder to store different
+                    # platform frameworks. e.g. AFNetworking/AFNetworking-iOS/AFNetworking.framework
+                    
+                    target_folder = standard_sanbox.pod_dir(self.name)
+                    if target_names.count > 1 
+                        target_folder += real_file_folder.basename
                     end
-                end
+                    target_folder.rmtree if target_folder.exist?
+                    target_folder.mkpath
 
-                # symbol link copy resource for static framework
-                hash = Prebuild::Passer.resources_to_copy_for_static_framework || {}
-                path_objects = hash[self.name]
-                if path_objects != nil
-                    path_objects.each do |object|
-                        make_link(object.real_file_path, object.target_file_path)
+
+                    walk(real_file_folder) do |child|
+                        source = child
+                        # only make symlink to file and `.framework` folder
+                        if child.directory? and child.extname == ".framework"
+                            mirror_with_symlink(source, real_file_folder, target_folder)
+                            next false  # return false means don't go deeper
+                        elsif child.file?
+                            mirror_with_symlink(source, real_file_folder, target_folder)
+                            next true
+                        else
+                            next true
+                        end
                     end
-                end
-            end
+
+
+                    # symbol link copy resource for static framework
+                    hash = Prebuild::Passer.resources_to_copy_for_static_framework || {}
+                    
+                    path_objects = hash[name]
+                    if path_objects != nil
+                        path_objects.each do |object|
+                            make_link(object.real_file_path, object.target_file_path)
+                        end
+                    end
+                end # of for each 
+
+            end # of method
 
         end
     end
@@ -95,7 +113,7 @@ module Pod
             changes = Pod::Prebuild::Passer.prebuild_pods_changes
             updated_names = []
             if changes == nil
-                updated_names = PrebuildSandbox.from_standard_sandbox(self.sandbox).exsited_framework_names
+                updated_names = PrebuildSandbox.from_standard_sandbox(self.sandbox).exsited_framework_pod_names
             else
                 added = changes.added
                 changed = changes.changed 
@@ -127,45 +145,66 @@ module Pod
 
             # call original
             old_method2.bind(self).()
+            # ...
+            # ...
+            # ...
+            # after finishing the very complex orginal function
 
-
-            # check the prebuilt targets 
-            targets = self.prebuild_pod_targets
-            targets_have_different_platforms = targets.select {|t| t.pod_name != t.name }
-
-            if targets_have_different_platforms.count > 0
-                names = targets_have_different_platforms.map(&:pod_name)
-                STDERR.puts "[!] Binary doesn't support pods who integrate in 2 or more platforms simultaneously: #{names}".red
-                exit
+            
+            # prepare
+            # make sturcture to fast get target by name
+            pod_name_to_targets_hash = self.pod_targets.reduce({}) do |sum, target|
+                array = sum[target.pod_name] || []
+                array << target
+                sum[target.pod_name] = array
+                sum
+            end
+            def get_corresponding_targets(spec, pod_name_to_targets_hash)
+                corresponding_targets = pod_name_to_targets_hash[spec.root.name] || []
+                corresponding_targets = corresponding_targets.reject do |target|
+                    Prebuild::Passer.target_names_to_skip_integration_framework.include? target.name
+                end
+                corresponding_targets
+            end
+            def add_vendered_framework(spec, platform, added_framework_file_path)
+                if spec.attributes_hash[platform] == nil
+                    spec.attributes_hash[platform] = {}
+                end
+                vendored_frameworks = spec.attributes_hash[platform]["vendored_frameworks"] || []
+                vendored_frameworks = [vendored_frameworks] if vendored_frameworks.kind_of?(String)
+                vendored_frameworks += [added_framework_file_path]
+                spec.attributes_hash[platform]["vendored_frameworks"] = vendored_frameworks
+            end
+            def empty_source_files(spec)
+                spec.attributes_hash["source_files"] = []
+                ["ios", "watchos", "tvos", "osx"].each do |plat|
+                    if spec.attributes_hash[plat] != nil
+                        spec.attributes_hash[plat]["source_files"] = []
+                    end
+                end
             end
-
 
             specs = self.analysis_result.specifications
             prebuilt_specs = (specs.select do |spec|
                 self.prebuild_pod_names.include? spec.root.name
             end)
-            
-            # make sturcture to fast get target by name
-            name_to_target_hash = self.pod_targets.reduce({}) do |sum, target|
-                sum[target.name] = target
-                sum
-            end
 
             prebuilt_specs.each do |spec|
-                # `spec` may be a subspec, so we use the root's name 
-                root_name = spec.root.name
-                
-                target = name_to_target_hash[root_name]
-                next if Prebuild::Passer.target_names_to_skip_integration_framework.include? target.pod_name
 
-                # use the prebuilt framework
-                original_vendored_frameworks = spec.attributes_hash["vendored_frameworks"] || []
-                if original_vendored_frameworks.kind_of?(String)
-                    original_vendored_frameworks = [original_vendored_frameworks]
+                # Use the prebuild framworks as vendered frameworks
+                targets = get_corresponding_targets(spec, pod_name_to_targets_hash)
+                targets.each do |target|
+                    # the framework_file_path rule is decided when `install_for_prebuild`,
+                    # as to compitable with older version and be less wordy.
+                    framework_file_path = target.framework_name
+                    framework_file_path = target.name + "/" + framework_file_path if targets.count > 1
+                    add_vendered_framework(spec, target.platform.name.to_s, framework_file_path)
                 end
-                original_vendored_frameworks += [target.framework_name]
-                spec.attributes_hash["vendored_frameworks"] = original_vendored_frameworks
-                spec.attributes_hash["source_files"] = []
+                # Clean the source files
+                # we just add the prebuilt framework to specific platform and set no source files 
+                # for all platform, so it doesn't support the sence that 'a pod perbuild for one
+                # platform and not for another platform.'
+                empty_source_files(spec)
 
                 # to avoid the warning of missing license
                 spec.attributes_hash["license"] = {} 

lib/cocoapods-binary/Main.rb

@@ -48,7 +48,7 @@ Pod::HooksManager.register('cocoapods-binary', :pre_install) do |installer_conte
     # check user_framework is on
     podfile = installer_context.podfile
     podfile.target_definition_list.each do |target_definition|
-        next if target_definition.prebuild_framework_names.empty?
+        next if target_definition.prebuild_framework_pod_names.empty?
         if not target_definition.uses_frameworks?
             STDERR.puts "[!] Cocoapods-binary requires `use_frameworks!`".red
             exit
@@ -97,6 +97,7 @@ Pod::HooksManager.register('cocoapods-binary', :pre_install) do |installer_conte
     Pod::Podfile::DSL.enable_prebuild_patch false
     Pod::Config.force_disable_write_lockfile false
     Pod::Installer.disable_install_complete_message false
+    Pod::UserInterface.warnings = [] # clean the warning in the prebuild step, it's duplicated.
     
     
     # -- step 2: pod install ---

lib/cocoapods-binary/Prebuild.rb

@@ -43,11 +43,9 @@ module Pod
             unchanged = changes.unchanged
             deleted = changes.deleted 
             
-            unchange_framework_names = (added + unchanged)
-
-            exsited_framework_names = sandbox.exsited_framework_names
+            exsited_framework_pod_names = sandbox.exsited_framework_pod_names
             missing = unchanged.select do |pod_name|
-                not exsited_framework_names.include?(pod_name)
+                not exsited_framework_pod_names.include?(pod_name)
             end
 
             needed = (added + changed + deleted + missing)
@@ -58,7 +56,7 @@ module Pod
         # The install method when have completed cache
         def install_when_cache_hit!
             # just print log
-            self.sandbox.exsited_framework_names.each do |name|
+            self.sandbox.exsited_framework_target_names.each do |name|
                 UI.puts "Using #{name}"
             end
         end
@@ -82,24 +80,23 @@ module Pod
                 deleted = changes.deleted 
     
                 existed_framework_folder.mkdir unless existed_framework_folder.exist?
-                exsited_framework_names = sandbox.exsited_framework_names
+                exsited_framework_pod_names = sandbox.exsited_framework_pod_names
     
                 # additions
                 missing = unchanged.select do |pod_name|
-                    not exsited_framework_names.include?(pod_name)
+                    not exsited_framework_pod_names.include?(pod_name)
                 end
 
 
                 root_names_to_update = (added + changed + missing)
 
                 # transform names to targets
-                name_to_target_hash = self.pod_targets.reduce({}) do |sum, target|
-                    sum[target.name] = target
-                    sum
+                def targets_for_pod_names(root_pod_names)
+                    self.pod_targets.select do |target|
+                        target.pod_name == root_pod_names
+                    end
                 end
-                targets = root_names_to_update.map do |root_name|
-                    name_to_target_hash[root_name]
-                end || []
+                targets = targets_for_pod_names(root_names_to_update)
 
                 # add the dendencies
                 dependency_targets = targets.map {|t| t.recursive_dependent_targets }.flatten.uniq || []
@@ -117,8 +114,8 @@ module Pod
             Pod::Prebuild.remove_build_dir(sandbox_path)
             targets.each do |target|
                 next unless target.should_build?
+                output_path = sandbox.framework_folder_path_for_target_name(target.name)
 
-                output_path = sandbox.framework_folder_path_for_pod_name(target.name)
                 output_path.mkpath unless output_path.exist?
                 Pod::Prebuild.build(sandbox_path, target, output_path, bitcode_enabled)
 
@@ -134,6 +131,9 @@ module Pod
                     end
                     Prebuild::Passer.resources_to_copy_for_static_framework[target.name] = path_objects
                 end
+
+                # save the pod_name for prebuild framwork in sandbox 
+                sandbox.save_pod_name_for_target target
             end            
             Pod::Prebuild.remove_build_dir(sandbox_path)
 
@@ -141,12 +141,12 @@ module Pod
             # copy vendored libraries and frameworks
             targets.each do |target|
                 root_path = self.sandbox.pod_dir(target.name)
-                target_folder = sandbox.framework_folder_path_for_pod_name(target.name)
+                target_folder = sandbox.framework_folder_path_for_target_name(target.name)
                 
                 # If target shouldn't build, we copy all the original files
                 # This is for target with only .a and .h files
                 if not target.should_build? 
-                    Prebuild::Passer.target_names_to_skip_integration_framework << target.pod_name
+                    Prebuild::Passer.target_names_to_skip_integration_framework << target.name
                     FileUtils.cp_r(root_path, target_folder, :remove_destination => true)
                     next
                 end
@@ -168,11 +168,11 @@ module Pod
             # Remove useless files
             # remove useless pods
             all_needed_names = self.pod_targets.map(&:name).uniq
-            useless_names = sandbox.exsited_framework_names.reject do |name| 
+            useless_target_names = sandbox.exsited_framework_target_names.reject do |name| 
                 all_needed_names.include? name
             end
-            useless_names.each do |name|
-                path = sandbox.framework_folder_path_for_pod_name(name)
+            useless_target_names.each do |name|
+                path = sandbox.framework_folder_path_for_target_name(name)
                 path.rmtree if path.exist?
             end
 

lib/cocoapods-binary/helper/feature_switches.rb

@@ -38,11 +38,6 @@ module Pod
                 end
                 
                 if should_prebuild and (not local)
-                    if current_target_definition.platform == :watchos
-                        # watchos isn't supported currently
-                        Pod::UI.warn "Binary doesn't support watchos currently: #{name}. You can manually set `binary => false` for this pod to suppress this warning."
-                        return
-                    end
                     old_method.bind(self).(name, *args)
                 end
             end

lib/cocoapods-binary/helper/names.rb

@@ -0,0 +1,57 @@
+#
+# There are many kinds of name in cocoapods. Two main names are widely used in this plugin.
+# - root_spec.name (spec.root_name, targe.pod_name):
+#   aka "pod_name"
+#   the name we use in podfile. the concept.
+# 
+# - target.name:
+#   aka "target_name"
+#   the name of the final target in xcode project. the final real thing.
+#
+# One pod may have multiple targets in xcode project, due to one pod can be used in mutiple 
+# platform simultaneously. So one `root_spec.name` may have multiple coresponding `target.name`s.
+# Therefore, map a spec to/from targets is a little complecated. It's one to many.
+#
+
+
+
+
+
+
+# Target:
+   
+#     def pod_name
+#       root_spec.name
+#     end
+
+#     def name
+# 	    pod_name + #{scope_suffix}
+#     end	
+
+#     def product_module_name
+#       root_spec.module_name
+#     end
+  
+#     def framework_name
+#       "#{product_module_name}.framework"
+#     end
+
+#    def product_name
+#       if requires_frameworks?
+#         framework_name
+#       else
+#         static_library_name
+#       end
+#     end
+
+#     def product_basename
+#       if requires_frameworks?
+#         product_module_name
+#       else
+#         label
+#       end
+#     end
+
+#     def framework_name
+#       "#{product_module_name}.framework"
+#     end

lib/cocoapods-binary/helper/podfile_options.rb

@@ -23,28 +23,25 @@ module Pod
         def set_prebuild_for_pod(pod_name, should_prebuild)
             
             if should_prebuild == true
-                # watchos isn't supported currently
-                return if self.platform == :watchos
-
-                @prebuild_framework_names ||= []
-                @prebuild_framework_names.push pod_name
+                @prebuild_framework_pod_names ||= []
+                @prebuild_framework_pod_names.push pod_name
             else
-                @should_not_prebuild_framework_names ||= []
-                @should_not_prebuild_framework_names.push pod_name
+                @should_not_prebuild_framework_pod_names ||= []
+                @should_not_prebuild_framework_pod_names.push pod_name
             end
         end
 
-        def prebuild_framework_names
-            names = @prebuild_framework_names || []
+        def prebuild_framework_pod_names
+            names = @prebuild_framework_pod_names || []
             if parent != nil and parent.kind_of? TargetDefinition
-                names += parent.prebuild_framework_names
+                names += parent.prebuild_framework_pod_names
             end
             names
         end
-        def should_not_prebuild_framework_names
-            names = @should_not_prebuild_framework_names || []
+        def should_not_prebuild_framework_pod_names
+            names = @should_not_prebuild_framework_pod_names || []
             if parent != nil and parent.kind_of? TargetDefinition
-                names += parent.should_not_prebuild_framework_names
+                names += parent.should_not_prebuild_framework_pod_names
             end
             names
         end
@@ -71,13 +68,13 @@ module Pod
 
             all = []
 
-            aggregate_targets = self.aggregate_targets.select { |a| a.platform != :watchos }
+            aggregate_targets = self.aggregate_targets
             aggregate_targets.each do |aggregate_target|
                 target_definition = aggregate_target.target_definition
                 targets = aggregate_target.pod_targets || []
 
                 # filter prebuild
-                prebuild_names = target_definition.prebuild_framework_names
+                prebuild_names = target_definition.prebuild_framework_pod_names
                 if not Podfile::DSL.prebuild_all
                     targets = targets.select { |pod_target| prebuild_names.include?(pod_target.pod_name) } 
                 end
@@ -85,7 +82,7 @@ module Pod
                 targets = (targets + dependency_targets).uniq
 
                 # filter should not prebuild
-                explict_should_not_names = target_definition.should_not_prebuild_framework_names
+                explict_should_not_names = target_definition.should_not_prebuild_framework_pod_names
                 targets = targets.reject { |pod_target| explict_should_not_names.include?(pod_target.pod_name) } 
 
                 all += targets

lib/cocoapods-binary/helper/prebuild_sandbox.rb

@@ -1,3 +1,5 @@
+require_relative "names"
+
 module Pod
     class PrebuildSandbox < Sandbox
 
@@ -19,31 +21,51 @@ module Pod
             self.root + "GeneratedFrameworks"
         end
 
-        def framework_folder_path_for_pod_name(name)
+        # @param name [String] pass the target.name (may containing platform suffix)
+        # @return [Pathname] the folder containing the framework file.
+        def framework_folder_path_for_target_name(name)
             self.generate_framework_path + name
         end
 
-        def exsited_framework_names
+        
+        def exsited_framework_target_names
+            exsited_framework_name_pairs.map {|pair| pair[0]}.uniq
+        end
+        def exsited_framework_pod_names
+            exsited_framework_name_pairs.map {|pair| pair[1]}.uniq
+        end
+        def existed_target_names_for_pod_name(pod_name)
+            exsited_framework_name_pairs.select {|pair| pair[1] == pod_name }.map { |pair| pair[0]}
+        end
+
+
+
+        def save_pod_name_for_target(target)
+            folder = framework_folder_path_for_target_name(target.name)
+            flag_file_path = folder + "#{target.pod_name}.pod_name"
+            File.write(flag_file_path.to_s, "")
+        end
+
+
+        private
+
+        def pod_name_for_target_folder(target_folder_path)
+            name = Pathname.new(target_folder_path).children.first do |child|
+                child.to_s.end_with? ".pod_name"
+            end.basename(".pod_name").to_s 
+            name ||= Pathname.new(target_folder_path).basename.to_s # for compatibility with older version
+        end
+
+        # Array<[target_name, pod_name]>
+        def exsited_framework_name_pairs
             return [] unless generate_framework_path.exist?
-            generate_framework_path.children().map do |framework_name|
-                if framework_name.directory?
-                    if not framework_name.children.empty?
-                        File.basename(framework_name)
-                    else
-                        nil
-                    end
+            generate_framework_path.children().map do |framework_path|
+                if framework_path.directory? && (not framework_path.children.empty?)
+                    [framework_path.basename.to_s,  pod_name_for_target_folder(framework_path)]
                 else
                     nil
                 end
-            end.reject(&:nil?)
+            end.reject(&:nil?).uniq
         end
-
-        def framework_existed?(root_name)
-            return false unless generate_framework_path.exist?
-            generate_framework_path.children().any? do |child|
-                child.basename.to_s == root_name
-            end
-        end
-
     end
 end

lib/cocoapods-binary/rome/build_framework.rb

@@ -15,11 +15,12 @@ def build_for_iosish_platform(sandbox,
                               target, 
                               device, 
                               simulator,
-                              bitcode_enabled)
+                              bitcode_enabled,
+                              simulator_default_arch)
 
   deployment_target = target.platform.deployment_target.to_s
   
-  target_label = target.label
+  target_label = target.label # name with platform if it's used in multiple platforms
   Pod::UI.puts "Prebuilding #{target_label}..."
   
   other_options = [] 
@@ -27,13 +28,13 @@ def build_for_iosish_platform(sandbox,
     other_options += ['OTHER_CFLAGS="-fembed-bitcode"']
   end
   xcodebuild(sandbox, target_label, device, deployment_target, other_options)
-  xcodebuild(sandbox, target_label, simulator, deployment_target, other_options + ['ARCHS=x86_64', 'ONLY_ACTIVE_ARCH=NO'])
+  xcodebuild(sandbox, target_label, simulator, deployment_target, other_options + ["ARCHS=#{simulator_default_arch}",'ONLY_ACTIVE_ARCH=NO'])
 
   # paths
-  root_name = target.pod_name
+  target_name = target.name # equals target.label, like "AFNeworking-iOS" when AFNetworking is used in multiple platforms.
   module_name = target.product_module_name
-  device_framwork_path = "#{build_dir}/#{CONFIGURATION}-#{device}/#{root_name}/#{module_name}.framework"
-  simulator_framwork_path = "#{build_dir}/#{CONFIGURATION}-#{simulator}/#{root_name}/#{module_name}.framework"
+  device_framwork_path = "#{build_dir}/#{CONFIGURATION}-#{device}/#{target_name}/#{module_name}.framework"
+  simulator_framwork_path = "#{build_dir}/#{CONFIGURATION}-#{simulator}/#{target_name}/#{module_name}.framework"
 
   device_binary = device_framwork_path + "/#{module_name}"
   simulator_binary = simulator_framwork_path + "/#{module_name}"
@@ -41,7 +42,7 @@ def build_for_iosish_platform(sandbox,
   
   # the device_lib path is the final output file path
   # combine the bianries
-  tmp_lipoed_binary_path = "#{build_dir}/#{root_name}"
+  tmp_lipoed_binary_path = "#{build_dir}/#{target_name}"
   lipo_log = `lipo -create -output #{tmp_lipoed_binary_path} #{device_binary} #{simulator_binary}`
   puts lipo_log unless File.exist?(tmp_lipoed_binary_path)
   FileUtils.mv tmp_lipoed_binary_path, device_binary, :force => true
@@ -93,10 +94,10 @@ module Pod
 
       # -- build the framework
       case target.platform.name
-      when :ios then build_for_iosish_platform(sandbox, build_dir, output_path, target, 'iphoneos', 'iphonesimulator', bitcode_enabled)
+      when :ios then build_for_iosish_platform(sandbox, build_dir, output_path, target, 'iphoneos', 'iphonesimulator', bitcode_enabled, "x86_64")
       when :osx then xcodebuild(sandbox, target.label)
       # when :tvos then build_for_iosish_platform(sandbox, build_dir, target, 'appletvos', 'appletvsimulator')
-      # when :watchos then build_for_iosish_platform(sandbox, build_dir, target, 'watchos', 'watchsimulator')
+      when :watchos then build_for_iosish_platform(sandbox, build_dir, output_path, target, 'watchos', 'watchsimulator', true, "i386")
       else raise "Unsupported platform for '#{target.name}': '#{target.platform.name}'" end
     
       raise Pod::Informative, 'The build directory was not found in the expected location.' unless build_dir.directory?