Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C7CC217B16 for ; Tue, 21 Apr 2015 18:24:35 +0000 (UTC) Received: (qmail 96723 invoked by uid 500); 21 Apr 2015 18:24:35 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 96694 invoked by uid 500); 21 Apr 2015 18:24:35 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 96685 invoked by uid 99); 21 Apr 2015 18:24:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Apr 2015 18:24:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 847BFE0280; Tue, 21 Apr 2015 18:24:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agrieve@apache.org To: commits@cordova.apache.org Message-Id: <692b9fa69f51492d991a5ce43a15ebeb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: android commit: CB-8884 Delete Eclipse tweaks from create script Date: Tue, 21 Apr 2015 18:24:35 +0000 (UTC) Repository: cordova-android Updated Branches: refs/heads/master b63a2e37b -> ee14a6779 CB-8884 Delete Eclipse tweaks from create script Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/ee14a677 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/ee14a677 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/ee14a677 Branch: refs/heads/master Commit: ee14a67795b446bce76ac39a64b6c36cc4b96597 Parents: b63a2e3 Author: Andrew Grieve Authored: Tue Apr 21 14:24:15 2015 -0400 Committer: Andrew Grieve Committed: Tue Apr 21 14:24:15 2015 -0400 ---------------------------------------------------------------------- bin/lib/create.js | 21 +------- bin/templates/project/eclipse-project | 45 ---------------- bin/templates/project/eclipse-project-CLI | 71 -------------------------- 3 files changed, 1 insertion(+), 136 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/ee14a677/bin/lib/create.js ---------------------------------------------------------------------- diff --git a/bin/lib/create.js b/bin/lib/create.js index a816d35..c7f5656 100755 --- a/bin/lib/create.js +++ b/bin/lib/create.js @@ -58,7 +58,7 @@ function copyJsAndLibrary(projectPath, shared, projectName) { if (shared) { shell.rm('-rf', nestedCordovaLibPath); } else if (!wasSymlink) { - // Delete only the src, since eclipse can't handle its .project file being deleted. + // Delete only the src, since Eclipse / Android Studio can't handle their project files being deleted. shell.rm('-rf', path.join(nestedCordovaLibPath, 'src')); } }); @@ -72,13 +72,6 @@ function copyJsAndLibrary(projectPath, shared, projectName) { shell.cp('-f', path.join(ROOT, 'framework', 'build.gradle'), nestedCordovaLibPath); shell.cp('-f', path.join(ROOT, 'framework', 'cordova.gradle'), nestedCordovaLibPath); shell.cp('-r', path.join(ROOT, 'framework', 'src'), nestedCordovaLibPath); - // Create an eclipse project file and set the name of it to something unique. - // Without this, you can't import multiple CordovaLib projects into the same workspace. - var eclipseProjectFilePath = path.join(nestedCordovaLibPath, '.project'); - if (!fs.existsSync(eclipseProjectFilePath)) { - var data = '' + projectName + '-' + 'CordovaLib'; - fs.writeFileSync(eclipseProjectFilePath, data, 'utf8'); - } } } @@ -248,17 +241,6 @@ exports.createProject = function(project_path, package_name, project_name, activ // 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 copyJsAndLibrary(project_path, use_shared_project, safe_activity_name); @@ -267,7 +249,6 @@ exports.createProject = function(project_path, package_name, project_name, activ shell.cp('-f', path.join(project_template_dir, 'Activity.java'), activity_path); shell.sed('-i', /__ACTIVITY__/, safe_activity_name, activity_path); shell.sed('-i', /__NAME__/, project_name, path.join(project_path, 'res', 'values', 'strings.xml')); - shell.sed('-i', /__NAME__/, project_name, path.join(project_path, '.project')); shell.sed('-i', /__ID__/, package_name, activity_path); shell.cp('-f', path.join(project_template_dir, 'AndroidManifest.xml'), manifest_path); http://git-wip-us.apache.org/repos/asf/cordova-android/blob/ee14a677/bin/templates/project/eclipse-project ---------------------------------------------------------------------- diff --git a/bin/templates/project/eclipse-project b/bin/templates/project/eclipse-project deleted file mode 100644 index 42bcc3e..0000000 --- a/bin/templates/project/eclipse-project +++ /dev/null @@ -1,45 +0,0 @@ - - - __NAME__ - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - - - 1388696068187 - - 10 - - org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-true-CordovaLib|platform_www|cordova - - - - - http://git-wip-us.apache.org/repos/asf/cordova-android/blob/ee14a677/bin/templates/project/eclipse-project-CLI ---------------------------------------------------------------------- diff --git a/bin/templates/project/eclipse-project-CLI b/bin/templates/project/eclipse-project-CLI deleted file mode 100644 index 581b3ab..0000000 --- a/bin/templates/project/eclipse-project-CLI +++ /dev/null @@ -1,71 +0,0 @@ - - - __NAME__ - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - - - config.xml - 1 - $%7BPARENT-2-PROJECT_LOC%7D/config.xml - - - www - 2 - $%7BPARENT-2-PROJECT_LOC%7D/www - - - merges - 2 - $%7BPARENT-2-PROJECT_LOC%7D/merges - - - - - 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) - - - - - --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org