diff --git a/Tools/Install/install-tools b/Tools/Install/install-tools index 6173d3ef6..afce0496e 100755 --- a/Tools/Install/install-tools +++ b/Tools/Install/install-tools @@ -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 diff --git a/Tools/press/objj-analysis-tools.j b/Tools/press/objj-analysis-tools.j old mode 100644 new mode 100755 index 1dc7b9676..e672a2a90 --- a/Tools/press/objj-analysis-tools.j +++ b/Tools/press/objj-analysis-tools.j @@ -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); diff --git a/Tools/press/press.j b/Tools/press/press.j index c5e7aec27..6802ac5dc 100644 --- a/Tools/press/press.j +++ b/Tools/press/press.j @@ -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+";");