CB-8441 grunt compile now uses platform dependencies cordova-js-src for platform specific exec files
diff --git a/src/amazon-fireos/android/nativeapiprovider.js b/src/legacy-exec/amazon-fireos/android/nativeapiprovider.js
similarity index 100%
rename from src/amazon-fireos/android/nativeapiprovider.js
rename to src/legacy-exec/amazon-fireos/android/nativeapiprovider.js
diff --git a/src/amazon-fireos/android/promptbasednativeapi.js b/src/legacy-exec/amazon-fireos/android/promptbasednativeapi.js
similarity index 100%
rename from src/amazon-fireos/android/promptbasednativeapi.js
rename to src/legacy-exec/amazon-fireos/android/promptbasednativeapi.js
diff --git a/src/amazon-fireos/exec.js b/src/legacy-exec/amazon-fireos/exec.js
similarity index 100%
rename from src/amazon-fireos/exec.js
rename to src/legacy-exec/amazon-fireos/exec.js
diff --git a/src/amazon-fireos/platform.js b/src/legacy-exec/amazon-fireos/platform.js
similarity index 100%
rename from src/amazon-fireos/platform.js
rename to src/legacy-exec/amazon-fireos/platform.js
diff --git a/src/amazon-fireos/plugin/android/app.js b/src/legacy-exec/amazon-fireos/plugin/android/app.js
similarity index 100%
rename from src/amazon-fireos/plugin/android/app.js
rename to src/legacy-exec/amazon-fireos/plugin/android/app.js
diff --git a/src/android/android/nativeapiprovider.js b/src/legacy-exec/android/android/nativeapiprovider.js
similarity index 100%
rename from src/android/android/nativeapiprovider.js
rename to src/legacy-exec/android/android/nativeapiprovider.js
diff --git a/src/android/android/promptbasednativeapi.js b/src/legacy-exec/android/android/promptbasednativeapi.js
similarity index 100%
rename from src/android/android/promptbasednativeapi.js
rename to src/legacy-exec/android/android/promptbasednativeapi.js
diff --git a/src/android/exec.js b/src/legacy-exec/android/exec.js
similarity index 100%
rename from src/android/exec.js
rename to src/legacy-exec/android/exec.js
diff --git a/src/android/platform.js b/src/legacy-exec/android/platform.js
similarity index 100%
rename from src/android/platform.js
rename to src/legacy-exec/android/platform.js
diff --git a/src/android/plugin/android/app.js b/src/legacy-exec/android/plugin/android/app.js
similarity index 100%
rename from src/android/plugin/android/app.js
rename to src/legacy-exec/android/plugin/android/app.js
diff --git a/src/blackberry10/exec.js b/src/legacy-exec/blackberry10/exec.js
similarity index 100%
rename from src/blackberry10/exec.js
rename to src/legacy-exec/blackberry10/exec.js
diff --git a/src/blackberry10/platform.js b/src/legacy-exec/blackberry10/platform.js
similarity index 100%
rename from src/blackberry10/platform.js
rename to src/legacy-exec/blackberry10/platform.js
diff --git a/src/browser/confighelper.js b/src/legacy-exec/browser/confighelper.js
similarity index 100%
rename from src/browser/confighelper.js
rename to src/legacy-exec/browser/confighelper.js
diff --git a/src/browser/exec.js b/src/legacy-exec/browser/exec.js
similarity index 100%
rename from src/browser/exec.js
rename to src/legacy-exec/browser/exec.js
diff --git a/src/browser/platform.js b/src/legacy-exec/browser/platform.js
similarity index 100%
rename from src/browser/platform.js
rename to src/legacy-exec/browser/platform.js
diff --git a/src/firefoxos/exec.js b/src/legacy-exec/firefoxos/exec.js
similarity index 100%
rename from src/firefoxos/exec.js
rename to src/legacy-exec/firefoxos/exec.js
diff --git a/src/firefoxos/init.js b/src/legacy-exec/firefoxos/init.js
similarity index 100%
rename from src/firefoxos/init.js
rename to src/legacy-exec/firefoxos/init.js
diff --git a/src/firefoxos/platform.js b/src/legacy-exec/firefoxos/platform.js
similarity index 100%
rename from src/firefoxos/platform.js
rename to src/legacy-exec/firefoxos/platform.js
diff --git a/src/ios/exec.js b/src/legacy-exec/ios/exec.js
similarity index 100%
rename from src/ios/exec.js
rename to src/legacy-exec/ios/exec.js
diff --git a/src/ios/platform.js b/src/legacy-exec/ios/platform.js
similarity index 100%
rename from src/ios/platform.js
rename to src/legacy-exec/ios/platform.js
diff --git a/src/osx/exec.js b/src/legacy-exec/osx/exec.js
similarity index 100%
rename from src/osx/exec.js
rename to src/legacy-exec/osx/exec.js
diff --git a/src/osx/platform.js b/src/legacy-exec/osx/platform.js
similarity index 100%
rename from src/osx/platform.js
rename to src/legacy-exec/osx/platform.js
diff --git a/src/osx/plugin/osx/.gitignore b/src/legacy-exec/osx/plugin/osx/.gitignore
similarity index 100%
rename from src/osx/plugin/osx/.gitignore
rename to src/legacy-exec/osx/plugin/osx/.gitignore
diff --git a/src/ubuntu/exec.js b/src/legacy-exec/ubuntu/exec.js
similarity index 100%
rename from src/ubuntu/exec.js
rename to src/legacy-exec/ubuntu/exec.js
diff --git a/src/ubuntu/platform.js b/src/legacy-exec/ubuntu/platform.js
similarity index 100%
rename from src/ubuntu/platform.js
rename to src/legacy-exec/ubuntu/platform.js
diff --git a/src/webos/exec.js b/src/legacy-exec/webos/exec.js
similarity index 100%
rename from src/webos/exec.js
rename to src/legacy-exec/webos/exec.js
diff --git a/src/webos/platform.js b/src/legacy-exec/webos/platform.js
similarity index 100%
rename from src/webos/platform.js
rename to src/legacy-exec/webos/platform.js
diff --git a/src/webos/webos/service.js b/src/legacy-exec/webos/webos/service.js
similarity index 100%
rename from src/webos/webos/service.js
rename to src/legacy-exec/webos/webos/service.js
diff --git a/src/windows/exec.js b/src/legacy-exec/windows/exec.js
similarity index 100%
rename from src/windows/exec.js
rename to src/legacy-exec/windows/exec.js
diff --git a/src/windows/platform.js b/src/legacy-exec/windows/platform.js
similarity index 100%
rename from src/windows/platform.js
rename to src/legacy-exec/windows/platform.js
diff --git a/src/wp8/exec.js b/src/legacy-exec/wp8/exec.js
similarity index 100%
rename from src/wp8/exec.js
rename to src/legacy-exec/wp8/exec.js
diff --git a/src/wp8/platform.js b/src/legacy-exec/wp8/platform.js
similarity index 100%
rename from src/wp8/platform.js
rename to src/legacy-exec/wp8/platform.js
diff --git a/tasks/lib/bundle.js b/tasks/lib/bundle.js
index 686fa77..66190a7 100644
--- a/tasks/lib/bundle.js
+++ b/tasks/lib/bundle.js
@@ -28,14 +28,30 @@
var modules = collectFiles(path.join('src', 'common'));
var scripts = collectFiles(path.join('src', 'scripts'));
modules[''] = path.join('src', 'cordova.js');
- copyProps(modules, collectFiles(path.join('src', platform)));
+
+ var platformDep = path.join('node_modules', 'cordova-'+platform);
+ //check to see if platform dependency has cordova-js-src directory
+ if(fs.existsSync(platformDep) && fs.existsSync(path.join(platformDep, 'cordova-js-src'))) {
+ console.log('using node module platform dependency');
+ copyProps(modules, collectFiles(path.join('node_modules', 'cordova-'+platform, 'cordova-js-src')));
+ } else {
+ if(platform !== 'test') {
+ //for platforms that don't have a release with cordova-js-src yet
+ copyProps(modules, collectFiles(path.join('src', 'legacy-exec', platform)));
+ } else {
+ //platform === test
+ copyProps(modules, collectFiles(path.join('src', platform)));
+ }
+
+ }
+ console.log(modules)
if (platform === 'test') {
// Add any platform-specific modules that have tests to the test bundle.
- var testFilesPath = path.join('src', 'android', 'android');
+ var testFilesPath = path.join('node_modules', 'cordova-android', 'cordova-js-src', 'android');
copyProps(modules, collectFiles(testFilesPath, 'android'));
- modules['android/exec'] = path.join('src', 'android' , 'exec.js');
- modules['ios/exec'] = path.join('src', 'ios' , 'exec.js');
+ modules['android/exec'] = path.join('node_modules', 'cordova-android', 'cordova-js-src', 'exec.js');
+ modules['ios/exec'] = path.join('node_modules', 'cordova-ios', 'cordova-js-src', 'exec.js');
}
var output = [];
