@@ -394,13 +394,13 @@ module SproutCore def normalize_url(url) # Parse the URL - matched = url.match(/^#{index_root}(\/([^\/\.]+))?(\/([^\/\.]+))?(\/|(\/index\.html))?$/) + matched = url.match(/^#{index_root}(\/([^\/\.]+))?(\/([^\/\.]+))?(\/([^\/\.]+))?(\/|(\/index\.html))?$/) unless matched.nil? matched_language = matched[2] || preferred_language matched_platform = matched[4] || preferred_platform matched_build_number = matched[6] || 'current' url = [index_root, - matched_language, matched_build_number, + matched_language, matched_platform, matched_build_number, 'index.html'] * '/' end lib/sproutcore/bundle.rb @@ -361,7 +361,7 @@ module SproutCore # This is only useful in development mode ret.use_source_directly = use_source_directly if use_source_directly - path_parts = [bundle.build_root, language.to_s, '_src', src_path] + path_parts = [bundle.build_root, language.to_s, platform.to_s, '_src', src_path] ret.build_path = File.join(*(path_parts.compact)) path_parts[0] = url_root ret.url = path_parts.compact.join('/') @@ -373,14 +373,14 @@ module SproutCore # # The URL is the url_root + current_language + current_platform + (cache_link) else - path_parts = [bundle.build_root, language.to_s, + path_parts = [bundle.build_root, language.to_s, platform.to_s, (cache_link || bundle.build_number.to_s), ret.filename] ret.build_path = File.join(*path_parts.compact) path_parts[0] = url_root ret.url = path_parts.compact.join('/') - path_parts[2] = 'current' # create path to "current" build + path_parts[3] = 'current' # create path to "current" build ret.current_url = path_parts.compact.join('/') end lib/sproutcore/bundle_manifest.rb 0b1c6753b557d5aaa51a19cf5dfbb1f5c5c930c3 Charles Jolley charles@sproutit.com http://github.com/sproutit/sproutcore-buildtools/commit/284a5af9c57f95bb52fac51f1b5becbf92ff5279 284a5af9c57f95bb52fac51f1b5becbf92ff5279 2009-01-12T14:17:44-08:00 2009-01-12T14:17:44-08:00 Revert "Disable platform support in URLs" This reverts commit cc6ba54bc3e248d7535a85f68bf5016570aa6cba. 33a907f63f266ac2482041fdb069f55c34abaa60 Charles Jolley charles@sproutit.com