Remove src/<platform> directory structure.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/482acf84 Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/482acf84 Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/482acf84 Branch: refs/heads/future Commit: 482acf84c716a4ef7da236a885920998be7fdc56 Parents: 65bc262 Author: Braden Shepherdson <[email protected]> Authored: Wed Mar 27 11:30:56 2013 -0400 Committer: Tim Kim <[email protected]> Committed: Tue Apr 9 14:01:02 2013 -0700 ---------------------------------------------------------------------- platforms/android.js | 16 +++++----------- platforms/blackberry.js | 15 +++++---------- platforms/ios.js | 26 +++++++++++++------------- 3 files changed, 23 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/482acf84/platforms/android.js ---------------------------------------------------------------------- diff --git a/platforms/android.js b/platforms/android.js index 41ac491..f099284 100644 --- a/platforms/android.js +++ b/platforms/android.js @@ -100,10 +100,10 @@ exports.handlePlugin = function (action, project_dir, plugin_dir, plugin_et, var fs.unlinkSync(destFile); // check if directory is empty var curDir = srcDir; - while(curDir !== project_dir + '/src') { + while(curDir !== path.join(project_dir, 'src')) { if(fs.readdirSync(curDir).length == 0) { fs.rmdirSync(curDir); - curDir = path.resolve(curDir + '/..'); + curDir = path.resolve(path.join(curDir, '..')); } else { // directory not empty...do nothing break; @@ -119,11 +119,11 @@ exports.handlePlugin = function (action, project_dir, plugin_dir, plugin_et, var if (action == 'install') { shell.mkdir('-p', libDir); - var src = path.resolve(plugin_dir, 'src/android', + var src = path.resolve(plugin_dir, libFile.attrib['src']), dest = path.resolve(libDir, path.basename(libFile.attrib['src'])); - + shell.cp(src, dest); } else { var destFile = path.resolve(libDir, @@ -173,13 +173,7 @@ exports.handlePlugin = function (action, project_dir, plugin_dir, plugin_et, var function srcPath(pluginPath, filename) { - var prefix = /^src\/android/; - - if (prefix.test(filename)) { - return path.resolve(pluginPath, filename); - } else { - return path.resolve(pluginPath, 'src/android', filename); - } + return path.resolve(pluginPath, filename); } // reads the package name out of the Android Manifest file http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/482acf84/platforms/blackberry.js ---------------------------------------------------------------------- diff --git a/platforms/blackberry.js b/platforms/blackberry.js index 8e3cb5a..b7096bf 100644 --- a/platforms/blackberry.js +++ b/platforms/blackberry.js @@ -74,10 +74,10 @@ exports.handlePlugin = function (action, project_dir, plugin_dir, plugin_et) { fs.unlinkSync(destFile); // check if directory is empty var curDir = srcDir; - while(curDir !== project_dir + '/src') { + while(curDir !== path.join(project_dir, 'src')) { if(fs.readdirSync(curDir).length == 0) { fs.rmdirSync(curDir); - curDir = path.resolve(curDir + '/..'); + curDir = path.resolve(curDir, '..'); } else { // directory not empty...do nothing break; @@ -93,7 +93,8 @@ exports.handlePlugin = function (action, project_dir, plugin_dir, plugin_et) { if (action == 'install') { shell.mkdir('-p', libDir); - var src = path.resolve(plugin_dir, 'src/blackberry', + + var src = path.resolve(plugin_dir, libFile.attrib['src']), dest = path.resolve(libDir, path.basename(libFile.attrib['src'])); @@ -141,13 +142,7 @@ exports.handlePlugin = function (action, project_dir, plugin_dir, plugin_et) { function srcPath(pluginPath, filename) { - var prefix = /^src\/blackberry/; - - if (prefix.test(filename)) { - return path.resolve(pluginPath, filename); - } else { - return path.resolve(pluginPath, 'src/blackberry', filename); - } + return path.resolve(pluginPath, filename); } function pluginInstalled(plugin_et, project_dir) { http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/482acf84/platforms/ios.js ---------------------------------------------------------------------- diff --git a/platforms/ios.js b/platforms/ios.js index 5431787..c7077fb 100644 --- a/platforms/ios.js +++ b/platforms/ios.js @@ -39,7 +39,7 @@ exports.handlePlugin = function (action, project_dir, plugin_dir, plugin_et, var // grab and parse pbxproj // we don't want CordovaLib's xcode project - var project_files = glob.sync(project_dir + '/*.xcodeproj/project.pbxproj'); + var project_files = glob.sync(path.join(project_dir, '*.xcodeproj', 'project.pbxproj')); if (!project_files.length) throw "does not appear to be an xcode project (no xcode project file)"; var pbxPath = project_files[0]; @@ -48,9 +48,9 @@ exports.handlePlugin = function (action, project_dir, plugin_dir, plugin_et, var xcodeproj.parseSync(); // grab and parse plist file or config.xml - var config_files = (glob.sync(project_dir + '/**/{PhoneGap,Cordova}.plist').length == 0 ? - glob.sync(project_dir + '/**/config.xml') : - glob.sync(project_dir + '/**/{PhoneGap,Cordova}.plist') + var config_files = (glob.sync(path.join(project_dir, '**', '{PhoneGap,Cordova}.plist')).length == 0 ? + glob.sync(path.join(project_dir, '**', 'config.xml')) : + glob.sync(path.join(project_dir, '**', '{PhoneGap,Cordova}.plist')) ); config_files = config_files.filter(function (val) { @@ -84,18 +84,18 @@ exports.handlePlugin = function (action, project_dir, plugin_dir, plugin_et, var // move native files (source/header/resource) sourceFiles && sourceFiles.forEach(function (sourceFile) { var src = sourceFile.attrib['src'], - srcFile = path.resolve(plugin_dir, 'src/ios', src), + srcFile = path.resolve(plugin_dir, src), targetDir = path.resolve(pluginsDir, getRelativeDir(sourceFile)), destFile = path.resolve(targetDir, path.basename(src)); if (action == 'install') { - xcodeproj.addSourceFile('Plugins/' + path.relative(pluginsDir, destFile)); + xcodeproj.addSourceFile(path.join('Plugins', path.relative(pluginsDir, destFile))); shell.mkdir('-p', targetDir); checkLastCommand(); shell.cp(srcFile, destFile); checkLastCommand(); } else { - xcodeproj.removeSourceFile('Plugins/' + path.basename(src)); + xcodeproj.removeSourceFile(path.join('Plugins', path.basename(src))); if(fs.existsSync(destFile)) fs.unlinkSync(destFile); shell.rm('-rf', targetDir); @@ -105,18 +105,18 @@ exports.handlePlugin = function (action, project_dir, plugin_dir, plugin_et, var headerFiles && headerFiles.forEach(function (headerFile) { var src = headerFile.attrib['src'], - srcFile = path.resolve(plugin_dir, 'src/ios', src), + srcFile = path.resolve(plugin_dir, src), targetDir = path.resolve(pluginsDir, getRelativeDir(headerFile)), destFile = path.resolve(targetDir, path.basename(src)); if (action == 'install') { - xcodeproj.addHeaderFile('Plugins/' + path.relative(pluginsDir, destFile)); + xcodeproj.addHeaderFile(path.join('Plugins', path.relative(pluginsDir, destFile))); shell.mkdir('-p', targetDir); checkLastCommand(); shell.cp(srcFile, destFile); checkLastCommand(); } else { - xcodeproj.removeHeaderFile('Plugins/' + path.basename(src)); + xcodeproj.removeHeaderFile(path.join('Plugins', path.basename(src))); if(fs.existsSync(destFile)) fs.unlinkSync(destFile); shell.rm('-rf', targetDir); @@ -126,11 +126,11 @@ exports.handlePlugin = function (action, project_dir, plugin_dir, plugin_et, var resourceFiles && resourceFiles.forEach(function (resource) { var src = resource.attrib['src'], - srcFile = path.resolve(plugin_dir, 'src/ios', src), + srcFile = path.resolve(plugin_dir, src), destFile = path.resolve(resourcesDir, path.basename(src)); if (action == 'install') { - xcodeproj.addResourceFile('Resources/' + path.basename(src)); + xcodeproj.addResourceFile(path.join('Resources', path.basename(src))); var st = fs.statSync(srcFile); if (st.isDirectory()) { shell.cp('-R', srcFile, resourcesDir); @@ -140,7 +140,7 @@ exports.handlePlugin = function (action, project_dir, plugin_dir, plugin_et, var checkLastCommand(); } } else { - xcodeproj.removeResourceFile('Resources/' + path.basename(src)); + xcodeproj.removeResourceFile(path.join('Resources', path.basename(src))); shell.rm('-rf', destFile); checkLastCommand(); }
