colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-29 11:28:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed press to match fragment_create_file() change. Updated install script.

Browse Source 
Reviewed by me.
This commit is contained in:
Tom Robinson committed 2008-10-03 04:53:40 -07:00
1 parent fcc1be118e
commit d99c583d79
3 files changed
+7 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Tools/Install/install-tools
+2
View File
@@ -32,12 +32,14 @@ ln -sf $INSTALL_DIR/share/objj/bin/objj $INSTALL_DIR/bin/objj
ln -sf $INSTALL_DIR/share/objj/bin/objjc $INSTALL_DIR/bin/objjc
ln -sf $INSTALL_DIR/share/objj/bin/steam $INSTALL_DIR/bin/steam
ln -sf $INSTALL_DIR/share/objj/bin/bake $INSTALL_DIR/bin/bake
ln -sf $INSTALL_DIR/share/objj/bin/press $INSTALL_DIR/bin/press
chmod +x $INSTALL_DIR/bin/nib2cib
chmod +x $INSTALL_DIR/bin/objj
chmod +x $INSTALL_DIR/bin/objjc
chmod +x $INSTALL_DIR/bin/steam
chmod +x $INSTALL_DIR/bin/bake
chmod +x $INSTALL_DIR/bin/press
chmod +x $INSTALL_DIR/share/objj/bin/*
chmod +x $INSTALL_DIR/share/objj/lib/cat
Tools/press/objj-analysis-tools.j
Regular → Executable
+3 -5
View File
@@ -78,7 +78,7 @@ function traverseDependencies(context, file)
}
}
}
else if (fragment.type & FRAGMENT_IMPORT)
else if (fragment.type & FRAGMENT_FILE)
{
if (ignoreImports)
{
@@ -152,7 +152,7 @@ function findImportInObjjFiles(scope, fragment)
importPath = searchPath;
}
}
else if (fragment.type & FRAGMENT_FILE)
else
{
//CPLog.debug("Importing search-path file: " + fragment.info);
@@ -167,8 +167,6 @@ function findImportInObjjFiles(scope, fragment)
}
}
}
else
CPLog.warn("Import fragment not local or file");
return importPath;
}
@@ -212,7 +210,7 @@ function findGlobalDefines(context, scope, rootPath)
for (var i = 0; i < aFragment.context.fragments.length; i++)
{
if ((aFragment.context.fragments[i].type & FRAGMENT_IMPORT) && (/Foundation\//).test(aFragment.context.fragments[i].info))
if ((aFragment.context.fragments[i].type & FRAGMENT_FILE) && (/Foundation\//).test(aFragment.context.fragments[i].info))
{
CPLog.error("Inserting patch");
aFragment.context.fragments.splice(i, 0, patchFragment);
Tools/press/press.j
+2 -2
View File
@@ -137,7 +137,7 @@ function main()
outputFiles[staticPath].push(file.fragments[i].info.length+";");
outputFiles[staticPath].push(file.fragments[i].info);
}
else if (file.fragments[i].type & FRAGMENT_IMPORT)
else if (file.fragments[i].type & FRAGMENT_FILE)
{
var ignoreFragment = false;
if (file.fragments[i].conditionallyIgnore)
@@ -159,7 +159,7 @@ function main()
outputFiles[staticPath].push(relativePath.length+";");
outputFiles[staticPath].push(relativePath);
}
else if (file.fragments[i].type & FRAGMENT_FILE)
else
{
outputFiles[staticPath].push("I;");
outputFiles[staticPath].push(file.fragments[i].info.length+";");