From d2407d1c2ae738fb602316c8eee706bd4bb2739a Mon Sep 17 00:00:00 2001
From: Aparajita Fishman <aparajita@vasudevaserver.org>
Date: Wed, 11 May 2011 12:17:24 -0400
Subject: [PATCH] Don't generate XML for docs, updated ThemeDescriptor capp
 template

---
 Tools/Documentation/Cappuccino.doxygen        |  2 +-
 .../Templates/ThemeDescriptor/Jakefile        | 31 ++++++++++++++-----
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/Tools/Documentation/Cappuccino.doxygen b/Tools/Documentation/Cappuccino.doxygen
index fc9f5524a..39d3e93dc 100644
--- a/Tools/Documentation/Cappuccino.doxygen
+++ b/Tools/Documentation/Cappuccino.doxygen
@@ -1280,7 +1280,7 @@ MAN_LINKS              = NO
 # generate an XML file that captures the structure of
 # the code including all documentation.
 
-GENERATE_XML           = YES
+GENERATE_XML           = NO
 
 # The XML_OUTPUT tag is used to specify where the XML pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
diff --git a/Tools/capp/Resources/Templates/ThemeDescriptor/Jakefile b/Tools/capp/Resources/Templates/ThemeDescriptor/Jakefile
index 9516150ef..2e9fa9527 100644
--- a/Tools/capp/Resources/Templates/ThemeDescriptor/Jakefile
+++ b/Tools/capp/Resources/Templates/ThemeDescriptor/Jakefile
@@ -3,14 +3,30 @@
  * __project.name__
  *
  * Created by __user.name__ on __project.date__.
+ *
  * Copyright __project.year__, __organization.name__. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 //===========================================================
 //  DO NOT REMOVE
 //===========================================================
 
-var ENV = require("system").env,
+var SYS = require("system"),
+    ENV = SYS.env,
     FILE = require("file"),
     OS = require("os");
 
@@ -38,9 +54,9 @@ var buildDir = "Build";
 var stream = require("narwhal/term").stream,
     JAKE = require("jake"),
     task = JAKE.task,
+    FileList = JAKE.FileList,
     CLEAN = require("jake/clean").CLEAN,
     CLOBBER = require("jake/clean").CLOBBER,
-    FileList = JAKE.FileList,
     blend = require("cappuccino/jake").blend,
     configuration = ENV["CONFIG"] || ENV["CONFIGURATION"] || ENV["c"] || "Debug",
     productName = "__project.nameasidentifier__",
@@ -91,7 +107,8 @@ task ("test-release", ["release"], function()
 });
 
 CLEAN.include(buildPath);
-CLOBBER.include(buildDir);
+CLOBBER.include(FILE.join(buildDir, "Debug"))
+       .include(FILE.join(buildDir, "Release"));
 
 task ("help", function()
 {
@@ -101,8 +118,8 @@ task ("help", function()
     colorPrint("__project.name__ - Theme Blend", "bold+green");
     colorPrint("--------------------------------------------------------------------------", "bold+green");
 
-    describeTask(app, "debug", "Builds a debug version at " + FILE.join(buildDir, "Debug"));
-    describeTask(app, "release", "Builds a release version at " + FILE.join(buildDir, "Release"));
+    describeTask(app, "debug", "Builds a debug version at " + FILE.join(buildDir, "Debug", productName));
+    describeTask(app, "release", "Builds a release version at " + FILE.join(buildDir, "Release", productName));
     describeTask(app, "all", "Builds a debug and release version");
     describeTask(app, "test", "Builds a debug version, symlinks to the installed BlendKit framework,\nand opens the theme showcase in the default browser");
     describeTask(app, "test-release", "Builds a release version, symlinks to the installed BlendKit framework,\nand opens the theme showcase in the default browser");
@@ -123,11 +140,11 @@ var describeTask = function(application, task, description)
 
 var symlinkBlendKit = function(destinationPath)
 {
-    if (FILE.isDirectory(destinationPath))
+    if (FILE.exists(destinationPath))
         return;
 
     var blendKitPath = null,
-        path = FILE.join(require("system").prefix, "packages", "cappuccino", "Frameworks", "BlendKit");
+        path = FILE.join(SYS.prefix, "packages", "cappuccino", "Frameworks", "BlendKit");
 
     if (FILE.isDirectory(path))
         blendKitPath = path;