fixed tests to the point all android-one-install will work
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/db66171d Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/db66171d Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/db66171d Branch: refs/heads/future Commit: db66171dc2dc6c43a36bcb5dbbe76d18e2b22bc7 Parents: 90db4b1 Author: Tim Kim <[email protected]> Authored: Fri Apr 5 14:45:40 2013 -0700 Committer: Tim Kim <[email protected]> Committed: Tue Apr 9 14:05:40 2013 -0700 ---------------------------------------------------------------------- platforms/android.js | 3 +-- test/android-one-install.js | 1 - test/plugins/ChildBrowser/plugin.xml | 22 +++++++++++----------- test/plugins/WeblessPlugin/plugin.xml | 14 +++++++------- 4 files changed, 19 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/db66171d/platforms/android.js ---------------------------------------------------------------------- diff --git a/platforms/android.js b/platforms/android.js index 303c5b6..ee595c4 100644 --- a/platforms/android.js +++ b/platforms/android.js @@ -87,16 +87,15 @@ exports.handlePlugin = function (action, project_dir, plugin_dir, plugin_et, var // move source files sourceFiles.forEach(function (sourceFile) { + var srcDir = path.resolve(project_dir, sourceFile.attrib['target-dir']) , destFile = path.resolve(srcDir, path.basename(sourceFile.attrib['src'])); if (action == 'install') { - shell.mkdir('-p', srcDir); var srcFile = srcPath(plugin_dir, sourceFile.attrib['src']); - console.log('src file ' + srcFile); shell.cp(srcFile, destFile); } else { fs.unlinkSync(destFile); http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/db66171d/test/android-one-install.js ---------------------------------------------------------------------- diff --git a/test/android-one-install.js b/test/android-one-install.js index 8ec4da6..ade18a2 100644 --- a/test/android-one-install.js +++ b/test/android-one-install.js @@ -106,7 +106,6 @@ exports['should move the src file'] = function (test) { android.handlePlugin('install', test_project_dir, test_plugin_dir, plugin_et, { APP_ID: 12345 }); plugin_loader.handlePrepare(test_project_dir, pluginsPath, wwwPath, 'android'); - var bahPath = path.join(test_dir, 'projects', 'android_one', 'src', 'com', 'phonegap', 'plugins', 'childBrowser'); var javaPath = path.join(test_dir, 'projects', 'android_one', 'src', 'com', 'phonegap', 'plugins', 'childBrowser', 'ChildBrowser.java'); test.ok(fs.statSync(javaPath)); http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/db66171d/test/plugins/ChildBrowser/plugin.xml ---------------------------------------------------------------------- diff --git a/test/plugins/ChildBrowser/plugin.xml b/test/plugins/ChildBrowser/plugin.xml index 7641ec0..caff701 100644 --- a/test/plugins/ChildBrowser/plugin.xml +++ b/test/plugins/ChildBrowser/plugin.xml @@ -53,7 +53,7 @@ value="com.phonegap.plugins.childBrowser.ChildBrowser"/> </config-file> - <source-file src="ChildBrowser.java" + <source-file src="src/android/ChildBrowser.java" target-dir="src/com/phonegap/plugins/childBrowser" /> <info> Please make sure you read this because it is very important to complete the installation of your plugin @@ -70,18 +70,18 @@ value="ChildBrowserCommand" /> </config-file> - <resource-file src="ChildBrowser.bundle" /> - <resource-file src="ChildBrowserViewController.xib" /> + <resource-file src="src/ios/ChildBrowser.bundle" /> + <resource-file src="src/ios/ChildBrowserViewController.xib" /> - <header-file src="ChildBrowserCommand.h" /> - <header-file src="ChildBrowserViewController.h" /> - <header-file src="preserveDirs/PreserveDirsTest.h" preserve-dirs="true" /> - <header-file src="TargetDirTest.h" target-dir="targetDir"/> + <header-file src="src/ios/ChildBrowserCommand.h" /> + <header-file src="src/ios/ChildBrowserViewController.h" /> + <header-file src="src/ios/preserveDirs/PreserveDirsTest.h" preserve-dirs="true" /> + <header-file src="src/ios/TargetDirTest.h" target-dir="targetDir"/> - <source-file src="ChildBrowserCommand.m" /> - <source-file src="ChildBrowserViewController.m" /> - <source-file src="preserveDirs/PreserveDirsTest.m" preserve-dirs="true" /> - <header-file src="TargetDirTest.m" target-dir="targetDir"/> + <source-file src="src/ios/ChildBrowserCommand.m" /> + <source-file src="src/ios/ChildBrowserViewController.m" /> + <source-file src="src/ios/preserveDirs/PreserveDirsTest.m" preserve-dirs="true" /> + <header-file src="src/ios/TargetDirTest.m" target-dir="targetDir"/> <!-- framework for testing (not actual dependency of ChildBrowser --> <framework src="libsqlite3.dylib" /> http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/db66171d/test/plugins/WeblessPlugin/plugin.xml ---------------------------------------------------------------------- diff --git a/test/plugins/WeblessPlugin/plugin.xml b/test/plugins/WeblessPlugin/plugin.xml index d0f3bd9..0056636 100644 --- a/test/plugins/WeblessPlugin/plugin.xml +++ b/test/plugins/WeblessPlugin/plugin.xml @@ -50,7 +50,7 @@ value="com.phonegap.plugins.weblessplugin.WeblessPlugin"/> </config-file> - <source-file src="WeblessPlugin.java" + <source-file src="src/android/WeblessPlugin.java" target-dir="src/com/phonegap/plugins/weblessplugin" /> </platform> @@ -66,14 +66,14 @@ value="WeblessPluginCommand"/> </config-file> - <resource-file src="WeblessPlugin.bundle" /> - <resource-file src="WeblessPluginViewController.xib" /> + <resource-file src="src/ios/WeblessPlugin.bundle" /> + <resource-file src="src/ios/WeblessPluginViewController.xib" /> - <header-file src="WeblessPluginCommand.h" /> - <header-file src="WeblessPluginViewController.h" /> + <header-file src="src/ios/WeblessPluginCommand.h" /> + <header-file src="src/ios/WeblessPluginViewController.h" /> - <source-file src="WeblessPluginCommand.m" /> - <source-file src="WeblessPluginViewController.m" /> + <source-file src="src/ios/WeblessPluginCommand.m" /> + <source-file src="src/ios/WeblessPluginViewController.m" /> <!-- framework for testing (not actual dependency of WeblessPlugin --> <framework src="libsqlite3.dylib" />
