CB-5715 For CLI, hide assets/www and res/xml/config.xml by default

Add a helper file under assets to say how to re-show the hidden files.
Move the config.xml, www, merges entries to the root to be more discoverable.
This commit is contained in:
Andrew Grieve 2014-01-28 00:28:42 -05:00
parent 029d1561dc
commit f4b1d09407
2 changed files with 31 additions and 21 deletions

View File

@ -165,17 +165,23 @@ exports.createProject = function(project_path, package_name, project_name, proje
// copy project template // copy project template
shell.cp('-r', path.join(project_template_dir, 'assets'), project_path); 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(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). // Manually create directories that would be empty within the template (since git doesn't track directories).
shell.mkdir(path.join(project_path, 'libs')); shell.mkdir(path.join(project_path, 'libs'));
// Add in the proper eclipse project file. // Add in the proper eclipse project file.
if (use_cli_template) { 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')); 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 { } else {
shell.cp(path.join(project_template_dir, 'eclipse-project'), path.join(project_path, '.project')); shell.cp(path.join(project_template_dir, 'eclipse-project'), path.join(project_path, '.project'));
} }
// copy cordova.js, cordova.jar and res/xml // copy cordova.js, cordova.jar
shell.cp('-r', path.join(ROOT, 'framework', 'res', 'xml'), path.join(project_path, 'res'));
copyJsAndLibrary(project_path, use_shared_project, safe_activity_name); copyJsAndLibrary(project_path, use_shared_project, safe_activity_name);
// interpolate the activity name and package // interpolate the activity name and package

View File

@ -32,34 +32,38 @@
</natures> </natures>
<linkedResources> <linkedResources>
<link> <link>
<name>-- Cordova Project --</name> <name>config.xml</name>
<type>2</type>
<locationURI>virtual:/virtual</locationURI>
</link>
<link>
<name>-- Cordova Project --/config.xml</name>
<type>1</type> <type>1</type>
<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/config.xml</locationURI> <locationURI>$%7BPARENT-2-PROJECT_LOC%7D/config.xml</locationURI>
</link> </link>
<link> <link>
<name>-- Cordova Project --/www</name> <name>www</name>
<type>2</type> <type>2</type>
<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/www</locationURI> <locationURI>$%7BPARENT-2-PROJECT_LOC%7D/www</locationURI>
</link> </link>
<link> <link>
<name>-- Cordova Project --/merges</name> <name>merges</name>
<type>2</type> <type>2</type>
<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/merges</locationURI> <locationURI>$%7BPARENT-2-PROJECT_LOC%7D/merges</locationURI>
</link> </link>
</linkedResources> </linkedResources>
<filteredResources> <filteredResources>
<filter> <filter>
<id>1388696068187</id> <id>1390880034107</id>
<name></name> <name></name>
<type>10</type> <type>30</type>
<matcher> <matcher>
<id>org.eclipse.ui.ide.multiFilter</id> <id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-true-CordovaLib|platform_www|cordova</arguments> <arguments>1.0-projectRelativePath-matches-false-true-^(build.xml|ant-gen|ant-build|custom_rules.xml|CordovaLib|platform_www|cordova)</arguments>
</matcher>
</filter>
<filter>
<id>1390880034108</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-projectRelativePath-matches-false-true-^(assets/www|res/xml/config.xml)</arguments>
</matcher> </matcher>
</filter> </filter>
</filteredResources> </filteredResources>