diff --git a/bin/lib/create.js b/bin/lib/create.js index 8025a0b6..c4e72f6f 100755 --- a/bin/lib/create.js +++ b/bin/lib/create.js @@ -165,17 +165,23 @@ exports.createProject = function(project_path, package_name, project_name, proje // 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')); + // Manually create directories that would be empty within the template (since git doesn't track directories). shell.mkdir(path.join(project_path, 'libs')); + // Add in the proper eclipse project file. if (use_cli_template) { + var note = 'To show `assets/www` or `res/xml/config.xml`, go to:\n' + + ' Project -> Properties -> Resource -> Resource Filters\n' + + 'And delete the exclusion filter.\n'; shell.cp(path.join(project_template_dir, 'eclipse-project-CLI'), path.join(project_path, '.project')); + fs.writeFileSync(path.join(project_path, 'assets', '_where-is-www.txt'), note); } else { shell.cp(path.join(project_template_dir, 'eclipse-project'), path.join(project_path, '.project')); } - // copy cordova.js, cordova.jar and res/xml - shell.cp('-r', path.join(ROOT, 'framework', 'res', 'xml'), path.join(project_path, 'res')); + // copy cordova.js, cordova.jar copyJsAndLibrary(project_path, use_shared_project, safe_activity_name); // interpolate the activity name and package diff --git a/bin/templates/project/eclipse-project-CLI b/bin/templates/project/eclipse-project-CLI index 7e438bf6..581b3ab1 100644 --- a/bin/templates/project/eclipse-project-CLI +++ b/bin/templates/project/eclipse-project-CLI @@ -32,36 +32,40 @@ - -- Cordova Project -- - 2 - virtual:/virtual - - - -- Cordova Project --/config.xml + config.xml 1 $%7BPARENT-2-PROJECT_LOC%7D/config.xml - -- Cordova Project --/www + www 2 $%7BPARENT-2-PROJECT_LOC%7D/www - -- Cordova Project --/merges + merges 2 $%7BPARENT-2-PROJECT_LOC%7D/merges - - - 1388696068187 - - 10 - - org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-true-CordovaLib|platform_www|cordova - - - + + + 1390880034107 + + 30 + + org.eclipse.ui.ide.multiFilter + 1.0-projectRelativePath-matches-false-true-^(build.xml|ant-gen|ant-build|custom_rules.xml|CordovaLib|platform_www|cordova) + + + + 1390880034108 + + 30 + + org.eclipse.ui.ide.multiFilter + 1.0-projectRelativePath-matches-false-true-^(assets/www|res/xml/config.xml) + + +