colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-16 21:41:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for platform stuff.

Browse Source 
Reviewed by me.
This commit is contained in:
Francisco Tolmasky committed 2009-03-16 14:50:45 -07:00
1 parent b3cc75fe46
commit 6d34f53e43
2 files changed
+16 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AppKit/rakefile
+12 -2
View File
@@ -13,8 +13,6 @@ subprojects = %w{Tools}
subrake(subprojects)
task :build => [$PRODUCT, $ENVIRONMENT_PRODUCT]
Specs = {}
AppKitFiles = FileList['**/*.j'].exclude('CoreGraphics/CGContextCanvas.j', 'CoreGraphics/CGContextVML.j', 'Themes/**', 'Tools/**')
@@ -60,3 +58,15 @@ bundle Specs[:AppKitRelease], :AppKitRelease
file_d $ENVIRONMENT_PRODUCT => [$PRODUCT] do
cp_r(Specs[$PRODUCT.to_sym].build_path, $ENVIRONMENT_PRODUCT)
end
ThemeFiles = FileList['Themes/Aristo/*']
$THEME_PRODUCT = File.join(Specs[$PRODUCT.to_sym].build_path, 'Resources', 'Aristo.blend')
file_d $THEME_PRODUCT => ThemeFiles do
File.popen("blend -d Themes/Aristo/ThemeDescriptors.j -o #{$THEME_PRODUCT} -R Themes/Aristo/Resources") do |blend|
puts blend.read
end
end
task :build => [$PRODUCT, $ENVIRONMENT_PRODUCT, $THEME_PRODUCT]
Objective-J/file.js
+4 -4
View File
@@ -369,7 +369,7 @@ objj_search.prototype.didReceiveBundleResponse = function(aResponse)
platforms = dictionary_getValue(bundle.info, "CPBundlePlatforms"),
index = 0,
count = OBJJ_PLATFORMS.length,
inner_count = platforms.length;
innerCount = platforms.length;
// Ugh, no indexOf, no objects-in-common.
for(; index < count; ++index)
@@ -377,8 +377,8 @@ objj_search.prototype.didReceiveBundleResponse = function(aResponse)
var innerIndex = 0,
currentPlatform = OBJJ_PLATFORMS[index];
for (; innerIndex < inner_count; ++innerIndex)
if(OBJJ_PLATFORMS[index] === platforms[innerIndex])
for (; innerIndex < innerCount; ++innerIndex)
if(currentPlatform === platforms[innerIndex])
{
platform = currentPlatform;
break;
@@ -386,7 +386,7 @@ objj_search.prototype.didReceiveBundleResponse = function(aResponse)
}
executablePath = platform + ".platform/" + executablePath;
this.request(DIRECTORY(aResponse.filePath) + executablePath, this.didReceiveExecutableResponse);
// FIXME: Is this the right approach?