From a7d8120ad9042e1ffa3db0ead3b3abbbff1e45d2 Mon Sep 17 00:00:00 2001
From: Siva Velusamy <vsiva@google.com>
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
---
 eclipse/artifacts/bundles/.project        | 11 ------
 eclipse/artifacts/bundles/category.xml    | 32 ----------------
 eclipse/artifacts/bundles/ide.p2.inf      |  9 -----
 eclipse/artifacts/bundles/ide.product     | 55 ---------------------------
 eclipse/artifacts/bundles/monitor.product | 54 --------------------------
 eclipse/artifacts/bundles/pom.xml         | 63 -------------------------------
 eclipse/artifacts/p2repo/.project         | 11 ------
 eclipse/artifacts/p2repo/category.xml     | 32 ----------------
 eclipse/artifacts/p2repo/pom.xml          | 17 ---------
 9 files changed, 284 deletions(-)
 delete mode 100644 eclipse/artifacts/bundles/.project
 delete mode 100644 eclipse/artifacts/bundles/category.xml
 delete mode 100644 eclipse/artifacts/bundles/ide.p2.inf
 delete mode 100644 eclipse/artifacts/bundles/ide.product
 delete mode 100644 eclipse/artifacts/bundles/monitor.product
 delete mode 100644 eclipse/artifacts/bundles/pom.xml
 delete mode 100644 eclipse/artifacts/p2repo/.project
 delete mode 100644 eclipse/artifacts/p2repo/category.xml
 delete mode 100644 eclipse/artifacts/p2repo/pom.xml

(limited to 'eclipse/artifacts')

diff --git a/eclipse/artifacts/bundles/.project b/eclipse/artifacts/bundles/.project
deleted file mode 100644
index 9174087..0000000
--- a/eclipse/artifacts/bundles/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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
deleted file mode 100644
index fd4ad19..0000000
--- a/eclipse/artifacts/bundles/category.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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
deleted file mode 100644
index cabaa55..0000000
--- a/eclipse/artifacts/bundles/ide.p2.inf
+++ /dev/null
@@ -1,9 +0,0 @@
-#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
deleted file mode 100644
index fd71c4b..0000000
--- a/eclipse/artifacts/bundles/ide.product
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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
deleted file mode 100644
index 9aec4f1..0000000
--- a/eclipse/artifacts/bundles/monitor.product
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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
deleted file mode 100644
index e162934..0000000
--- a/eclipse/artifacts/bundles/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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
deleted file mode 100644
index 5360679..0000000
--- a/eclipse/artifacts/p2repo/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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
deleted file mode 100644
index fd4ad19..0000000
--- a/eclipse/artifacts/p2repo/category.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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
deleted file mode 100644
index fa9aca1..0000000
--- a/eclipse/artifacts/p2repo/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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>
-- 
cgit v1.1