You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by be...@apache.org on 2013/05/24 21:15:57 UTC
[1/6] wp7 commit: CB-3444 rename cordova.js,
no more version in file name
Updated Branches:
refs/heads/3.0.0 43efc47b0 -> 0a264e3b3
CB-3444 rename cordova.js, no more version in file name
Project: http://git-wip-us.apache.org/repos/asf/cordova-wp7/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp7/commit/700a0ea3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp7/tree/700a0ea3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp7/diff/700a0ea3
Branch: refs/heads/3.0.0
Commit: 700a0ea36908a103a3da39fadbcf8e81df5c2e20
Parents: 43efc47
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Wed May 22 16:07:00 2013 -0700
Committer: Benn Mapes <be...@gmail.com>
Committed: Fri May 24 12:09:08 2013 -0700
----------------------------------------------------------------------
templates/standalone/CordovaAppProj.csproj | 10 +
templates/standalone/www/cordova.js | 200 +++++++++++-----------
2 files changed, 110 insertions(+), 100 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-wp7/blob/700a0ea3/templates/standalone/CordovaAppProj.csproj
----------------------------------------------------------------------
diff --git a/templates/standalone/CordovaAppProj.csproj b/templates/standalone/CordovaAppProj.csproj
index 3e0bc51..e123adf 100644
--- a/templates/standalone/CordovaAppProj.csproj
+++ b/templates/standalone/CordovaAppProj.csproj
@@ -142,6 +142,16 @@
<Content Include="CordovaSourceDictionary.xml">
<SubType>Designer</SubType>
</Content>
+ <Content Include="www\cordova.js" />
+ <Content Include="www\network.html">
+ <SubType>Designer</SubType>
+ </Content>
+ <Content Include="www\notification.html">
+ <SubType>Designer</SubType>
+ </Content>
+ <Content Include="www\storage.html">
+ <SubType>Designer</SubType>
+ </Content>
<None Include="BuildManifestProcessor.js" />
<None Include="Properties\AppManifest.xml">
<SubType>Designer</SubType>
http://git-wip-us.apache.org/repos/asf/cordova-wp7/blob/700a0ea3/templates/standalone/www/cordova.js
----------------------------------------------------------------------
diff --git a/templates/standalone/www/cordova.js b/templates/standalone/www/cordova.js
index 42c8781..0d763d9 100644
--- a/templates/standalone/www/cordova.js
+++ b/templates/standalone/www/cordova.js
@@ -1,5 +1,5 @@
// Platform: windowsphone
-// 2.7.0rc1-73-g0bca505
+// 2.8.0rc1-0-g22bc4d8
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,8 +19,8 @@
under the License.
*/
;(function() {
-var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-73-g0bca505';
-// file: lib\scripts\require.js
+var CORDOVA_JS_BUILD_LABEL = '2.8.0rc1-0-g22bc4d8';
+// file: lib/scripts/require.js
var require,
define;
@@ -329,7 +329,7 @@ module.exports = cordova;
});
-// file: lib\common\argscheck.js
+// file: lib/common/argscheck.js
define("cordova/argscheck", function(require, exports, module) {
var exec = require('cordova/exec');
@@ -395,7 +395,7 @@ moduleExports.enableChecks = true;
});
-// file: lib\common\builder.js
+// file: lib/common/builder.js
define("cordova/builder", function(require, exports, module) {
var utils = require('cordova/utils');
@@ -508,7 +508,7 @@ exports.replaceHookForTesting = function() {};
});
-// file: lib\common\channel.js
+// file: lib/common/channel.js
define("cordova/channel", function(require, exports, module) {
var utils = require('cordova/utils'),
@@ -758,7 +758,7 @@ module.exports = channel;
});
-// file: lib\common\commandProxy.js
+// file: lib/common/commandProxy.js
define("cordova/commandProxy", function(require, exports, module) {
@@ -788,7 +788,7 @@ module.exports = {
};
});
-// file: lib\windowsphone\exec.js
+// file: lib/windowsphone/exec.js
define("cordova/exec", function(require, exports, module) {
var cordova = require('cordova');
@@ -841,7 +841,7 @@ module.exports = function(success, fail, service, action, args) {
});
-// file: lib\common\modulemapper.js
+// file: lib/common/modulemapper.js
define("cordova/modulemapper", function(require, exports, module) {
var builder = require('cordova/builder'),
@@ -942,7 +942,7 @@ exports.reset();
});
-// file: lib\windowsphone\platform.js
+// file: lib/windowsphone/platform.js
define("cordova/platform", function(require, exports, module) {
var cordova = require('cordova'),
@@ -969,7 +969,7 @@ module.exports = {
});
-// file: lib\common\plugin\Acceleration.js
+// file: lib/common/plugin/Acceleration.js
define("cordova/plugin/Acceleration", function(require, exports, module) {
var Acceleration = function(x, y, z, timestamp) {
@@ -983,7 +983,7 @@ module.exports = Acceleration;
});
-// file: lib\common\plugin\Camera.js
+// file: lib/common/plugin/Camera.js
define("cordova/plugin/Camera", function(require, exports, module) {
var argscheck = require('cordova/argscheck'),
@@ -1041,7 +1041,7 @@ module.exports = cameraExport;
});
-// file: lib\common\plugin\CameraConstants.js
+// file: lib/common/plugin/CameraConstants.js
define("cordova/plugin/CameraConstants", function(require, exports, module) {
module.exports = {
@@ -1079,7 +1079,7 @@ module.exports = {
});
-// file: lib\common\plugin\CameraPopoverHandle.js
+// file: lib/common/plugin/CameraPopoverHandle.js
define("cordova/plugin/CameraPopoverHandle", function(require, exports, module) {
var exec = require('cordova/exec');
@@ -1097,7 +1097,7 @@ module.exports = CameraPopoverHandle;
});
-// file: lib\common\plugin\CameraPopoverOptions.js
+// file: lib/common/plugin/CameraPopoverOptions.js
define("cordova/plugin/CameraPopoverOptions", function(require, exports, module) {
var Camera = require('cordova/plugin/CameraConstants');
@@ -1119,7 +1119,7 @@ module.exports = CameraPopoverOptions;
});
-// file: lib\common\plugin\CaptureAudioOptions.js
+// file: lib/common/plugin/CaptureAudioOptions.js
define("cordova/plugin/CaptureAudioOptions", function(require, exports, module) {
/**
@@ -1136,7 +1136,7 @@ module.exports = CaptureAudioOptions;
});
-// file: lib\common\plugin\CaptureError.js
+// file: lib/common/plugin/CaptureError.js
define("cordova/plugin/CaptureError", function(require, exports, module) {
/**
@@ -1161,7 +1161,7 @@ module.exports = CaptureError;
});
-// file: lib\common\plugin\CaptureImageOptions.js
+// file: lib/common/plugin/CaptureImageOptions.js
define("cordova/plugin/CaptureImageOptions", function(require, exports, module) {
/**
@@ -1176,7 +1176,7 @@ module.exports = CaptureImageOptions;
});
-// file: lib\common\plugin\CaptureVideoOptions.js
+// file: lib/common/plugin/CaptureVideoOptions.js
define("cordova/plugin/CaptureVideoOptions", function(require, exports, module) {
/**
@@ -1193,7 +1193,7 @@ module.exports = CaptureVideoOptions;
});
-// file: lib\common\plugin\CompassError.js
+// file: lib/common/plugin/CompassError.js
define("cordova/plugin/CompassError", function(require, exports, module) {
/**
@@ -1212,7 +1212,7 @@ module.exports = CompassError;
});
-// file: lib\common\plugin\CompassHeading.js
+// file: lib/common/plugin/CompassHeading.js
define("cordova/plugin/CompassHeading", function(require, exports, module) {
var CompassHeading = function(magneticHeading, trueHeading, headingAccuracy, timestamp) {
@@ -1226,7 +1226,7 @@ module.exports = CompassHeading;
});
-// file: lib\common\plugin\ConfigurationData.js
+// file: lib/common/plugin/ConfigurationData.js
define("cordova/plugin/ConfigurationData", function(require, exports, module) {
/**
@@ -1247,7 +1247,7 @@ module.exports = ConfigurationData;
});
-// file: lib\common\plugin\Connection.js
+// file: lib/common/plugin/Connection.js
define("cordova/plugin/Connection", function(require, exports, module) {
/**
@@ -1266,7 +1266,7 @@ module.exports = {
});
-// file: lib\common\plugin\Contact.js
+// file: lib/common/plugin/Contact.js
define("cordova/plugin/Contact", function(require, exports, module) {
var argscheck = require('cordova/argscheck'),
@@ -1428,7 +1428,7 @@ module.exports = Contact;
});
-// file: lib\common\plugin\ContactAddress.js
+// file: lib/common/plugin/ContactAddress.js
define("cordova/plugin/ContactAddress", function(require, exports, module) {
/**
@@ -1459,7 +1459,7 @@ module.exports = ContactAddress;
});
-// file: lib\common\plugin\ContactError.js
+// file: lib/common/plugin/ContactError.js
define("cordova/plugin/ContactError", function(require, exports, module) {
/**
@@ -1486,7 +1486,7 @@ module.exports = ContactError;
});
-// file: lib\common\plugin\ContactField.js
+// file: lib/common/plugin/ContactField.js
define("cordova/plugin/ContactField", function(require, exports, module) {
/**
@@ -1508,7 +1508,7 @@ module.exports = ContactField;
});
-// file: lib\common\plugin\ContactFindOptions.js
+// file: lib/common/plugin/ContactFindOptions.js
define("cordova/plugin/ContactFindOptions", function(require, exports, module) {
/**
@@ -1527,7 +1527,7 @@ module.exports = ContactFindOptions;
});
-// file: lib\common\plugin\ContactName.js
+// file: lib/common/plugin/ContactName.js
define("cordova/plugin/ContactName", function(require, exports, module) {
/**
@@ -1553,7 +1553,7 @@ module.exports = ContactName;
});
-// file: lib\common\plugin\ContactOrganization.js
+// file: lib/common/plugin/ContactOrganization.js
define("cordova/plugin/ContactOrganization", function(require, exports, module) {
/**
@@ -1582,7 +1582,7 @@ module.exports = ContactOrganization;
});
-// file: lib\common\plugin\Coordinates.js
+// file: lib/common/plugin/Coordinates.js
define("cordova/plugin/Coordinates", function(require, exports, module) {
/**
@@ -1636,7 +1636,7 @@ module.exports = Coordinates;
});
-// file: lib\common\plugin\DirectoryEntry.js
+// file: lib/common/plugin/DirectoryEntry.js
define("cordova/plugin/DirectoryEntry", function(require, exports, module) {
var argscheck = require('cordova/argscheck'),
@@ -1727,7 +1727,7 @@ module.exports = DirectoryEntry;
});
-// file: lib\common\plugin\DirectoryReader.js
+// file: lib/common/plugin/DirectoryReader.js
define("cordova/plugin/DirectoryReader", function(require, exports, module) {
var exec = require('cordova/exec'),
@@ -1775,7 +1775,7 @@ module.exports = DirectoryReader;
});
-// file: lib\common\plugin\Entry.js
+// file: lib/common/plugin/Entry.js
define("cordova/plugin/Entry", function(require, exports, module) {
var argscheck = require('cordova/argscheck'),
@@ -1980,7 +1980,7 @@ module.exports = Entry;
});
-// file: lib\common\plugin\File.js
+// file: lib/common/plugin/File.js
define("cordova/plugin/File", function(require, exports, module) {
/**
@@ -2042,7 +2042,7 @@ module.exports = File;
});
-// file: lib\common\plugin\FileEntry.js
+// file: lib/common/plugin/FileEntry.js
define("cordova/plugin/FileEntry", function(require, exports, module) {
var utils = require('cordova/utils'),
@@ -2107,7 +2107,7 @@ module.exports = FileEntry;
});
-// file: lib\common\plugin\FileError.js
+// file: lib/common/plugin/FileError.js
define("cordova/plugin/FileError", function(require, exports, module) {
/**
@@ -2138,7 +2138,7 @@ module.exports = FileError;
});
-// file: lib\common\plugin\FileReader.js
+// file: lib/common/plugin/FileReader.js
define("cordova/plugin/FileReader", function(require, exports, module) {
var exec = require('cordova/exec'),
@@ -2514,7 +2514,7 @@ module.exports = FileReader;
});
-// file: lib\common\plugin\FileSystem.js
+// file: lib/common/plugin/FileSystem.js
define("cordova/plugin/FileSystem", function(require, exports, module) {
var DirectoryEntry = require('cordova/plugin/DirectoryEntry');
@@ -2537,7 +2537,7 @@ module.exports = FileSystem;
});
-// file: lib\common\plugin\FileTransfer.js
+// file: lib/common/plugin/FileTransfer.js
define("cordova/plugin/FileTransfer", function(require, exports, module) {
var argscheck = require('cordova/argscheck'),
@@ -2729,7 +2729,7 @@ module.exports = FileTransfer;
});
-// file: lib\common\plugin\FileTransferError.js
+// file: lib/common/plugin/FileTransferError.js
define("cordova/plugin/FileTransferError", function(require, exports, module) {
/**
@@ -2753,7 +2753,7 @@ module.exports = FileTransferError;
});
-// file: lib\common\plugin\FileUploadOptions.js
+// file: lib/common/plugin/FileUploadOptions.js
define("cordova/plugin/FileUploadOptions", function(require, exports, module) {
/**
@@ -2779,7 +2779,7 @@ module.exports = FileUploadOptions;
});
-// file: lib\common\plugin\FileUploadResult.js
+// file: lib/common/plugin/FileUploadResult.js
define("cordova/plugin/FileUploadResult", function(require, exports, module) {
/**
@@ -2796,7 +2796,7 @@ module.exports = FileUploadResult;
});
-// file: lib\common\plugin\FileWriter.js
+// file: lib/common/plugin/FileWriter.js
define("cordova/plugin/FileWriter", function(require, exports, module) {
var exec = require('cordova/exec'),
@@ -3055,7 +3055,7 @@ module.exports = FileWriter;
});
-// file: lib\common\plugin\Flags.js
+// file: lib/common/plugin/Flags.js
define("cordova/plugin/Flags", function(require, exports, module) {
/**
@@ -3076,7 +3076,7 @@ module.exports = Flags;
});
-// file: lib\common\plugin\GlobalizationError.js
+// file: lib/common/plugin/GlobalizationError.js
define("cordova/plugin/GlobalizationError", function(require, exports, module) {
@@ -3102,7 +3102,7 @@ module.exports = GlobalizationError;
});
-// file: lib\common\plugin\InAppBrowser.js
+// file: lib/common/plugin/InAppBrowser.js
define("cordova/plugin/InAppBrowser", function(require, exports, module) {
var exec = require('cordova/exec');
@@ -3178,7 +3178,7 @@ module.exports = function(strUrl, strWindowName, strWindowFeatures) {
});
-// file: lib\common\plugin\LocalFileSystem.js
+// file: lib/common/plugin/LocalFileSystem.js
define("cordova/plugin/LocalFileSystem", function(require, exports, module) {
var exec = require('cordova/exec');
@@ -3197,7 +3197,7 @@ module.exports = LocalFileSystem;
});
-// file: lib\common\plugin\Media.js
+// file: lib/common/plugin/Media.js
define("cordova/plugin/Media", function(require, exports, module) {
var argscheck = require('cordova/argscheck'),
@@ -3377,7 +3377,7 @@ module.exports = Media;
});
-// file: lib\common\plugin\MediaError.js
+// file: lib/common/plugin/MediaError.js
define("cordova/plugin/MediaError", function(require, exports, module) {
/**
@@ -3417,7 +3417,7 @@ module.exports = _MediaError;
});
-// file: lib\common\plugin\MediaFile.js
+// file: lib/common/plugin/MediaFile.js
define("cordova/plugin/MediaFile", function(require, exports, module) {
var utils = require('cordova/utils'),
@@ -3457,7 +3457,7 @@ module.exports = MediaFile;
});
-// file: lib\common\plugin\MediaFileData.js
+// file: lib/common/plugin/MediaFileData.js
define("cordova/plugin/MediaFileData", function(require, exports, module) {
/**
@@ -3481,7 +3481,7 @@ module.exports = MediaFileData;
});
-// file: lib\common\plugin\Metadata.js
+// file: lib/common/plugin/Metadata.js
define("cordova/plugin/Metadata", function(require, exports, module) {
/**
@@ -3497,7 +3497,7 @@ module.exports = Metadata;
});
-// file: lib\common\plugin\Position.js
+// file: lib/common/plugin/Position.js
define("cordova/plugin/Position", function(require, exports, module) {
var Coordinates = require('cordova/plugin/Coordinates');
@@ -3515,7 +3515,7 @@ module.exports = Position;
});
-// file: lib\common\plugin\PositionError.js
+// file: lib/common/plugin/PositionError.js
define("cordova/plugin/PositionError", function(require, exports, module) {
/**
@@ -3538,7 +3538,7 @@ module.exports = PositionError;
});
-// file: lib\common\plugin\ProgressEvent.js
+// file: lib/common/plugin/ProgressEvent.js
define("cordova/plugin/ProgressEvent", function(require, exports, module) {
// If ProgressEvent exists in global context, use it already, otherwise use our own polyfill
@@ -3590,7 +3590,7 @@ module.exports = ProgressEvent;
});
-// file: lib\common\plugin\accelerometer.js
+// file: lib/common/plugin/accelerometer.js
define("cordova/plugin/accelerometer", function(require, exports, module) {
/**
@@ -3745,7 +3745,7 @@ module.exports = accelerometer;
});
-// file: lib\common\plugin\accelerometer\symbols.js
+// file: lib/common/plugin/accelerometer/symbols.js
define("cordova/plugin/accelerometer/symbols", function(require, exports, module) {
@@ -3756,7 +3756,7 @@ modulemapper.defaults('cordova/plugin/accelerometer', 'navigator.accelerometer')
});
-// file: lib\common\plugin\battery.js
+// file: lib/common/plugin/battery.js
define("cordova/plugin/battery", function(require, exports, module) {
/**
@@ -3840,7 +3840,7 @@ module.exports = battery;
});
-// file: lib\common\plugin\battery\symbols.js
+// file: lib/common/plugin/battery/symbols.js
define("cordova/plugin/battery/symbols", function(require, exports, module) {
@@ -3850,7 +3850,7 @@ modulemapper.defaults('cordova/plugin/battery', 'navigator.battery');
});
-// file: lib\common\plugin\camera\symbols.js
+// file: lib/common/plugin/camera/symbols.js
define("cordova/plugin/camera/symbols", function(require, exports, module) {
@@ -3862,7 +3862,7 @@ modulemapper.defaults('cordova/plugin/CameraPopoverOptions', 'CameraPopoverOptio
});
-// file: lib\common\plugin\capture.js
+// file: lib/common/plugin/capture.js
define("cordova/plugin/capture", function(require, exports, module) {
var exec = require('cordova/exec'),
@@ -3940,7 +3940,7 @@ module.exports = new Capture();
});
-// file: lib\common\plugin\capture\symbols.js
+// file: lib/common/plugin/capture/symbols.js
define("cordova/plugin/capture/symbols", function(require, exports, module) {
var modulemapper = require('cordova/modulemapper');
@@ -3956,7 +3956,7 @@ modulemapper.clobbers('cordova/plugin/capture', 'navigator.device.capture');
});
-// file: lib\common\plugin\compass.js
+// file: lib/common/plugin/compass.js
define("cordova/plugin/compass", function(require, exports, module) {
var argscheck = require('cordova/argscheck'),
@@ -4043,7 +4043,7 @@ module.exports = compass;
});
-// file: lib\common\plugin\compass\symbols.js
+// file: lib/common/plugin/compass/symbols.js
define("cordova/plugin/compass/symbols", function(require, exports, module) {
@@ -4055,7 +4055,7 @@ modulemapper.clobbers('cordova/plugin/compass', 'navigator.compass');
});
-// file: lib\common\plugin\console-via-logger.js
+// file: lib/common/plugin/console-via-logger.js
define("cordova/plugin/console-via-logger", function(require, exports, module) {
//------------------------------------------------------------------------------
@@ -4227,7 +4227,7 @@ for (var key in console) {
});
-// file: lib\common\plugin\contacts.js
+// file: lib/common/plugin/contacts.js
define("cordova/plugin/contacts", function(require, exports, module) {
var argscheck = require('cordova/argscheck'),
@@ -4288,7 +4288,7 @@ module.exports = contacts;
});
-// file: lib\common\plugin\contacts\symbols.js
+// file: lib/common/plugin/contacts/symbols.js
define("cordova/plugin/contacts/symbols", function(require, exports, module) {
@@ -4305,7 +4305,7 @@ modulemapper.clobbers('cordova/plugin/ContactOrganization', 'ContactOrganization
});
-// file: lib\common\plugin\device.js
+// file: lib/common/plugin/device.js
define("cordova/plugin/device", function(require, exports, module) {
var argscheck = require('cordova/argscheck'),
@@ -4368,7 +4368,7 @@ module.exports = new Device();
});
-// file: lib\common\plugin\device\symbols.js
+// file: lib/common/plugin/device/symbols.js
define("cordova/plugin/device/symbols", function(require, exports, module) {
@@ -4378,7 +4378,7 @@ modulemapper.clobbers('cordova/plugin/device', 'device');
});
-// file: lib\common\plugin\echo.js
+// file: lib/common/plugin/echo.js
define("cordova/plugin/echo", function(require, exports, module) {
var exec = require('cordova/exec'),
@@ -4416,7 +4416,7 @@ module.exports = function(successCallback, errorCallback, message, forceAsync) {
});
-// file: lib\windowsphone\plugin\file\symbols.js
+// file: lib/windowsphone/plugin/file/symbols.js
define("cordova/plugin/file/symbols", function(require, exports, module) {
@@ -4427,7 +4427,7 @@ symbolshelper(modulemapper.defaults);
});
-// file: lib\common\plugin\file\symbolshelper.js
+// file: lib/common/plugin/file/symbolshelper.js
define("cordova/plugin/file/symbolshelper", function(require, exports, module) {
module.exports = function(exportFunc) {
@@ -4452,7 +4452,7 @@ module.exports = function(exportFunc) {
});
-// file: lib\windowsphone\plugin\filetransfer\symbols.js
+// file: lib/windowsphone/plugin/filetransfer/symbols.js
define("cordova/plugin/filetransfer/symbols", function(require, exports, module) {
@@ -4463,7 +4463,7 @@ modulemapper.clobbers('cordova/plugin/FileTransferError', 'FileTransferError');
});
-// file: lib\common\plugin\geolocation.js
+// file: lib/common/plugin/geolocation.js
define("cordova/plugin/geolocation", function(require, exports, module) {
var argscheck = require('cordova/argscheck'),
@@ -4659,7 +4659,7 @@ module.exports = geolocation;
});
-// file: lib\common\plugin\geolocation\symbols.js
+// file: lib/common/plugin/geolocation/symbols.js
define("cordova/plugin/geolocation/symbols", function(require, exports, module) {
@@ -4672,7 +4672,7 @@ modulemapper.clobbers('cordova/plugin/Coordinates', 'Coordinates');
});
-// file: lib\common\plugin\globalization.js
+// file: lib/common/plugin/globalization.js
define("cordova/plugin/globalization", function(require, exports, module) {
var argscheck = require('cordova/argscheck'),
@@ -5048,7 +5048,7 @@ module.exports = globalization;
});
-// file: lib\common\plugin\globalization\symbols.js
+// file: lib/common/plugin/globalization/symbols.js
define("cordova/plugin/globalization/symbols", function(require, exports, module) {
@@ -5059,7 +5059,7 @@ modulemapper.clobbers('cordova/plugin/GlobalizationError', 'GlobalizationError')
});
-// file: lib\windowsphone\plugin\inappbrowser\symbols.js
+// file: lib/windowsphone/plugin/inappbrowser/symbols.js
define("cordova/plugin/inappbrowser/symbols", function(require, exports, module) {
@@ -5069,7 +5069,7 @@ modulemapper.clobbers('cordova/plugin/InAppBrowser', 'open');
});
-// file: lib\common\plugin\logger.js
+// file: lib/common/plugin/logger.js
define("cordova/plugin/logger", function(require, exports, module) {
//------------------------------------------------------------------------------
@@ -5399,7 +5399,7 @@ document.addEventListener("deviceready", logger.__onDeviceReady, false);
});
-// file: lib\common\plugin\logger\symbols.js
+// file: lib/common/plugin/logger/symbols.js
define("cordova/plugin/logger/symbols", function(require, exports, module) {
@@ -5409,7 +5409,7 @@ modulemapper.clobbers('cordova/plugin/logger', 'cordova.logger');
});
-// file: lib\windowsphone\plugin\media\symbols.js
+// file: lib/windowsphone/plugin/media/symbols.js
define("cordova/plugin/media/symbols", function(require, exports, module) {
@@ -5420,7 +5420,7 @@ modulemapper.defaults('cordova/plugin/MediaError', 'MediaError');
});
-// file: lib\common\plugin\network.js
+// file: lib/common/plugin/network.js
define("cordova/plugin/network", function(require, exports, module) {
var exec = require('cordova/exec'),
@@ -5492,7 +5492,7 @@ module.exports = me;
});
-// file: lib\common\plugin\networkstatus\symbols.js
+// file: lib/common/plugin/networkstatus/symbols.js
define("cordova/plugin/networkstatus/symbols", function(require, exports, module) {
@@ -5504,7 +5504,7 @@ modulemapper.defaults('cordova/plugin/Connection', 'Connection');
});
-// file: lib\common\plugin\notification.js
+// file: lib/common/plugin/notification.js
define("cordova/plugin/notification", function(require, exports, module) {
var exec = require('cordova/exec');
@@ -5607,7 +5607,7 @@ module.exports = {
});
-// file: lib\common\plugin\notification\symbols.js
+// file: lib/common/plugin/notification/symbols.js
define("cordova/plugin/notification/symbols", function(require, exports, module) {
@@ -5617,7 +5617,7 @@ modulemapper.defaults('cordova/plugin/notification', 'navigator.notification');
});
-// file: lib\common\plugin\requestFileSystem.js
+// file: lib/common/plugin/requestFileSystem.js
define("cordova/plugin/requestFileSystem", function(require, exports, module) {
var argscheck = require('cordova/argscheck'),
@@ -5663,7 +5663,7 @@ module.exports = requestFileSystem;
});
-// file: lib\common\plugin\resolveLocalFileSystemURI.js
+// file: lib/common/plugin/resolveLocalFileSystemURI.js
define("cordova/plugin/resolveLocalFileSystemURI", function(require, exports, module) {
var argscheck = require('cordova/argscheck'),
@@ -5712,7 +5712,7 @@ module.exports = function(uri, successCallback, errorCallback) {
});
-// file: lib\common\plugin\splashscreen.js
+// file: lib/common/plugin/splashscreen.js
define("cordova/plugin/splashscreen", function(require, exports, module) {
var exec = require('cordova/exec');
@@ -5730,7 +5730,7 @@ module.exports = splashscreen;
});
-// file: lib\common\plugin\splashscreen\symbols.js
+// file: lib/common/plugin/splashscreen/symbols.js
define("cordova/plugin/splashscreen/symbols", function(require, exports, module) {
@@ -5740,7 +5740,7 @@ modulemapper.clobbers('cordova/plugin/splashscreen', 'navigator.splashscreen');
});
-// file: lib\windowsphone\plugin\windowsphone\DOMStorage\plugininit.js
+// file: lib/windowsphone/plugin/windowsphone/DOMStorage/plugininit.js
define("cordova/plugin/windowsphone/DOMStorage/plugininit", function(require, exports, module) {
(function(win,doc) {
@@ -5925,7 +5925,7 @@ module.exports = null;
});
-// file: lib\windowsphone\plugin\windowsphone\FileTransfer.js
+// file: lib/windowsphone/plugin/windowsphone/FileTransfer.js
define("cordova/plugin/windowsphone/FileTransfer", function(require, exports, module) {
var exec = require('cordova/exec'),
@@ -6033,7 +6033,7 @@ module.exports = FileTransfer;
});
-// file: lib\windowsphone\plugin\windowsphone\FileUploadOptions.js
+// file: lib/windowsphone/plugin/windowsphone/FileUploadOptions.js
define("cordova/plugin/windowsphone/FileUploadOptions", function(require, exports, module) {
/**
@@ -6065,7 +6065,7 @@ module.exports = FileUploadOptions;
});
-// file: lib\windowsphone\plugin\windowsphone\XHRPatch\plugininit.js
+// file: lib/windowsphone/plugin/windowsphone/XHRPatch/plugininit.js
define("cordova/plugin/windowsphone/XHRPatch/plugininit", function(require, exports, module) {
// TODO: the build process will implicitly wrap this in a define() call
@@ -6305,7 +6305,7 @@ module.exports = null;
});
-// file: lib\windowsphone\plugin\windowsphone\console.js
+// file: lib/windowsphone/plugin/windowsphone/console.js
define("cordova/plugin/windowsphone/console", function(require, exports, module) {
@@ -6335,7 +6335,7 @@ module.exports = debugConsole;
});
-// file: lib\windowsphone\plugin\windowsphone\console\symbols.js
+// file: lib/windowsphone/plugin/windowsphone/console/symbols.js
define("cordova/plugin/windowsphone/console/symbols", function(require, exports, module) {
@@ -6346,7 +6346,7 @@ modulemapper.clobbers('cordova/plugin/windowsphone/console', 'console');
});
-// file: lib\common\symbols.js
+// file: lib/common/symbols.js
define("cordova/symbols", function(require, exports, module) {
var modulemapper = require('cordova/modulemapper');
@@ -6359,7 +6359,7 @@ modulemapper.clobbers('cordova/exec', 'Cordova.exec');
});
-// file: lib\common\utils.js
+// file: lib/common/utils.js
define("cordova/utils", function(require, exports, module) {
var utils = exports;
@@ -6530,7 +6530,7 @@ function UUIDcreatePart(length) {
});
window.cordova = require('cordova');
-// file: lib\scripts\bootstrap.js
+// file: lib/scripts/bootstrap.js
(function (context) {
var channel = require('cordova/channel');
@@ -6604,7 +6604,7 @@ window.cordova = require('cordova');
}(window));
-// file: lib\scripts\plugin_loader.js
+// file: lib/scripts/plugin_loader.js
// Tries to load all plugins' js-modules.
// This is an async process, but onDeviceReady is blocked on onPluginsReady.
[3/6] wp7 commit: distribution tooling update
Posted by be...@apache.org.
distribution tooling update
Project: http://git-wip-us.apache.org/repos/asf/cordova-wp7/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp7/commit/2558a05c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp7/tree/2558a05c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp7/diff/2558a05c
Branch: refs/heads/3.0.0
Commit: 2558a05cfd9737da858f7f832897b435563fdf07
Parents: 26c72e1
Author: Benn Mapes <be...@gmail.com>
Authored: Thu May 23 11:57:16 2013 -0700
Committer: Benn Mapes <be...@gmail.com>
Committed: Fri May 24 12:13:23 2013 -0700
----------------------------------------------------------------------
bin/update.bat | 9 +
bin/update.js | 353 +++++++++++++++++++++
templates/vs/MyTemplateStandAlone.vstemplate | 32 ++-
tooling/scripts/buildjs.js | 31 ++-
tooling/scripts/dist.js | 37 ++-
tooling/scripts/package.js | 50 +++-
tooling/scripts/reversion.js | 13 +-
tooling/scripts/win-zip.js | 32 --
8 files changed, 484 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-wp7/blob/2558a05c/bin/update.bat
----------------------------------------------------------------------
diff --git a/bin/update.bat b/bin/update.bat
new file mode 100644
index 0000000..9da7e3c
--- /dev/null
+++ b/bin/update.bat
@@ -0,0 +1,9 @@
+@ECHO OFF
+SET full_path=%~dp0
+IF EXIST %full_path%update.js (
+ cscript "%full_path%update.js" %* //nologo
+) ELSE (
+ ECHO.
+ ECHO ERROR: Could not find 'update.js' in 'bin' folder, aborting...>&2
+ EXIT /B 1
+)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cordova-wp7/blob/2558a05c/bin/update.js
----------------------------------------------------------------------
diff --git a/bin/update.js b/bin/update.js
new file mode 100644
index 0000000..8ea38a8
--- /dev/null
+++ b/bin/update.js
@@ -0,0 +1,353 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+
+var fso = WScript.CreateObject("Scripting.FileSystemObject");
+var wscript_shell = WScript.CreateObject("WScript.Shell");
+var shell = WScript.CreateObject("shell.application");
+var args = WScript.Arguments;
+// working dir
+var ROOT = WScript.ScriptFullName.split('\\bin\\update.js').join('');
+//Get version number
+var VERSION = read(ROOT+'\\VERSION').replace(/\r\n/,'').replace(/\n/,'');
+var plugins_folder = "\\Plugins";
+var template_folder = "\\templates\\standalone";
+// anything thats missing to the project
+var overwrite = false;
+var replace = false;
+
+// usage function
+function Usage() {
+ Log("WARNING : Make sure to back up your project before updating!")
+ Log("Usage: update Path-To-Project ");//[ -f | -r ] ");
+ Log(" Path-To-Old-Project : The path the project you would like to update.");
+ //Log(" -f : Will forcefully overwrite and add all core components of the application.");
+ //Log(" -r : Will create an updated project, only keeping the www assets. *NOTE: no native code will be preserved*");
+ Log("examples:");
+ Log(" update C:\\Users\\anonymous\\Desktop\\MyProject");
+}
+
+// logs messaged to stdout and stderr
+function Log(msg, error) {
+ if (error) {
+ WScript.StdErr.WriteLine(msg);
+ }
+ else {
+ WScript.StdOut.WriteLine(msg);
+ }
+}
+
+// executes a commmand in the shell
+function exec(command) {
+ //Log("Command : " + command);
+ var oShell=wscript_shell.Exec(command);
+ while (oShell.Status === 0) {
+ WScript.sleep(100);
+ }
+}
+
+// executes a commmand in the shell
+function exec_verbose(command) {
+ Log("Command: " + command);
+ var oShell=wscript_shell.Exec(command);
+ while (oShell.Status == 0) {
+ //Wait a little bit so we're not super looping
+ WScript.sleep(100);
+ //Print any stdout output from the script
+ if (!oShell.StdOut.AtEndOfStream) {
+ var line = oShell.StdOut.ReadAll();
+ Log(line);
+ }
+ }
+ //Check to make sure our scripts did not encounter an error
+ if (!oShell.StdErr.AtEndOfStream) {
+ var line = oShell.StdErr.ReadAll();
+ Log(line, true);
+ WScript.Quit(2);
+ }
+}
+
+var ForReading = 1, ForWriting = 2, ForAppending = 8;
+var TristateUseDefault = -2, TristateTrue = -1, TristateFalse = 0;
+
+// returns the contents of a file
+function read(filename) {
+ if (fso.FileExists(filename)) {
+ var f=fso.OpenTextFile(filename, 1, 2);
+ var s=f.ReadAll();
+ f.Close();
+ return s;
+ }
+ else {
+ Log('Cannot read non-existant file : ' + filename, true);
+ WScript.Quit(2);
+ }
+ return null;
+}
+
+// writes the contents to the specified file
+function write(filename, contents) {
+ var f=fso.OpenTextFile(filename, ForWriting, TristateTrue);
+ f.Write(contents);
+ f.Close();
+}
+
+// replaces the matches of regexp with replacement
+function replaceInFile(filename, regexp, replacement) {
+ var text = read(filename).replace(regexp,replacement);
+ write(filename,text);
+}
+
+// returns true if the given path is the root of a cordova windows phone project
+// currently returns true if the folder contains a .csproj file.
+function is_windows_phone_project(path) {
+ if (fso.FolderExists(path)) {
+ 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()) == 'csproj') {
+ return true;
+ }
+ }
+ }
+ return false;
+}
+
+// returns the name of the application
+function get_app_name(path) {
+ var WMAppManifest = read(path + '\\Properties\\WMAppManifest.xml').split('\n');
+ for (line in WMAppManifest) {
+ if (WMAppManifest[line].match(/Title\=\"/)) {
+ return WMAppManifest[line].split('Title="')[1].split('"')[0];
+ }
+ }
+ Log("Error : unable to find applicaiton name in the project.", true);
+ Log(" Path : " + path, true);
+ WScript.Quit(2);
+}
+
+// returns the name of the application package
+function get_package_name(path) {
+ var WMAppManifest = read(path + '\\Properties\\WMAppManifest.xml').split('\n');
+ for (line in WMAppManifest) {
+ if (WMAppManifest[line].match(/Title\=\"/)) {
+ return WMAppManifest[line].split('Title="')[1].split('"')[0];
+ }
+ }
+ Log("Error : unable to find applicaiton name in the project.", true);
+ Log(" Path : " + path, true);
+ WScript.Quit(2);
+}
+
+// returns the GUID ame of the application
+function get_app_GUID(path) {
+ var AppXAML = read(path + '\\App.xaml').split('\n');
+ for (line in AppXAML) {
+ if (AppXAML[line].match(/x\:Class\=\"/)) {
+ return AppXAML[line].split('Class="')[1].split('"')[0];
+ }
+ }
+ Log("Error : unable to find package name in the project.", true);
+ Log(" Path : " + path, true);
+ WScript.Quit(2);
+}
+
+// updates the cordova.js and all references in the given project with this repositories version
+function update_cordova_js(path) {
+ // remove old cordova.js
+ var www_contents = shell.NameSpace(path + '\\www').Items();
+ for(i = 0; i < www_contents.Count; i++)
+ {
+ if(www_contents.Item(i).Name.match(/cordova\-(\d+)[.](\d+)[.](\d+)(rc\d)?[.]js/))
+ {
+ fso.DeleteFile(path + '\\www\\' + www_contents.Item(i).Name);
+ }
+ }
+ // update version file
+ copy_to(ROOT + "\\VERSION", path + "\\VERSION");
+ // copy over new cordova.js
+ copy_to(ROOT + template_folder + "\\www\\cordova.js", path + "\\www\\cordova.js");
+
+ // update corodva references
+ 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)
+ // update references in index.html
+ replaceInFile(path + '\\www\\index.html', cordova_regex, "cordova");
+ version_regex = /return\s*\"(\d+)[.](\d+)[.](\d+)(rc\d)?/; //Matches return "x.x.x[rcx]
+ // update references in Device.cs
+ replaceInFile(path + '\\Plugins\\Device.cs', version_regex, "return \"" + VERSION);
+}
+
+// Copies assets that need to be saved from source to desination.
+// TODO : Add all critical assets here
+function save_restore(source, destination) {
+ fso.CreateFolder(destination + '\\www');
+ copy_to(source + '\\www', destination + '\\www');
+ copy_to(source + '\\SplashScreenImage.jpg', destination + '\\SplashScreenImage.jpg');
+ copy_to(source + '\\Background.png', destination + '\\Background.png');
+ copy_to(source + '\\ApplicationIcon.png', destination + '\\ApplicationIcon.png');
+ copy_to(source + '\\config.xml', destination + '\\config.xml');
+}
+
+// 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);
+ }
+}
+
+// copies a folder or file from source to destination
+function copy_to(source, destination) {
+ // check that source exists
+ if (!fso.FolderExists(source)) {
+ if (!fso.FileExists(source)) {
+ Log("Error : Could not copy file/folder because it doesn't exist.", true);
+ Log(" File/Folder : " + source, true);
+ WScript.Quit(2);
+ }
+ }
+ // if source is a folder, then copy all folder contents
+ if (fso.FolderExists(source)) {
+ fso.CopyFolder(source, destination, true);
+ }
+ // if it's a file, just copy it.
+ else {
+ exec('%comspec% /c copy /Y /V ' + source + ' ' + destination);
+ }
+}
+
+// updates the cordova.js in project along with the cordova tooling.
+function update_project(path) {
+ // update cordova folder
+ delete_if_exists(path + '\\cordova');
+ fso.CreateFolder(path + '\\cordova');
+ copy_to(ROOT + template_folder + '\\cordova', path + '\\cordova');
+ // clean project (all generated files)
+ exec(path + '\\cordova\\clean.bat');
+
+ // update core cordovalib
+ delete_if_exists(path + '\\cordovalib');
+ fso.CreateFolder(path + '\\cordovalib');
+ copy_to(ROOT + template_folder + '\\cordovalib', path + '\\cordovalib');
+
+ // update core plugins
+ // TODO : Remove for 3.0.0
+ delete_if_exists(path + '\\Plugins');
+ fso.CreateFolder(path + '\\Plugins');
+ copy_to(ROOT + template_folder + '\\Plugins', path + '\\Plugins');
+
+ // update cordova.js
+ update_cordova_js(path);
+}
+
+// Replaces the current project with a newly created project, keeping important assets to preserve the app.
+// TODO: Things that need to be kept other then www
+// - WMAppManifest (capabilities etc...)
+// - GUID (for marketplace apps etc...)
+// - Splashscreen and other images etc...
+// - Find more things that should be kept
+function replace_project(path) {
+ //create new project and move www assets into it.
+ Log("WARNING : Upgrading your app with the \'-r\' flag will delete all native and plugin");
+ Log(" components of your application and replace them with the updated core components given");
+ Log(" by this platforms \'bin\\create\' script. It is *HIGHLY RECOMMENDED* to back up your app");
+ Log(" before continuing. The name and package name along with all of the www assets will be");
+ Log(" preserved. Are you sure you wish to continue? (Y/N)");
+ var response;
+ while (response != 'Y') {
+ response = WScript.StdIn.ReadLine();
+ if (response == 'N') {
+ WScript.Quit(2);
+ } else if (response != "Y") {
+ Log("Error : did not recognize '" + response + "'");
+ Log("Are you sure you wish to continue? (Y/N)");
+ }
+ }
+ // place all assets to be preserved in a temperary folder
+ delete_if_exists(ROOT + '\\temp');
+ fso.CreateFolder(ROOT + '\\temp');
+ save_restore(path, ROOT + '\\temp');
+
+ // get app name from WMAppManifest
+ var app_name = get_app_name(path);
+ // get package name from App.xaml
+ var package_name = get_package_name(path);
+ // get the GUID so that app stays the same
+ var app_GUID = get_app_GUID(path);
+ // delete previous project
+ delete_if_exists(path);
+ // create the new project from the current repository
+ exec(ROOT + '\\bin\\create.bat ' + path + ' ' + app_name + ' ' + package_name);
+ // remove default www assets
+ delete_if_exists(path + '\\www');
+ // move www assets back to project folder
+ save_restore(ROOT + '\\temp', path);
+ // cleanup temp folder
+ delete_if_exists(ROOT + '\\temp');
+}
+
+
+
+if (args.Count() > 0) {
+ if(args.Count() > 2) {
+ Log("Error : too many arguments provided.", true);
+ WScript.Quit(1);
+ }
+
+ if (args(0).indexOf("--help") > -1 ||
+ args(0).indexOf("/?") > -1 ) {
+ Usage();
+ WScript.Quit(1);
+ }
+ else if (fso.FolderExists(args(0)) && is_windows_phone_project(args(0))) {
+ if(args.Count() > 1) {
+ /*if(args(1) == '-f' || args(1) == '--force') {
+ //TODO: do something for this
+ Log("ERROR : NOT IMPLEMENTED", true);
+ WScript.Quit(2);
+ }
+ else if(args(1) == '-r' || args(1) == '--replace') {
+ replace_project(args(0));
+ }
+ else {
+ Log('Error : \'' + args(1) + '\' is not regognized as an update option', true);
+ }*/
+ Usage();
+ Log('Error : too many arguments', true);
+ } else if (args.Count() == 1) {
+ update_project(args(0));
+ }
+ }
+ else if (fso.FolderExists(args(0))) {
+ Log("The path provided is not a path to a cordova windows phone project.", true);
+ Log(" Please provide the path to the root folder of your cordova windows phone project.", true);
+ WScript.Quit(2);
+ }
+ else {
+ Log("The given path to the project does not exist.", true);
+ Log(" Please provide a path to the project you would like to update.", true);
+ Usage();
+ WScript.Quit(2);
+ }
+}
+else {
+ Usage();
+ WScript.Quit(1);
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cordova-wp7/blob/2558a05c/templates/vs/MyTemplateStandAlone.vstemplate
----------------------------------------------------------------------
diff --git a/templates/vs/MyTemplateStandAlone.vstemplate b/templates/vs/MyTemplateStandAlone.vstemplate
index 34b949d..0de2a0e 100644
--- a/templates/vs/MyTemplateStandAlone.vstemplate
+++ b/templates/vs/MyTemplateStandAlone.vstemplate
@@ -98,7 +98,7 @@
<ProjectItem ReplaceParameters="false" TargetFileName="SplashScreenImage.jpg">SplashScreenImage.jpg</ProjectItem>
<ProjectItem ReplaceParameters="false" TargetFileName="VERSION">VERSION</ProjectItem>
<Folder Name="www" TargetFolderName="www">
- <ProjectItem ReplaceParameters="true" TargetFileName="cordova-2.7.0.js">cordova-2.7.0.js</ProjectItem>
+ <ProjectItem ReplaceParameters="true" TargetFileName="cordova.js">cordova.js</ProjectItem>
<Folder Name="css" TargetFolderName="css">
<ProjectItem ReplaceParameters="true" TargetFileName="index.css">index.css</ProjectItem>
</Folder>
@@ -110,6 +110,36 @@
<ProjectItem ReplaceParameters="true" TargetFileName="index.js">index.js</ProjectItem>
</Folder>
</Folder>
+ <Folder Name="cordova" TargetFolderName="cordova">
+ <ProjectItem ReplaceParameters="false" TargetFileName="build.bat">build.bat</ProjectItem>
+ <ProjectItem ReplaceParameters="false" TargetFileName="clean.bat">clean.bat</ProjectItem>
+ <ProjectItem ReplaceParameters="false" TargetFileName="log.bat">log.bat</ProjectItem>
+ <ProjectItem ReplaceParameters="false" TargetFileName="run.bat">run.bat</ProjectItem>
+ <ProjectItem ReplaceParameters="false" TargetFileName="version.bat">version.bat</ProjectItem>
+ <Folder Name="lib" TargetFolderName="lib">
+ <ProjectItem ReplaceParameters="false" TargetFileName="build.js">build.js</ProjectItem>
+ <ProjectItem ReplaceParameters="false" TargetFileName="clean.js">clean.js</ProjectItem>
+ <ProjectItem ReplaceParameters="false" TargetFileName="deploy.js">deploy.js</ProjectItem>
+ <ProjectItem ReplaceParameters="false" TargetFileName="install-device.bat">install-device.bat</ProjectItem>
+ <ProjectItem ReplaceParameters="false" TargetFileName="install-emulator.bat">install-emulator.bat</ProjectItem>
+ <ProjectItem ReplaceParameters="false" TargetFileName="list-devices.bat">list-devices.bat</ProjectItem>
+ <ProjectItem ReplaceParameters="false" TargetFileName="list-emulator-images.bat">list-emulator-images.bat</ProjectItem>
+ <ProjectItem ReplaceParameters="false" TargetFileName="list-started-emulators.bat">list-started-emulators.bat</ProjectItem>
+ <ProjectItem ReplaceParameters="false" TargetFileName="log.js">log.js</ProjectItem>
+ <ProjectItem ReplaceParameters="false" TargetFileName="start-emulator.bat">start-emulator.bat</ProjectItem>
+ <ProjectItem ReplaceParameters="false" TargetFileName="target-list.js">target-list.js</ProjectItem>
+ <Folder Name="CordovaDeploy" TargetFolderName="CordovaDeploy">
+ <ProjectItem ReplaceParameters="false" TargetFileName="CordovaDeploy.sln">CordovaDeploy.sln</ProjectItem>
+ <Folder Name="CordovaDeploy" TargetFolderName="CordovaDeploy">
+ <ProjectItem ReplaceParameters="false" TargetFileName="CordovaDeploy.csproj">CordovaDeploy.csproj</ProjectItem>
+ <ProjectItem ReplaceParameters="false" TargetFileName="Program.cs">Program.cs</ProjectItem>
+ <Folder Name="Properties" TargetFolderName="Properties">
+ <ProjectItem ReplaceParameters="false" TargetFileName="AssemblyInfo.cs">AssemblyInfo.cs</ProjectItem>
+ </Folder>
+ </Folder>
+ </Folder>
+ </Folder>
+ </Folder>
</Project>
</TemplateContent>
</VSTemplate>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cordova-wp7/blob/2558a05c/tooling/scripts/buildjs.js
----------------------------------------------------------------------
diff --git a/tooling/scripts/buildjs.js b/tooling/scripts/buildjs.js
index b5c51ad..4bfba53 100644
--- a/tooling/scripts/buildjs.js
+++ b/tooling/scripts/buildjs.js
@@ -38,9 +38,6 @@ var args = WScript.Arguments,
VERSION = read(ROOT+'\\VERSION').replace(/\r\n/,'').replace(/\n/,''),
BUILD_DESTINATION;
-function Log(msg) {
- WScript.StdOut.WriteLine(msg);
-}
// help function
function Usage()
@@ -58,6 +55,16 @@ function Usage()
Log("");
}
+// logs messaged to stdout and stderr
+function Log(msg, error) {
+ if (error) {
+ WScript.StdErr.WriteLine(msg);
+ }
+ else {
+ WScript.StdOut.WriteLine(msg);
+ }
+}
+
// returns the contents of a file
function read(filename) {
//Log('Reading in ' + filename);
@@ -101,7 +108,7 @@ function exec_verbose(command) {
if(!oShell.StdErr.AtEndOfStream)
{
var err_line = oShell.StdErr.ReadAll();
- WScript.StdErr.WriteLine(err_line);
+ Log(err_line, true);
WScript.Quit(1);
}
}
@@ -134,8 +141,8 @@ function build_js(path)
//copy the javascript wherever it needs to go.
wscript_shell.CurrentDirectory = path + '\\temp\\cordova-js\\pkg';
- exec('%comspec% /c copy /Y cordova.windowsphone.js ' + path + STANDALONE_PATH + '\\www\\cordova-' + VERSION + '.js');
- exec('%comspec% /c copy /Y cordova.windowsphone.js ' + path + EXAMPLE_PATH + '\\www\\cordova-' + VERSION + '.js');
+ exec('%comspec% /c copy /Y cordova.windowsphone.js ' + path + STANDALONE_PATH + '\\www\\cordova.js');
+ exec('%comspec% /c copy /Y cordova.windowsphone.js ' + path + EXAMPLE_PATH + '\\www\\cordova.js');
//TODO: Delete old cordova.js (done in reversion.js)
@@ -154,10 +161,10 @@ function set_path(some_arg)
}
else
{
- Log("ERROR: The given path is not a cordova-wp7 repo, or");
- Log(" does not exist. If your trying to reversion a");
- Log(" cordova repo other then this one, please provide");
- Log(" it's path in the form: -p:C:\\Path\\to\\repo");
+ Log("ERROR: The given path is not a cordova-wp7 repo, or", true);
+ Log(" does not exist. If your trying to reversion a", true);
+ Log(" cordova repo other then this one, please provide", true);
+ Log(" it's path in the form: -p:C:\\Path\\to\\repo", true);
WScript.Quit(1);
}
@@ -193,8 +200,8 @@ if(args.Count() > 0)
else if(set_path(arg(0))) {} //do nothing
else
{
- Log("The provided version number is invalid, please provide");
- Log(" a version number in the format Major.Minor.Fix[rc#]");
+ Log("The provided version number is invalid, please provide", true);
+ Log(" a version number in the format Major.Minor.Fix[rc#]", true);
Usage();
WScript.Quit(1);
}
http://git-wip-us.apache.org/repos/asf/cordova-wp7/blob/2558a05c/tooling/scripts/dist.js
----------------------------------------------------------------------
diff --git a/tooling/scripts/dist.js b/tooling/scripts/dist.js
index 4303202..bca8b11 100644
--- a/tooling/scripts/dist.js
+++ b/tooling/scripts/dist.js
@@ -35,6 +35,9 @@ Famework
var fso = WScript.CreateObject('Scripting.FileSystemObject'),
wscript_shell = WScript.CreateObject("WScript.Shell");
+//Replace root directory or create new directory?
+var replace = false;
+
//Set up directory structure of current release
//arguments passed in
var args = WScript.Arguments,
@@ -49,8 +52,6 @@ var args = WScript.Arguments,
var BUILD_DESTINATION;
//current script that is running
var current_script = "dist";
-// replace the directory
-var replace = false;
/*************************************************/
@@ -59,13 +60,14 @@ var replace = false;
// help function
-function Usage() {
+function Usage()
+{
Log("");
Log("This is a command line tool for building new releases. It will package a new release");
Log(" of a cordova-wp7 project, reversioning it to match the VERSION file in the root directory.");
- Log("Usage: dist [ <NEW_PATH_FOR_BUILD> | -f ] ");
- Log(" -f : force tool to reversion the current repositoy.");
- Log(" <NEW_PATH_FOR_BUILD> : path to create the new reversioned repositoy in.");
+ Log("Usage: dist [ <PATH_TO_NEW_REPO> | -f ] ");
+ Log(" -f : reversion the repositoy this script is in.");
+ Log(" <PATH_TO_NEW_REPO> : path to create the new reversioned repositoy in.");
Log("");
}
@@ -79,17 +81,20 @@ function Log(msg, error) {
}
}
+
// returns the contents of a file
function read(filename) {
//Log('Reading in ' + filename);
- if(fso.FileExists(filename)) {
+ if(fso.FileExists(filename))
+ {
var f=fso.OpenTextFile(filename, 1,2);
var s=f.ReadAll();
f.Close();
return s;
}
- else {
- Log('Cannot read non-existant file : ' + filename, true);
+ else
+ {
+ Log('Cannot read non-existant file : ' + filename);
WScript.Quit(1);
}
return null;
@@ -109,7 +114,8 @@ function exec(command) {
}
}
//Check to make sure our scripts did not encounter an error
- if(!oShell.StdErr.AtEndOfStream) {
+ if(!oShell.StdErr.AtEndOfStream)
+ {
var err_line = oShell.StdErr.ReadAll();
Log(err_line, true);
Log("ERROR: Could not complete distribution, failed while running: " + current_script, true);
@@ -117,7 +123,8 @@ function exec(command) {
}
}
-function space() {
+function space()
+{
Log("");
Log("*****************************************************");
Log("");
@@ -163,7 +170,6 @@ if (args.Count() > 0) {
Log("Error : too many arguments provided.", true);
WScript.Quit(1);
}
-
}
else {
Usage();
@@ -200,9 +206,10 @@ space();
/** - build cordova.js **/
/** - windows.cordova.js -> templates + example **/
/*************************************************/
-current_script = "buildjs.js";
-exec('cscript ' + BUILD_DESTINATION + SCRIPTS + '\\buildjs.js //nologo');
-space();
+// New Workflow does not require building the new js, it should already be in place.
+// current_script = "buildjs.js";
+// exec('cscript ' + BUILD_DESTINATION + SCRIPTS + '\\buildjs.js //nologo');
+// space();
/*************************************************/
/****************** Step 5 *********************/
http://git-wip-us.apache.org/repos/asf/cordova-wp7/blob/2558a05c/tooling/scripts/package.js
----------------------------------------------------------------------
diff --git a/tooling/scripts/package.js b/tooling/scripts/package.js
index f3970a8..b5f882d 100644
--- a/tooling/scripts/package.js
+++ b/tooling/scripts/package.js
@@ -43,7 +43,6 @@ var ADD_TO_VS = false;
// build the dll?
var BUILD_DLL = false;
-function Log(msg) { WScript.StdOut.WriteLine(msg); }
// help function
function Usage()
@@ -57,6 +56,16 @@ function Usage()
Log("");
}
+// logs messaged to stdout and stderr
+function Log(msg, error) {
+ if (error) {
+ WScript.StdErr.WriteLine(msg);
+ }
+ else {
+ WScript.StdOut.WriteLine(msg);
+ }
+}
+
// returns the contents of a file
function read(filename) {
//Log('Reading in ' + filename);
@@ -100,7 +109,7 @@ function exec_verbose(command) {
if(!oShell.StdErr.AtEndOfStream)
{
var err_line = oShell.StdErr.ReadAll();
- WScript.StdErr.WriteLine(err_line);
+ Log(err_lin, true);
WScript.Quit(1);
}
}
@@ -121,7 +130,7 @@ function package_templates()
exec('%comspec% /c copy /Y ' + BUILD_DESTINATION + TEMPLATES_PATH + '\\vs\\pg_templatePreview.jpg ' + BUILD_DESTINATION + STANDALONE_PATH + '\\__PreviewImage.jpg');
exec('%comspec% /c copy /Y ' + BUILD_DESTINATION + '\\VERSION ' + BUILD_DESTINATION + STANDALONE_PATH);
- exec_verbose('cscript ' + BUILD_DESTINATION + '\\tooling\\scripts\\win-zip.js ' + template_path + ' ' + BUILD_DESTINATION + STANDALONE_PATH + '\\ //nologo');
+ zip_project(template_path, BUILD_DESTINATION + STANDALONE_PATH);
if(ADD_TO_VS)
@@ -139,6 +148,41 @@ function package_templates()
}
}
+function zip_project(zip_path, project_path)
+{
+ // create empty ZIP file and open for adding
+ var file = fso.CreateTextFile(zip_path, true);
+
+ // create twenty-two byte "fingerprint" for .zip
+ file.write("PK");
+ file.write(String.fromCharCode(5));
+ file.write(String.fromCharCode(6));
+ file.write('\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0');
+ file.Close();
+
+ // open .zip foder and copy contents of project_path to zip_path
+ var zipFolder = shell.NameSpace(zip_path);
+ var sourceItems = shell.NameSpace(project_path).items();
+ if (zipFolder !== null) {
+ zipFolder.CopyHere(sourceItems, 4|20|16);
+ var maxTime = 5000;
+ while(zipFolder.items().Count < sourceItems.Count)
+ {
+ maxTime -= 100;
+ if(maxTime > 0 ) {
+ WScript.Sleep(100);
+ }
+ else {
+ Log('Failed to create .zip file.', true);
+ break;
+ }
+ }
+ }
+ else {
+ Log('Failed to create .zip file.', true);
+ }
+}
+
// builds the new cordova dll and copys it to the full template (only done because of the version referance in Device.cs)
function build_dll()
{
http://git-wip-us.apache.org/repos/asf/cordova-wp7/blob/2558a05c/tooling/scripts/reversion.js
----------------------------------------------------------------------
diff --git a/tooling/scripts/reversion.js b/tooling/scripts/reversion.js
index 3b42fc4..8bf5ed1 100644
--- a/tooling/scripts/reversion.js
+++ b/tooling/scripts/reversion.js
@@ -24,6 +24,9 @@ var fso = WScript.CreateObject('Scripting.FileSystemObject'),
shell = WScript.CreateObject("shell.application"),
wscript_shell = WScript.CreateObject("WScript.Shell");
+//Get new version from git or build off this version?
+var GET_NEW = false;
+
//Set up directory structure of current release
//arguments passed in
var args = WScript.Arguments,
@@ -138,18 +141,9 @@ function updateVersionNumbers() {
// update standalone project
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)
- replaceInFile(BUILD_DESTINATION + STANDALONE_PATH + '\\CordovaAppProj.csproj', cordova_regex, "cordova-" + VERSION);
- replaceInFile(BUILD_DESTINATION + STANDALONE_PATH + '\\www\\index.html', cordova_regex, "cordova-" + VERSION);
version_regex = /return\s*\"(\d+)[.](\d+)[.](\d+)(rc\d)?/; //Matches return "x.x.x[rcx]
-
- WScript.StdOut.WriteLine("path = " + BUILD_DESTINATION + CORDOVA_LIB + '\\Plugins\\Device.cs');
replaceInFile(BUILD_DESTINATION + CORDOVA_LIB + '\\..\\Plugins\\Device.cs', version_regex, "return \"" + VERSION);
- // update example proj
- replaceInFile(BUILD_DESTINATION + EXAMPLE_PATH + '\\CordovaExample.csproj', cordova_regex, "cordova-" + VERSION);
- version_regex = /VERSION\s*\=\s*\'(\d+)[.](\d+)[.](\d+)(rc\d)?/; //Matches VERSION = x.x.x[rcx]
- replaceInFile(BUILD_DESTINATION + EXAMPLE_PATH + '\\www\\cordova-current.js', version_regex, "VERSION = \'" + 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");
@@ -160,7 +154,6 @@ function updateVersionNumbers() {
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 + TEMPLATES_PATH + '\\vs\\MyTemplateStandAlone.vstemplate', cordova_regex, "cordova-" + VERSION);
}
// delete all cordova.js and generated files (templates) from old version numbers
http://git-wip-us.apache.org/repos/asf/cordova-wp7/blob/2558a05c/tooling/scripts/win-zip.js
----------------------------------------------------------------------
diff --git a/tooling/scripts/win-zip.js b/tooling/scripts/win-zip.js
deleted file mode 100644
index 3d8dc1a..0000000
--- a/tooling/scripts/win-zip.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Script for zipping the contents of a directory.
- */
-
-// get commman line arguments
-var objArgs = WScript.Arguments;
-var zipPath = objArgs(0);
-var sourcePath = objArgs(1);
-
-
-// create empty ZIP file and open for adding
-var fso = new ActiveXObject("Scripting.FileSystemObject");
-var file = fso.CreateTextFile(zipPath, true);
-
-// create twenty-two byte "fingerprint" for .zip
-file.write("PK");
-file.write(String.fromCharCode(5));
-file.write(String.fromCharCode(6));
-file.write('\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0');
-file.Close();
-
-// open .zip foder and copy contents of sourcePath
-var objShell = new ActiveXObject("shell.application");
-var zipFolder = objShell.NameSpace(zipPath);
-var sourceItems = objShell.NameSpace(sourcePath).items();
-if (zipFolder !== null) {
- zipFolder.CopyHere(sourceItems, 4|20|16);
- WScript.Sleep(4000);
-}
-else {
- WScript.StdErr.WriteLine('Failed to create .zip file.');
-}
\ No newline at end of file
[4/6] wp7 commit: Set VERSION to 2.8.0rc1
Posted by be...@apache.org.
Set VERSION to 2.8.0rc1
Project: http://git-wip-us.apache.org/repos/asf/cordova-wp7/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp7/commit/000ce341
Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp7/tree/000ce341
Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp7/diff/000ce341
Branch: refs/heads/3.0.0
Commit: 000ce341dcc29461619fbcdf39cde1d4e4d9cc93
Parents: 2558a05
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu May 23 00:28:23 2013 -0400
Committer: Benn Mapes <be...@gmail.com>
Committed: Fri May 24 12:13:24 2013 -0700
----------------------------------------------------------------------
VERSION | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-wp7/blob/000ce341/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 9aa3464..1277c83 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.7.0
\ No newline at end of file
+2.8.0rc1
[5/6] wp7 commit: Version 2.8.0rc1 prep
Posted by be...@apache.org.
Version 2.8.0rc1 prep
Project: http://git-wip-us.apache.org/repos/asf/cordova-wp7/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp7/commit/8114e136
Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp7/tree/8114e136
Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp7/diff/8114e136
Branch: refs/heads/3.0.0
Commit: 8114e13612099d64737ec14ac9387d5b0537fe45
Parents: 000ce34
Author: Benn Mapes <be...@gmail.com>
Authored: Thu May 23 14:17:38 2013 -0700
Committer: Benn Mapes <be...@gmail.com>
Committed: Fri May 24 12:13:26 2013 -0700
----------------------------------------------------------------------
framework/Properties/AssemblyInfo.cs | 4 ++--
templates/standalone/Plugins/Device.cs | 2 +-
templates/standalone/VERSION | 2 +-
templates/vs/MyTemplateStandAlone.vstemplate | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-wp7/blob/8114e136/framework/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/framework/Properties/AssemblyInfo.cs b/framework/Properties/AssemblyInfo.cs
index 62c7964..58fcdbb 100644
--- a/framework/Properties/AssemblyInfo.cs
+++ b/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.7.0")]
+[assembly: AssemblyDescription("2.8.0rc1")]
[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.7.0.0")]
+[assembly: AssemblyVersion("2.8.0.0")]
[assembly: AssemblyFileVersion("2.6.0rc1")]
http://git-wip-us.apache.org/repos/asf/cordova-wp7/blob/8114e136/templates/standalone/Plugins/Device.cs
----------------------------------------------------------------------
diff --git a/templates/standalone/Plugins/Device.cs b/templates/standalone/Plugins/Device.cs
index 07100ae..52b124e 100644
--- a/templates/standalone/Plugins/Device.cs
+++ b/templates/standalone/Plugins/Device.cs
@@ -73,7 +73,7 @@ namespace WPCordovaClassLib.Cordova.Commands
get
{
// TODO: should be able to dynamically read the Cordova version from somewhere...
- return "2.7.0";
+ return "2.8.0rc1";
}
}
http://git-wip-us.apache.org/repos/asf/cordova-wp7/blob/8114e136/templates/standalone/VERSION
----------------------------------------------------------------------
diff --git a/templates/standalone/VERSION b/templates/standalone/VERSION
index 9aa3464..1277c83 100644
--- a/templates/standalone/VERSION
+++ b/templates/standalone/VERSION
@@ -1 +1 @@
-2.7.0
\ No newline at end of file
+2.8.0rc1
http://git-wip-us.apache.org/repos/asf/cordova-wp7/blob/8114e136/templates/vs/MyTemplateStandAlone.vstemplate
----------------------------------------------------------------------
diff --git a/templates/vs/MyTemplateStandAlone.vstemplate b/templates/vs/MyTemplateStandAlone.vstemplate
index 0de2a0e..e6579f7 100644
--- a/templates/vs/MyTemplateStandAlone.vstemplate
+++ b/templates/vs/MyTemplateStandAlone.vstemplate
@@ -1,13 +1,13 @@
<VSTemplate Version="3.0.0" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" Type="Project">
<TemplateData>
- <Name>CordovaWP7_2_7_0</Name>
- <Description>Cordova 2.7.0 for Windows Phone 7.5 using the Cordova source code directly.</Description>
+ <Name>CordovaWP7_2_8_0rc1</Name>
+ <Description>Cordova 2.8.0rc1 for Windows Phone 7.5 using the Cordova source code directly.</Description>
<ProjectType>CSharp</ProjectType>
<ProjectSubType>
</ProjectSubType>
<SortOrder>1000</SortOrder>
<CreateNewFolder>true</CreateNewFolder>
- <DefaultName>CordovaWP7_2_7_0</DefaultName>
+ <DefaultName>CordovaWP7_2_8_0rc1</DefaultName>
<ProvideDefaultName>true</ProvideDefaultName>
<LocationField>Enabled</LocationField>
<EnableLocationBrowseButton>true</EnableLocationBrowseButton>
[6/6] wp7 commit: [CB-3495] clean project after creating
Posted by be...@apache.org.
[CB-3495] clean project after creating
Project: http://git-wip-us.apache.org/repos/asf/cordova-wp7/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp7/commit/0a264e3b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp7/tree/0a264e3b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp7/diff/0a264e3b
Branch: refs/heads/3.0.0
Commit: 0a264e3b3964863095f2be376f5be8330c345792
Parents: 8114e13
Author: Benn Mapes <be...@gmail.com>
Authored: Thu May 23 16:41:18 2013 -0700
Committer: Benn Mapes <be...@gmail.com>
Committed: Fri May 24 12:13:28 2013 -0700
----------------------------------------------------------------------
bin/create.js | 3 ++
templates/standalone/cordova/lib/clean.js | 43 +++++++++++++++---------
2 files changed, 30 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-wp7/blob/0a264e3b/bin/create.js
----------------------------------------------------------------------
diff --git a/bin/create.js b/bin/create.js
index a789e20..7d89d0a 100644
--- a/bin/create.js
+++ b/bin/create.js
@@ -203,6 +203,9 @@ function create(path, namespace, name) {
}
}
+ //clean up any Bin/obj or other generated files
+ exec('cscript ' + path + '\\cordova\\lib\\clean.js //nologo');
+
Log("CREATE SUCCESS : " + path);
// TODO: Name the project according to the arguments
http://git-wip-us.apache.org/repos/asf/cordova-wp7/blob/0a264e3b/templates/standalone/cordova/lib/clean.js
----------------------------------------------------------------------
diff --git a/templates/standalone/cordova/lib/clean.js b/templates/standalone/cordova/lib/clean.js
index 3a8c871..b091425 100644
--- a/templates/standalone/cordova/lib/clean.js
+++ b/templates/standalone/cordova/lib/clean.js
@@ -50,32 +50,43 @@ function Log(msg, error) {
// cleans any generated files in the cordova project
function clean_project(path) {
- if (fso.FolderExists(path + "\\obj")) {
- fso.DeleteFolder(path + "\\obj");
- }
- if (fso.FolderExists(path + "\\Bin")) {
- fso.DeleteFolder(path + "\\Bin");
+ delete_if_exists(path + "\\obj");
+ delete_if_exists(path + "\\Bin");
+
+ // checks to see if a .csproj file exists in the project root
+ if (fso.FolderExists(path)) {
+ 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()) == 'user') {
+ delete_if_exists(proj_files.item())
+ } else if (fso.GetExtensionName(proj_files.item()) == 'sou') {
+ delete_if_exists(proj_files.item())
+ }
+ }
}
- //TODO: delete CordovaAppProj.csproj.user as well? Service References?
+ //TODO: delete Service References?
}
// cleans any files generated by build --debug
function clean_debug(path) {
- if (fso.FolderExists(path + "\\obj\\Debug")) {
- fso.DeleteFolder(path + "\\obj\\Debug");
- }
- if (fso.FolderExists(path + "\\Bin\\Debug")) {
- fso.DeleteFolder(path + "\\Bin\\Debug");
- }
+ delete_if_exists(path + "\\obj\\Debug");
+ delete_if_exists(path + "\\Bin\\Debug");
}
// cleans any files generated by build --release
function clean_release(path) {
- if (fso.FolderExists(path + "\\obj\\Release")) {
- fso.DeleteFolder(path + "\\obj\\Release");
+ delete_if_exists(path + "\\obj\\Release");
+ delete_if_exists(path + "\\Bin\\Release");
+}
+
+// deletes the path element if it exists
+function delete_if_exists(path) {
+ if (fso.FolderExists(path)) {
+ fso.DeleteFolder(path);
}
- if (fso.FolderExists(path + "\\Bin\\Release")) {
- fso.DeleteFolder(path + "\\Bin\\Release");
+ else if (fso.FileExists(path)) {
+ fso.DeleteFile(path);
}
}
[2/6] wp7 commit: Update JS snapshot to version 2.8.0rc1
Posted by be...@apache.org.
Update JS snapshot to version 2.8.0rc1
Project: http://git-wip-us.apache.org/repos/asf/cordova-wp7/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp7/commit/26c72e1a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp7/tree/26c72e1a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp7/diff/26c72e1a
Branch: refs/heads/3.0.0
Commit: 26c72e1a99837645f9f4d99d983dfe4acd8108e3
Parents: 700a0ea
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu May 23 00:33:07 2013 -0400
Committer: Benn Mapes <be...@gmail.com>
Committed: Fri May 24 12:13:21 2013 -0700
----------------------------------------------------------------------
templates/standalone/www/cordova.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-wp7/blob/26c72e1a/templates/standalone/www/cordova.js
----------------------------------------------------------------------
diff --git a/templates/standalone/www/cordova.js b/templates/standalone/www/cordova.js
index 0d763d9..dbfd627 100644
--- a/templates/standalone/www/cordova.js
+++ b/templates/standalone/www/cordova.js
@@ -1,4 +1,4 @@
-// Platform: windowsphone
+// Platform: windowsphone
// 2.8.0rc1-0-g22bc4d8
/*
Licensed to the Apache Software Foundation (ASF) under one