You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/02/10 22:29:30 UTC
git commit: CB-4886 Minor tweaks to Android & iOS plugman create
templates.
Updated Branches:
refs/heads/master a1b11a128 -> ce8c42148
CB-4886 Minor tweaks to Android & iOS plugman create templates.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/ce8c4214
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/ce8c4214
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/ce8c4214
Branch: refs/heads/master
Commit: ce8c421481ff04e87eaf81442e9504b6358c13c3
Parents: a1b11a1
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Feb 10 16:28:46 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Feb 10 16:28:46 2014 -0500
----------------------------------------------------------------------
doc/base.js | 20 +++-----------------
doc/platforms/android/android.xml | 2 +-
doc/platforms/ios/base.h | 9 ---------
doc/platforms/ios/base.m | 8 +++++++-
doc/platforms/ios/ios.xml | 5 +----
src/create.js | 4 ++--
src/platform.js | 10 +---------
7 files changed, 15 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/ce8c4214/doc/base.js
----------------------------------------------------------------------
diff --git a/doc/base.js b/doc/base.js
index eaf0fb3..20af664 100644
--- a/doc/base.js
+++ b/doc/base.js
@@ -1,19 +1,5 @@
-var cordova = require('cordova'),
- exec = require('cordova/exec');
+var exec = require('cordova/exec');
-var %pluginName% = function() {
- this.options = {};
+exports.coolMethod = function(arg0, success, error) {
+ exec(success, error, "%pluginName%", "coolMethod", [arg0]);
};
-
-%pluginName%.prototype = {
- /*
- Add your plugin methods here
- */
- coolMethod: function( args, success, error ) {
- cordova.exec( success, error, "%pluginName%", "coolMethod", args );
- }
-};
-
-var %pluginName%Instance = new %pluginName%();
-
-module.exports = %pluginName%Instance;
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/ce8c4214/doc/platforms/android/android.xml
----------------------------------------------------------------------
diff --git a/doc/platforms/android/android.xml b/doc/platforms/android/android.xml
index 37154b7..c3dc1b7 100644
--- a/doc/platforms/android/android.xml
+++ b/doc/platforms/android/android.xml
@@ -8,5 +8,5 @@
<!--add permissions -->
</config-file>
- <source-file src="src/android/CDV%pluginName%.java" target-dir="src/%packageName%/%pluginName%" />
+ <source-file src="src/android/%pluginName%.java" target-dir="src/%packageName%/%pluginName%" />
</platform>
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/ce8c4214/doc/platforms/ios/base.h
----------------------------------------------------------------------
diff --git a/doc/platforms/ios/base.h b/doc/platforms/ios/base.h
deleted file mode 100644
index 12aff60..0000000
--- a/doc/platforms/ios/base.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/********* CDV%pluginName%.h Cordova Plugin Header *******/
-
-#import <Cordova/CDV.h>
-
-@interface CDV%pluginName% : CDVPlugin
-
-- (void)coolMethod:(CDVInvokedUrlCommand*)command;
-
-@end
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/ce8c4214/doc/platforms/ios/base.m
----------------------------------------------------------------------
diff --git a/doc/platforms/ios/base.m b/doc/platforms/ios/base.m
index 131772b..cb25117 100644
--- a/doc/platforms/ios/base.m
+++ b/doc/platforms/ios/base.m
@@ -1,8 +1,14 @@
/********* CDV%pluginName%.m Cordova Plugin Implementation *******/
-#import "CDV%pluginName%.h"
#import <Cordova/CDV.h>
+@interface CDV%pluginName% : CDVPlugin {
+ // Member variables go here.
+}
+
+- (void)coolMethod:(CDVInvokedUrlCommand*)command;
+@end
+
@implementation CDV%pluginName%
- (void)coolMethod:(CDVInvokedUrlCommand*)command
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/ce8c4214/doc/platforms/ios/ios.xml
----------------------------------------------------------------------
diff --git a/doc/platforms/ios/ios.xml b/doc/platforms/ios/ios.xml
index 0358dd2..6600567 100644
--- a/doc/platforms/ios/ios.xml
+++ b/doc/platforms/ios/ios.xml
@@ -1,12 +1,9 @@
<platform name="ios">
<config-file target="config.xml" parent="/*">
<feature name="%pluginName%">
- <param name="ios-package" value="CDV%pluginName%" />
+ <param name="ios-package" value="%pluginName%" />
</feature>
</config-file>
- <header-file src="src/ios/CDV%pluginName%.h" />
<source-file src="src/ios/CDV%pluginName%.m" />
-
- <framework src="MobileCoreServices.framework" />
</platform>
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/ce8c4214/src/create.js
----------------------------------------------------------------------
diff --git a/src/create.js b/src/create.js
index cbf60c4..7db67b7 100644
--- a/src/create.js
+++ b/src/create.js
@@ -69,13 +69,13 @@ module.exports = function create( name, id, version, pluginPath, options ) {
jsMod.set( 'name', name );
clobber = et.Element( 'clobbers' );
- clobber.set( 'target', 'cordova.' + name );
+ clobber.set( 'target', 'cordova.plugins.' + name );
jsMod.append( clobber );
root.append( jsMod );
//Write out the plugin.xml file
- fs.writeFileSync( cwd + "plugin.xml", new et.ElementTree( root ).write( "plugin.xml", {indent: 4} ), 'utf-8' );
+ fs.writeFileSync( cwd + "plugin.xml", new et.ElementTree( root ).write( {indent: 4} ), 'utf-8' );
return Q();
};
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/ce8c4214/src/platform.js
----------------------------------------------------------------------
diff --git a/src/platform.js b/src/platform.js
index e19796b..f85573d 100644
--- a/src/platform.js
+++ b/src/platform.js
@@ -107,21 +107,13 @@ function doPlatformBase( docDir, platformName, pluginName, pluginID, pluginVersi
extension: "m"
}
);
-
- baseFiles.push(
- {
- file: fs.readFileSync( docDir + "base.h", "utf-8" )
- .replace( /%pluginName%/g, pluginName ),
- extension: "h"
- }
- );
break;
}
shell.mkdir( '-p', 'src/' + platformName );
for( i; i < baseFiles.length; i++ ) {
- fs.writeFileSync( 'src/' + platformName + '/CDV' + pluginName + '.' + baseFiles[ i ].extension, baseFiles[ i ].file, 'utf-8' );
+ fs.writeFileSync( 'src/' + platformName + '/' + pluginName + '.' + baseFiles[ i ].extension, baseFiles[ i ].file, 'utf-8' );
}
}