Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 43AD110EA8 for ; Tue, 16 Jul 2013 01:56:08 +0000 (UTC) Received: (qmail 30672 invoked by uid 500); 16 Jul 2013 01:56:08 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 30654 invoked by uid 500); 16 Jul 2013 01:56:08 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 30643 invoked by uid 99); 16 Jul 2013 01:56:08 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Jul 2013 01:56:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E612F8A8A10; Tue, 16 Jul 2013 01:56:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bennmapes@apache.org To: commits@cordova.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: Updated tooling (kindof) for 3.0.0 reversion Date: Tue, 16 Jul 2013 01:56:07 +0000 (UTC) Updated Branches: refs/heads/master aa7d419d9 -> adc358142 Updated tooling (kindof) for 3.0.0 reversion Project: http://git-wip-us.apache.org/repos/asf/cordova-wp8/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp8/commit/adc35814 Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp8/tree/adc35814 Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp8/diff/adc35814 Branch: refs/heads/master Commit: adc358142b10b7b43c93ea971bb2b7d270086556 Parents: aa7d419 Author: Benn Mapes Authored: Mon Jul 15 18:39:59 2013 -0700 Committer: Benn Mapes Committed: Mon Jul 15 18:51:58 2013 -0700 ---------------------------------------------------------------------- wp7/framework/Properties/AssemblyInfo.cs | 6 ++--- wp7/tooling/scripts/dist.js | 6 ++--- wp7/tooling/scripts/reversion.js | 28 ++++++-------------- wp8/template/CordovaWP8AppProj.csproj | 6 ++--- wp8/tooling/scripts/dist.js | 4 +-- wp8/tooling/scripts/reversion.js | 38 ++++++--------------------- 6 files changed, 27 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/adc35814/wp7/framework/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --git a/wp7/framework/Properties/AssemblyInfo.cs b/wp7/framework/Properties/AssemblyInfo.cs index 6ddfe0b..122ead8 100644 --- a/wp7/framework/Properties/AssemblyInfo.cs +++ b/wp7/framework/Properties/AssemblyInfo.cs @@ -6,7 +6,7 @@ using System.Runtime.InteropServices; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("WPCordovaClassLib")] -[assembly: AssemblyDescription("2.9.0")] +[assembly: AssemblyDescription("0.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Cordova")] [assembly: AssemblyProduct("WPCordovaClassLib")] @@ -32,6 +32,6 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.9.0.0")] -[assembly: AssemblyFileVersion("2.9.0.0")] +[assembly: AssemblyVersion("0.0.0.0")] +[assembly: AssemblyFileVersion("0.0.0.0")] http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/adc35814/wp7/tooling/scripts/dist.js ---------------------------------------------------------------------- diff --git a/wp7/tooling/scripts/dist.js b/wp7/tooling/scripts/dist.js index fe2407c..7d185ba 100644 --- a/wp7/tooling/scripts/dist.js +++ b/wp7/tooling/scripts/dist.js @@ -43,13 +43,13 @@ var replace = false; var args = WScript.Arguments; Log("args = " + args); //Root folder of cordova-wp7 (i.e C:\Cordova\cordova-wp\cordova-wp7) -var rootPath = WScript.ScriptFullName.split('\\tooling\\', 1); +var rootPath = WScript.ScriptFullName.split('\\wp7\\tooling\\', 1); Log("rootPath = " + rootPath); // tooling scripts var scriptPath = '\\tooling\\scripts'; Log("scriptPath = " + scriptPath); //Get version number -var VERSION=read(rootPath+'\\..\\VERSION').replace(/\r\n/,'').replace(/\n/,''); +var VERSION=read(rootPath+'\\VERSION').replace(/\r\n/,'').replace(/\n/,''); Log("VERSION = " + VERSION); //Destination to build to @@ -148,7 +148,7 @@ if (args.Count() > 0) { WScript.Quit(1); } else if (args(0) == '-f') { - buildDestination = rootPath; + buildDestination = rootPath + '\\wp7'; replace = true; } else { http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/adc35814/wp7/tooling/scripts/reversion.js ---------------------------------------------------------------------- diff --git a/wp7/tooling/scripts/reversion.js b/wp7/tooling/scripts/reversion.js index 7754514..93de0bf 100644 --- a/wp7/tooling/scripts/reversion.js +++ b/wp7/tooling/scripts/reversion.js @@ -33,9 +33,9 @@ var args = WScript.Arguments, //Root folder of cordova-wp7 (i.e C:\Cordova\cordova-wp7) ROOT = WScript.ScriptFullName.split('\\tooling\\', 1), //Sub folder containing templates - TEMPLATES_PATH = '\\templates', + TEMPLATE_PATH = '\\template', //Sub folder for standalone project - STANDALONE_PATH = TEMPLATES_PATH + '\\standalone', + STANDALONE_PATH = TEMPLATE_PATH, //Sub folder containing framework FRAMEWORK_PATH = '\\framework', //Subfolder containing example project @@ -131,7 +131,7 @@ function exec_verbose(command) { function updateVersionNumbers() { WScript.StdOut.WriteLine("Updating version numbers...."); var version_regex = /(\d+)[.](\d+)[.](\d+)(rc\d)?/; - replaceInFile(BUILD_DESTINATION + '\\VERSION', version_regex, VERSION); + //replaceInFile(BUILD_DESTINATION + '\\VERSION', version_regex, VERSION); // replace assembly versions in framework var framework_regex = /Description\(\"(\d+)[.](\d+)[.](\d+)(rc\d)?\"\)\]/; //Will match ("x.x.x[rcx]")] replaceInFile(BUILD_DESTINATION + FRAMEWORK_PATH + "\\Properties\\AssemblyInfo.cs", framework_regex, "Description(\"" + VERSION + "\")]"); @@ -139,21 +139,18 @@ function updateVersionNumbers() { replaceInFile(BUILD_DESTINATION + FRAMEWORK_PATH + "\\Properties\\AssemblyInfo.cs", framework_regex, "Version(\"" + BASE_VERSION + "\")]"); // update standalone project - exec('%comspec% /c copy /Y /V ' + BUILD_DESTINATION + "\\VERSION " + BUILD_DESTINATION + STANDALONE_PATH + "\\VERSION"); + //exec('%comspec% /c copy /Y /V ' + BUILD_DESTINATION + "\\VERSION " + BUILD_DESTINATION + STANDALONE_PATH + "\\VERSION"); var cordova_regex = /cordova-(\d+)[.](\d+)[.](\d+)(rc\d)?/g; //Matches *first* cordova-x.x.x[rcx] (just ad g at end to make global) version_regex = /return\s*\"(\d+)[.](\d+)[.](\d+)(rc\d)?/; //Matches return "x.x.x[rcx] - replaceInFile(BUILD_DESTINATION + CORDOVA_LIB + '\\..\\Plugins\\Device.cs', version_regex, "return \"" + VERSION); + //replaceInFile(BUILD_DESTINATION + CORDOVA_LIB + '\\..\\Plugins\\Device.cs', version_regex, "return \"" + VERSION); - // update template discription - version_regex = /Cordova\s*(\d+)[.](\d+)[.](\d+)(rc\d)?\s*Windows/g; //Matches version: x.x.x[rcx] - replaceInFile(BUILD_DESTINATION + TEMPLATES_PATH + '\\vs\\description.txt', version_regex, "Cordova " + VERSION + " Windows"); // update .vstemplate files for the template zips. var name_regex = /CordovaWP7[_](\d+)[_](\d+)[_](\d+)(rc\d)?/g; - var discript_regex = /Cordova\s*(\d+)[.](\d+)[.](\d+)(rc\d)?/; + var discript_regex = /version:\s*(\d+)[.](\d+)[.](\d+)(rc\d)?/; - replaceInFile(BUILD_DESTINATION + TEMPLATES_PATH + '\\vs\\MyTemplateStandAlone.vstemplate', name_regex, 'CordovaWP7_' + VERSION.replace(/\./g, '_')); - replaceInFile(BUILD_DESTINATION + TEMPLATES_PATH + '\\vs\\MyTemplateStandAlone.vstemplate', discript_regex, "Cordova " + VERSION); + replaceInFile(BUILD_DESTINATION + TEMPLATE_PATH + '\\MyTemplate.vstemplate', name_regex, 'CordovaWP7_' + VERSION.replace(/\./g, '_')); + replaceInFile(BUILD_DESTINATION + TEMPLATE_PATH + '\\MyTemplate.vstemplate', discript_regex, "version: " + VERSION); } // delete all cordova.js and generated files (templates) from old version numbers @@ -193,15 +190,6 @@ function cleanup() fso.DeleteFile(BUILD_DESTINATION + '\\' + root_folder.Item(i).Name); } } - - var standalone_www = shell.NameSpace(BUILD_DESTINATION + STANDALONE_PATH + '\\www').Items(); - for(i = 0; i < standalone_www.Count; i++) - { - if(standalone_www.Item(i).Name.match(/cordova\-(\d+)[.](\d+)[.](\d+)(rc\d)?[.]js/)) - { - fso.DeleteFile(BUILD_DESTINATION + STANDALONE_PATH + '\\www\\' + standalone_www.Item(i).Name); - } - } } http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/adc35814/wp8/template/CordovaWP8AppProj.csproj ---------------------------------------------------------------------- diff --git a/wp8/template/CordovaWP8AppProj.csproj b/wp8/template/CordovaWP8AppProj.csproj index 2c501ac..960db28 100644 --- a/wp8/template/CordovaWP8AppProj.csproj +++ b/wp8/template/CordovaWP8AppProj.csproj @@ -123,9 +123,10 @@ App.xaml + + - @@ -134,13 +135,12 @@ - + - MainPage.xaml http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/adc35814/wp8/tooling/scripts/dist.js ---------------------------------------------------------------------- diff --git a/wp8/tooling/scripts/dist.js b/wp8/tooling/scripts/dist.js index 630133d..834546e 100644 --- a/wp8/tooling/scripts/dist.js +++ b/wp8/tooling/scripts/dist.js @@ -42,7 +42,7 @@ var replace = false; //arguments passed in var args = WScript.Arguments, //Root folder of cordova-wp8 (i.e C:\Cordova\cordova-wp8) - ROOT = WScript.ScriptFullName.split('\\tooling\\', 1), + ROOT = WScript.ScriptFullName.split('\\wp8\\tooling\\', 1), // tooling scripts SCRIPTS = '\\tooling\\scripts'; //Get version number @@ -144,7 +144,7 @@ if (args.Count() > 0) { WScript.Quit(1); } else if (args(0) == '-f') { - BUILD_DESTINATION = ROOT; + BUILD_DESTINATION = ROOT + '\\wp8'; replace = true; } else { http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/adc35814/wp8/tooling/scripts/reversion.js ---------------------------------------------------------------------- diff --git a/wp8/tooling/scripts/reversion.js b/wp8/tooling/scripts/reversion.js index 702733b..24e7d71 100644 --- a/wp8/tooling/scripts/reversion.js +++ b/wp8/tooling/scripts/reversion.js @@ -33,9 +33,9 @@ var args = WScript.Arguments, //Root folder of cordova-wp8 (i.e C:\Cordova\cordova-wp8) ROOT = WScript.ScriptFullName.split('\\tooling\\', 1), //Sub folder containing templates - TEMPLATES_PATH = '\\templates', + TEMPLATE_PATH = '\\template', //Sub folder for standalone project - STANDALONE_PATH = TEMPLATES_PATH + '\\standalone', + STANDALONE_PATH = TEMPLATE_PATH, //Sub folder containing framework FRAMEWORK_PATH = '\\framework', //Subfolder containing example project @@ -131,7 +131,7 @@ function exec_verbose(command) { function updateVersionNumbers() { WScript.StdOut.WriteLine("Updating version numbers...."); var version_regex = /(\d+)[.](\d+)[.](\d+)(rc\d)?/; - replaceInFile(BUILD_DESTINATION + '\\VERSION', version_regex, VERSION); + //replaceInFile(BUILD_DESTINATION + '\\VERSION', version_regex, VERSION); // replace assembaly versions in framework var framework_regex = /Description\(\"(\d+)[.](\d+)[.](\d+)(rc\d)?\"\)\]/; //Will match ("x.x.x[rcx]")] replaceInFile(BUILD_DESTINATION + FRAMEWORK_PATH + "\\Properties\\AssemblyInfo.cs", framework_regex, "Description(\"" + VERSION + "\")]"); @@ -139,21 +139,17 @@ function updateVersionNumbers() { replaceInFile(BUILD_DESTINATION + FRAMEWORK_PATH + "\\Properties\\AssemblyInfo.cs", framework_regex, "Version(\"" + BASE_VERSION + "\")]"); // update standalone project - exec('%comspec% /c copy /Y /V ' + BUILD_DESTINATION + "\\VERSION " + BUILD_DESTINATION + STANDALONE_PATH + "\\VERSION"); + //exec('%comspec% /c copy /Y /V ' + BUILD_DESTINATION + "\\VERSION " + BUILD_DESTINATION + STANDALONE_PATH + "\\VERSION"); var cordova_regex = /cordova-(\d+)[.](\d+)[.](\d+)(rc\d)?/g; //Matches *first* cordova-x.x.x[rcx] (just ad g at end to make global) version_regex = /return\s*\"(\d+)[.](\d+)[.](\d+)(rc\d)?/; //Matches return "x.x.x[rcx] - replaceInFile(BUILD_DESTINATION + CORDOVA_LIB + '\\..\\Plugins\\Device.cs', version_regex, "return \"" + VERSION); - - // update template discription - version_regex = /Cordova\s*(\d+)[.](\d+)[.](\d+)(rc\d)?\s*Windows/g; //Matches version: x.x.x[rcx] - replaceInFile(BUILD_DESTINATION + TEMPLATES_PATH + '\\vs\\description.txt', version_regex, "Cordova " + VERSION + " Windows"); + //replaceInFile(BUILD_DESTINATION + CORDOVA_LIB + '\\..\\Plugins\\Device.cs', version_regex, "return \"" + VERSION); // update .vstemplate files for the template zips. var name_regex = /CordovaWP8[_](\d+)[_](\d+)[_](\d+)(rc\d)?/g; - var discript_regex = /Cordova\s*(\d+)[.](\d+)[.](\d+)(rc\d)?/; + var discript_regex = /version:\s*(\d+)[.](\d+)[.](\d+)(rc\d)?/; - replaceInFile(BUILD_DESTINATION + TEMPLATES_PATH + '\\vs\\MyTemplateStandAlone.vstemplate', name_regex, 'CordovaWP8_' + VERSION.replace(/\./g, '_')); - replaceInFile(BUILD_DESTINATION + TEMPLATES_PATH + '\\vs\\MyTemplateStandAlone.vstemplate', discript_regex, "Cordova " + VERSION); + replaceInFile(BUILD_DESTINATION + TEMPLATE_PATH + '\\MyTemplate.vstemplate', name_regex, 'CordovaWP8_' + VERSION.replace(/\./g, '_')); + replaceInFile(BUILD_DESTINATION + TEMPLATE_PATH + '\\MyTemplate.vstemplate', discript_regex, "version: " + VERSION); } // delete all cordova.js and generated files (templates) from old version numbers @@ -193,24 +189,6 @@ function cleanup() fso.DeleteFile(BUILD_DESTINATION + '\\' + root_folder.Item(i).Name); } } - // remove old cordova.js - var example_www = shell.NameSpace(BUILD_DESTINATION + EXAMPLE_PATH + '\\www').Items(); - for(i = 0; i < example_www.Count; i++) - { - if(example_www.Item(i).Name.match(/cordova\-(\d+)[.](\d+)[.](\d+)(rc\d)?[.]js/)) - { - fso.DeleteFile(BUILD_DESTINATION + EXAMPLE_PATH + '\\www\\' + example_www.Item(i).Name); - } - } - - var standalone_www = shell.NameSpace(BUILD_DESTINATION + STANDALONE_PATH + '\\www').Items(); - for(i = 0; i < standalone_www.Count; i++) - { - if(standalone_www.Item(i).Name.match(/cordova\-(\d+)[.](\d+)[.](\d+)(rc\d)?[.]js/)) - { - fso.DeleteFile(BUILD_DESTINATION + STANDALONE_PATH + '\\www\\' + standalone_www.Item(i).Name); - } - } }