Permalink
Browse files

Remove ScalaIDE product definitions and dependencies.

Fixed #1001281.
  • Loading branch information...
1 parent b22d4ae commit cb8d9661eec58bd2524b30c18c6c4ed818efe36f @dragos dragos committed Oct 16, 2012
@@ -1 +0,0 @@
-target/
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.scala-ide</groupId>
- <artifactId>org.scala-ide.build</artifactId>
- <version>2.1.0-SNAPSHOT</version>
- </parent>
- <artifactId>org.scala-ide.product</artifactId>
- <packaging>eclipse-repository</packaging>
-
- <properties>
- <!-- some default values, can be overwritten by profiles -->
- <repo.scala-ide.ecosystem>${repo.scala-ide.root}/ecosystem/dev-milestone-2.9/site/</repo.scala-ide.ecosystem>
- </properties>
-
- <profiles>
- <profile>
- <!--- the profile using the default values. Scala 2.9.x -->
- <id>scala-2.9.x</id>
- </profile>
-
- <profile>
- <!-- Scala 2.10.x -->
- <id>scala-2.10.x</id>
- <properties>
- <repo.scala-ide.ecosystem>${repo.scala-ide.root}/ecosystem/dev-milestone-milestone/site/</repo.scala-ide.ecosystem>
- <scala.major.minor.version>2.10.0-M7</scala.major.minor.version>
- </properties>
- </profile>
- </profiles>
-
- <repositories>
- <repository>
- <id>scala-ide ecosystem</id>
- <url>${repo.scala-ide.ecosystem}</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>eclipse.${eclipse.codename}</id>
- <name>Eclipse p2 repository</name>
- <layout>p2</layout>
- <url>${repo.eclipse}</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>ajdt.${eclipse.codename}</id>
- <name>AJDT for Eclipse p2 repository</name>
- <layout>p2</layout>
- <url>${repo.ajdt}</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
-
- <build>
- <plugins>
- <plugin>
- <!-- enable tycho to support eclipse type artifacts -->
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho.plugin.version}</version>
- <configuration>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>carbon</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-repository-plugin</artifactId>
- <version>${tycho.plugin.version}</version>
- <configuration>
- <includeAllDependencies>true</includeAllDependencies>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-director-plugin</artifactId>
- <version>${tycho.plugin.version}</version>
- <executions>
- <execution>
- <id>materialize-products</id>
- <goals>
- <goal>materialize-products</goal>
- </goals>
- </execution>
- <execution>
- <id>archive-products</id>
- <goals>
- <goal>archive-products</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <formats>
- <linux>tar.gz</linux>
- </formats>
- <products>
- <product>
- <id>scalaide.product.id</id>
- <rootFolder>eclipse</rootFolder>
- <archiveFileName>scala-SDK-2.1-M2-${scala.major.minor.version}</archiveFileName>
- </product>
- </products>
- <installFeatures>true</installFeatures>
- <profile>SDKProfile</profile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
@@ -1,7 +0,0 @@
-instructions.configure=\
- addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/3.7,name:The Eclipse Project Updates);\
- addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/3.7,name:The Eclipse Project Updates);\
- addRepository(type:0,location:http${#58}//download.eclipse.org/releases/indigo,name:Indigo);\
- addRepository(type:1,location:http${#58}//download.eclipse.org/releases/indigo,name:Indigo);\
- addRepository(type:0,location:http${#58}//download.scala-ide.org/ecosystem/dev-milestone-2.9/site/,name:Scala IDE);\
- addRepository(type:1,location:http${#58}//download.scala-ide.org/ecosystem/dev-milestone-2.9/site/,name:Scala IDE);
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="Typesafe Scala IDE" uid="scalaide.product.id" id="org.scala-ide.sdt.product" application="org.eclipse.ui.ide.workbench" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="true">
-
- <aboutInfo>
- <image path="eclipse_lg.gif"/>
- <text>
- %productBlurb
- </text>
- </aboutInfo>
-
- <configIni use="default">
-<!-- <macosx>config.ini</macosx>
- <linux>config.ini</linux>
- <win32>config.ini</win32> -->
- </configIni>
-
- <launcherArgs>
- <vmArgs>-Xmx1500m
--Xms100m
--XX:MaxPermSize=128m</vmArgs>
- <vmArgsMac>
--XstartOnFirstThread
--Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
- </launcherArgs>
-
- <windowImages i16="eclipse.gif" i32="eclipse32.gif" i48="eclipse48.gif" i64="eclipse.png" i128="eclipse32.png"/>
-
- <splash
- location="org.eclipse.platform"
- startupProgressRect="0,280,455,15"
- startupMessageRect="7,220,441,20"
- startupForegroundColor="C8D5EA" />
- <launcher>
- <solaris/>
- <win useIco="false">
- <bmp/>
- </win>
- </launcher>
-
- <intro introId="org.eclipse.ui.intro.universal"/>
-
- <vm>
- <macos include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</macos>
- </vm>
-
- <features>
- <feature id="org.scala-ide.sdt.feature"/>
- <feature id="org.scala-ide.sdt.weaving.feature"/>
- <feature id="org.scalaide.worksheet.feature"/>
- <feature id="org.eclipse.cvs"/>
- <feature id="org.eclipse.equinox.p2.core.feature"/>
- <feature id="org.eclipse.equinox.p2.extras.feature"/>
- <feature id="org.eclipse.equinox.p2.rcp.feature"/>
- <feature id="org.eclipse.equinox.p2.user.ui"/>
- <feature id="org.eclipse.equinox.weaving.sdk"/>
- <feature id="org.eclipse.help"/>
- <feature id="org.eclipse.pde"/>
- <feature id="org.eclipse.jdt"/>
- <feature id="org.eclipse.platform"/>
- <feature id="org.eclipse.rcp"/>
- </features>
- <configurations>
- <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
- <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
-
- <!-- Needed in order for the update manager to work. -->
- <plugin id="org.eclipse.equinox.common" autostart="true" startLevel="2" />
- <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="4" />
- <plugin id="org.eclipse.update.configurator" autostart="true" level="4" />
- <property name="equinox.use.ds" value="true" />
- <property name="org.eclipse.update.reconcile" value="false" />
-
- <property name="eclipse.p2.data.area" value="@config.dir/../p2/" />
- <property name="eclipse.p2.profile" value="SDKProfile" />
- <property name="eclipse.buildId" value="2.1-M2-Typesafe" />
- </configurations>
-
-</product>
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=$eclipse.buildId$
@@ -11,8 +11,4 @@ bin.includes = META-INF/,\
about.png,\
templates/,\
target/lib/,\
- plugin.properties,\
- plugin_customization.ini,\
- product.png,\
- intro-scala.png,\
- about.mappings
+ plugin.properties
Deleted file not rendered
@@ -1,28 +1,3 @@
JUnitShortcut.label= JUnit Test
RunJUnitLaunchShortcut.description=Runs a set of JUnit tests
DebugJUnitLaunchShortcut.description=Debugs a set of JUnit tests
-
-productIntroTitle=Scala IDE build of Eclipse SDK
-productBlurb=Scala IDE build of Eclipse SDK\n\
-\n\
-Build id: {0}\n\
-\n\
-(c) LAMP/EPFL and Typesafe for Scala IDE and associated plugins\n\
-\n\
-The Scala IDE for Eclipse provides an integrated environment for creating Scala programs.\n\
-Visit http://scala-ide.org/\n\
-\n\
-Typesafe Team: Luc Bourlier, Mirco Dotta, Iulian Dragos, Martin Odersky, and Hubert Plocinicak.\n\
-Many thanks to David Bernard, Donna Malayeri, Eric Molitor, Matt Russell, Miles Sabin,\n\
-Mirko Stocker, Joshua Suereth, Eugene Vigdorchik, and all other contributors.\n\
-\n\
-\n\
-Eclipse SDK\n\
-\n\
-Version: 3.7.2\n\
-\n\
-(c) Copyright Eclipse contributors and others 2000, 2012. All rights reserved.\n\
-Visit http://www.eclipse.org/platform\n\
-\n\
-This product includes software developed by the\n\
-Apache Software Foundation http://www.apache.org/
@@ -768,6 +768,9 @@
<initializer
class="scala.tools.eclipse.logging.ui.properties.LoggingPreferencePageInitializer">
</initializer>
+ <initializer
+ class="scala.tools.eclipse.PreferenceInitializer">
+ </initializer>
</extension>
<extension point="org.eclipse.core.expressions.propertyTesters">
@@ -1461,51 +1464,4 @@
</enablement>
</moveParticipant>
</extension>
- <extension
- id="org.scala-ide.sdt.product"
- point="org.eclipse.core.runtime.products">
- <product
- application="org.eclipse.ui.ide.workbench"
- description="Scala IDE for Eclipse"
- name="Scala IDE">
- <property name="aboutImage" value="product.png"/>
- <property name="aboutText" value="%productBlurb"/>
- <property
- name="preferenceCustomization"
- value="plugin_customization.ini">
- </property>
- <property
- name="introTitle"
- value="%productIntroTitle"/>
- <property
- name="introBrandingImage"
- value="product:intro-scala.png"/>
- <property
- name="startupForegroundColor"
- value="C8D5EA"/>
- <property
- name="startupMessageRect"
- value="7,220,441,20"/>
- <property
- name="startupProgressRect"
- value="0,280,455,15"/>
- <property
- name="buildIdLocation"
- value="312,190">
- </property>
- </product>
- </extension>
- <extension point="org.eclipse.ui.intro">
- <introProductBinding
- introId="org.eclipse.ui.intro.universal"
- productId="org.scala-ide.sdt.product">
- </introProductBinding>
- </extension>
- <extension
- point="org.eclipse.core.runtime.preferences">
- <initializer
- class="scala.tools.eclipse.PreferenceInitializer">
- </initializer>
- </extension>
-
</plugin>
Oops, something went wrong.

0 comments on commit cb8d966

Please sign in to comment.