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 2014/06/04 02:39:06 UTC
git commit: CB-6859 Removed all wp7 references, tests still passing
Repository: cordova-lib
Updated Branches:
refs/heads/master 37e21e829 -> 6d74f296f
CB-6859 Removed all wp7 references, tests still passing
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/6d74f296
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/6d74f296
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/6d74f296
Branch: refs/heads/master
Commit: 6d74f296f311ecbc85c354cb2f4ea8f8280e416e
Parents: 37e21e8
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Tue Jun 3 14:43:49 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue Jun 3 14:43:49 2014 -0700
----------------------------------------------------------------------
.../fixtures/plugins/ChildBrowser/plugin.xml | 16 --
.../spec-cordova/metadata/wp7_parser.spec.js | 208 ---------------
cordova-lib/spec-cordova/serve.spec.js | 1 -
cordova-lib/spec-cordova/util.spec.js | 8 +-
cordova-lib/spec-plugman/platforms/wp7.spec.js | 129 ---------
.../plugins/ChildBrowser/plugin.xml | 16 --
.../spec-plugman/plugins/Contacts/plugin.xml | 15 --
.../spec-plugman/plugins/DummyPlugin/plugin.xml | 12 -
.../plugins/FaultyPlugin/plugin.xml | 14 -
.../projects/wp7/CordovaAppProj.csproj | 76 ------
.../projects/wp7/Properties/WMAppManifest.xml | 28 --
cordova-lib/spec-plugman/util/csproj.spec.js | 12 +-
cordova-lib/src/cordova/lazy_load.js | 4 +-
cordova-lib/src/cordova/metadata/wp7_parser.js | 262 -------------------
cordova-lib/src/cordova/platforms.js | 7 -
cordova-lib/src/plugman/platforms.js | 1 -
cordova-lib/src/plugman/platforms/wp7.js | 91 -------
cordova-lib/src/plugman/prepare.js | 9 +-
cordova-lib/src/plugman/util/default-engines.js | 6 +-
19 files changed, 17 insertions(+), 898 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6d74f296/cordova-lib/spec-cordova/fixtures/plugins/ChildBrowser/plugin.xml
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/fixtures/plugins/ChildBrowser/plugin.xml b/cordova-lib/spec-cordova/fixtures/plugins/ChildBrowser/plugin.xml
index 512c02f..11ddd86 100644
--- a/cordova-lib/spec-cordova/fixtures/plugins/ChildBrowser/plugin.xml
+++ b/cordova-lib/spec-cordova/fixtures/plugins/ChildBrowser/plugin.xml
@@ -106,22 +106,6 @@
<framework src="social.framework" weak="true" />
<framework src="music.framework" weak="rabbit" />
</platform>
- <!-- wp7 -->
- <platform name="wp7">
- <resource-file src="src\wp7\Images\appbar.back.rest.png" />
- <config-file target="config.xml" parent="/widget/plugins">
- <plugin name="ChildBrowser"
- value="ChildBrowser"/>
- </config-file>
-
- <source-file src="src\wp7\ChildBrowserCommand.cs"
- target-dir="Plugins\" />
-
- <!-- modify the project file to include the added files -->
- <config-file target=".csproj" parent=".">
- </config-file>
-
- </platform>
<!-- wp8 -->
<platform name="wp8">
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6d74f296/cordova-lib/spec-cordova/metadata/wp7_parser.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/metadata/wp7_parser.spec.js b/cordova-lib/spec-cordova/metadata/wp7_parser.spec.js
deleted file mode 100644
index 2ba8061..0000000
--- a/cordova-lib/spec-cordova/metadata/wp7_parser.spec.js
+++ /dev/null
@@ -1,208 +0,0 @@
-/**
- 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 platforms = require('../../src/cordova/platforms'),
- util = require('../../src/cordova/util'),
- path = require('path'),
- shell = require('shelljs'),
- fs = require('fs'),
- et = require('elementtree'),
- xmlHelpers = require('../../src/util/xml-helpers'),
- Q = require('q'),
- child_process = require('child_process'),
- config = require('../../src/cordova/config'),
- ConfigParser = require('../../src/cordova/ConfigParser'),
- CordovaError = require('../../src/CordovaError'),
- cordova = require('../../src/cordova/cordova');
-
-// Create a real config object before mocking out everything.
-var cfg = new ConfigParser(path.join(__dirname, '..', 'test-config.xml'));
-
-describe('wp7 project parser', function() {
- var proj = '/some/path';
- var exists, exec, custom, readdir, cfg_parser;
- var projXml, manifestXml;
- beforeEach(function() {
- exists = spyOn(fs, 'existsSync').andReturn(true);
- exec = spyOn(child_process, 'exec').andCallFake(function(cmd, opts, cb) {
- (cb || opts)(0, '', '');
- });
- custom = spyOn(config, 'has_custom_path').andReturn(false);
- readdir = spyOn(fs, 'readdirSync').andReturn(['test.csproj']);
- projXml = manifestXml = null;
- spyOn(xmlHelpers, 'parseElementtreeSync').andCallFake(function(path) {
- if (/WMAppManifest.xml$/.exec(path)) {
- return manifestXml = new et.ElementTree(et.XML('<foo><App Title="s"><PrimaryToken /><RootNamespace/><SilverlightAppEntry/><XapFilename/><AssemblyName/></App></foo>'));
- } else if (/csproj$/.exec(path)) {
- return projXml = new et.ElementTree(et.XML('<foo><App Title="s"><PrimaryToken /><RootNamespace/><SilverlightAppEntry/><XapFilename/><AssemblyName/></App></foo>'));
- } else if (/xaml$/.exec(path)) {
- return new et.ElementTree(et.XML('<foo><App Title="s"><PrimaryToken /><RootNamespace/><SilverlightAppEntry/><XapFilename/><AssemblyName/></App></foo>'));
- } else {
- throw new CordovaError('Unexpected parseElementtreeSync: ' + path);
- }
- });
- });
-
- function wrapper(p, done, post) {
- p.then(post, function(err) {
- expect(err).toBeUndefined();
- }).fin(done);
- }
-
- function errorWrapper(p, done, post) {
- p.then(function() {
- expect('this call').toBe('fail');
- }, post).fin(done);
- }
-
- describe('constructions', function() {
- it('should throw if provided directory does not contain a csproj file', function() {
- readdir.andReturn([]);
- expect(function() {
- new platforms.wp7.parser(proj);
- }).toThrow();
- });
- it('should create an instance with path, manifest properties', function() {
- expect(function() {
- var p = new platforms.wp7.parser(proj);
- expect(p.wp7_proj_dir).toEqual(proj);
- expect(p.manifest_path).toEqual(path.join(proj, 'Properties', 'WMAppManifest.xml'));
- }).not.toThrow();
- });
- });
-
- describe('check_requirements', function() {
- it('should fire a callback if there is an error during shelling out', function(done) {
- exec.andCallFake(function(cmd, opts, cb) {
- (cb || opts)(50, 'there was an errorz!');
- });
- errorWrapper(platforms.wp7.parser.check_requirements(proj), done, function(err) {
- expect(err).toContain('there was an errorz!');
- });
- });
- it('should check by calling check_reqs on the stock lib path if no custom path is defined', function(done) {
- wrapper(platforms.wp7.parser.check_requirements(proj), done, function(err) {
- expect(exec.mostRecentCall.args[0]).toContain(util.libDirectory);
- expect(exec.mostRecentCall.args[0]).toMatch(/check_reqs"$/);
- });
- });
- it('should check by calling check_reqs on a custom path if it is so defined', function(done) {
- var custom_path = path.join('some','custom','path','to','wp7','lib');
- custom.andReturn(custom_path);
- wrapper(platforms.wp7.parser.check_requirements(proj), done, function() {
- expect(exec.mostRecentCall.args[0]).toContain(custom_path);
- expect(exec.mostRecentCall.args[0]).toMatch(/check_reqs"$/);
- });
- });
- });
-
- describe('instance', function() {
- var p, cp, rm, is_cordova, write, read, mv, mkdir;
- var wp7_proj = path.join(proj, 'platforms', 'wp7');
- beforeEach(function() {
- p = new platforms.wp7.parser(wp7_proj);
- cp = spyOn(shell, 'cp');
- rm = spyOn(shell, 'rm');
- mv = spyOn(shell, 'mv');
- mkdir = spyOn(shell, 'mkdir');
- is_cordova = spyOn(util, 'isCordova').andReturn(proj);
- write = spyOn(fs, 'writeFileSync');
- read = spyOn(fs, 'readFileSync').andReturn('');
- });
-
- describe('update_from_config method', function() {
- beforeEach(function() {
- cfg.name = function() { return 'testname' };
- cfg.content = function() { return 'index.html' };
- cfg.packageName = function() { return 'testpkg' };
- cfg.version = function() { return 'one point oh' };
- readdir.andReturn(['test.sln']);
- });
-
- it('should write out the app name to wmappmanifest.xml', function() {
- p.update_from_config(cfg);
- var appEl = manifestXml.getroot().find('.//App');
- expect(appEl.attrib.Title).toEqual('testname');
- });
- it('should write out the app id to csproj file', function() {
- p.update_from_config(cfg);
- var appEl = projXml.getroot().find('.//RootNamespace');
- expect(appEl.text).toContain('testpkg');
- });
- it('should write out the app version to wmappmanifest.xml', function() {
- p.update_from_config(cfg);
- var appEl = manifestXml.getroot().find('.//App');
- expect(appEl.attrib.Version).toEqual('one point oh');
- });
- });
- describe('www_dir method', function() {
- it('should return www', function() {
- expect(p.www_dir()).toEqual(path.join(wp7_proj, 'www'));
- });
- });
- describe('config_xml method', function() {
- it('should return the location of the config.xml', function() {
- expect(p.config_xml()).toEqual(path.join(wp7_proj, 'config.xml'));
- });
- });
- describe('update_www method', function() {
- var update_csproj;
- beforeEach(function() {
- update_csproj = spyOn(p, 'update_csproj');
- });
- it('should rm project-level www and cp in platform agnostic www', function() {
- p.update_www();
- expect(rm).toHaveBeenCalled();
- expect(cp).toHaveBeenCalled();
- });
- });
- describe('update_project method', function() {
- var config, www, overrides, svn, cfg, csproj;
- beforeEach(function() {
- config = spyOn(p, 'update_from_config');
- www = spyOn(p, 'update_www');
- svn = spyOn(util, 'deleteSvnFolders');
- csproj = spyOn(p, 'update_csproj');
- exists.andReturn(false);
- });
- it('should call update_from_config', function(done) {
- wrapper(p.update_project(), done, function(){
- expect(config).toHaveBeenCalled();
- });
- });
- it('should throw if update_from_config throws', function(done) {
- var err = new Error('uh oh!');
- config.andCallFake(function() { throw err; });
- errorWrapper(p.update_project({}), done, function(e) {
- expect(e).toEqual(err);
- });
- });
- it('should call update_www', function(done) {
- wrapper(p.update_project(), done, function() {
- expect(www).not.toHaveBeenCalled();
- });
- });
- it('should call deleteSvnFolders', function(done) {
- wrapper(p.update_project(), done, function() {
- expect(svn).toHaveBeenCalled();
- });
- });
- });
- });
-});
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6d74f296/cordova-lib/spec-cordova/serve.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/serve.spec.js b/cordova-lib/spec-cordova/serve.spec.js
index b8396d4..600c366 100644
--- a/cordova-lib/spec-cordova/serve.spec.js
+++ b/cordova-lib/spec-cordova/serve.spec.js
@@ -27,7 +27,6 @@ var cordova = require('../src/cordova/cordova'),
android_parser = require('../src/cordova/metadata/android_parser'),
ios_parser = require('../src/cordova/metadata/ios_parser'),
blackberry_parser = require('../src/cordova/metadata/blackberry10_parser'),
- wp7_parser = require('../src/cordova/metadata/wp7_parser'),
wp8_parser = require('../src/cordova/metadata/wp8_parser');
var cwd = process.cwd();
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6d74f296/cordova-lib/spec-cordova/util.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/util.spec.js b/cordova-lib/spec-cordova/util.spec.js
index 0c252ab..27c7385 100644
--- a/cordova-lib/spec-cordova/util.spec.js
+++ b/cordova-lib/spec-cordova/util.spec.js
@@ -130,11 +130,11 @@ describe('util module', function() {
var platforms = path.join(temp, 'platforms');
var android = path.join(platforms, 'android');
var ios = path.join(platforms, 'ios');
- var wp7 = path.join(platforms, 'wp7');
+ var wp8_dir = path.join(platforms, 'wp8');
var atari = path.join(platforms, 'atari');
shell.mkdir('-p', android);
shell.mkdir('-p', ios);
- shell.mkdir('-p', wp7);
+ shell.mkdir('-p', wp8_dir);
shell.mkdir('-p', atari);
var res = util.listPlatforms(temp);
expect(res.length).toEqual(3);
@@ -149,11 +149,11 @@ describe('util module', function() {
var plugins = path.join(temp, 'plugins');
var android = path.join(plugins, 'android');
var ios = path.join(plugins, 'ios');
- var wp7 = path.join(plugins, 'wp7');
+ var wp8_dir = path.join(plugins, 'wp8');
var atari = path.join(plugins, 'atari');
shell.mkdir('-p', android);
shell.mkdir('-p', ios);
- shell.mkdir('-p', wp7);
+ shell.mkdir('-p', wp8_dir);
shell.mkdir('-p', atari);
var res = util.findPlugins(plugins);
expect(res.length).toEqual(4);
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6d74f296/cordova-lib/spec-plugman/platforms/wp7.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/platforms/wp7.spec.js b/cordova-lib/spec-plugman/platforms/wp7.spec.js
deleted file mode 100644
index ca57179..0000000
--- a/cordova-lib/spec-plugman/platforms/wp7.spec.js
+++ /dev/null
@@ -1,129 +0,0 @@
-var wp7 = require('../../src/plugman/platforms/wp7'),
- common = require('../../src/plugman/platforms/common'),
- install = require('../../src/plugman/install'),
- path = require('path'),
- fs = require('fs'),
- shell = require('shelljs'),
- et = require('elementtree'),
- os = require('osenv'),
- temp = path.join(os.tmpdir(), 'plugman'),
- plugins_dir = path.join(temp, 'cordova', 'plugins'),
- xml_helpers = require('../../src/util/xml-helpers'),
- plugins_module = require('../../src/plugman/util/plugins'),
- dummyplugin = path.join(__dirname, '..', 'plugins', 'DummyPlugin'),
- faultyplugin = path.join(__dirname, '..', 'plugins', 'FaultyPlugin'),
- wp7_project = path.join(__dirname, '..', 'projects', 'wp7');
-
-var xml_path = path.join(dummyplugin, 'plugin.xml')
- , xml_text = fs.readFileSync(xml_path, 'utf-8')
- , plugin_et = new et.ElementTree(et.XML(xml_text));
-
-var platformTag = plugin_et.find('./platform[@name="wp7"]');
-var dummy_id = plugin_et._root.attrib['id'];
-var valid_source = platformTag.findall('./source-file'),
- assets = plugin_et.findall('./asset'),
- configChanges = platformTag.findall('./config-file');
-xml_path = path.join(faultyplugin, 'plugin.xml')
-xml_text = fs.readFileSync(xml_path, 'utf-8')
-plugin_et = new et.ElementTree(et.XML(xml_text));
-
-platformTag = plugin_et.find('./platform[@name="wp7"]');
-var invalid_source = platformTag.findall('./source-file');
-var faulty_id = plugin_et._root.attrib['id'];
-
-shell.mkdir('-p', temp);
-shell.cp('-rf', path.join(wp7_project, '*'), temp);
-var proj_files = wp7.parseProjectFile(temp);
-shell.rm('-rf', temp);
-
-function copyArray(arr) {
- return Array.prototype.slice.call(arr, 0);
-}
-
-describe('wp7 project handler', function() {
-
- beforeEach(function() {
- shell.mkdir('-p', temp);
- shell.mkdir('-p', plugins_dir);
- });
- afterEach(function() {
- shell.rm('-rf', temp);
- });
-
- describe('www_dir method', function() {
- it('should return cordova-wp7 project www location using www_dir', function() {
- expect(wp7.www_dir(path.sep)).toEqual(path.sep + 'www');
- });
- });
- describe('package_name method', function() {
- it('should return a wp7 project\'s proper package name', function() {
- expect(wp7.package_name(wp7_project)).toEqual("{5FC10D78-8779-4EDB-9B61-1D04F0A755D4}");
- });
- });
-
- describe('parseProjectFile method', function() {
- it('should throw if project is not an wp7 project', function() {
- expect(function() {
- wp7.parseProjectFile(temp);
- }).toThrow('does not appear to be a Windows Phone project (no .csproj file)');
- });
- });
-
- describe('installation', function() {
- beforeEach(function() {
- shell.mkdir('-p', temp);
- });
- afterEach(function() {
- shell.rm('-rf', temp);
- });
- describe('of <source-file> elements', function() {
- beforeEach(function() {
- shell.cp('-rf', path.join(wp7_project, '*'), temp);
- });
- it('should copy stuff from one location to another by calling common.copyFile', function() {
- var source = copyArray(valid_source);
- var s = spyOn(common, 'copyFile');
- wp7['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
- expect(s).toHaveBeenCalledWith(dummyplugin, 'src/wp7/DummyPlugin.cs', temp, path.join('Plugins', 'com.phonegap.plugins.dummyplugin', 'DummyPlugin.cs'));
- });
- it('should throw if source-file src cannot be found', function() {
- var source = copyArray(invalid_source);
- expect(function() {
- wp7['source-file'].install(source[1], faultyplugin, temp, faulty_id, proj_files);
- }).toThrow('"' + path.resolve(faultyplugin, 'src/wp7/NotHere.cs') + '" not found!');
- });
- it('should throw if source-file target already exists', function() {
- var source = copyArray(valid_source);
- var target = path.join(temp, 'Plugins', dummy_id, 'DummyPlugin.cs');
- shell.mkdir('-p', path.dirname(target));
- fs.writeFileSync(target, 'some bs', 'utf-8');
- expect(function() {
- wp7['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
- }).toThrow('"' + target + '" already exists!');
- });
- });
- });
-
- describe('uninstallation', function() {
- beforeEach(function() {
- shell.mkdir('-p', temp);
- shell.mkdir('-p', plugins_dir);
- shell.cp('-rf', path.join(wp7_project, '*'), temp);
- });
- afterEach(function() {
- shell.rm('-rf', temp);
- });
- describe('of <source-file> elements', function() {
- it('should remove stuff by calling common.removeFile', function(done) {
- var s = spyOn(common, 'removeFile');
- install('wp7', temp, dummyplugin, plugins_dir, {})
- .then(function() {
- var source = copyArray(valid_source);
- wp7['source-file'].uninstall(source[0], temp, dummy_id, proj_files);
- expect(s).toHaveBeenCalledWith(temp, path.join('Plugins', 'com.phonegap.plugins.dummyplugin', 'DummyPlugin.cs'));
- done();
- });
- });
- });
- });
-});
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6d74f296/cordova-lib/spec-plugman/plugins/ChildBrowser/plugin.xml
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/plugins/ChildBrowser/plugin.xml b/cordova-lib/spec-plugman/plugins/ChildBrowser/plugin.xml
index 77809f2..030f8ca 100644
--- a/cordova-lib/spec-plugman/plugins/ChildBrowser/plugin.xml
+++ b/cordova-lib/spec-plugman/plugins/ChildBrowser/plugin.xml
@@ -104,22 +104,6 @@
<framework src="music.framework" weak="rabbit" />
<framework src="Custom.framework" custom="true" />
</platform>
- <!-- wp7 -->
- <platform name="wp7">
- <resource-file src="src\wp7\Images\appbar.back.rest.png" />
- <config-file target="config.xml" parent="/widget/plugins">
- <plugin name="ChildBrowser"
- value="ChildBrowser"/>
- </config-file>
-
- <source-file src="src\wp7\ChildBrowserCommand.cs"
- target-dir="Plugins\" />
-
- <!-- modify the project file to include the added files -->
- <config-file target=".csproj" parent=".">
- </config-file>
-
- </platform>
<!-- wp8 -->
<platform name="wp8">
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6d74f296/cordova-lib/spec-plugman/plugins/Contacts/plugin.xml
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/plugins/Contacts/plugin.xml b/cordova-lib/spec-plugman/plugins/Contacts/plugin.xml
index 7328f1a..622eb2a 100644
--- a/cordova-lib/spec-plugman/plugins/Contacts/plugin.xml
+++ b/cordova-lib/spec-plugman/plugins/Contacts/plugin.xml
@@ -110,21 +110,6 @@
<dependency id="org.apache.cordova.blackberry10.pimlib" url="https://github.com/blackberry/cordova-blackberry-plugins.git" commit="plugins" subdir="/plugin/org.apache.cordova.blackberry10.pimlib/"/>
</platform>
- <!-- wp7 -->
- <platform name="wp7">
- <config-file target="config.xml" parent="/*">
- <feature name="Contacts">
- <param name="wp-package" value="Contacts"/>
- </feature>
- </config-file>
-
- <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
- <Capability Name="ID_CAP_CONTACTS" />
- </config-file>
-
- <source-file src="src/wp/Contacts.cs" />
- </platform>
-
<!-- wp8 -->
<platform name="wp8">
<config-file target="config.xml" parent="/*">
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6d74f296/cordova-lib/spec-plugman/plugins/DummyPlugin/plugin.xml
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/plugins/DummyPlugin/plugin.xml b/cordova-lib/spec-plugman/plugins/DummyPlugin/plugin.xml
index e3d7097..0e88443 100644
--- a/cordova-lib/spec-plugman/plugins/DummyPlugin/plugin.xml
+++ b/cordova-lib/spec-plugman/plugins/DummyPlugin/plugin.xml
@@ -133,18 +133,6 @@
<framework src="src/ios/Custom.framework" custom="true" />
</platform>
- <!-- wp7 -->
- <platform name="wp7">
- <config-file target="config.xml" parent="/*">
- <feature id="dummyPlugin" required="true" version="1.0.0.0"/>
- </config-file>
-
- <source-file src="src/wp7/DummyPlugin.cs"/>
- <js-module src="www/dummyplugin.js" name="Dummy">
- <clobbers target="dummy" />
- </js-module>
- </platform>
-
<!-- wp8 -->
<platform name="wp8">
<config-file target="config.xml" parent="/*">
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6d74f296/cordova-lib/spec-plugman/plugins/FaultyPlugin/plugin.xml
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/plugins/FaultyPlugin/plugin.xml b/cordova-lib/spec-plugman/plugins/FaultyPlugin/plugin.xml
index 22564e7..706db45 100644
--- a/cordova-lib/spec-plugman/plugins/FaultyPlugin/plugin.xml
+++ b/cordova-lib/spec-plugman/plugins/FaultyPlugin/plugin.xml
@@ -117,20 +117,6 @@
<lib-file src="src/blackberry10/simulator/echoJnext.so" target-dir="ext-qnx/cordova.echo/simulator" />
</platform>
- <!-- wp7 -->
- <platform name="wp7">
- <config-file target="config.xml" parent="/*">
- <feature name="FaultyPlugin">
- <param name="wp-package" value="FaultyPlugin"/>
- </feature>
- </config-file>
-
- <source-file src="src/wp7/FaultyPlugin.cs" />
-
- <!-- this doesn't exist -->
- <source-file src="src/wp7/NotHere.cs" />
- </platform>
-
<!-- wp8 -->
<platform name="wp8">
<config-file target="config.xml" parent="/*">
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6d74f296/cordova-lib/spec-plugman/projects/wp7/CordovaAppProj.csproj
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/projects/wp7/CordovaAppProj.csproj b/cordova-lib/spec-plugman/projects/wp7/CordovaAppProj.csproj
deleted file mode 100644
index 4b122a2..0000000
--- a/cordova-lib/spec-plugman/projects/wp7/CordovaAppProj.csproj
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>10.0.20506</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{3677C1B7-D68B-4CF9-BF8A-E869D437A6DF}</ProjectGuid>
- <ProjectTypeGuids>{C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>$safeprojectname$</RootNamespace>
- <AssemblyName>$safeprojectname$</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
- <TargetFrameworkProfile>WindowsPhone71</TargetFrameworkProfile>
- <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
- <SilverlightApplication>true</SilverlightApplication>
- <SupportedCultures>
- </SupportedCultures>
- <XapOutputs>true</XapOutputs>
- <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
- <XapFilename>$safeprojectname$.xap</XapFilename>
- <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
- <SilverlightAppEntry>$safeprojectname$.App</SilverlightAppEntry>
- <ValidateXaml>true</ValidateXaml>
- <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>Bin\Debug</OutputPath>
- <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
- <NoStdLib>true</NoStdLib>
- <NoConfig>true</NoConfig>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>Bin\Release</OutputPath>
- <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
- <NoStdLib>true</NoStdLib>
- <NoConfig>true</NoConfig>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="Microsoft.Devices.Sensors" />
- <Reference Include="Microsoft.Phone" />
- <Reference Include="Microsoft.Phone.Interop" />
- <Reference Include="Microsoft.Xna.Framework" />
- <Reference Include="System.Device" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.Servicemodel.Web" />
- <Reference Include="System.Windows" />
- <Reference Include="system" />
- <Reference Include="System.Core" />
- <Reference Include="System.Net" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Xml.Linq" />
- </ItemGroup>
- <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
- <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
- <ProjectExtensions />
- <PropertyGroup>
- <PreBuildEvent>CScript "$(ProjectDir)/BuildManifestProcessor.js" "$(ProjectPath)"</PreBuildEvent>
- </PropertyGroup>
- <PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
- </PropertyGroup>
- <ItemGroup />
-</Project>
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6d74f296/cordova-lib/spec-plugman/projects/wp7/Properties/WMAppManifest.xml
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/projects/wp7/Properties/WMAppManifest.xml b/cordova-lib/spec-plugman/projects/wp7/Properties/WMAppManifest.xml
deleted file mode 100644
index b218fcb..0000000
--- a/cordova-lib/spec-plugman/projects/wp7/Properties/WMAppManifest.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Deployment xmlns="http://schemas.microsoft.com/windowsphone/2009/deployment" AppPlatformVersion="7.1">
- <App xmlns="" ProductID="{5FC10D78-8779-4EDB-9B61-1D04F0A755D4}" Title="An App"
- RuntimeType="Silverlight" Version="1.0.0.0" Genre="apps.normal"
- Author="An App author"
- BitsPerPixel="32"
- Description="Apache Cordova for Windows Phone 7"
- Publisher="An App">
-
- <IconPath IsRelative="true" IsResource="false">ApplicationIcon.png</IconPath>
- <Capabilities>
- <Capability Name="ID_CAP_WEBBROWSERCOMPONENT" />
- </Capabilities>
-
- <Tasks>
- <DefaultTask Name="_default" NavigationPage="MainPage.xaml" />
- </Tasks>
- <Tokens>
- <PrimaryToken TokenID="An AppToken" TaskName="_default">
- <TemplateType5>
- <BackgroundImageURI IsRelative="true" IsResource="false">Background.png</BackgroundImageURI>
- <Count>0</Count>
- <Title>An App</Title>
- </TemplateType5>
- </PrimaryToken>
- </Tokens>
- </App>
-</Deployment>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6d74f296/cordova-lib/spec-plugman/util/csproj.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/util/csproj.spec.js b/cordova-lib/spec-plugman/util/csproj.spec.js
index 36f3957..f187fd2 100644
--- a/cordova-lib/spec-plugman/util/csproj.spec.js
+++ b/cordova-lib/spec-plugman/util/csproj.spec.js
@@ -5,11 +5,9 @@ var csproj = require('../../src/plugman/util/csproj'),
fs = require('fs'),
xml_helpers = require('../../src/util/xml-helpers');
-var wp7_project = path.join(__dirname, '..', 'projects', 'wp7'),
- wp8_project = path.join(__dirname, '..', 'projects', 'wp8'),
+var wp8_project = path.join(__dirname, '..', 'projects', 'wp8'),
temp = path.join(os.tmpdir(), 'plugman'),
- example1_csproj = path.join(wp7_project, 'CordovaAppProj.csproj'),
- example2_csproj = path.join(wp8_project, 'CordovaAppProj.csproj'),
+ example_csproj = path.join(wp8_project, 'CordovaAppProj.csproj'),
wpcsproj = path.join(__dirname, '..', 'plugins', 'WPcsproj');
describe('csproj', function() {
@@ -21,7 +19,7 @@ describe('csproj', function() {
it('should successfully parse a valid csproj file into an xml document', function() {
var doc;
expect(function() {
- doc = new csproj(example1_csproj);
+ doc = new csproj(example_csproj);
}).not.toThrow();
expect(doc.xml.getroot()).toBeDefined();
});
@@ -40,7 +38,7 @@ describe('csproj', function() {
var content_test = path.join('src', 'Content.img');
describe('add method', function() {
- var test_csproj = new csproj(example1_csproj);
+ var test_csproj = new csproj(example_csproj);
it('should properly add .xaml files', function() {
test_csproj.addSourceFile(page_test);
expect(test_csproj.xml.getroot().find('.//Page[@Include="src\\UI\\PageTest.xaml"]')).toBeTruthy();
@@ -63,7 +61,7 @@ describe('csproj', function() {
});
describe('remove method', function() {
- var test_csproj = new csproj(example2_csproj);
+ var test_csproj = new csproj(example_csproj);
it('should properly remove .xaml pages', function() {
test_csproj.removeSourceFile(page_test);
expect(test_csproj.xml.getroot().find('.//Page[@Include="src\\UI\\PageTest.xaml"]')).toBeFalsy();
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6d74f296/cordova-lib/src/cordova/lazy_load.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/lazy_load.js b/cordova-lib/src/cordova/lazy_load.js
index 0124996..e90ef9f 100644
--- a/cordova-lib/src/cordova/lazy_load.js
+++ b/cordova-lib/src/cordova/lazy_load.js
@@ -77,8 +77,8 @@ module.exports = {
var uri = URL.parse(url);
var isUri = uri.protocol && uri.protocol[1] != ':'; // second part of conditional is for awesome windows support. fuuu windows
if (isUri) {
- download_dir = (platform == 'wp7' || platform == 'wp8' ? path.join(util.libDirectory, 'wp', id, version) :
- path.join(util.libDirectory, platform, id, version));
+ download_dir = (platform == 'wp8' ? path.join(util.libDirectory, 'wp', id, version) :
+ path.join(util.libDirectory, platform, id, version));
lib_dir = platforms[platform] && platforms[platform].subdirectory && platform !== "blackberry10" ? path.join(download_dir, platforms[platform].subdirectory) : download_dir;
if (fs.existsSync(download_dir)) {
events.emit('verbose', id + ' library for "' + platform + '" already exists. No need to download. Continuing.');
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6d74f296/cordova-lib/src/cordova/metadata/wp7_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/wp7_parser.js b/cordova-lib/src/cordova/metadata/wp7_parser.js
deleted file mode 100644
index 4b8dae1..0000000
--- a/cordova-lib/src/cordova/metadata/wp7_parser.js
+++ /dev/null
@@ -1,262 +0,0 @@
-/**
- 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 fs = require('fs'),
- path = require('path'),
- et = require('elementtree'),
- xml = require('../../util/xml-helpers'),
- util = require('../util'),
- events = require('../events'),
- shell = require('shelljs'),
- child_process = require('child_process'),
- Q = require('q'),
- ConfigParser = require('../ConfigParser'),
- CordovaError = require('../../CordovaError'),
- config = require('../config'),
- hooker = require('../hooker');
-
-module.exports = function wp7_parser(project) {
- try {
- // TODO : Check that it's not a wp7 project?
- var csproj_file = fs.readdirSync(project).filter(function(e) { return e.match(/\.csproj$/i); })[0];
- if (!csproj_file) throw new CordovaError('No .csproj file in "'+project+'"');
- this.wp7_proj_dir = project;
- this.csproj_path = path.join(this.wp7_proj_dir, csproj_file);
- this.sln_path = path.join(this.wp7_proj_dir, csproj_file.replace(/\.csproj/, '.sln'));
- } catch(e) {
- throw new CordovaError('The provided path "' + project + '" is not a Windows Phone 7 project. ' + e);
- }
- this.manifest_path = path.join(this.wp7_proj_dir, 'Properties', 'WMAppManifest.xml');
-};
-
-// Returns a promise.
-module.exports.check_requirements = function(project_root) {
- events.emit('log', 'Checking wp7 requirements...');
- var lib_path = path.join(util.libDirectory, 'wp', 'cordova', require('../platforms').wp7.version, 'wp7');
- var custom_path = config.has_custom_path(project_root, 'wp7');
- if (custom_path) {
- lib_path = path.join(custom_path, 'wp7');
- }
- var command = '"' + path.join(lib_path, 'bin', 'check_reqs') + '"';
- events.emit('verbose', 'Running "' + command + '" (output to follow)');
- var d = Q.defer();
- child_process.exec(command, function(err, output, stderr) {
- events.emit('verbose', output+stderr);
- if (err) {
- d.reject(new CordovaError('Requirements check failed: ' + output + stderr));
- } else {
- d.resolve();
- }
- });
- return d.promise;
-};
-
-module.exports.prototype = {
- update_from_config:function(config) {
- //check config parser
- if (config instanceof ConfigParser) {
- } else throw new Error('update_from_config requires a ConfigParser object');
-
- //Get manifest file
- var manifest = xml.parseElementtreeSync(this.manifest_path);
-
- //Update app version
- var version = config.version();
- manifest.find('.//App').attrib.Version = version;
-
- // Update app name by editing app title in Properties\WMAppManifest.xml
- var name = config.name();
- var prev_name = manifest.find('.//App[@Title]')['attrib']['Title'];
- if(prev_name != name) {
- events.emit('verbose', "Updating app name from " + prev_name + " to " + name);
- manifest.find('.//App').attrib.Title = name;
- manifest.find('.//App').attrib.Publisher = name + " Publisher";
- manifest.find('.//App').attrib.Author = name + " Author";
- manifest.find('.//PrimaryToken').attrib.TokenID = name;
- //update name of sln and csproj.
- name = name.replace(/(\.\s|\s\.|\s+|\.+)/g, '_'); //make it a ligitamate name
- prev_name = prev_name.replace(/(\.\s|\s\.|\s+|\.+)/g, '_');
- var sln_name = fs.readdirSync(this.wp7_proj_dir).filter(function(e) { return e.match(/\.sln$/i); })[0];
- var sln_path = path.join(this.wp7_proj_dir, sln_name);
- var sln_file = fs.readFileSync(sln_path, 'utf-8');
- var name_regex = new RegExp(prev_name, "g");
- fs.writeFileSync(sln_path, sln_file.replace(name_regex, name), 'utf-8');
- shell.mv('-f', this.csproj_path, path.join(this.wp7_proj_dir, name + '.csproj'));
- this.csproj_path = path.join(this.wp7_proj_dir, name + '.csproj');
- shell.mv('-f', sln_path, path.join(this.wp7_proj_dir, name + '.sln'));
- this.sln_path = path.join(this.wp7_proj_dir, name + '.sln');
- }
-
- // Update package name by changing:
- /* - CordovaAppProj.csproj
- * - MainPage.xaml
- * - MainPage.xaml.cs
- * - App.xaml
- * - App.xaml.cs
- */
- var pkg = config.packageName();
- var csproj = xml.parseElementtreeSync(this.csproj_path);
- prev_name = csproj.find('.//RootNamespace').text;
- if(prev_name != pkg) {
- events.emit('verbose', "Updating package name from " + prev_name + " to " + pkg);
- //CordovaAppProj.csproj
- csproj.find('.//RootNamespace').text = pkg;
- csproj.find('.//AssemblyName').text = pkg;
- csproj.find('.//XapFilename').text = pkg + '.xap';
- csproj.find('.//SilverlightAppEntry').text = pkg + '.App';
- fs.writeFileSync(this.csproj_path, csproj.write({indent: 4}), 'utf-8');
- //MainPage.xaml
- var mainPageXAML = xml.parseElementtreeSync(path.join(this.wp7_proj_dir, 'MainPage.xaml'));
- mainPageXAML.getroot().attrib['x:Class'] = pkg + '.MainPage';
- fs.writeFileSync(path.join(this.wp7_proj_dir, 'MainPage.xaml'), mainPageXAML.write({indent: 4}), 'utf-8');
- //MainPage.xaml.cs
- var mainPageCS = fs.readFileSync(path.join(this.wp7_proj_dir, 'MainPage.xaml.cs'), 'utf-8');
- var namespaceRegEx = new RegExp('namespace ' + prev_name);
- fs.writeFileSync(path.join(this.wp7_proj_dir, 'MainPage.xaml.cs'), mainPageCS.replace(namespaceRegEx, 'namespace ' + pkg), 'utf-8');
- //App.xaml
- var appXAML = xml.parseElementtreeSync(path.join(this.wp7_proj_dir, 'App.xaml'));
- appXAML.getroot().attrib['x:Class'] = pkg + '.App';
- fs.writeFileSync(path.join(this.wp7_proj_dir, 'App.xaml'), appXAML.write({indent: 4}), 'utf-8');
- //App.xaml.cs
- var appCS = fs.readFileSync(path.join(this.wp7_proj_dir, 'App.xaml.cs'), 'utf-8');
- fs.writeFileSync(path.join(this.wp7_proj_dir, 'App.xaml.cs'), appCS.replace(namespaceRegEx, 'namespace ' + pkg), 'utf-8');
- }
-
- //Write out manifest
- fs.writeFileSync(this.manifest_path, manifest.write({indent: 4}), 'utf-8');
- },
- // Returns the platform-specific www directory.
- www_dir:function() {
- return path.join(this.wp7_proj_dir, 'www');
- },
- config_xml:function() {
- return path.join(this.wp7_proj_dir, 'config.xml');
- },
- // copy files from merges directory to actual www dir
- copy_merges:function(merges_sub_path) {
- var merges_path = path.join(util.appDir(util.isCordova(this.wp7_proj_dir)), 'merges', merges_sub_path);
- if (fs.existsSync(merges_path)) {
- var overrides = path.join(merges_path, '*');
- shell.cp('-rf', overrides, this.www_dir());
- }
- },
-
- // Used for creating platform_www in projects created by older versions.
- cordovajs_path:function(libDir) {
- var jsPath = path.join(libDir, '..', 'common', 'www', 'cordova.js');
- return path.resolve(jsPath);
- },
-
- // Replace the www dir with contents of platform_www and app www and updates the csproj file.
- update_www:function() {
- var projectRoot = util.isCordova(this.wp7_proj_dir);
- var app_www = util.projectWww(projectRoot);
- var platform_www = path.join(this.wp7_proj_dir, 'platform_www');
-
- // Clear the www dir
- shell.rm('-rf', this.www_dir());
- shell.mkdir(this.www_dir());
- // Copy over all app www assets
- shell.cp('-rf', path.join(app_www, '*'), this.www_dir());
-
- // Copy all files from merges directories - wp generic first, then wp7 specific.
- this.copy_merges('wp');
- this.copy_merges('wp7');
- // Copy over stock platform www assets (cordova.js)
- shell.cp('-rf', path.join(platform_www, '*'), this.www_dir());
- },
-
- // updates the csproj file to explicitly list all www content.
- update_csproj:function() {
- var csproj_xml = xml.parseElementtreeSync(this.csproj_path);
- // remove any previous references to the www files
- var item_groups = csproj_xml.findall('ItemGroup');
- for (var i = 0, l = item_groups.length; i < l; i++) {
- var group = item_groups[i];
- var files = group.findall('Content');
- for (var j = 0, k = files.length; j < k; j++) {
- var file = files[j];
- if (file.attrib.Include.substr(0, 3) == 'www') {
- // remove file reference
- group.remove(0, file);
- // remove ItemGroup if empty
- var new_group = group.findall('Content');
- if(new_group.length < 1) {
- csproj_xml.getroot().remove(0, group);
- }
- }
- }
- }
-
- // now add all www references back in from the wp www folder
- var www_files = this.folder_contents('www', this.www_dir());
- for(file in www_files) {
- var item = new et.Element('ItemGroup');
- var content = new et.Element('Content');
- content.attrib.Include = www_files[file];
- item.append(content);
- csproj_xml.getroot().append(item);
- }
- // save file
- fs.writeFileSync(this.csproj_path, csproj_xml.write({indent:4}), 'utf-8');
- },
- // Returns an array of all the files in the given directory with relative paths
- // - name : the name of the top level directory (i.e all files will start with this in their path)
- // - dir : the directory whos contents will be listed under 'name' directory
- folder_contents:function(name, dir) {
- var results = [];
- var folder_dir = fs.readdirSync(dir);
- for(item in folder_dir) {
- var stat = fs.statSync(path.join(dir, folder_dir[item]));
-
- if(stat.isDirectory()) {
- var sub_dir = this.folder_contents(path.join(name, folder_dir[item]), path.join(dir, folder_dir[item]));
- //Add all subfolder item paths
- for(sub_item in sub_dir) {
- results.push(sub_dir[sub_item]);
- }
- }
- else if(stat.isFile()) {
- results.push(path.join(name, folder_dir[item]));
- }
- // else { it is a FIFO, or a Socket or something ... }
- }
- return results;
- },
-
- // calls the nessesary functions to update the wp7 project
- // Returns a promise.
- update_project:function(cfg) {
- try {
- this.update_from_config(cfg);
- } catch(e) {
- return Q.reject(e);
- }
- // trigger an event in case anyone needs to modify the contents of the www folder before we package it.
- var that = this;
- var projectRoot = util.isCordova(process.cwd());
- var hooks = new hooker(projectRoot);
-
- return hooks.fire('pre_package', { wwwPath:this.www_dir(), platforms: ['wp7'] })
- .then(function() {
- that.update_csproj();
- // TODO: Add overrides support? Why is this missing?
- util.deleteSvnFolders(that.www_dir());
- });
- }
-};
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6d74f296/cordova-lib/src/cordova/platforms.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/platforms.js b/cordova-lib/src/cordova/platforms.js
index 58ad517..d9a1514 100644
--- a/cordova-lib/src/cordova/platforms.js
+++ b/cordova-lib/src/cordova/platforms.js
@@ -40,13 +40,6 @@ module.exports = {
url : 'https://git-wip-us.apache.org/repos/asf?p=cordova-amazon-fireos.git',
version: '3.5.0'
},
- 'wp7' : {
- hostos : ['win32'],
- parser : './metadata/wp7_parser',
- url : 'https://git-wip-us.apache.org/repos/asf?p=cordova-wp8.git',
- version: '3.5.0',
- subdirectory: 'wp7'
- },
'wp8' : {
hostos : ['win32'],
parser : './metadata/wp8_parser',
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6d74f296/cordova-lib/src/plugman/platforms.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms.js b/cordova-lib/src/plugman/platforms.js
index a2ad634..71bffbe 100644
--- a/cordova-lib/src/plugman/platforms.js
+++ b/cordova-lib/src/plugman/platforms.js
@@ -3,7 +3,6 @@ module.exports = {
'amazon-fireos': require('./platforms/amazon-fireos'),
'ios': require('./platforms/ios'),
'blackberry10': require('./platforms/blackberry10'),
- 'wp7': require('./platforms/wp7'),
'wp8': require('./platforms/wp8'),
'windows8' : require('./platforms/windows8'),
'firefoxos': require('./platforms/firefoxos'),
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6d74f296/cordova-lib/src/plugman/platforms/wp7.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/wp7.js b/cordova-lib/src/plugman/platforms/wp7.js
deleted file mode 100644
index 24da900..0000000
--- a/cordova-lib/src/plugman/platforms/wp7.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *
- * Copyright 2013 Jesse MacFadyen
- *
- * Licensed 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 common = require('./common'),
- path = require('path'),
- glob = require('glob'),
- fs = require('fs'),
- csproj = require('../util/csproj'),
- events = require('../events'),
- xml_helpers = require('../../util/xml-helpers');
-
-module.exports = {
- www_dir:function(project_dir) {
- return path.join(project_dir, 'www');
- },
- package_name:function(project_dir) {
- return xml_helpers.parseElementtreeSync(path.join(project_dir, 'Properties', 'WMAppManifest.xml')).find('App').attrib.ProductID;
- },
- parseProjectFile:function(project_dir) {
- var project_files = glob.sync('*.csproj', {
- cwd:project_dir
- });
- if (project_files.length === 0) {
- throw new Error('does not appear to be a Windows Phone project (no .csproj file)');
- }
- return new csproj(path.join(project_dir, project_files[0]));
- },
- "source-file":{
- install:function(source_el, plugin_dir, project_dir, plugin_id, project_file) {
- var dest = path.join('Plugins', plugin_id, source_el.attrib['target-dir'] ? source_el.attrib['target-dir'] : '', path.basename(source_el.attrib['src']));
-
- common.copyNewFile(plugin_dir, source_el.attrib['src'], project_dir, dest);
- // add reference to this file to csproj.
- project_file.addSourceFile(dest);
- },
- uninstall:function(source_el, project_dir, plugin_id, project_file) {
- var dest = path.join('Plugins', plugin_id, source_el.attrib['target-dir'] ? source_el.attrib['target-dir'] : '', path.basename(source_el.attrib['src']));
- common.removeFile(project_dir, dest);
- // remove reference to this file from csproj.
- project_file.removeSourceFile(dest);
- }
- },
- "header-file": {
- install:function(source_el, plugin_dir, project_dir, plugin_id) {
- events.emit('verbose', 'header-fileinstall is not supported for wp7');
- },
- uninstall:function(source_el, project_dir, plugin_id) {
- events.emit('verbose', 'header-file.uninstall is not supported for wp7');
- }
- },
- "resource-file":{
- install:function(el, plugin_dir, project_dir, plugin_id) {
- events.emit('verbose', 'resource-file.install is not supported for wp7');
- },
- uninstall:function(el, project_dir, plugin_id) {
- events.emit('verbose', 'resource-file.uninstall is not supported for wp7');
- }
- },
- "framework": {
- install:function(source_el, plugin_dir, project_dir, plugin_id) {
- events.emit('verbose', 'framework.install is not supported for wp7');
- },
- uninstall:function(source_el, project_dir, plugin_id) {
- events.emit('verbose', 'framework.uninstall is not supported for wp7');
- }
- },
- "lib-file": {
- install:function(source_el, plugin_dir, project_dir, plugin_id) {
- events.emit('verbose', 'lib-file.install is not supported for wp7');
- },
- uninstall:function(source_el, project_dir, plugin_id) {
- events.emit('verbose', 'lib-file.uninstall is not supported for wp7');
- }
- }
-};
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6d74f296/cordova-lib/src/plugman/prepare.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/prepare.js b/cordova-lib/src/plugman/prepare.js
index c2fbda1..c291b1f 100644
--- a/cordova-lib/src/plugman/prepare.js
+++ b/cordova-lib/src/plugman/prepare.js
@@ -23,7 +23,6 @@ var platform_modules = require('./platforms'),
path = require('path'),
config_changes = require('./util/config-changes'),
xml_helpers = require('../util/xml-helpers'),
- wp7 = require('./platforms/wp7'),
wp8 = require('./platforms/wp8'),
windows8 = require('./platforms/windows8'),
common = require('./platforms/common');
@@ -75,8 +74,8 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
// for windows phone platform we need to add all www resources to the .csproj file
// first we need to remove them all to prevent duplicates
var wp_csproj;
- if(platform == 'wp7' || platform == 'wp8') {
- wp_csproj = (platform == wp7? wp7.parseProjectFile(project_dir) : wp8.parseProjectFile(project_dir));
+ if(platform == 'wp8') {
+ wp_csproj = wp8.parseProjectFile(project_dir);
var item_groups = wp_csproj.xml.findall('ItemGroup');
for (var i = 0, l = item_groups.length; i < l; i++) {
var group = item_groups[i];
@@ -181,7 +180,7 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
var scriptContent = fs.readFileSync(path.join(pluginDir, fsPath), 'utf-8').replace(/^\ufeff/, ''); // Window BOM
scriptContent = 'cordova.define("' + moduleName + '", function(require, exports, module) { ' + scriptContent + '\n});\n';
fs.writeFileSync(path.join(platformPluginsDir, plugin_id, fsPath), scriptContent, 'utf-8');
- if(platform == 'wp7' || platform == 'wp8' || platform == "windows8") {
+ if(platform == 'wp8' || platform == "windows8") {
wp_csproj.addSourceFile(path.join('www', 'plugins', plugin_id, fsPath));
}
@@ -225,7 +224,7 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
events.emit('verbose', 'Writing out cordova_plugins.js...');
fs.writeFileSync(path.join(wwwDir, 'cordova_plugins.js'), final_contents, 'utf-8');
- if(platform == 'wp7' || platform == 'wp8' || platform == "windows8") {
+ if(platform == 'wp8' || platform == "windows8") {
wp_csproj.addSourceFile(path.join('www', 'cordova_plugins.js'));
wp_csproj.write();
}
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6d74f296/cordova-lib/src/plugman/util/default-engines.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/util/default-engines.js b/cordova-lib/src/plugman/util/default-engines.js
index 5921608..a12b508 100644
--- a/cordova-lib/src/plugman/util/default-engines.js
+++ b/cordova-lib/src/plugman/util/default-engines.js
@@ -12,8 +12,6 @@ module.exports = function(project_dir){
{ 'platform':'ios', 'scriptSrc': path.join(project_dir,'cordova','version') },
'cordova-blackberry10':
{ 'platform':'blackberry10', 'scriptSrc': path.join(project_dir,'cordova','version') },
- 'cordova-wp7':
- { 'platform':'wp7', 'scriptSrc': path.join(project_dir,'cordova','version') },
'cordova-wp8':
{ 'platform':'wp8', 'scriptSrc': path.join(project_dir,'cordova','version') },
'cordova-windows8':
@@ -29,8 +27,8 @@ module.exports = function(project_dir){
'android-sdk' :
{ 'platform':'android', 'scriptSrc': path.join(project_dir,'cordova','android_sdk_version') },
'windows-os' :
- { 'platform':'wp7|wp8|windows8', 'scriptSrc': path.join(project_dir,'cordova','win_os_version') },
+ { 'platform':'wp8|windows8', 'scriptSrc': path.join(project_dir,'cordova','win_os_version') },
'windows-sdk' :
- { 'platform':'wp7|wp8|windows8', 'scriptSrc': path.join(project_dir,'cordova','win_sdk_version') }
+ { 'platform':'wp8|windows8', 'scriptSrc': path.join(project_dir,'cordova','win_sdk_version') }
}
};