jake targets build-stable and build-latest now work

7 files changed, 16 insertions, 145 deletions

diff --git a/.#Jakefile b/.#Jakefile
deleted file mode 120000
index f774db9..0000000
--- a/.#Jakefile
+++ /dev/null
@@ -1 +0,0 @@
-hitman@xiaopo.1775:1262235051
\ No newline at end of file
diff --git a/Jakefile b/Jakefile
index 95643fa..76a3570 100644
--- a/Jakefile
+++ b/Jakefile
@@ -24,10 +24,16 @@ var LESSONS = [ ['~/tmp/karma_lesson1', 'karma_lesson1'],
 var includedLessons = [];
 var bundleType = '';
 
-var CLEAN = require('jake/clean').CLEAN; 
-CLEAN.include('**/#*#', '**/\.tmp');
+var CLEAN_LIB = require('jake/clean');
+var CLEAN = CLEAN_LIB.CLEAN; 
+CLEAN.include('**/#*#', '\.#*' , '**/\.tmp');
 CLEAN.exclude('\.git');
 
+var CLOBBER = CLEAN_LIB.CLOBBER; 
+CLOBBER.include('build/', '**/\.tmp');
+CLOBBER.exclude('\.git');
+
+
 //docs, documentation
 JAKE.task('docs', function(){
 	var path = './tools/jsdoc-toolkit';
@@ -53,7 +59,11 @@ JAKE.filedir('lessons-dir', function(){
 }); 
 
 
-JAKE.filedir('bundle-dir', function(){
+JAKE.task('lessons-bundle-dir', function(){
+    var lessonsTargetDir = FILE.join(bundleDir, 'lessons');
+    if(FILE.exists(lessonsTargetDir)){
+	FILE.rmtree(lessonsTargetDir);
+    }
     FILE.mkdirs(FILE.join(bundleDir, 'lessons'));
 }); 
 
@@ -88,16 +98,15 @@ var copyLessons = function(){
 	    var lessonDir = FILE.join(bundleDir, 'lessons');
 	    var cmdCopyLessons = "cp -r " + lessonsDir + "/" + 
 				    lessonName + " " + lessonDir;
-	    var cmdRmGitFiles = "find " + bundleDir + " -d -name '.git' " +
+	    var cmdRmGitFiles = "find " + bundleDir + " -type d -name '.git' " +
 		"-exec rm -rf {} \\; ";
 	    OS.system(cmdCopyLessons);
 	    OS.system(cmdRmGitFiles);
-	    
 	});
 };
 
 
-JAKE.task('build-stable', ['checkout', 'lessons-dir', 'bundle-dir'], function()
+JAKE.task('build-stable', ['checkout', 'lessons-dir', 'lessons-bundle-dir'], function()
 {
     LESSONS.forEach(function(lessonRepo) { 
 			prepareEachLessonDir(lessonRepo, "stable"); 
@@ -107,7 +116,7 @@ JAKE.task('build-stable', ['checkout', 'lessons-dir', 'bundle-dir'], function()
 
 JAKE.task('build', ['build-latest']);
 
-JAKE.task('build-latest',['checkout', 'lessons-dir'],  function()
+JAKE.task('build-latest',['checkout', 'lessons-dir', 'lessons-bundle-dir'],  function()
 {
     LESSONS.forEach(function(lessonRepo) { 
 			prepareEachLessonDir(lessonRepo, "master"); 
diff --git a/Jakefile~ b/Jakefile~
deleted file mode 100644
index fbb3e72..0000000
--- a/Jakefile~
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/env narwhal
- 
-var FILE = require("file"),
-    ENV = require("system").env,
-    OS = require("os"),
-    JAKE = require("jake");
-
-var CLEAN = require('jake/clean').CLEAN; 
-CLEAN.include('**/#*#', '**/\.tmp');
-CLEAN.exclude('\.git');
-
-//docs, documentation
-JAKE.task('docs', function(){
-	var path = './tools/jsdoc-toolkit';
-	 if(FILE.exists(path)){
-	     var cmd = 'java -jar ' + path + '/jsrun.jar ' + 
-		 path + '/app/run.js ' + './js/karma.js -d=docs/ ' +
-		 '-t=tools/jsdoc-toolkit/templates/jsdoc/';
-	     OS.system(cmd);
-	 } else {
-	     print("The folder ./tools/jsdoc-toolkit isn't present " +
-		   "you need it to generate documentation");
-	 }
-
-});
-
-
-/*
-JAKE.task("cleanfoo", function()
-{
-    cleanList.toString();
-    cleanList.forEach(function(aFilename)
-    {
-        try
-        {   print(aFilename);
-            FILE.rmtree(aFilename);
-        }
-        catch(anException)
-        {
-        }
-    });
-});
-*/
-
-/*var CLEAN = require('jake/clean').CLEAN; 
-var CLEANFOO = new JAKE.FileList("*.bak");
-
-//clean
-JAKE.task("cleanfoo", function()
-{   
-    print('foo');
-    print(CLEANFOO._items);
-    CLEANFOO.forEach(function(aFilename)
-    {  print('foo');
-        try
-        {   print(aFilename);
-            FILE.rmtree(aFilename);
-        }
-        catch(anException)
-        {
-	    print(anException);
-        }
-    });
-});
-*/
-//clobber
-
-//checkout bundle
-
-//checkout lessons
-
-
-//delete backup files and commit their removal
-
diff --git a/bin/kbuild.js~ b/bin/kbuild.js~
deleted file mode 100644
index 0b472f3..0000000
--- a/bin/kbuild.js~
+++ /dev/null
@@ -1,11 +0,0 @@
-
-//requires narwhal
-
-//list of repos
-var repos = [ ["folder_name", "git_url"],
-	       ["folder_name", "git_url"]
-	];
-
-var CLONE_DIR = "";
-
-var BUILD_DIR = "";
\ No newline at end of file
diff --git a/examples/NumberWords-svg/index.html~ b/examples/NumberWords-svg/index.html~
deleted file mode 100644
index a0f2568..0000000
--- a/examples/NumberWords-svg/index.html~
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>crossword demo</title>
-    <meta name="keywords" 
-	  content="karma,javascript,html5,sugar,sugarlabs,gsoc,ole,nepal,urugay" />
-    <link rel="stylesheet" type="text/css" href="jquery.svg.css" />
-    <link rel="stylesheet" type="text/css" href="css/lesson.css" />
-    <script type="text/javascript" src="../../js/jquery-1.3.2.min.js"></script>
-    <script type="text/javascript" src="../../js/karma.js"></script>
-    <script type="text/javascript" src="../../js/jquery.svg.js"></script>
-    <script type="text/javascript" src="../../js/jquery.svgdom.js"></script>
-    <script type="text/javascript" src="js/lesson.js"></script>
-  </head>
-  <body>
-    
-    <object id="crossword" data="assets/svg/crossword.svg" type="image/svg+xml">
-    </object>
-     
-  </body>
-</html>
\ No newline at end of file
diff --git a/examples/NumberWords-svg/js/lesson.js~ b/examples/NumberWords-svg/js/lesson.js~
deleted file mode 100644
index 2d04f79..0000000
--- a/examples/NumberWords-svg/js/lesson.js~
+++ /dev/null
@@ -1,24 +0,0 @@
-$(document).ready(
-    function(){
-	var k = Karma({
-			  svg :[    
-                              {name:'capitals', domId: 'capitals'},
-			      {name:'alien', domId: 'alien'},
-			      {name:'spaceship', domId: 'spaceship'},
-			      {name: 'help', domId: 'helpScreen'},
-			      {name:'playAgain', domId:'playAgain'},
-			      {name:'helpIcon', domId:'helpIcon'},
-			      {name:'quitIcon', domId:'quitIcon'}
-			  ],
-			  audio:[
-			      {name:'correct', file:'correct.ogg'},
-			      {name:'incorrect', file:'incorrect.ogg'}
-			  ]
-	});
-
-	k.ready(function() {
-
-
-	});
-
-    });
\ No newline at end of file
diff --git a/tools/xo_bundle/activity/activity.info~ b/tools/xo_bundle/activity/activity.info~
deleted file mode 100755
index 80b0fae..0000000
--- a/tools/xo_bundle/activity/activity.info~
+++ /dev/null
@@ -1,7 +0,0 @@
-[Activity]
-name = Karma 
-service_name = org.karmaeducation.Karma
-icon = activity-karma
-activity_version = 1 
-show_launcher = yes
-exec = ./firefox karma/examples/adding_up_to_10/index.html