You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2013/05/29 08:59:14 UTC
git commit: create removes user files,
clean does not remove user files
Updated Branches:
refs/heads/master 6f80793d2 -> a3ee95cd5
create removes user files, clean does not remove user files
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/a3ee95cd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/a3ee95cd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/a3ee95cd
Branch: refs/heads/master
Commit: a3ee95cd505c68d5afac646e50c4de9e5ea90e31
Parents: 6f80793
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Tue May 28 23:58:42 2013 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue May 28 23:58:42 2013 -0700
----------------------------------------------------------------------
windows8/bin/create.js | 20 ++++++++---
windows8/template/cordova/lib/clean.js | 50 ++------------------------
2 files changed, 19 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/a3ee95cd/windows8/bin/create.js
----------------------------------------------------------------------
diff --git a/windows8/bin/create.js b/windows8/bin/create.js
index 026c81c..5c7d8c5 100644
--- a/windows8/bin/create.js
+++ b/windows8/bin/create.js
@@ -120,6 +120,16 @@ function genGuid() {
return strGuid;
}
+// deletes the path element if it exists
+function delete_if_exists(path) {
+ if (fso.FolderExists(path)) {
+ fso.DeleteFolder(path);
+ }
+ else if (fso.FileExists(path)) {
+ fso.DeleteFile(path);
+ }
+}
+
// creates new project in path, with the given package and app name
function create(destPath, namespace, name, guid) {
@@ -158,11 +168,11 @@ function create(destPath, namespace, name, guid) {
// cleanup
// Delete bld forder and bin folder
- fso.DeleteFolder(destPath + "\\bld");
- fso.DeleteFolder(destPath + "\\bin");
- // delete any user objects that exist
- fso.DeleteFile(destPath + "\\*.user");
- fso.DeleteFile(destPath + "\\*.suo");
+
+ delete_if_exists(destPath + "\\bld");
+ delete_if_exists(destPath + "\\bin");
+ delete_if_exists(destPath + "\\*.user");
+ delete_if_exists(destPath + "\\*.suo");
// TODO: Name the project according to the arguments
// update the solution to include the new project by name
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/a3ee95cd/windows8/template/cordova/lib/clean.js
----------------------------------------------------------------------
diff --git a/windows8/template/cordova/lib/clean.js b/windows8/template/cordova/lib/clean.js
index caa1957..6ef19af 100644
--- a/windows8/template/cordova/lib/clean.js
+++ b/windows8/template/cordova/lib/clean.js
@@ -28,13 +28,8 @@ var ROOT = WScript.ScriptFullName.split('\\cordova\\lib\\clean.js').join('');
// help function
function Usage() {
Log("");
- Log("Usage: clean [ --debug | --release ]");
- Log(" --debug : Cleans generated debug files in project.");
- Log(" --release : Cleans generated release files in project.");
- Log("examples:");
- Log(" clean --debug");
- Log(" clean");
- Log(" - deletes all generated files in project");
+ Log("Usage: clean");
+ Log(" - deletes all generated files in project");
Log("");
}
@@ -50,29 +45,10 @@ function Log(msg, error) {
// cleans any generated files in the cordova project
function clean_project(path) {
- delete_if_exists(path + "\\obj");
- delete_if_exists(path + "\\Bin");
- // delete AppName.csproj.user as well? Service References?
- var proj_folder = fso.GetFolder(path);
- var proj_files = new Enumerator(proj_folder.Files);
- for (;!proj_files.atEnd(); proj_files.moveNext()) {
- if (fso.GetExtensionName(proj_files.item()).match(/user/)) {
- fso.DeleteFile(proj_files.item());
- }
- }
+ delete_if_exists(path + "\\bld");
+ delete_if_exists(path + "\\bin");
}
-// cleans any files generated by build --debug
-function clean_debug(path) {
- delete_if_exists(path + "\\obj\\Debug");
- delete_if_exists(path + "\\Bin\\Debug");
-}
-
-// cleans any files generated by build --release
-function clean_release(path) {
- delete_if_exists(path + "\\obj\\Release");
- delete_if_exists(path + "\\Bin\\Release");
-}
// deletes the path element if it exists
function delete_if_exists(path) {
@@ -97,24 +73,6 @@ if (args.Count() > 0) {
Usage();
WScript.Quit(2);
}
- else if (fso.FolderExists(ROOT)) {
- if (args(0) == "--debug" || args(0) == "-d") {
- clean_debug(ROOT);
- }
- else if (args(0) == "--release" || args(0) == "-r") {
- clean_release(ROOT);
- }
- else {
- Log("Error: \"" + args(0) + "\" is not recognized as a build option", true);
- Usage();
- WScript.Quit(2);
- }
- }
- else {
- Log("Error: Project directory not found,", true);
- Usage();
- WScript.Quit(2);
- }
}
else {
if (fso.FolderExists(ROOT)) {