colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-05 10:23:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update press for new build system. Also fixed bug that was supposedly fixed previously (hasOwnProperty)

Browse Source
This commit is contained in:
Tom Robinson
2009-03-19 03:25:02 -07:00
parent b525be4680
commit 41ba12b1d7
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/press/Rakefile
+6 -1
View File
@@ -10,8 +10,9 @@ $PRODUCT = :press
$BUILD_PATH = File.join($BUILD_DIR, $CONFIGURATION, 'press')
$ENVIRONMENT_BIN_PRODUCT = File.join($ENVIRONMENT_BIN_DIR, 'press')
$ENVIRONMENT_LIB_PRODUCT = File.join($ENVIRONMENT_LIB_DIR, 'press')
$ENVIRONMENT_BRIDGE = File.join($ENVIRONMENT_LIB_DIR, 'press', 'bridge.js')
task :build => [:press, $ENVIRONMENT_BIN_PRODUCT, $ENVIRONMENT_LIB_PRODUCT]
task :build => [:press, $ENVIRONMENT_BIN_PRODUCT, $ENVIRONMENT_LIB_PRODUCT, $ENVIRONMENT_BRIDGE]
# Debug Framework
ObjectiveJ::BundleTask.new(:press) do |t|
@@ -36,3 +37,7 @@ end
file_d $ENVIRONMENT_LIB_PRODUCT => [:press] do
cp_r(File.join($BUILD_PATH, '.'), $ENVIRONMENT_LIB_PRODUCT)
end
file_d $ENVIRONMENT_BRIDGE => [File.join($HOME_DIR, 'Tools', 'Utilities', 'bridge.js')] do
cp(File.join($HOME_DIR, 'Tools', 'Utilities', 'bridge.js'), $ENVIRONMENT_BRIDGE)
end
Tools/press/main.j
-2
View File
@@ -563,5 +563,3 @@ function outputTransformer(os, document, encoding, standalone)
String(serializer.transform(domSource, streamResult));
}
main();
Tools/press/objj-analysis-tools.j
+4 -4
View File
@@ -1,5 +1,5 @@
var objjPath = OBJJ_LIB+'/Frameworks-Rhino/Objective-J/Objective-J.js',
bridgePath = OBJJ_LIB+'/bridge.js',
var objjPath = OBJJ_HOME+'/lib/Frameworks/Objective-J/rhino.platform/Objective-J.js',
bridgePath = OBJJ_HOME+'/lib/press/bridge.js',
envPath = "/Users/tlrobinson/280North/git/cappuccino/Tools/press/env.js";
/*
@@ -83,7 +83,7 @@ function traverseDependencies(context, file)
var token;
while (token = lexer.skip_whitespace())
{
if (context.dependencies[token])
if (context.dependencies.hasOwnProperty(token))
{
var files = context.dependencies[token];
for (var j = 0; j < files.length; j++)
@@ -153,7 +153,7 @@ function traverseDependencies(context, file)
if (context.referenceCallback)
context.referenceCallback(file.path, referencedFile, referencedFiles[referencedFile]);
if (context.scope.objj_files[referencedFile])
if (context.scope.objj_files.hasOwnProperty(referencedFile))
traverseDependencies(context, context.scope.objj_files[referencedFile]);
else
CPLog.error("Missing referenced file: " + referencedFile);