diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 49f4e2d17..000000000 --- a/.gitmodules +++ /dev/null @@ -1,12 +0,0 @@ -[submodule "External/narwhal"] - path = External/narwhal - url = git://github.com/tlrobinson/narwhal.git -[submodule "External/jack"] - path = External/jack - url = git://github.com/tlrobinson/jack.git -[submodule "External/browserjs"] - path = External/browserjs - url = git://github.com/tlrobinson/browserjs.git -[submodule "External/ojunit"] - path = External/ojunit - url = git://github.com/280north/ojunit.git diff --git a/External/Jakefile b/External/Jakefile deleted file mode 100644 index 3731900b3..000000000 --- a/External/Jakefile +++ /dev/null @@ -1,63 +0,0 @@ -#!/usr/bin/env narwhal - -var FILE = require("file"), - ENV = require("system").env, - OS = require("os"), - Jake = require("jake"); - /*, - Clean = require("jake/clean"); -*/ - -require(FILE.absolute("../common.jake")); - -$ENVIRONMENT_NARWHAL_PRODUCT = $ENVIRONMENT_DIR -$ENVIRONMENT_PACKAGES_PRODUCT = FILE.join($ENVIRONMENT_NARWHAL_PRODUCT, 'packages') - -$EXTERNALS = ['browserjs', 'jack', 'narwhal', 'ojunit']; -$PACKAGES = ['browserjs', 'jack']; - -function git_export(source, destination) -{ - destination = FILE.join(FILE.absolute(destination), ''); - OS.system("cd " + source + " && git checkout-index -a -f \"--prefix=" + destination + "\""); -}; - -filedir ($ENVIRONMENT_DIR, function() -{ - FILE.mkdirs($ENVIRONMENT_DIR); -}); - -task ("update_submodules", function() -{ - if (ENV['NOSUBUP']) - return; - - if (executableExists("git")) - OS.system("cd .. && git submodule init && git submodule update"); - else - throw "Git not installed"; -}); - -task ("build", ["update_submodules", $ENVIRONMENT_DIR], function() -{ - rm_rf($ENVIRONMENT_NARWHAL_PRODUCT); - - git_export('narwhal', $ENVIRONMENT_NARWHAL_PRODUCT); - - $PACKAGES.forEach(function(aPackage) - { - git_export(aPackage, FILE.join($ENVIRONMENT_PACKAGES_PRODUCT, aPackage)); - }); - - symlink_executable(FILE.join($ENVIRONMENT_PACKAGES_PRODUCT, 'jack', 'bin', 'jackup')) -}); - -//CLOBBER.include($ENVIRONMENT_NARWHAL_PRODUCT) - -task ("pull", function() -{ - $EXTERNALS.forEach(function(external) - { - OS.system("cd " + external + " && git pull origin master"); - }); -}); diff --git a/External/Rakefile b/External/Rakefile deleted file mode 100644 index 4a50f5de4..000000000 --- a/External/Rakefile +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env ruby - -require '../common' -require 'objective-j' -require 'rake' -require 'rake/clean' - -require 'fileutils' - -$ENVIRONMENT_NARWHAL_PRODUCT = $ENVIRONMENT_DIR -$ENVIRONMENT_PACKAGES_PRODUCT = File.join($ENVIRONMENT_NARWHAL_PRODUCT, 'packages') - -$EXTERNALS = ['browserjs', 'jack', 'narwhal', 'ojunit'] -$PACKAGES = ['browserjs', 'jack'] - -def git_export(source, dest) - dest = File.join(File.expand_path(dest), ''); - system %{cd "#{source}" && git checkout-index -a -f "--prefix=#{dest}"} -end - -file_d $ENVIRONMENT_DIR do - mkdir_p $ENVIRONMENT_DIR -end - -task :update_submodules do - if !ENV['NOSUBUP'] then - if executable_exists? "git" - system %{cd .. && git submodule init && git submodule update} - else - puts "Git not installed" - rake abort - end - end -end - -task :build => [:update_submodules, $ENVIRONMENT_DIR] do - rm_rf($ENVIRONMENT_NARWHAL_PRODUCT) - - git_export('narwhal', $ENVIRONMENT_NARWHAL_PRODUCT) - - $PACKAGES.each do |package| - git_export(package, File.join($ENVIRONMENT_PACKAGES_PRODUCT, package)) - end - - symlink_executable(File.join($ENVIRONMENT_PACKAGES_PRODUCT, 'jack', 'bin', 'jackup')) -end - -CLOBBER.include($ENVIRONMENT_NARWHAL_PRODUCT) - -task :pull do - $EXTERNALS.each do |external| - system "cd #{external} && git pull origin master" - end -end \ No newline at end of file diff --git a/External/browserjs b/External/browserjs deleted file mode 160000 index 98a71a412..000000000 --- a/External/browserjs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 98a71a4122bde9cacebe5b437e66c4b17208a195 diff --git a/External/jack b/External/jack deleted file mode 160000 index 3ee7b5681..000000000 --- a/External/jack +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3ee7b56812c97770318891a0fd21287cae9ccfc2 diff --git a/External/narwhal b/External/narwhal deleted file mode 160000 index cd6e4b02a..000000000 --- a/External/narwhal +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cd6e4b02ab7f039e2f106ef6f8edb3efbfab5b8a diff --git a/External/ojunit b/External/ojunit deleted file mode 160000 index 352b7e8c6..000000000 --- a/External/ojunit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 352b7e8c618729a48d130098368ae0a774ce5f0d diff --git a/Tools/bake/Rakefile b/Tools/bake/Rakefile deleted file mode 100644 index e833736e0..000000000 --- a/Tools/bake/Rakefile +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env ruby - -require 'rake' -require '../../common' -require 'objective-j' -require 'objective-j/bundletask' - - -$PRODUCT = :bake -$BUILD_PATH = File.join($BUILD_DIR, $CONFIGURATION, 'bake') -$ENVIRONMENT_BIN_PRODUCT = File.join($ENVIRONMENT_BIN_DIR, 'bake') -$ENVIRONMENT_LIB_PRODUCT = File.join($ENVIRONMENT_LIB_DIR, 'bake') - -# Debug Framework -ObjectiveJ::BundleTask.new(:bake) do |t| - t.name = 'bake' - t.identifier = 'com.280n.bake' - t.version = '0.7.1' - t.author = '280 North, Inc.' - t.email = 'feedback @nospam@ 280north.com' - t.summary = 'Deployment tool for Cappuccino applications' - t.sources = FileList['*.j'] - t.resources = FileList['Resources/*'] - t.license = ObjectiveJ::License::LGPL_v2_1 - t.build_path = $BUILD_PATH - t.flag = '-DDEBUG' if $CONFIGURATION == 'Debug' - t.flag = '-O' if $CONFIGURATION == 'Release' -end - -#executable in environment directory -file_d $ENVIRONMENT_BIN_PRODUCT do - make_objj_executable($ENVIRONMENT_BIN_PRODUCT) -end - -file_d $ENVIRONMENT_LIB_PRODUCT => [:bake] do - cp_r(File.join($BUILD_PATH, '.'), $ENVIRONMENT_LIB_PRODUCT) -end - -task :build => [:bake, $ENVIRONMENT_BIN_PRODUCT, $ENVIRONMENT_LIB_PRODUCT] - -CLOBBER.include($ENVIRONMENT_BIN_PRODUCT, $ENVIRONMENT_LIB_PRODUCT) diff --git a/Tools/bake/Resources/bake_template.html b/Tools/bake/Resources/bake_template.html deleted file mode 100644 index 28ed44809..000000000 --- a/Tools/bake/Resources/bake_template.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - $APPLICATION_NAME - - - - - - - -
- -
-
-
-

