Tools/capp/Configuration.j Tools/capp/Generate.j Tools/capp/Templates/Application/Rakefile Tools/capp/Templates/NibApplication/Rakefile Tools/capp/Templates/ThemeDescriptor/Rakefile @@ -67,7 +67,7 @@ file_d $STARTER_DOWNLOAD_APPLICATION => [$TOOLS_DOWNLOAD_ENV] do rm_rf($STARTER_DOWNLOAD_APPLICATION) mkdir_p($STARTER_DOWNLOAD) - system %{capp #{$STARTER_DOWNLOAD_APPLICATION} -t Application } + system %{capp gen #{$STARTER_DOWNLOAD_APPLICATION} -t Application --noconfig } end Rakefile @@ -1,9 +1,9 @@ /* * AppController.j - * __Product__ + * __project.name__ * - * Created by __Me__ on __Date__. - * Copyright 2008 __MyCompanyName__. All rights reserved. + * Created by __user.name__ on __project.date__. + * Copyright __project.year__, __organization.name__ All rights reserved. */ @import <Foundation/CPObject.j> Tools/capp/Templates/Application/AppController.j @@ -5,7 +5,7 @@ <key>CPApplicationDelegateClass</key> <string>AppController</string> <key>CPBundleName</key> - <string>__Product__</string> + <string>__project.name__</string> <key>CPPrincipalClass</key> <string>CPApplication</string> </dict> Tools/capp/Templates/Application/Info.plist @@ -4,18 +4,16 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns = "http://www.w3.org/1999/xhtml" xml:lang = "en" lang = "en">  <head> <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" /> - <title>__Product__</title> + <title>__project.name__</title> <script type = "text/javascript"> OBJJ_MAIN_FILE = "main.j"; @@ -44,7 +42,7 @@ <script type = "text/javascript"> document.write("<div id='container'><p id='content'>" + "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " + - "Loading __Product__...</p></div>"); + "Loading __project.name__...</p></div>"); </script> <noscript> Tools/capp/Templates/Application/index-debug.html @@ -4,18 +4,16 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns = "http://www.w3.org/1999/xhtml" xml:lang = "en" lang = "en">  <head> <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" /> - <title>__Product__</title> + <title>__project.name__</title> <script type = "text/javascript"> OBJJ_MAIN_FILE = "main.j"; @@ -43,7 +41,7 @@ <script type = "text/javascript"> document.write("<div id='container'><p id='content'>" + "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " + - "Loading __Product__...</p></div>"); + "Loading __project.name__...</p></div>"); </script> <noscript> Tools/capp/Templates/Application/index.html @@ -1,9 +1,9 @@ /* - * main.j - * __Product__ + * AppController.j + * __project.name__ * - * Created by __Me__ on __Date__. - * Copyright 2008 __MyCompanyName__. All rights reserved. + * Created by __user.name__ on __project.date__. + * Copyright __project.year__, __organization.name__ All rights reserved. */ @import <Foundation/Foundation.j> Tools/capp/Templates/Application/main.j @@ -1,3 +1,10 @@ +/* + * AppController.j + * __project.name__ + * + * Created by __user.name__ on __project.date__. + * Copyright __project.year__, __organization.name__ All rights reserved. + */ @import <Foundation/CPObject.j> Tools/capp/Templates/NibApplication/AppController.j @@ -4,18 +4,16 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns = "http://www.w3.org/1999/xhtml" xml:lang = "en" lang = "en">  <head> <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" /> - <title>__Product__</title> + <title>__project.name__</title> <script type = "text/javascript"> OBJJ_MAIN_FILE = "main.j"; @@ -44,7 +42,7 @@ <script type = "text/javascript"> document.write("<div id='container'><p id='content'>" + "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " + - "Loading __Product__...</p></div>"); + "Loading __project.name__...</p></div>"); </script> <noscript> Tools/capp/Templates/NibApplication/index-debug.html @@ -4,18 +4,16 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns = "http://www.w3.org/1999/xhtml" xml:lang = "en" lang = "en">  <head> <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" /> - <title>__Product__</title> + <title>__project.name__</title> <script type = "text/javascript"> OBJJ_MAIN_FILE = "main.j"; @@ -43,7 +41,7 @@ <script type = "text/javascript"> document.write("<div id='container'><p id='content'>" + "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " + - "Loading __Product__...</p></div>"); + "Loading __project.name__...</p></div>"); </script> <noscript> Tools/capp/Templates/NibApplication/index.html @@ -1,9 +1,9 @@ /* - * main.j - * __Product__ + * AppController.j + * __project.name__ * - * Created by __Me__ on __Date__. - * Copyright 2008 __MyCompanyName__. All rights reserved. + * Created by __user.name__ on __project.date__. + * Copyright __project.year__, __organization.name__ All rights reserved. */ @import <Foundation/Foundation.j> @@ -12,9 +12,7 @@ @import "AppController.j" -CPLogRegister(CPLogPopup); - function main(args, namedArgs) { CPApplicationMain(args, namedArgs); -} \ No newline at end of file +} Tools/capp/Templates/NibApplication/main.j @@ -1,33 +1,36 @@ /* * ThemeDescriptors.j - * __Product__ + * __project.name__ * - * Created by __Me__ on __Date__. - * Copyright 2008 __MyCompanyName__. All rights reserved. + * Created by __user.name__ on __project.date__. + * Copyright __project.year__, __organization.name__ All rights reserved. */ @import <Foundation/CPObject.j> -@implementation __Product__ThemeDescriptor : CPObject +@implementation __project.nameasidentifier__ThemeDescriptor : CPObject { } + (CPString)themeName { - return @"__Product__"; + return @"__project.name__"; } -+ (CPTextField)themedTextField ++ (CPButton)themedStandardButton { - var textField = [[CPTextField alloc] initWithFrame:CGRectMake(0.0, 0.0, 200.0, 20.0)]; + var button = [[CPButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 100.0, 20.0)]; - [textField setValue:[CPColor blueColor] forThemedAttributeName:@"bezel-color"]; - [textField setValue:[CPColor redColor] forThemedAttributeName:@"text-color"]; - - [textField setStringValue:@"Yikes!"]; + [button setValue:[CPColor blueColor] forThemeAttribute:@"bezel-color"]; + [button setValue:[CPColor greenColor] forThemeAttribute:@"bezel-color" inState:CPThemeStateHighlighted]; + + [button setValue:[CPColor redColor] forThemeAttribute:@"text-color"]; + [button setValue:[CPColor yellowColor] forThemeAttribute:@"text-color" inState:CPThemeStateHighlighted]; + + [button setTitle:@"Yikes!"]; - return textField; + return button; } @end Tools/capp/Templates/ThemeDescriptor/ThemeDescriptors.j @@ -4,18 +4,16 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns = "http://www.w3.org/1999/xhtml" xml:lang = "en" lang = "en">  <head> <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" /> - <title>__Product__</title> + <title>__project.name__</title> <script type = "text/javascript"> OBJJ_MAIN_FILE = "main.j"; @@ -44,7 +42,7 @@ <script type = "text/javascript"> document.write("<div id='container'><p id='content'>" + "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " + - "Loading __Product__...</p></div>"); + "Loading __project.name__...</p></div>"); </script> <noscript> Tools/capp/Templates/ThemeDescriptor/index-debug.html @@ -4,18 +4,16 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns = "http://www.w3.org/1999/xhtml" xml:lang = "en" lang = "en">  <head> <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" /> - <title>__Product__</title> + <title>__project.name__</title> <script type = "text/javascript"> OBJJ_MAIN_FILE = "main.j"; @@ -43,7 +41,7 @@ <script type = "text/javascript"> document.write("<div id='container'><p id='content'>" + "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " + - "Loading __Product__...</p></div>"); + "Loading __project.name__...</p></div>"); </script> <noscript> Tools/capp/Templates/ThemeDescriptor/index.html @@ -5,129 +5,56 @@ importClass(java.io.OutputStreamWriter); @import <Foundation/Foundation.j> +@import "Configuration.j" +@import "Generate.j" + + function main() { if (system.args.length < 1) return printUsage(); var index = 0, - count = system.args.length, - - shouldSymbolicallyLink = false, - justFrameworks = false, - - template = "Application", - destination = ""; + count = system.args.length; for (; index < count; ++index) { var argument = system.args[index]; - switch (system.args[index]) - { - case "-l": shouldSymbolicallyLink = true; - break; - - case "-h": - case "--help": printUsage(); - return; - - case "-t": - case "--template": template = system.args[++index]; - break; - - case "-f": - case "--frameworks": justFrameworks = true; - break; - - default: destination = argument; - } - } - - var sourceTemplate = new java.io.File(OBJJ_HOME + "/lib/capp/Resources/Templates/" + template), - destinationProject = new java.io.File(destination); - - if (!destinationProject.exists()) - { - if (!justFrameworks) + switch (argument) { - exec(["cp", "-vR", sourceTemplate.getCanonicalPath(), destinationProject.getCanonicalPath()], true); - - var files = getFiles(destinationProject, ['j', "plist", "html"]), - index = 0, - count = files.length; + case "version": + case "--version": return print("capp version 0.7.0"); - for (; index < count; ++index) - { - var file = files[index], - contents = readFile(file); + case "-h": + case "--help": return printUsage(); - contents = contents.replace(/__Product__/g, destinationProject.getName()); + case "config": return config.apply(this, system.args.slice(index + 1)); - writeContentsToFile(contents, file); - } + case "gen": return gen.apply(this, system.args.slice(index + 1)); + + default: print("unknown command " + argument); } - - createFrameworksInFile(destinationProject, shouldSymbolicallyLink); } - else - print("Directory already exists"); -} - -function createFrameworksInFile(/*File*/ aFile, /*Boolean*/ shouldSymbolicallyLink) -{ - var destinationFrameworks = new java.io.File(aFile.getCanonicalPath()+ "/Frameworks"), - destinationDebugFrameworks = new java.io.File(aFile.getCanonicalPath() + "/Frameworks/Debug"); - - if (!shouldSymbolicallyLink) - { - var sourceFrameworks = new java.io.File(OBJJ_HOME + "/lib/Frameworks"); - - exec(["cp", "-vR", sourceFrameworks.getCanonicalPath(), destinationFrameworks.getCanonicalPath()], true); - - return true; - } - - var BUILD = system.env["CAPP_BUILD"] || system.env["STEAM_BUILD"]; - - if (!BUILD) - throw "CAPP_BUILD or STEAM_BUILD must be defined"; - - // Release Frameworks - new java.io.File(destinationFrameworks).mkdir(); - - exec(["ln", "-s", new java.io.File(BUILD + "/Release/Objective-J").getCanonicalPath(), - new java.io.File(aFile.getCanonicalPath() + "/Frameworks/Objective-J").getCanonicalPath()], true); - - exec(["ln", "-s", new java.io.File(BUILD + "/Release/Foundation").getCanonicalPath(), - new java.io.File(aFile.getCanonicalPath() + "/Frameworks/Foundation").getCanonicalPath()], true); - - exec(["ln", "-s", new java.io.File(BUILD + "/Release/AppKit").getCanonicalPath(), - new java.io.File(aFile.getCanonicalPath() + "/Frameworks/AppKit").getCanonicalPath()], true); - - // Debug Frameworks - new java.io.File(destinationDebugFrameworks).mkdir(); - - exec(["ln", "-s", new java.io.File(BUILD + "/Debug/Objective-J").getCanonicalPath(), - new java.io.File(aFile.getCanonicalPath() + "/Frameworks/Debug/Objective-J").getCanonicalPath()], true); - - exec(["ln", "-s", new java.io.File(BUILD + "/Debug/Foundation").getCanonicalPath(), - new java.io.File(aFile.getCanonicalPath() + "/Frameworks/Debug/Foundation").getCanonicalPath()], true); - - exec(["ln", "-s", new java.io.File(BUILD + "/Debug/AppKit").getCanonicalPath(), - new java.io.File(aFile.getCanonicalPath() + "/Frameworks/Debug/AppKit").getCanonicalPath()], true); } function printUsage() { - print("capp /path/to/your/app [options]"); + print("capp [--version] COMMAND [ARGS]"); + print(" --version Print version"); + print(" -h, --help Print usage"); + print(""); + print(ANSITextApplyProperties(" gen", ANSI_BOLD) + " PATH Generate new project at PATH from a predefined template"); print(" -l Symlink the Frameworks folder to your $CAPP_BUILD or $STEAM_BUILD directory"); print(" -t, --template Specify the template name to use (listed in capp/Resources/Templates)"); print(" -f, --frameworks Create only frameworks, not a full application"); - print(" -h, --help Print usage"); + print(""); + print(ANSITextApplyProperties(" config ", ANSI_BOLD)); + print(" name value Set a value for a given key"); + print(" -l, --list List all variables set in config file."); + print(" --get name Get the value for a given key"); } - function writeContentsToFile(/*String*/ aString, /*File*/ aFile) { var writer = new BufferedWriter(new FileWriter(aFile)); @@ -207,11 +134,10 @@ function getFiles(/*File*/ sourceDirectory, /*nil|String|Array<String>*/ extensi else if (name.substring(name.length - extensions.length - 1) === ("." + extensions)) isValidExtension = true; - if (isValidExtension) - matches.push(file); - if (file.isDirectory()) matches = matches.concat(getFiles(file, extensions, exclusions)); + else if (isValidExtension) + matches.push(file); } } Tools/capp/main.j 45e3f776cf5157d37575b382903f20f83822ac67 Francisco Tolmasky francisco@280north.com http://github.com/280north/cappuccino/commit/a0cd03caa439f10f07e7853a632132351f22e12f a0cd03caa439f10f07e7853a632132351f22e12f

2009-05-18T15:57:39-07:00

Added config option to capp and default Rakefiles for new projects. Reviewed by me. 3261b6f5536112ae4934b48e42112ac05e6f62c1 Francisco Tolmasky francisco@280north.com