Skip to content

Commit

Permalink
Fixed press to support running on apps from any directory.
Browse files Browse the repository at this point in the history 
New usage:
    press root_directory output_directory [--main override_main.j] [--frameworks override_frameworks] [--png]

[cappuccino#88 state:resolved responsible:tlrobinson]
  • Loading branch information
Tom Robinson committed Oct 4, 2008
1 parent 344d2eb commit a0c594a
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 47 deletions.
22 changes: 4 additions & 18 deletions Tools/press/objj-analysis-tools.j
View file
Expand Up @@ -144,8 +144,6 @@ function findImportInObjjFiles(scope, fragment)

if (fragment.type & FRAGMENT_LOCAL)
{
//CPLog.debug("Importing local file: " + fragment.info);

var searchPath = fragment.info;
if (scope.objj_files[searchPath])
{
Expand All @@ -154,12 +152,10 @@ function findImportInObjjFiles(scope, fragment)
}
else
{
//CPLog.debug("Importing search-path file: " + fragment.info);

var count = scope.OBJJ_INCLUDE_PATHS.length;
while (count--)
{
var searchPath = scope.OBJJ_INCLUDE_PATHS[count] + fragment.info;
var searchPath = scope.OBJJ_INCLUDE_PATHS[count].replace(/\/$/, "") + "/" + fragment.info;
if (scope.objj_files[searchPath])
{
importPath = searchPath;
Expand Down Expand Up @@ -240,21 +236,11 @@ function findGlobalDefines(context, scope, rootPath)
return result;
}

runWithScope(context, scope, function(importName) {

print('Loading from '+OBJJ_INCLUDE_PATHS);

objj_import(importName, true, function() {
print('Callback complete');
});

print('Done');

runWithScope(context, scope, function(importName)
{
objj_import(importName, true, NULL);
}, [rootPath]);

//for (var i in scope.objj_included_files)
// CPLog.debug(i + " ==> " + scope.objj_included_files[i]);

return dependencies;
}

Expand Down
90 changes: 61 additions & 29 deletions Tools/press/press.j
View file
Expand Up @@ -4,57 +4,84 @@ import "objj-analysis-tools.j"

CPLogRegister(CPLogPrint);

var defaultMain = "main.j",
defaultFrameworks = "Frameworks";

function main()
{
var rootPath = null,
var rootDirectory = null,
outputDirectory = null,
mainFilename = null,
frameworksDirectory = null,
optimizePNG = false;

for (var i = 0; i < args.length; i++)
var usageError = false;
while (args.length && !usageError)
{
if (args[i] == "--png")
optimizePNG = true;
else
var arg = args.shift();
switch(arg)
{
if (rootPath == null)
rootPath = args[i];
else if (outputDirectory == null)
outputDirectory = args[i];
else
{
CPLog.warn("Extra param!");
}
case "--png":
optimizePNG = true;
break;
case "--main":
if (args.length)
mainFile = args.shift();
else
usageError = true;
break;
case "--frameworks":
if (args.length)
frameworksDirectory = args.shift().replace(/\/$/, "");
else
usageError = true;
break;
default:
if (rootDirectory == null)
rootDirectory = arg.replace(/\/$/, "");
else if (outputDirectory == null)
outputDirectory = arg.replace(/\/$/, "");
else
usageError = true;
}
}

if (rootPath == null || outputDirectory == null)
if (rootDirectory == null || outputDirectory == null)
{
print("Usage: press input_base_file.j output_directory");
print("Usage: press root_directory output_directory [--main override_main.j] [--frameworks override_frameworks] [--png]");
return;
}

var rootPath = args[0],
sourceDirectory = dirname(rootPath) || ".",
outputDirectory = args[1];
rootDirectory = absolutePath(rootDirectory);

var cx = Packages.org.mozilla.javascript.Context.enter(),
// determine main and frameworks paths
var mainPath = rootDirectory + "/" + (mainFilename || defaultMain),
frameworksPath = rootDirectory + "/" + (frameworksDirectory || defaultFrameworks);

CPLog.info("root=" + rootDirectory);
CPLog.info("output=" + outputDirectory);
CPLog.info("main=" + mainPath)
CPLog.info("frameworks=" + frameworksPath);

// get Rhino context
var cx = Packages.org.mozilla.javascript.Context.getCurrentContext(), //Packages.org.mozilla.javascript.Context.enter(),
scope = makeObjjScope(cx);

var frameworks = rootPath.substring(0, rootPath.lastIndexOf("/")+1) + "Frameworks/";
scope.OBJJ_INCLUDE_PATHS = [frameworks];
// set OBJJ_INCLUDE_PATHS to include the frameworks path
scope.OBJJ_INCLUDE_PATHS = [frameworksPath];
CPLog.info("OBJJ_INCLUDE_PATHS="+scope.OBJJ_INCLUDE_PATHS);

// phase 1: get global defines
var globals = findGlobalDefines(cx, scope, rootPath);
var globals = findGlobalDefines(cx, scope, mainPath);

// coalesce the results
var dependencies = coalesceGlobalDefines(globals);

// phase 2: walk the import tree to determine exactly which files need to be included
// phase 2: walk the dependency tree (both imports and references) to determine exactly which files need to be included

var requiredFiles = {};

if (scope.objj_files[rootPath])
if (scope.objj_files[mainPath])
{
var context = {
scope : scope,
Expand All @@ -69,8 +96,8 @@ function main()
}
}

requiredFiles[rootPath] = true;
traverseDependencies(context, scope.objj_files[rootPath]);
requiredFiles[mainPath] = true;
traverseDependencies(context, scope.objj_files[mainPath]);

var count = 0,
total = 0;
Expand Down Expand Up @@ -185,14 +212,14 @@ function main()

// phase 4: copy everything and write out the new files

var sourceDirectoryFile = new Packages.java.io.File(sourceDirectory),
var rootDirectoryFile = new Packages.java.io.File(rootDirectory),
outputDirectoryFile = new Packages.java.io.File(outputDirectory);

copyDirectory(sourceDirectoryFile, outputDirectoryFile, optimizePNG);
copyDirectory(rootDirectoryFile, outputDirectoryFile, optimizePNG);

for (var path in outputFiles)
{
var file = new java.io.File(outputDirectoryFile, path);
var file = new java.io.File(outputDirectoryFile, pathRelativeTo(path, rootDirectory));

var parent = file.getParentFile();
if (!parent.exists())
Expand Down Expand Up @@ -265,6 +292,11 @@ function basename(path)
return path.substring(path.lastIndexOf("/") + 1);
}

function absolutePath(path)
{
return String((new Packages.java.io.File(path)).getCanonicalPath());
}

function pathRelativeTo(target, relativeTo)
{
var components = [],
Expand Down

0 comments on commit a0c594a

Please sign in to comment.