Loading $APPLICATION_NAME...

-
- - diff --git a/Tools/bake/example.bakefile b/Tools/bake/example.bakefile deleted file mode 100644 index 9374f3723..000000000 --- a/Tools/bake/example.bakefile +++ /dev/null @@ -1,56 +0,0 @@ -{ - "sources" : [ - { - "type" : "git", - "path" : "git://github.com/280north/cappuccino.git", - "parts" : [ - { - "src" : "Objective-J", - "dst" : "Frameworks/Objective-J", - "build" : "ant -DBuild=BUILD_PATH", - "copyFrom" : "Release/Objective-J" - }, - { - "src" : "Foundation", - "dst" : "Frameworks/Foundation", - "build" : "steam build -c Release -b BUILD_PATH", - "copyFrom" : "Release/Foundation" - }, - { - "src" : "AppKit", - "dst" : "Frameworks/AppKit", - "build" : "steam build -c Release -b BUILD_PATH", - "copyFrom" : "Release/AppKit" - } - ] - }, - { - "type" : "rsync", - "path" : "/Users/username/projects/NewApplication", - "parts" : [ - { - "src" : "", - "dst" : "Blah" - } - ] - }, - { - "type" : "svn", - "path" : "https://svn.youserver.com/Project/trunk", - "parts" : [ - { - "src" : "subdirectory", - "dst" : "Something" - } - ] - } - ], - "deployments" : [ - { "host" : "deploy@myserver.com", "path" : "/var/www/mysite/public" } - ], - "templateVars" : { - "APPLICATION_NAME" : "My Application", - "BACKGROUND_COLOR" : "black", - "TEXT_COLOR" : "black" - } -} diff --git a/Tools/bake/main.j b/Tools/bake/main.j deleted file mode 100644 index 5a325be9e..000000000 --- a/Tools/bake/main.j +++ /dev/null @@ -1,299 +0,0 @@ -@import -importPackage(Packages.java.io); - -var options = { - base : "trunk", - clean : false, - deploy : false, - deployHost : null, - deployPath : null, - skipUpdate : false, - tag : false, - archive : false, - message : null, - templatePath : OBJJ_HOME + "/lib/bake/Resources/bake_template.html" -} - -var targetPath, - checkoutsPath, - buildsPath, - productsPath, - version = ROUND(new Date().getTime() / 1000); - -CPLogRegister(CPLogPrint); - -function readConfig(configFile) -{ - var fileData = String(readFile(configFile)); - if (!fileData) - throw new Error("Couldn't read file: " + configFile); - - var configs = JSON.parse(fileData); - - return configs; -} - -function update() -{ - for (var i = 0; i < options.sources.length; i++) - { - var source = options.sources[i]; - - source.localSourcePath = checkoutsPath + "/" + source.path.replace(/\W+/g, "_"); - - switch (source.type) - { - case "git": - if (new File(source.localSourcePath).isDirectory()) - { - CPLog.debug("git pull (" + source.localSourcePath + ")"); - exec("git pull", null, new File(source.localSourcePath)); - } - else - { - CPLog.debug("git clone (" + source.path + ")"); - exec(["git", "clone", source.path, source.localSourcePath]); - } - break; - case "svn": - if (new File(source.localSourcePath).isDirectory()) - { - CPLog.debug("svn up (" + source.localSourcePath + ")"); - exec("svn up", null, new File(source.localSourcePath)); - } - else - { - CPLog.debug("svn co (" + source.path + ")"); - exec(["svn", "co", source.path, source.localSourcePath]); - } - break; - case "rsync": - CPLog.debug("rsync (" + source.localSourcePath + ")"); - exec(["rsync", "-avz", source.path + "/", source.localSourcePath]); - break; - default : - CPLog.error("Unimplemented: " + source.type); - } - - } - -} - -function build() -{ - var versionedPath = productsPath + "/" + version + "/" + version; - - for (var i = 0; i < options.sources.length; i++) - { - var source = options.sources[i]; - - for (var j = 0; j < source.parts.length; j++) - { - var part = source.parts[j]; - var fromPath = source.localSourcePath + "/" + part.src; - var toPath = versionedPath + "/" + part.dst; - - if (part.build) - { - var buildCommand = part.build.replace("$BUILD_PATH", buildsPath); - CPLog.debug("Building: " + buildCommand); - - exec(buildCommand, null, new File(fromPath)); - - fromPath = buildsPath + "/" + part.copyFrom; - } - - mkdirs(toPath); - - var rsyncCommand = "rsync -aC " + fromPath + "/. " + toPath; - CPLog.debug("Rsyncing: " + rsyncCommand); - exec(rsyncCommand); - } - } - - if (options.press) - { - var tempPath = versionedPath+"-Stripped"; - - var pressCommand = ["press", versionedPath, tempPath]; - if (options.png) - pressCommand.push("--png"); - - var result = exec(pressCommand); - if (result.code) - throw new Error("press failed"); - - exec(["rm", "-rf", versionedPath]); - exec(["mv", tempPath, versionedPath]); - } - - var results = exec(["bash", "-c", "find "+versionedPath+" \\( -name \"*.sj\" -or -name \"*.j\" \\) -exec cat {} \\; | wc -c | tr -d \" \""]); - - var filesTotal = parseInt(results.stdout); - if (isNaN(filesTotal)) - filesTotal = 0; - - CPLog.debug("FILES_TOTAL=["+filesTotal+"]"); - - var substitutions = options.templateVars; - substitutions.VERSION = version; - substitutions.FILES_TOTAL = filesTotal; - - var template = readFile(options.templatePath); - if (!template) - throw new Error("Couldn't get template"); - - for (var variable in substitutions) - template = template.replace(new RegExp("\\$" + variable, "g"), substitutions[variable]); - - templateBytes = new java.lang.String(template).getBytes(); - templateOutput = new FileOutputStream(productsPath + "/" + version + "/index.html"); - templateOutput.write(templateBytes, 0, templateBytes.length); - templateOutput.close(); - - exec(["tar", "czf", version+".tar.gz", version], null, new File(productsPath)); -} - -function deploy() -{ - for (var i = 0; i < options.deployments.length; i++) - { - var dep = options.deployments[i]; - - exec(["scp", productsPath + "/" + version + ".tar.gz", dep.host + ":~/" + version + ".tar.gz"]); - exec(["ssh", dep.host, - "tar xzf " + version + ".tar.gz; " + - "mkdir -p " + dep.path + "; " + - "mv " + version + "/" + version + "/ " + dep.path + "/" + version + "; " + - "mv " + version + "/index.html " + dep.path + "/index.html; " + - "rm " + version + ".tar.gz; " + - "rmdir " + version + "; " + - "cd " + dep.path + "; " + - "ln -nsf " + version + " Current"]); - } -} - -function main() -{ - var bakefile = "bakefile", - commandOpts = {}; - - while (args.length) - { - var arg = args.shift(); - switch (arg) - { - case "--base": - commandOpts.base = args.shift(); - break; - case "--tag": - commandOpts.tag = true; - break; - case "--archive": - commandOpts.archive = true; - break; - case "--clean": - commandOpts.clean = true; - break; - case "--deploy": - commandOpts.deploy = true; - break; - case "--press": - commandOpts.press = true; - break; - case "--png": - commandOpts.png = true; - break; - case "--host": - commandOpts.deployHost = args.shift(); - break; - case "--path": - commandOpts.deployPath = args.shift(); - break; - case "--skip-update": - commandOpts.skipUpdate = true - break; - case "--message": - commandOpts.message = args.shift(); - break; - default: - bakefile = arg; - } - } - - try - { - var configOpts = readConfig(bakefile); - - for (var i in configOpts) options[i] = configOpts[i]; - for (var i in commandOpts) options[i] = commandOpts[i]; - - targetPath = pwd() + "/" + bakefile.match(/^[^\.]+/)[0] + ".oven"; - mkdirs(targetPath); - - checkoutsPath = targetPath + "/Checkouts" - mkdirs(checkoutsPath); - - buildsPath = targetPath + "/Build" - mkdirs(buildsPath); - - productsPath = targetPath + "/Products" - mkdirs(productsPath); - - if (!options.skipUpdate) - { - CPLog.info("Updating"); - update(); - } - - CPLog.info("Building"); - build(); - - if (options.deploy) - { - CPLog.info("Deploying"); - deploy(); - } - - } - catch (e) - { - CPLog.error(e); - } -} - -function exec() -{ - var runtime = Packages.java.lang.Runtime.getRuntime() - var p = runtime.exec.apply(runtime, arguments); - - var stdout = ""; - var reader = new Packages.java.io.BufferedReader(new Packages.java.io.InputStreamReader(p.getInputStream())); - while (s = reader.readLine()) - { - stdout += s; - CPLog.info("exec: " + s); - } - - var stderr = ""; - var reader = new Packages.java.io.BufferedReader(new Packages.java.io.InputStreamReader(p.getErrorStream())); - while (s = reader.readLine()) - { - stdout += s; - CPLog.warn("exec: " + s); - } - - var code = p.waitFor(); - - return { code : code, stdout : stdout, stderr : stderr }; -} - -function pwd() -{ - return String(new File("").getAbsolutePath()); -} - -function mkdirs(path) -{ - return new File(path).mkdirs(); -}