diff --git a/bin/lib/create.js b/bin/lib/create.js index 7bc13044..1d78d911 100755 --- a/bin/lib/create.js +++ b/bin/lib/create.js @@ -39,7 +39,8 @@ function getFrameworkDir(projectPath, shared) { function copyJsAndLibrary(projectPath, shared, projectName) { var nestedCordovaLibPath = getFrameworkDir(projectPath, false); - shell.cp('-f', path.join(ROOT, 'framework', 'assets', 'www', 'cordova.js'), path.join(projectPath, 'assets', 'www', 'cordova.js')); + var srcCordovaJsPath = path.join(ROOT, 'bin', 'templates', 'project', 'assets', 'www', 'cordova.js'); + shell.cp('-f', srcCordovaJsPath, path.join(projectPath, 'assets', 'www', 'cordova.js')); // Don't fail if there are no old jars. setShellFatal(false, function() { shell.ls(path.join(projectPath, 'libs', 'cordova-*.jar')).forEach(function(oldJar) { @@ -241,7 +242,6 @@ exports.createProject = function(project_path, package_name, project_name, activ // copy project template shell.cp('-r', path.join(project_template_dir, 'assets'), project_path); shell.cp('-r', path.join(project_template_dir, 'res'), project_path); - shell.cp('-r', path.join(ROOT, 'framework', 'res', 'xml'), path.join(project_path, 'res')); shell.cp(path.join(project_template_dir, 'gitignore'), path.join(project_path, '.gitignore')); // Manually create directories that would be empty within the template (since git doesn't track directories). diff --git a/framework/assets/www/cordova.js b/bin/templates/project/assets/www/cordova.js similarity index 100% rename from framework/assets/www/cordova.js rename to bin/templates/project/assets/www/cordova.js diff --git a/framework/res/xml/config.xml b/bin/templates/project/res/xml/config.xml similarity index 100% rename from framework/res/xml/config.xml rename to bin/templates/project/res/xml/config.xml diff --git a/framework/assets/www/index.html b/framework/assets/www/index.html deleted file mode 100644 index 57ad7521..00000000 --- a/framework/assets/www/index.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - diff --git a/framework/res/drawable-hdpi/icon.png b/framework/res/drawable-hdpi/icon.png deleted file mode 100644 index 4d276344..00000000 Binary files a/framework/res/drawable-hdpi/icon.png and /dev/null differ diff --git a/framework/res/drawable-ldpi/icon.png b/framework/res/drawable-ldpi/icon.png deleted file mode 100644 index cd5032a4..00000000 Binary files a/framework/res/drawable-ldpi/icon.png and /dev/null differ diff --git a/framework/res/drawable-mdpi/icon.png b/framework/res/drawable-mdpi/icon.png deleted file mode 100644 index e79c6062..00000000 Binary files a/framework/res/drawable-mdpi/icon.png and /dev/null differ diff --git a/framework/res/drawable/splash.png b/framework/res/drawable/splash.png deleted file mode 100755 index d498589c..00000000 Binary files a/framework/res/drawable/splash.png and /dev/null differ diff --git a/framework/res/layout/main.xml b/framework/res/layout/main.xml deleted file mode 100644 index bf8a0ff2..00000000 --- a/framework/res/layout/main.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - diff --git a/framework/res/values/strings.xml b/framework/res/values/strings.xml deleted file mode 100644 index 8bfae7c6..00000000 --- a/framework/res/values/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - Cordova - Snap - diff --git a/test/build.gradle b/test/build.gradle index c7731748..887c5071 100644 --- a/test/build.gradle +++ b/test/build.gradle @@ -17,8 +17,6 @@ under the License. */ -// GENERATED FILE! DO NOT EDIT! - apply plugin: 'android' buildscript { @@ -73,3 +71,11 @@ dependencies { androidTestCompile fileTree(dir: 'androidTest/libs', include: '*.jar') } +task copyCordovaJs (type: Copy) { + from '../bin/templates/project/assets/www' + into 'assets/www' + include('cordova.js') +} +preBuild.dependsOn copyCordovaJs + +