lib/bpm/project.rb in bpm-1.0.0.beta.5 vs lib/bpm/project.rb in bpm-1.0.0.beta.6

@@ -636,13 +636,16 @@
 
         found << pkg
 
         # Look up dependencies of dependencies
         search_list += Array(pkg.dependencies)
-        search_list += Array(pkg.dependencies_development)
         search_list += Array(pkg.dependencies_build)
 
+        if has_local_package? pkg.name
+          search_list += Array(pkg.dependencies_development)
+        end
+
         ret << pkg
       end
 
       ret
     end
@@ -742,9 +745,12 @@
           ret[target_name].merge! tmp_settings['bpm_styles.css']
         elsif target_name =~ /\.js$/ && tmp_settings['bpm_libs.js']
           ret[target_name].merge! tmp_settings['bpm_libs.js']
         end
       end
+      
+      bpm_settings = ret[target_name]['bpm:settings'] ||= {}
+      ret[target_name]['bpm:settings'] = soft_merge(bpm_settings, opts)
       
     end
 
     def project_settings_excludes(dep_name, target_name)
       exclusions = bpm_build[target_name] && bpm_build[target_name]['exclude']