diff options
| author | Siva Velusamy <vsiva@google.com> | 2014-02-12 11:32:18 -0800 |
|---|---|---|
| committer | Siva Velusamy <vsiva@google.com> | 2014-04-15 09:20:06 -0700 |
| commit | 68bd64a51f78ae6a66bd8eea9baf07185e2b9588 (patch) | |
| tree | 2063beb52dac81892ce547f50bd71c2b4fa1060e | |
| parent | a1d044b7b46ae23c7d8a0f7253287c2cfeba9edc (diff) | |
| download | sdk-68bd64a51f78ae6a66bd8eea9baf07185e2b9588.tar.gz | |
Add scripts to enable Tycho build
This CL adds all the required files to perform a build
using Tycho. It is not integrated into the Android build
system though. In order to perform a build, make sure your
repository has the git projects prebuilts/eclipse and
prebuilts/eclipse-build-deps, then do:
$ cd sdk/eclipse
$ make -f maven.mk
That should create the necessary target platform and start
a build using Maven/Tycho. The resulting artifacts should
be in out/host/maven/bundles-<version>/products
Change-Id: I4672cd9ea1ac072a9b5ddb27d98a9849b2a2b8cb
51 files changed, 1195 insertions, 142 deletions
diff --git a/eclipse/TYCHO_BUILD b/eclipse/TYCHO_BUILD new file mode 100644 index 000000000..7836ec91d --- /dev/null +++ b/eclipse/TYCHO_BUILD @@ -0,0 +1,6 @@ +To build using Tycho, perform: + + $ cd sdk/eclipse + $ make -f maven.mk + +The resulting artifacts will be in $OUT/host/maven/bundles-<version>-SNAPSHOT/products/ diff --git a/eclipse/artifacts/bundles/.project b/eclipse/artifacts/bundles/.project new file mode 100644 index 000000000..91740876a --- /dev/null +++ b/eclipse/artifacts/bundles/.project @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>tycho-bundles</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + </buildSpec> + <natures> + </natures> +</projectDescription> diff --git a/eclipse/artifacts/bundles/category.xml b/eclipse/artifacts/bundles/category.xml new file mode 100644 index 000000000..fd4ad19ac --- /dev/null +++ b/eclipse/artifacts/bundles/category.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<site> + <description url="https://dl-ssl.google.com/android/eclipse/"> + Update Site for Android Development Toolkit + </description> + <feature url="features/com.android.ide.eclipse.ddms_22.6.2.qualifier.jar" id="com.android.ide.eclipse.ddms.feature" version="22.6.2.qualifier"> + <category name="developer"/> + </feature> + <feature url="features/com.android.ide.eclipse.hierarchyviewer_22.6.2.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer.feature" version="22.6.2.qualifier"> + <category name="developer"/> + </feature> + <feature url="features/com.android.ide.eclipse.traceview_22.6.2.qualifier.jar" id="com.android.ide.eclipse.traceview.feature" version="22.6.2.qualifier"> + <category name="developer"/> + </feature> + <feature url="features/com.android.ide.eclipse.gldebugger_22.6.2.qualifier.jar" id="com.android.ide.eclipse.gldebugger.feature" version="22.6.2.qualifier"> + <category name="developer"/> + </feature> + <feature url="features/com.android.ide.eclipse.adt_22.6.2.qualifier.jar" id="com.android.ide.eclipse.adt.feature" version="22.6.2.qualifier"> + <category name="developer"/> + </feature> + <feature url="features/com.android.ide.eclipse.adt.package_22.6.2.qualifier.jar" id="com.android.ide.eclipse.adt.package.feature" version="22.6.2.qualifier"> + <category name="developer"/> + </feature> + <feature url="features/com.android.ide.eclipse.ndk_22.6.2.qualifier.jar" id="com.android.ide.eclipse.ndk.feature" version="22.6.2.qualifier"> + <category name="developer"/> + </feature> + <category-def name="developer" label="Developer Tools"> + <description> + Features that add Android support to Eclipse for application developers. + </description> + </category-def> +</site> diff --git a/eclipse/artifacts/bundles/ide.p2.inf b/eclipse/artifacts/bundles/ide.p2.inf new file mode 100644 index 000000000..cabaa55dc --- /dev/null +++ b/eclipse/artifacts/bundles/ide.p2.inf @@ -0,0 +1,9 @@ +#tell pde.build not to generate start levels +org.eclipse.pde.build.append.startlevels=false + +requires.1.namespace=org.eclipse.equinox.p2.iu +requires.1.name=org.eclipse.platform.ide +requires.1.greedy=true + +instructions.configure=\ +org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//dl-ssl.google.com/android/eclipse/,type:0,name:Android Developer Tools Update Site,enabled:true); diff --git a/eclipse/artifacts/bundles/ide.product b/eclipse/artifacts/bundles/ide.product new file mode 100644 index 000000000..fd71c4b59 --- /dev/null +++ b/eclipse/artifacts/bundles/ide.product @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?pde version="3.5"?> + +<product name="eclipse" uid="adtproduct" id="adtproduct" application="org.eclipse.ui.ide.workbench" version="22.6.2.qualifier" useFeatures="true" includeLaunchers="true"> + + <configIni use="default"> + </configIni> + + <launcherArgs> + <programArgs>-product adtproduct</programArgs> + <programArgsWin>--launcher.XXMaxPermSize 256M</programArgsWin> + <vmArgs>-Dosgi.requiredJavaVersion=1.6 -Xms40m -Xmx768m</vmArgs> + <vmArgsLin>-XX:MaxPermSize=256m</vmArgsLin> + <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac> + </launcherArgs> + + <windowImages/> + + <splash + location="com.android.ide.eclipse.adt.package" /> + <launcher name="eclipse"> + <solaris/> + <win useIco="false"> + <bmp/> + </win> + </launcher> + + <vm> + <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</linux> + <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</macos> + <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows> + </vm> + + <plugins> + </plugins> + + <features> + <feature id="com.android.ide.eclipse.adt.package.feature" version="22.6.2.qualifier"/> + <feature id="com.android.ide.eclipse.adt.feature" version="22.6.2.qualifier"/> + <feature id="com.android.ide.eclipse.ddms.feature" version="22.6.2.qualifier"/> + <feature id="com.android.ide.eclipse.gldebugger.feature" version="22.6.2.qualifier"/> + <feature id="com.android.ide.eclipse.hierarchyviewer.feature" version="22.6.2.qualifier"/> + <feature id="com.android.ide.eclipse.ndk.feature" version="22.6.2.qualifier"/> + <feature id="com.android.ide.eclipse.traceview.feature" version="22.6.2.qualifier"/> + </features> + + <configurations> + <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" /> + <property name="eclipse.product" value="adtproduct" /> + <property name="org.eclipse.update.reconcile" value="false" /> + <property name="osgi.bundles.defaultStartLevel" value="4" /> + <property name="osgi.splashPath" value="platform\:/base/plugins/com.android.ide.eclipse.adt.package" /> + </configurations> + +</product> diff --git a/eclipse/artifacts/bundles/monitor.product b/eclipse/artifacts/bundles/monitor.product new file mode 100644 index 000000000..9aec4f151 --- /dev/null +++ b/eclipse/artifacts/bundles/monitor.product @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?pde version="3.5"?> + +<product name="monitor" uid="com.android.ide.eclipse.monitor.product" id="com.android.ide.eclipse.monitor.product" application="com.android.ide.eclipse.monitor.Application" version="22.6.2.qualifier" useFeatures="true" includeLaunchers="true"> + + <configIni use="default"> + </configIni> + + <launcherArgs> + <programArgs>-data @noDefault</programArgs> + <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac> + </launcherArgs> + + <windowImages/> + + <splash + location="com.android.ide.eclipse.monitor" /> + <launcher name="monitor"> + <solaris/> + <win useIco="false"> + <bmp/> + </win> + </launcher> + + <vm> + </vm> + + <plugins> + </plugins> + + <features> + <feature id="com.android.ide.eclipse.ddms.feature"/> + <feature id="com.android.ide.eclipse.gldebugger.feature"/> + <feature id="com.android.ide.eclipse.hierarchyviewer.feature"/> + <feature id="com.android.ide.eclipse.traceview.feature"/> + <feature id="com.android.ide.eclipse.monitor.feature"/> + <feature id="org.eclipse.rcp"/> + <feature id="org.eclipse.emf.ecore"/> + <feature id="org.eclipse.e4.rcp"/> + <feature id="org.eclipse.emf.common"/> + <feature id="org.eclipse.platform"/> + <feature id="org.eclipse.equinox.p2.core.feature"/> + <feature id="org.eclipse.help"/> + <feature id="org.eclipse.equinox.p2.rcp.feature"/> + <feature id="org.eclipse.equinox.p2.extras.feature"/> + </features> + + <configurations> + <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="2" /> + <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" /> + <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" /> + </configurations> + +</product> diff --git a/eclipse/artifacts/bundles/pom.xml b/eclipse/artifacts/bundles/pom.xml new file mode 100644 index 000000000..e1629349e --- /dev/null +++ b/eclipse/artifacts/bundles/pom.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <version>22.6.2-SNAPSHOT</version> + <artifactId>bundles</artifactId> + <packaging>eclipse-repository</packaging> + <name>bundles</name> + + <parent> + <relativePath>../../pom.xml</relativePath> + <groupId>adt.group</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-director-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <!-- install the product for all configured os/ws/arch environments + using p2 director --> + <execution> + <id>materialize-products</id> + <goals> + <goal>materialize-products</goal> + </goals> + </execution> + <!-- create product zips (one per os/ws/arch) --> + <execution> + <id>archive-products</id> + <goals> + <goal>archive-products</goal> + </goals> + </execution> + </executions> + <configuration> + <formats> + <win32>zip</win32> + <linux>tar.gz</linux> + <macosx>tar.gz</macosx> + </formats> + <products> + <product> + <id>com.android.ide.eclipse.monitor.product</id> + <attachId>com.android.ide.eclipse.monitor.product</attachId> + <rootFolder>monitor</rootFolder> + </product> + <product> + <id>adtproduct</id> + <attachId>adtproduct</attachId> + <rootFolder>adt</rootFolder> + </product> + </products> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/eclipse/artifacts/p2repo/.project b/eclipse/artifacts/p2repo/.project new file mode 100644 index 000000000..536067931 --- /dev/null +++ b/eclipse/artifacts/p2repo/.project @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>tycho-p2repo</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + </buildSpec> + <natures> + </natures> +</projectDescription> diff --git a/eclipse/artifacts/p2repo/category.xml b/eclipse/artifacts/p2repo/category.xml new file mode 100644 index 000000000..fd4ad19ac --- /dev/null +++ b/eclipse/artifacts/p2repo/category.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<site> + <description url="https://dl-ssl.google.com/android/eclipse/"> + Update Site for Android Development Toolkit + </description> + <feature url="features/com.android.ide.eclipse.ddms_22.6.2.qualifier.jar" id="com.android.ide.eclipse.ddms.feature" version="22.6.2.qualifier"> + <category name="developer"/> + </feature> + <feature url="features/com.android.ide.eclipse.hierarchyviewer_22.6.2.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer.feature" version="22.6.2.qualifier"> + <category name="developer"/> + </feature> + <feature url="features/com.android.ide.eclipse.traceview_22.6.2.qualifier.jar" id="com.android.ide.eclipse.traceview.feature" version="22.6.2.qualifier"> + <category name="developer"/> + </feature> + <feature url="features/com.android.ide.eclipse.gldebugger_22.6.2.qualifier.jar" id="com.android.ide.eclipse.gldebugger.feature" version="22.6.2.qualifier"> + <category name="developer"/> + </feature> + <feature url="features/com.android.ide.eclipse.adt_22.6.2.qualifier.jar" id="com.android.ide.eclipse.adt.feature" version="22.6.2.qualifier"> + <category name="developer"/> + </feature> + <feature url="features/com.android.ide.eclipse.adt.package_22.6.2.qualifier.jar" id="com.android.ide.eclipse.adt.package.feature" version="22.6.2.qualifier"> + <category name="developer"/> + </feature> + <feature url="features/com.android.ide.eclipse.ndk_22.6.2.qualifier.jar" id="com.android.ide.eclipse.ndk.feature" version="22.6.2.qualifier"> + <category name="developer"/> + </feature> + <category-def name="developer" label="Developer Tools"> + <description> + Features that add Android support to Eclipse for application developers. + </description> + </category-def> +</site> diff --git a/eclipse/artifacts/p2repo/pom.xml b/eclipse/artifacts/p2repo/pom.xml new file mode 100644 index 000000000..fa9aca173 --- /dev/null +++ b/eclipse/artifacts/p2repo/pom.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <version>22.6.2-SNAPSHOT</version> + <artifactId>p2repo</artifactId> + <packaging>eclipse-repository</packaging> + <name>p2repo</name> + + <parent> + <relativePath>../../pom.xml</relativePath> + <groupId>adt.group</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> +</project> 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 36ca16cf9..64dc64a07 100644 --- a/eclipse/features/com.android.ide.eclipse.adt.package/build.properties +++ b/eclipse/features/com.android.ide.eclipse.adt.package/build.properties @@ -1,4 +1,3 @@ bin.includes = feature.xml,\ - p2.inf,\ - ide.product + p2.inf 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 33533ac15..dbe20b3ae 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 @@ <?xml version="1.0" encoding="UTF-8"?> <feature - id="com.android.ide.eclipse.adt.package" + id="com.android.ide.eclipse.adt.package.feature" label="ADT Package" version="22.6.2.qualifier" provider-name="The Android Open Source Project" @@ -23,69 +23,20 @@ </url> <requires> - <import feature="org.eclipse.platform"/> - <import plugin="org.eclipse.equinox.app"/> - <import plugin="org.eclipse.core.runtime"/> - <import plugin="org.eclipse.core.resources"/> - <import plugin="org.eclipse.debug.core"/> - <import plugin="org.eclipse.debug.ui"/> - <import feature="org.eclipse.jdt" version="3.7.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.ant.core"/> - <import plugin="org.eclipse.jdt.core"/> - <import plugin="org.eclipse.jdt.ui"/> - <import plugin="org.eclipse.jdt.launching"/> - <import plugin="org.eclipse.jface.text"/> - <import plugin="org.eclipse.ui.editors"/> - <import plugin="org.eclipse.ui.workbench.texteditor"/> - <import plugin="org.eclipse.ui.console"/> - <import plugin="org.eclipse.core.filesystem"/> - <import plugin="org.eclipse.ui"/> - <import plugin="org.eclipse.ui.ide"/> - <import plugin="org.eclipse.ui.forms"/> - <import plugin="org.eclipse.ui.browser"/> - <import plugin="org.eclipse.ui.views"/> - <import plugin="org.eclipse.ui.views.log"/> - <import plugin="org.eclipse.wst.sse.core"/> - <import plugin="org.eclipse.wst.sse.ui"/> - <import plugin="org.eclipse.wst.xml.core"/> - <import plugin="org.eclipse.wst.xml.ui"/> - <import plugin="org.eclipse.jdt.junit"/> - <import plugin="org.eclipse.jdt.junit.runtime"/> - <import plugin="org.eclipse.ltk.core.refactoring"/> - <import plugin="org.eclipse.ltk.ui.refactoring"/> - <import plugin="org.eclipse.core.expressions"/> <import feature="org.eclipse.equinox.p2.user.ui"/> <import feature="org.eclipse.help"/> - <import feature="org.eclipse.rcp" version="3.7.0" match="greaterOrEqual"/> - <import feature="org.eclipse.wst.common_core.feature"/> - <import feature="org.eclipse.wst.common_ui.feature"/> - <import feature="org.eclipse.wst.xml_core.feature"/> - <import feature="org.eclipse.wst.xml_ui.feature"/> - <import plugin="org.eclipse.core.variables"/> - <import plugin="org.eclipse.cdt.core"/> - <import plugin="org.eclipse.cdt.ui"/> - <import plugin="org.eclipse.cdt.managedbuilder.core"/> - <import plugin="org.eclipse.cdt.managedbuilder.ui"/> - <import plugin="org.eclipse.cdt.debug.core"/> - <import plugin="org.eclipse.cdt.debug.ui"/> - <import plugin="org.eclipse.cdt.dsf"/> - <import plugin="org.eclipse.cdt.dsf.gdb"/> - <import plugin="org.eclipse.cdt.dsf.gdb.ui"/> - <import plugin="org.eclipse.cdt.launch"/> - <import feature="org.eclipse.egit" /> - <import feature="com.android.ide.eclipse.ddms" version="22.6.2" match="greaterOrEqual" /> - <import feature="com.android.ide.eclipse.adt" version="22.6.2" match="greaterOrEqual" /> - <import feature="com.android.ide.eclipse.gldebugger" version="22.6.2" match="greaterOrEqual" /> - <import feature="com.android.ide.eclipse.hierarchyviewer" version="22.6.2" match="greaterOrEqual" /> - <import feature="com.android.ide.eclipse.ndk" version="22.6.2" match="greaterOrEqual" /> - <import feature="com.android.ide.eclipse.traceview" version="22.6.2" match="greaterOrEqual" /> - <!-- - The build scripts will pull in the translation plugin if its plugin repository is accessible. - The following line should remain without any modifications as the build script looks for - exactly this pattern and removes the comment tags. - See sdk.git/adtproductbuild/build.xml. - --> - <!--import feature="com.google.i18n.inkstone.eclipse.localization" --> + <import feature="org.eclipse.jdt"/> + <import feature="org.eclipse.cdt"/> + <import feature="org.eclipse.platform"/> + <import feature="org.eclipse.rcp"/> + <import feature="org.eclipse.egit"/> + <import feature="org.eclipse.egit.import"/> </requires> + <plugin + id="com.android.ide.eclipse.adt.package" + download-size="0" + install-size="0" + version="0.0.0"/> + </feature> diff --git a/eclipse/features/com.android.ide.eclipse.adt.package/pom.xml b/eclipse/features/com.android.ide.eclipse.adt.package/pom.xml new file mode 100644 index 000000000..e835df853 --- /dev/null +++ b/eclipse/features/com.android.ide.eclipse.adt.package/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <version>22.6.2-SNAPSHOT</version> + <artifactId>com.android.ide.eclipse.adt.package.feature</artifactId> + <packaging>eclipse-feature</packaging> + <name>adt.package</name> + + <parent> + <relativePath>../../pom.xml</relativePath> + <groupId>adt.group</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + +</project> diff --git a/eclipse/features/com.android.ide.eclipse.adt/feature.xml b/eclipse/features/com.android.ide.eclipse.adt/feature.xml index 1ff56e885..98bae3b68 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 @@ <?xml version="1.0" encoding="UTF-8"?> <feature - id="com.android.ide.eclipse.adt" + id="com.android.ide.eclipse.adt.feature" label="Android Development Tools" version="22.6.2.qualifier" provider-name="The Android Open Source Project" diff --git a/eclipse/features/com.android.ide.eclipse.adt/pom.xml b/eclipse/features/com.android.ide.eclipse.adt/pom.xml new file mode 100644 index 000000000..3f77de428 --- /dev/null +++ b/eclipse/features/com.android.ide.eclipse.adt/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <version>22.6.2-SNAPSHOT</version> + <artifactId>com.android.ide.eclipse.adt.feature</artifactId> + <packaging>eclipse-feature</packaging> + <name>adt</name> + + <parent> + <relativePath>../../pom.xml</relativePath> + <groupId>adt.group</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + +</project> diff --git a/eclipse/features/com.android.ide.eclipse.ddms/feature.xml b/eclipse/features/com.android.ide.eclipse.ddms/feature.xml index 9a5ae3b3c..5a51a5d88 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 @@ <?xml version="1.0" encoding="UTF-8"?> <feature - id="com.android.ide.eclipse.ddms" + id="com.android.ide.eclipse.ddms.feature" label="Android DDMS" version="22.6.2.qualifier" provider-name="The Android Open Source Project" diff --git a/eclipse/features/com.android.ide.eclipse.ddms/pom.xml b/eclipse/features/com.android.ide.eclipse.ddms/pom.xml new file mode 100644 index 000000000..a03899582 --- /dev/null +++ b/eclipse/features/com.android.ide.eclipse.ddms/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <version>22.6.2-SNAPSHOT</version> + <artifactId>com.android.ide.eclipse.ddms.feature</artifactId> + <packaging>eclipse-feature</packaging> + <name>ddms</name> + + <parent> + <relativePath>../../pom.xml</relativePath> + <groupId>adt.group</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + +</project> diff --git a/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml b/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml index 1e1fda09d..baf58a3aa 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 @@ <?xml version="1.0" encoding="UTF-8"?> <feature - id="com.android.ide.eclipse.gldebugger" + id="com.android.ide.eclipse.gldebugger.feature" label="Tracer for OpenGL ES" version="22.6.2.qualifier" provider-name="The Android Open Source Project"> diff --git a/eclipse/features/com.android.ide.eclipse.gldebugger/pom.xml b/eclipse/features/com.android.ide.eclipse.gldebugger/pom.xml new file mode 100644 index 000000000..312df4c43 --- /dev/null +++ b/eclipse/features/com.android.ide.eclipse.gldebugger/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <version>22.6.2-SNAPSHOT</version> + <artifactId>com.android.ide.eclipse.gldebugger.feature</artifactId> + <packaging>eclipse-feature</packaging> + <name>gldebugger</name> + + <parent> + <relativePath>../../pom.xml</relativePath> + <groupId>adt.group</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + +</project> diff --git a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml index 17080b319..d72ce5ebc 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 @@ <?xml version="1.0" encoding="UTF-8"?> <feature - id="com.android.ide.eclipse.hierarchyviewer" + id="com.android.ide.eclipse.hierarchyviewer.feature" label="Android Hierarchy Viewer" version="22.6.2.qualifier" provider-name="The Android Open Source Project" diff --git a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/pom.xml b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/pom.xml new file mode 100644 index 000000000..1f400f39b --- /dev/null +++ b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <version>22.6.2-SNAPSHOT</version> + <artifactId>com.android.ide.eclipse.hierarchyviewer.feature</artifactId> + <packaging>eclipse-feature</packaging> + <name>hierarchyviewer</name> + + <parent> + <relativePath>../../pom.xml</relativePath> + <groupId>adt.group</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + +</project> diff --git a/eclipse/features/com.android.ide.eclipse.monitor/.project b/eclipse/features/com.android.ide.eclipse.monitor/.project new file mode 100644 index 000000000..347f1dcb7 --- /dev/null +++ b/eclipse/features/com.android.ide.eclipse.monitor/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>feature-monitor</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + </natures> +</projectDescription> diff --git a/eclipse/features/com.android.ide.eclipse.monitor/build.properties b/eclipse/features/com.android.ide.eclipse.monitor/build.properties new file mode 100644 index 000000000..64f93a9f0 --- /dev/null +++ b/eclipse/features/com.android.ide.eclipse.monitor/build.properties @@ -0,0 +1 @@ +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 new file mode 100644 index 000000000..be8b8d719 --- /dev/null +++ b/eclipse/features/com.android.ide.eclipse.monitor/feature.xml @@ -0,0 +1,233 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="com.android.ide.eclipse.monitor.feature" + label="Android Monitor" + version="22.6.2.qualifier" + provider-name="The Android Open Source Project" + plugin="com.android.ide.eclipse.monitor"> + + <description> + Android Debug Monitor + </description> + + <copyright> + Copyright (C) 2007-2014 The Android Open Source Project + </copyright> + + <license url="http://www.apache.org/licenses/LICENSE-2.0"> + 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. + </license> + + <plugin + id="com.android.ide.eclipse.monitor" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> diff --git a/eclipse/features/com.android.ide.eclipse.monitor/pom.xml b/eclipse/features/com.android.ide.eclipse.monitor/pom.xml new file mode 100644 index 000000000..f53dd7fb3 --- /dev/null +++ b/eclipse/features/com.android.ide.eclipse.monitor/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <version>22.6.2-SNAPSHOT</version> + <artifactId>com.android.ide.eclipse.monitor.feature</artifactId> + <packaging>eclipse-feature</packaging> + <name>monitor</name> + + <parent> + <relativePath>../../pom.xml</relativePath> + <groupId>adt.group</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + +</project> diff --git a/eclipse/features/com.android.ide.eclipse.ndk/feature.xml b/eclipse/features/com.android.ide.eclipse.ndk/feature.xml index 5fb8209e5..43535edb1 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 @@ <?xml version="1.0" encoding="UTF-8"?> <feature - id="com.android.ide.eclipse.ndk" + id="com.android.ide.eclipse.ndk.feature" label="Android Native Development Tools" version="22.6.2.qualifier" provider-name="The Android Open Source Project"> diff --git a/eclipse/features/com.android.ide.eclipse.ndk/pom.xml b/eclipse/features/com.android.ide.eclipse.ndk/pom.xml new file mode 100644 index 000000000..6ae3c775b --- /dev/null +++ b/eclipse/features/com.android.ide.eclipse.ndk/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <version>22.6.2-SNAPSHOT</version> + <artifactId>com.android.ide.eclipse.ndk.feature</artifactId> + <packaging>eclipse-feature</packaging> + <name>ndk</name> + + <parent> + <relativePath>../../pom.xml</relativePath> + <groupId>adt.group</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + +</project> diff --git a/eclipse/features/com.android.ide.eclipse.traceview/feature.xml b/eclipse/features/com.android.ide.eclipse.traceview/feature.xml index b07708f80..539ab7a74 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 @@ <?xml version="1.0" encoding="UTF-8"?> <feature - id="com.android.ide.eclipse.traceview" + id="com.android.ide.eclipse.traceview.feature" label="Android Traceview" version="22.6.2.qualifier" provider-name="The Android Open Source Project" diff --git a/eclipse/features/com.android.ide.eclipse.traceview/pom.xml b/eclipse/features/com.android.ide.eclipse.traceview/pom.xml new file mode 100644 index 000000000..fc7dcfb75 --- /dev/null +++ b/eclipse/features/com.android.ide.eclipse.traceview/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <version>22.6.2-SNAPSHOT</version> + <artifactId>com.android.ide.eclipse.traceview.feature</artifactId> + <packaging>eclipse-feature</packaging> + <name>traceview</name> + + <parent> + <relativePath>../../pom.xml</relativePath> + <groupId>adt.group</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + +</project> diff --git a/eclipse/maven.mk b/eclipse/maven.mk new file mode 100644 index 000000000..a054c0f74 --- /dev/null +++ b/eclipse/maven.mk @@ -0,0 +1,23 @@ +PWD=$(shell pwd) + +ANDROID_OUT=$(realpath $(PWD)/../../out) +ECLIPSE_PREBUILTS=$(realpath $(PWD)/../../prebuilts/eclipse) +ECLIPSE_BUILD_DEPS=$(realpath $(PWD)/../../prebuilts/eclipse-build-deps) + +TARGET_DIR=$(ANDROID_OUT)/host/maven/target + +all: setup build + +setup: + mkdir -p $(TARGET_DIR) + unzip -u $(ECLIPSE_BUILD_DEPS)/platform/org.eclipse.platform-4.2.2.zip -d $(TARGET_DIR)/platform + unzip -u $(ECLIPSE_BUILD_DEPS)/cdt/cdt-master-8.0.2.zip -d $(TARGET_DIR)/cdt + unzip -u $(ECLIPSE_BUILD_DEPS)/emf/emf-xsd-Update-2.9.1.zip -d $(TARGET_DIR)/emf + unzip -u $(ECLIPSE_BUILD_DEPS)/jdt/org.eclipse.jdt.source-4.2.2.zip -d $(TARGET_DIR)/jdt + unzip -u $(ECLIPSE_BUILD_DEPS)/wtp/wtp-repo-R-3.3.2-20120210195245.zip -d $(TARGET_DIR)/wtp + unzip -u $(ECLIPSE_BUILD_DEPS)/gef/GEF-Update-3.9.1.zip -d $(TARGET_DIR)/gef + unzip -u $(ECLIPSE_BUILD_DEPS)/pde/org.eclipse.pde-3.8.zip -d $(TARGET_DIR)/pde + unzip -u $(ECLIPSE_BUILD_DEPS)/egit/org.eclipse.egit.repository-2.2.0.201212191850-r.zip -d $(TARGET_DIR)/egit + +build: + $(ECLIPSE_PREBUILTS)/maven/apache-maven-3.2.1/bin/mvn -s settings.xml -DforceContextQualifier=M01 -DANDROID_OUT=$(ANDROID_OUT) package diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/pom.xml b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/pom.xml new file mode 100644 index 000000000..eb4a51122 --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <version>22.6.2-SNAPSHOT</version> + <artifactId>overlay.com.android.ide.eclipse.adt.overlay</artifactId> + <packaging>eclipse-plugin</packaging> + <name>adt.overlay</name> + + <parent> + <relativePath>../../pom.xml</relativePath> + <groupId>adt.group</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + +</project> diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt.package/META-INF/MANIFEST.MF index 049f85920..bac961feb 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt.package/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/META-INF/MANIFEST.MF @@ -5,6 +5,7 @@ Bundle-SymbolicName: com.android.ide.eclipse.adt.package;singleton:=true Bundle-Version: 22.6.2.qualifier Bundle-Vendor: The Android Open Source Project Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Eclipse-BundleShape: dir Require-Bundle: org.eclipse.platform, org.eclipse.equinox.app, org.eclipse.ui.intro, diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/ide.product b/eclipse/plugins/com.android.ide.eclipse.adt.package/ide.product index cef08ba3b..fd71c4b59 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt.package/ide.product +++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/ide.product @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="Android Developer Tools" uid="com.android.ide.eclipse.adt.package.product" id="com.android.ide.eclipse.adt.package.product" application="org.eclipse.ui.ide.workbench" version="22.6.2.qualifier" useFeatures="true" includeLaunchers="true"> +<product name="eclipse" uid="adtproduct" id="adtproduct" application="org.eclipse.ui.ide.workbench" version="22.6.2.qualifier" useFeatures="true" includeLaunchers="true"> <configIni use="default"> </configIni> <launcherArgs> - <programArgs>-product com.android.ide.eclipse.adt.package.product</programArgs> + <programArgs>-product adtproduct</programArgs> <programArgsWin>--launcher.XXMaxPermSize 256M</programArgsWin> <vmArgs>-Dosgi.requiredJavaVersion=1.6 -Xms40m -Xmx768m</vmArgs> <vmArgsLin>-XX:MaxPermSize=256m</vmArgsLin> @@ -18,10 +18,9 @@ <splash location="com.android.ide.eclipse.adt.package" /> - <launcher> + <launcher name="eclipse"> <solaris/> - <win useIco="true"> - <ico path="/plugin-adt-package/icons/adt.ico"/> + <win useIco="false"> <bmp/> </win> </launcher> @@ -36,11 +35,21 @@ </plugins> <features> - <feature id="com.android.ide.eclipse.adt.package"/> + <feature id="com.android.ide.eclipse.adt.package.feature" version="22.6.2.qualifier"/> + <feature id="com.android.ide.eclipse.adt.feature" version="22.6.2.qualifier"/> + <feature id="com.android.ide.eclipse.ddms.feature" version="22.6.2.qualifier"/> + <feature id="com.android.ide.eclipse.gldebugger.feature" version="22.6.2.qualifier"/> + <feature id="com.android.ide.eclipse.hierarchyviewer.feature" version="22.6.2.qualifier"/> + <feature id="com.android.ide.eclipse.ndk.feature" version="22.6.2.qualifier"/> + <feature id="com.android.ide.eclipse.traceview.feature" version="22.6.2.qualifier"/> </features> <configurations> - <property name="eclipse.product" value="com.android.ide.eclipse.adt.package.product" /> + <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" /> + <property name="eclipse.product" value="adtproduct" /> + <property name="org.eclipse.update.reconcile" value="false" /> + <property name="osgi.bundles.defaultStartLevel" value="4" /> + <property name="osgi.splashPath" value="platform\:/base/plugins/com.android.ide.eclipse.adt.package" /> </configurations> </product> diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin.xml b/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin.xml index fbeabb973..ed4f2650f 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin.xml +++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin.xml @@ -2,7 +2,7 @@ <?eclipse version="3.4"?> <plugin> <extension - id="product" + id="adtproduct" point="org.eclipse.core.runtime.products"> <product application="org.eclipse.ui.ide.workbench" @@ -57,7 +57,7 @@ point="org.eclipse.ui.intro"> <introProductBinding introId="com.android.ide.eclipse.adt.intro" - productId="com.android.ide.eclipse.adt.package.product"> + productId="adtproduct"> </introProductBinding> </extension> </plugin> diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin_customization.ini b/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin_customization.ini index 996af37ad..5585184d7 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin_customization.ini +++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin_customization.ini @@ -3,6 +3,6 @@ org.eclipse.ui/SHOW_TRADITIONAL_STYLE_TABS=false org.eclipse.ui/DOCK_PERSPECTIVE_BAR=topRight org.eclipse.ui/PERSPECTIVE_BAR_EXTRAS=com.android.ide.eclipse.ddms.Perspective org.eclipse.ui/PERSPECTIVE_BAR_SIZE=250 -org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP=true +org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = false org.eclipse.ui.workbench/SHOW_BUILDID_ON_STARTUP=true org.eclipse.ui/SHOW_MEMORY_MONITOR=true
\ No newline at end of file diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/pom.xml b/eclipse/plugins/com.android.ide.eclipse.adt.package/pom.xml new file mode 100644 index 000000000..b0733648f --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <version>22.6.2-SNAPSHOT</version> + <artifactId>com.android.ide.eclipse.adt.package</artifactId> + <packaging>eclipse-plugin</packaging> + <name>adt.package</name> + + <parent> + <relativePath>../../pom.xml</relativePath> + <groupId>adt.group</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + +</project> diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/pom.xml b/eclipse/plugins/com.android.ide.eclipse.adt/pom.xml new file mode 100644 index 000000000..26fd0f966 --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.adt/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <version>22.6.2-SNAPSHOT</version> + <artifactId>com.android.ide.eclipse.adt</artifactId> + <packaging>eclipse-plugin</packaging> + <name>adt</name> + + <parent> + <relativePath>../../pom.xml</relativePath> + <groupId>adt.group</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + +</project> diff --git a/eclipse/plugins/com.android.ide.eclipse.base/pom.xml b/eclipse/plugins/com.android.ide.eclipse.base/pom.xml new file mode 100644 index 000000000..bdc937301 --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.base/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <version>22.6.2-SNAPSHOT</version> + <artifactId>com.android.ide.eclipse.base</artifactId> + <packaging>eclipse-plugin</packaging> + <name>base</name> + + <parent> + <relativePath>../../pom.xml</relativePath> + <groupId>adt.group</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + +</project> diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/pom.xml b/eclipse/plugins/com.android.ide.eclipse.ddms/pom.xml new file mode 100644 index 000000000..80ef71853 --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.ddms/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <version>22.6.2-SNAPSHOT</version> + <artifactId>com.android.ide.eclipse.ddms</artifactId> + <packaging>eclipse-plugin</packaging> + <name>ddms</name> + + <parent> + <relativePath>../../pom.xml</relativePath> + <groupId>adt.group</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + +</project> diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/pom.xml b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/pom.xml new file mode 100644 index 000000000..6ff0700aa --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <version>22.6.2-SNAPSHOT</version> + <artifactId>com.android.ide.eclipse.gldebugger.tests</artifactId> + <packaging>eclipse-test-plugin</packaging> + <name>gldebugger.tests</name> + + <parent> + <relativePath>../../pom.xml</relativePath> + <groupId>adt.group</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + +</project> diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/build.properties b/eclipse/plugins/com.android.ide.eclipse.gldebugger/build.properties index 3b4a69888..6994c0bcb 100644 --- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/build.properties +++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/build.properties @@ -4,8 +4,5 @@ bin.includes = plugin.xml,\ META-INF/,\
.,\
icons/,\
- lib/host-libprotobuf-java-2.3.0-lite.jar,\
- lib/liblzf.jar,\
- lib/sdklib.jar,\
entries.in,\
libs/
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/pom.xml b/eclipse/plugins/com.android.ide.eclipse.gldebugger/pom.xml new file mode 100644 index 000000000..0bd14c317 --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <version>22.6.2-SNAPSHOT</version> + <artifactId>com.android.ide.eclipse.gldebugger</artifactId> + <packaging>eclipse-plugin</packaging> + <name>gldebugger</name> + + <parent> + <relativePath>../../pom.xml</relativePath> + <groupId>adt.group</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + +</project> diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/pom.xml b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/pom.xml new file mode 100644 index 000000000..e22fb7419 --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <version>22.6.2-SNAPSHOT</version> + <artifactId>com.android.ide.eclipse.hierarchyviewer</artifactId> + <packaging>eclipse-plugin</packaging> + <name>hierarchyviewer</name> + + <parent> + <relativePath>../../pom.xml</relativePath> + <groupId>adt.group</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + +</project> diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/monitor.product b/eclipse/plugins/com.android.ide.eclipse.monitor/monitor.product index 9df7cf94f..9aec4f151 100644 --- a/eclipse/plugins/com.android.ide.eclipse.monitor/monitor.product +++ b/eclipse/plugins/com.android.ide.eclipse.monitor/monitor.product @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="monitor" uid="com.android.ide.eclipse.monitor.product.config" id="com.android.ide.eclipse.monitor.product" application="com.android.ide.eclipse.monitor.Application" version="22.6.2" useFeatures="false" includeLaunchers="true"> - +<product name="monitor" uid="com.android.ide.eclipse.monitor.product" id="com.android.ide.eclipse.monitor.product" application="com.android.ide.eclipse.monitor.Application" version="22.6.2.qualifier" useFeatures="true" includeLaunchers="true"> <configIni use="default"> </configIni> @@ -16,7 +15,7 @@ <splash location="com.android.ide.eclipse.monitor" /> - <launcher> + <launcher name="monitor"> <solaris/> <win useIco="false"> <bmp/> @@ -27,63 +26,29 @@ </vm> <plugins> - <plugin id="com.android.ide.eclipse.base"/> - <plugin id="com.android.ide.eclipse.ddms"/> - <plugin id="com.android.ide.eclipse.gldebugger"/> - <plugin id="com.android.ide.eclipse.hierarchyviewer"/> - <plugin id="com.android.ide.eclipse.monitor"/> - <plugin id="com.android.ide.eclipse.traceview"/> - <plugin id="com.ibm.icu"/> - <plugin id="org.eclipse.compare.core"/> - <plugin id="org.eclipse.core.commands"/> - <plugin id="org.eclipse.core.contenttype"/> - <plugin id="org.eclipse.core.databinding"/> - <plugin id="org.eclipse.core.databinding.observable"/> - <plugin id="org.eclipse.core.databinding.property"/> - <plugin id="org.eclipse.core.expressions"/> - <plugin id="org.eclipse.core.filesystem"/> - <plugin id="org.eclipse.core.filesystem.linux.x86_64" fragment="true"/> - <plugin id="org.eclipse.core.jobs"/> - <plugin id="org.eclipse.core.resources"/> - <plugin id="org.eclipse.core.runtime"/> - <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/> - <plugin id="org.eclipse.core.variables"/> - <plugin id="org.eclipse.ecf"/> - <plugin id="org.eclipse.ecf.filetransfer"/> - <plugin id="org.eclipse.ecf.identity"/> - <plugin id="org.eclipse.ecf.provider.filetransfer"/> - <plugin id="org.eclipse.ecf.provider.filetransfer.ssl" fragment="true"/> - <plugin id="org.eclipse.ecf.ssl" fragment="true"/> - <plugin id="org.eclipse.equinox.app"/> - <plugin id="org.eclipse.equinox.common"/> - <plugin id="org.eclipse.equinox.p2.core"/> - <plugin id="org.eclipse.equinox.p2.engine"/> - <plugin id="org.eclipse.equinox.p2.metadata"/> - <plugin id="org.eclipse.equinox.p2.metadata.repository"/> - <plugin id="org.eclipse.equinox.p2.repository"/> - <plugin id="org.eclipse.equinox.preferences"/> - <plugin id="org.eclipse.equinox.registry"/> - <plugin id="org.eclipse.equinox.security"/> - <plugin id="org.eclipse.help"/> - <plugin id="org.eclipse.jface"/> - <plugin id="org.eclipse.jface.databinding"/> - <plugin id="org.eclipse.jface.text"/> - <plugin id="org.eclipse.osgi"/> - <plugin id="org.eclipse.osgi.services"/> - <plugin id="org.eclipse.swt"/> - <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/> - <plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/> - <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/> - <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/> - <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/> - <plugin id="org.eclipse.text"/> - <plugin id="org.eclipse.ui"/> - <plugin id="org.eclipse.ui.cocoa"/> - <plugin id="org.eclipse.ui.console"/> - <plugin id="org.eclipse.ui.ide"/> - <plugin id="org.eclipse.ui.workbench"/> - <plugin id="org.eclipse.ui.workbench.texteditor"/> </plugins> + <features> + <feature id="com.android.ide.eclipse.ddms.feature"/> + <feature id="com.android.ide.eclipse.gldebugger.feature"/> + <feature id="com.android.ide.eclipse.hierarchyviewer.feature"/> + <feature id="com.android.ide.eclipse.traceview.feature"/> + <feature id="com.android.ide.eclipse.monitor.feature"/> + <feature id="org.eclipse.rcp"/> + <feature id="org.eclipse.emf.ecore"/> + <feature id="org.eclipse.e4.rcp"/> + <feature id="org.eclipse.emf.common"/> + <feature id="org.eclipse.platform"/> + <feature id="org.eclipse.equinox.p2.core.feature"/> + <feature id="org.eclipse.help"/> + <feature id="org.eclipse.equinox.p2.rcp.feature"/> + <feature id="org.eclipse.equinox.p2.extras.feature"/> + </features> + + <configurations> + <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="2" /> + <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" /> + <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" /> + </configurations> </product> diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/plugin.xml b/eclipse/plugins/com.android.ide.eclipse.monitor/plugin.xml index 7a09eda5c..32c44d058 100644 --- a/eclipse/plugins/com.android.ide.eclipse.monitor/plugin.xml +++ b/eclipse/plugins/com.android.ide.eclipse.monitor/plugin.xml @@ -117,4 +117,16 @@ </action> </actionSet> </extension> + <extension + id="product" + point="org.eclipse.core.runtime.products"> + <product + application="com.android.ide.eclipse.monitor.Application" + name="monitor"> + <property + name="appName" + value="monitor"> + </property> + </product> + </extension> </plugin> diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/pom.xml b/eclipse/plugins/com.android.ide.eclipse.monitor/pom.xml new file mode 100644 index 000000000..81b1b31ab --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.monitor/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <version>22.6.2-SNAPSHOT</version> + <artifactId>com.android.ide.eclipse.monitor</artifactId> + <packaging>eclipse-plugin</packaging> + <name>monitor</name> + + <parent> + <relativePath>../../pom.xml</relativePath> + <groupId>adt.group</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + +</project> diff --git a/eclipse/plugins/com.android.ide.eclipse.ndk/pom.xml b/eclipse/plugins/com.android.ide.eclipse.ndk/pom.xml new file mode 100644 index 000000000..f96b797be --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.ndk/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <version>22.6.2-SNAPSHOT</version> + <artifactId>com.android.ide.eclipse.ndk</artifactId> + <packaging>eclipse-plugin</packaging> + <name>ndk</name> + + <parent> + <relativePath>../../pom.xml</relativePath> + <groupId>adt.group</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + +</project> diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/pom.xml b/eclipse/plugins/com.android.ide.eclipse.tests/pom.xml new file mode 100644 index 000000000..459d42bf8 --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.tests/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <version>22.6.2-SNAPSHOT</version> + <artifactId>com.android.ide.eclipse.tests</artifactId> + <packaging>eclipse-test-plugin</packaging> + <name>tests</name> + + <parent> + <relativePath>../../pom.xml</relativePath> + <groupId>adt.group</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + +</project> diff --git a/eclipse/plugins/com.android.ide.eclipse.traceview/pom.xml b/eclipse/plugins/com.android.ide.eclipse.traceview/pom.xml new file mode 100644 index 000000000..6fbf804ef --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.traceview/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <version>22.6.2-SNAPSHOT</version> + <artifactId>com.android.ide.eclipse.traceview</artifactId> + <packaging>eclipse-plugin</packaging> + <name>traceview</name> + + <parent> + <relativePath>../../pom.xml</relativePath> + <groupId>adt.group</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + +</project> diff --git a/eclipse/pom.xml b/eclipse/pom.xml new file mode 100644 index 000000000..e56efc8fa --- /dev/null +++ b/eclipse/pom.xml @@ -0,0 +1,187 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + This script builds Eclipse plugins, and the monitor & adt-bundle products. + + To run this script: + - Have Maven3 in your path + - $ mvn package -DANDROID_OUT=/path/to/android/out + + See http://wiki.eclipse.org/Tycho/Reference_Card#Examplary_parent_POM + --> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>adt.group</groupId> + <artifactId>parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>ADT</name> + + <!-- Common properties used in all modules --> + <properties> + <tycho-version>0.20.0</tycho-version> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <!-- + The following profiles allow us to change the build environment easily. The first profile uses + the target platform as present inside the Android tree's out folder, while the other profile + uses the target platform directly from eclipse.org. + + The first profile is automatically activated if the ANDROID_OUT system property is set: + $ mvn clean install -DANDROID_OUT=/path/to/android/out + The other profile can be tested out by: + $ mvn clean install -Pexternal-p2-repositories + --> + <profiles> + <profile> + <id>mirrored-p2-repositories</id> + <activation> + <property> + <name>ANDROID_OUT</name> + </property> + </activation> + <properties> + <!-- The target platform should have been created under the Android ANDROID_OUT folder --> + <target-platform.base.url>file://${ANDROID_OUT}/host/maven/target</target-platform.base.url> + </properties> + <repositories> + <repository> + <id>kepler</id> + <url>${target-platform.base.url}/platform</url> + <layout>p2</layout> + </repository> + <repository> + <id>jdt</id> + <url>${target-platform.base.url}/jdt</url> + <layout>p2</layout> + </repository> + <repository> + <id>cdt</id> + <url>${target-platform.base.url}/cdt</url> + <layout>p2</layout> + </repository> + <repository> + <id>emf</id> + <url>${target-platform.base.url}/emf</url> + <layout>p2</layout> + </repository> + <repository> + <id>wtp</id> + <url>${target-platform.base.url}/wtp</url> + <layout>p2</layout> + </repository> + <repository> + <id>gef</id> + <url>${target-platform.base.url}/gef</url> + <layout>p2</layout> + </repository> + <repository> + <id>pde</id> + <url>${target-platform.base.url}/pde</url> + <layout>p2</layout> + </repository> + <repository> + <id>egit</id> + <url>${target-platform.base.url}/egit</url> + <layout>p2</layout> + </repository> + </repositories> + </profile> + <profile> + <id>external-p2-repositories</id> + <repositories> + <repository> + <id>kepler</id> + <url>http://download.eclipse.org/releases/kepler</url> + <layout>p2</layout> + </repository> + </repositories> + </profile> + </profiles> + + <modules> + <module>plugins/com.android.ide.eclipse.base</module> + <module>plugins/com.android.ide.eclipse.ddms</module> + <module>plugins/com.android.ide.eclipse.gldebugger</module> + <module>plugins/com.android.ide.eclipse.hierarchyviewer</module> + <module>plugins/com.android.ide.eclipse.monitor</module> + <module>plugins/com.android.ide.eclipse.traceview</module> + + <module>plugins/com.android.ide.eclipse.adt</module> + <module>plugins/com.android.ide.eclipse.adt.overlay</module> + <module>plugins/com.android.ide.eclipse.adt.package</module> + <module>plugins/com.android.ide.eclipse.ndk</module> + + <module>features/com.android.ide.eclipse.ddms</module> + <module>features/com.android.ide.eclipse.gldebugger</module> + <module>features/com.android.ide.eclipse.hierarchyviewer</module> + <module>features/com.android.ide.eclipse.traceview</module> + <module>features/com.android.ide.eclipse.monitor</module> + + <module>features/com.android.ide.eclipse.adt</module> + <module>features/com.android.ide.eclipse.adt.package</module> + <module>features/com.android.ide.eclipse.ndk</module> + + <module>artifacts/p2repo</module> + <module>artifacts/bundles</module> + </modules> + + <build> + <!-- Path is relative to each of the build modules defined above. --> + <directory>../../../../out/host/maven/${project.artifactId}-${project.version}</directory> + + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <!-- + <target> + <artifact> + <groupId>adt.group</groupId> + <artifactId>helios</artifactId> + <version>1.0.0-SNAPSHOT</version> + </artifact> + </target> --> + <environments> + <environment> + <os>win32</os> + <ws>win32</ws> + <arch>x86</arch> + </environment> + <environment> + <os>win32</os> + <ws>win32</ws> + <arch>x86_64</arch> + </environment> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86</arch> + </environment> + <environment> + <os>macosx</os> + <ws>cocoa</ws> + <arch>x86_64</arch> + </environment> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86_64</arch> + </environment> + </environments> + </configuration> + </plugin> + + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-maven-plugin</artifactId> + <version>${tycho-version}</version> + <extensions>true</extensions> + </plugin> + </plugins> + </build> +</project> diff --git a/eclipse/settings.xml b/eclipse/settings.xml new file mode 100644 index 000000000..87c7a4fd2 --- /dev/null +++ b/eclipse/settings.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Run as: mvn -s /path/to/settings.xml --> +<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> + <localRepository>../../prebuilts/eclipse/tycho/tycho-dependencies-m2repo/</localRepository> + <offline>true</offline> +</settings> |