From a7d8120ad9042e1ffa3db0ead3b3abbbff1e45d2 Mon Sep 17 00:00:00 2001 From: Siva Velusamy Date: Tue, 15 Apr 2014 16:50:40 +0000 Subject: Revert "Add scripts to enable Tycho build" Breaks existing scripts. This reverts commit 68bd64a51f78ae6a66bd8eea9baf07185e2b9588. Change-Id: I2cfe3ba2cea94850f4273170fbb5a46d7b727633 --- .../build.properties | 3 +- .../feature.xml | 75 +++++-- .../com.android.ide.eclipse.adt.package/pom.xml | 18 -- .../com.android.ide.eclipse.adt/feature.xml | 2 +- .../features/com.android.ide.eclipse.adt/pom.xml | 18 -- .../com.android.ide.eclipse.ddms/feature.xml | 2 +- .../features/com.android.ide.eclipse.ddms/pom.xml | 18 -- .../com.android.ide.eclipse.gldebugger/feature.xml | 2 +- .../com.android.ide.eclipse.gldebugger/pom.xml | 18 -- .../feature.xml | 2 +- .../pom.xml | 18 -- .../com.android.ide.eclipse.monitor/.project | 17 -- .../build.properties | 1 - .../com.android.ide.eclipse.monitor/feature.xml | 233 --------------------- .../com.android.ide.eclipse.monitor/pom.xml | 18 -- .../com.android.ide.eclipse.ndk/feature.xml | 2 +- .../features/com.android.ide.eclipse.ndk/pom.xml | 18 -- .../com.android.ide.eclipse.traceview/feature.xml | 2 +- .../com.android.ide.eclipse.traceview/pom.xml | 18 -- 19 files changed, 70 insertions(+), 415 deletions(-) delete mode 100644 eclipse/features/com.android.ide.eclipse.adt.package/pom.xml delete mode 100644 eclipse/features/com.android.ide.eclipse.adt/pom.xml delete mode 100644 eclipse/features/com.android.ide.eclipse.ddms/pom.xml delete mode 100644 eclipse/features/com.android.ide.eclipse.gldebugger/pom.xml delete mode 100644 eclipse/features/com.android.ide.eclipse.hierarchyviewer/pom.xml delete mode 100644 eclipse/features/com.android.ide.eclipse.monitor/.project delete mode 100644 eclipse/features/com.android.ide.eclipse.monitor/build.properties delete mode 100644 eclipse/features/com.android.ide.eclipse.monitor/feature.xml delete mode 100644 eclipse/features/com.android.ide.eclipse.monitor/pom.xml delete mode 100644 eclipse/features/com.android.ide.eclipse.ndk/pom.xml delete mode 100644 eclipse/features/com.android.ide.eclipse.traceview/pom.xml (limited to 'eclipse/features') diff --git a/eclipse/features/com.android.ide.eclipse.adt.package/build.properties b/eclipse/features/com.android.ide.eclipse.adt.package/build.properties index 64dc64a..36ca16c 100644 --- a/eclipse/features/com.android.ide.eclipse.adt.package/build.properties +++ b/eclipse/features/com.android.ide.eclipse.adt.package/build.properties @@ -1,3 +1,4 @@ bin.includes = feature.xml,\ - p2.inf + p2.inf,\ + ide.product includeLaunchers=false diff --git a/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml b/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml index dbe20b3..33533ac 100644 --- a/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml @@ -1,6 +1,6 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - diff --git a/eclipse/features/com.android.ide.eclipse.adt.package/pom.xml b/eclipse/features/com.android.ide.eclipse.adt.package/pom.xml deleted file mode 100644 index e835df8..0000000 --- a/eclipse/features/com.android.ide.eclipse.adt.package/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - 4.0.0 - - 22.6.2-SNAPSHOT - com.android.ide.eclipse.adt.package.feature - eclipse-feature - adt.package - - - ../../pom.xml - adt.group - parent - 1.0.0-SNAPSHOT - - - diff --git a/eclipse/features/com.android.ide.eclipse.adt/feature.xml b/eclipse/features/com.android.ide.eclipse.adt/feature.xml index 98bae3b..1ff56e8 100644 --- a/eclipse/features/com.android.ide.eclipse.adt/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.adt/feature.xml @@ -1,6 +1,6 @@ - - 4.0.0 - - 22.6.2-SNAPSHOT - com.android.ide.eclipse.adt.feature - eclipse-feature - adt - - - ../../pom.xml - adt.group - parent - 1.0.0-SNAPSHOT - - - diff --git a/eclipse/features/com.android.ide.eclipse.ddms/feature.xml b/eclipse/features/com.android.ide.eclipse.ddms/feature.xml index 5a51a5d..9a5ae3b 100644 --- a/eclipse/features/com.android.ide.eclipse.ddms/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.ddms/feature.xml @@ -1,6 +1,6 @@ - - 4.0.0 - - 22.6.2-SNAPSHOT - com.android.ide.eclipse.ddms.feature - eclipse-feature - ddms - - - ../../pom.xml - adt.group - parent - 1.0.0-SNAPSHOT - - - diff --git a/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml b/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml index baf58a3..1e1fda0 100644 --- a/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml @@ -1,6 +1,6 @@ diff --git a/eclipse/features/com.android.ide.eclipse.gldebugger/pom.xml b/eclipse/features/com.android.ide.eclipse.gldebugger/pom.xml deleted file mode 100644 index 312df4c..0000000 --- a/eclipse/features/com.android.ide.eclipse.gldebugger/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - 4.0.0 - - 22.6.2-SNAPSHOT - com.android.ide.eclipse.gldebugger.feature - eclipse-feature - gldebugger - - - ../../pom.xml - adt.group - parent - 1.0.0-SNAPSHOT - - - diff --git a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml index d72ce5e..17080b3 100644 --- a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml @@ -1,6 +1,6 @@ - - 4.0.0 - - 22.6.2-SNAPSHOT - com.android.ide.eclipse.hierarchyviewer.feature - eclipse-feature - hierarchyviewer - - - ../../pom.xml - adt.group - parent - 1.0.0-SNAPSHOT - - - diff --git a/eclipse/features/com.android.ide.eclipse.monitor/.project b/eclipse/features/com.android.ide.eclipse.monitor/.project deleted file mode 100644 index 347f1dc..0000000 --- a/eclipse/features/com.android.ide.eclipse.monitor/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - feature-monitor - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/eclipse/features/com.android.ide.eclipse.monitor/build.properties b/eclipse/features/com.android.ide.eclipse.monitor/build.properties deleted file mode 100644 index 64f93a9..0000000 --- a/eclipse/features/com.android.ide.eclipse.monitor/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = feature.xml diff --git a/eclipse/features/com.android.ide.eclipse.monitor/feature.xml b/eclipse/features/com.android.ide.eclipse.monitor/feature.xml deleted file mode 100644 index be8b8d7..0000000 --- a/eclipse/features/com.android.ide.eclipse.monitor/feature.xml +++ /dev/null @@ -1,233 +0,0 @@ - - - - - Android Debug Monitor - - - - Copyright (C) 2007-2014 The Android Open Source Project - - - - Note: jcommon-1.0.12.jar is under the BSD license rather than the APL. You can find a copy of the BSD License at http://www.opensource.org/licenses/bsd-license.php - - jfreechart-1.0.9.jar and jfreechart-1.0.9-swt.jar are under the LGPL rather than the APL. You can find a copy of the LGPL at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt. You can get the source code for these two components at http://android.git.kernel.org/pub/jfreechart-1.0.9.zip - - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - - - diff --git a/eclipse/features/com.android.ide.eclipse.monitor/pom.xml b/eclipse/features/com.android.ide.eclipse.monitor/pom.xml deleted file mode 100644 index f53dd7f..0000000 --- a/eclipse/features/com.android.ide.eclipse.monitor/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - 4.0.0 - - 22.6.2-SNAPSHOT - com.android.ide.eclipse.monitor.feature - eclipse-feature - monitor - - - ../../pom.xml - adt.group - parent - 1.0.0-SNAPSHOT - - - diff --git a/eclipse/features/com.android.ide.eclipse.ndk/feature.xml b/eclipse/features/com.android.ide.eclipse.ndk/feature.xml index 43535ed..5fb8209 100644 --- a/eclipse/features/com.android.ide.eclipse.ndk/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.ndk/feature.xml @@ -1,6 +1,6 @@ diff --git a/eclipse/features/com.android.ide.eclipse.ndk/pom.xml b/eclipse/features/com.android.ide.eclipse.ndk/pom.xml deleted file mode 100644 index 6ae3c77..0000000 --- a/eclipse/features/com.android.ide.eclipse.ndk/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - 4.0.0 - - 22.6.2-SNAPSHOT - com.android.ide.eclipse.ndk.feature - eclipse-feature - ndk - - - ../../pom.xml - adt.group - parent - 1.0.0-SNAPSHOT - - - diff --git a/eclipse/features/com.android.ide.eclipse.traceview/feature.xml b/eclipse/features/com.android.ide.eclipse.traceview/feature.xml index 539ab7a..b07708f 100644 --- a/eclipse/features/com.android.ide.eclipse.traceview/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.traceview/feature.xml @@ -1,6 +1,6 @@ - - 4.0.0 - - 22.6.2-SNAPSHOT - com.android.ide.eclipse.traceview.feature - eclipse-feature - traceview - - - ../../pom.xml - adt.group - parent - 1.0.0-SNAPSHOT - - - -- cgit v1.1