Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Remove ScalaIDE product definitions and dependencies.

Fixed #1001281.
  • Loading branch information...
commit cb8d9661eec58bd2524b30c18c6c4ed818efe36f 1 parent b22d4ae
Iulian Dragos authored October 16, 2012
1  org.scala-ide.product/.gitignore
... ...
@@ -1 +0,0 @@
1  
-target/
156  org.scala-ide.product/pom.xml
... ...
@@ -1,156 +0,0 @@
1  
-<?xml version="1.0" encoding="UTF-8"?>
2  
-<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"
3  
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4  
-  <modelVersion>4.0.0</modelVersion>
5  
-  <parent>
6  
-    <groupId>org.scala-ide</groupId>
7  
-    <artifactId>org.scala-ide.build</artifactId>
8  
-    <version>2.1.0-SNAPSHOT</version>
9  
-  </parent>
10  
-  <artifactId>org.scala-ide.product</artifactId>
11  
-  <packaging>eclipse-repository</packaging>
12  
-
13  
-  <properties>
14  
-    <!-- some default values, can be overwritten by profiles -->
15  
-    <repo.scala-ide.ecosystem>${repo.scala-ide.root}/ecosystem/dev-milestone-2.9/site/</repo.scala-ide.ecosystem>
16  
-  </properties>
17  
-
18  
-  <profiles>
19  
-    <profile>
20  
-      <!--- the profile using the default values. Scala 2.9.x -->
21  
-      <id>scala-2.9.x</id>
22  
-    </profile>
23  
-
24  
-    <profile>
25  
-      <!-- Scala 2.10.x -->
26  
-      <id>scala-2.10.x</id>
27  
-      <properties>
28  
-        <repo.scala-ide.ecosystem>${repo.scala-ide.root}/ecosystem/dev-milestone-milestone/site/</repo.scala-ide.ecosystem>
29  
-        <scala.major.minor.version>2.10.0-M7</scala.major.minor.version>
30  
-      </properties>
31  
-    </profile>
32  
-  </profiles>
33  
-
34  
-  <repositories>
35  
-    <repository>
36  
-      <id>scala-ide ecosystem</id>
37  
-      <url>${repo.scala-ide.ecosystem}</url>
38  
-      <layout>p2</layout>
39  
-    </repository>
40  
-    <repository>
41  
-      <id>eclipse.${eclipse.codename}</id>
42  
-      <name>Eclipse p2 repository</name>
43  
-      <layout>p2</layout>
44  
-      <url>${repo.eclipse}</url>
45  
-      <snapshots>
46  
-        <enabled>false</enabled>
47  
-      </snapshots>
48  
-    </repository>
49  
-    <repository>
50  
-      <id>ajdt.${eclipse.codename}</id>
51  
-      <name>AJDT for Eclipse p2 repository</name>
52  
-      <layout>p2</layout>
53  
-      <url>${repo.ajdt}</url>
54  
-      <snapshots>
55  
-        <enabled>false</enabled>
56  
-      </snapshots>
57  
-    </repository>
58  
-  </repositories>
59  
-
60  
-
61  
-  <build>
62  
-    <plugins>
63  
-      <plugin>
64  
-        <!-- enable tycho to support eclipse type artifacts -->
65  
-        <groupId>org.eclipse.tycho</groupId>
66  
-        <artifactId>tycho-maven-plugin</artifactId>
67  
-        <extensions>true</extensions>
68  
-      </plugin>
69  
-      <plugin>
70  
-        <groupId>org.eclipse.tycho</groupId>
71  
-        <artifactId>target-platform-configuration</artifactId>
72  
-        <version>${tycho.plugin.version}</version>
73  
-        <configuration>
74  
-          <environments>
75  
-            <environment>
76  
-              <os>linux</os>
77  
-              <ws>gtk</ws>
78  
-              <arch>x86_64</arch>
79  
-            </environment>
80  
-            <environment>
81  
-              <os>linux</os>
82  
-              <ws>gtk</ws>
83  
-              <arch>x86</arch>
84  
-            </environment>
85  
-            <environment>
86  
-              <os>macosx</os>
87  
-              <ws>carbon</ws>
88  
-              <arch>x86</arch>
89  
-            </environment>
90  
-            <environment>
91  
-              <os>macosx</os>
92  
-              <ws>cocoa</ws>
93  
-              <arch>x86</arch>
94  
-            </environment>
95  
-            <environment>
96  
-              <os>macosx</os>
97  
-              <ws>cocoa</ws>
98  
-              <arch>x86_64</arch>
99  
-            </environment>
100  
-            <environment>
101  
-              <os>win32</os>
102  
-              <ws>win32</ws>
103  
-              <arch>x86</arch>
104  
-            </environment>
105  
-            <environment>
106  
-              <os>win32</os>
107  
-              <ws>win32</ws>
108  
-              <arch>x86_64</arch>
109  
-            </environment>
110  
-          </environments>
111  
-        </configuration>
112  
-      </plugin>
113  
-      <plugin>
114  
-        <groupId>org.eclipse.tycho</groupId>
115  
-        <artifactId>tycho-p2-repository-plugin</artifactId>
116  
-        <version>${tycho.plugin.version}</version>
117  
-        <configuration>
118  
-          <includeAllDependencies>true</includeAllDependencies>
119  
-        </configuration>
120  
-      </plugin>
121  
-      <plugin>
122  
-        <groupId>org.eclipse.tycho</groupId>
123  
-        <artifactId>tycho-p2-director-plugin</artifactId>
124  
-        <version>${tycho.plugin.version}</version>
125  
-        <executions>
126  
-          <execution>
127  
-            <id>materialize-products</id>
128  
-            <goals>
129  
-              <goal>materialize-products</goal>
130  
-            </goals>
131  
-          </execution>
132  
-          <execution>
133  
-            <id>archive-products</id>
134  
-            <goals>
135  
-              <goal>archive-products</goal>
136  
-            </goals>
137  
-          </execution>
138  
-        </executions>
139  
-        <configuration>
140  
-          <formats>
141  
-            <linux>tar.gz</linux>
142  
-          </formats>
143  
-          <products>
144  
-            <product>
145  
-              <id>scalaide.product.id</id>
146  
-              <rootFolder>eclipse</rootFolder>
147  
-              <archiveFileName>scala-SDK-2.1-M2-${scala.major.minor.version}</archiveFileName>
148  
-            </product>
149  
-          </products>
150  
-          <installFeatures>true</installFeatures>
151  
-          <profile>SDKProfile</profile>
152  
-        </configuration>
153  
-      </plugin>
154  
-    </plugins>
155  
-  </build>
156  
-</project>
7  org.scala-ide.product/scalaide.p2.inf
... ...
@@ -1,7 +0,0 @@
1  
-instructions.configure=\
2  
-  addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/3.7,name:The Eclipse Project Updates);\
3  
-  addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/3.7,name:The Eclipse Project Updates);\
4  
-  addRepository(type:0,location:http${#58}//download.eclipse.org/releases/indigo,name:Indigo);\
5  
-  addRepository(type:1,location:http${#58}//download.eclipse.org/releases/indigo,name:Indigo);\
6  
-  addRepository(type:0,location:http${#58}//download.scala-ide.org/ecosystem/dev-milestone-2.9/site/,name:Scala IDE);\
7  
-  addRepository(type:1,location:http${#58}//download.scala-ide.org/ecosystem/dev-milestone-2.9/site/,name:Scala IDE);
80  org.scala-ide.product/scalaide.product
... ...
@@ -1,80 +0,0 @@
1  
-<?xml version="1.0" encoding="UTF-8"?>
2  
-<?pde version="3.5"?>
3  
-
4  
-<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">
5  
-
6  
-   <aboutInfo>
7  
-      <image path="eclipse_lg.gif"/>
8  
-      <text>
9  
-         %productBlurb
10  
-      </text>
11  
-   </aboutInfo>
12  
-
13  
-   <configIni use="default">
14  
-<!--      <macosx>config.ini</macosx>
15  
-      <linux>config.ini</linux>
16  
-      <win32>config.ini</win32> -->
17  
-   </configIni>
18  
-
19  
-   <launcherArgs>
20  
-      <vmArgs>-Xmx1500m
21  
--Xms100m
22  
--XX:MaxPermSize=128m</vmArgs>
23  
-      <vmArgsMac>
24  
--XstartOnFirstThread
25  
--Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
26  
-   </launcherArgs>
27  
-
28  
-   <windowImages i16="eclipse.gif" i32="eclipse32.gif" i48="eclipse48.gif" i64="eclipse.png" i128="eclipse32.png"/>
29  
-
30  
-   <splash
31  
-      location="org.eclipse.platform"
32  
-      startupProgressRect="0,280,455,15"
33  
-      startupMessageRect="7,220,441,20"
34  
-      startupForegroundColor="C8D5EA" />
35  
-   <launcher>
36  
-      <solaris/>
37  
-      <win useIco="false">
38  
-         <bmp/>
39  
-      </win>
40  
-   </launcher>
41  
-
42  
-   <intro introId="org.eclipse.ui.intro.universal"/>
43  
-
44  
-   <vm>
45  
-      <macos include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</macos>
46  
-   </vm>
47  
-
48  
-   <features>
49  
-      <feature id="org.scala-ide.sdt.feature"/>
50  
-      <feature id="org.scala-ide.sdt.weaving.feature"/>
51  
-      <feature id="org.scalaide.worksheet.feature"/>
52  
-      <feature id="org.eclipse.cvs"/>
53  
-      <feature id="org.eclipse.equinox.p2.core.feature"/>
54  
-      <feature id="org.eclipse.equinox.p2.extras.feature"/>
55  
-      <feature id="org.eclipse.equinox.p2.rcp.feature"/>
56  
-      <feature id="org.eclipse.equinox.p2.user.ui"/>
57  
-      <feature id="org.eclipse.equinox.weaving.sdk"/>
58  
-      <feature id="org.eclipse.help"/>
59  
-      <feature id="org.eclipse.pde"/>
60  
-      <feature id="org.eclipse.jdt"/>
61  
-      <feature id="org.eclipse.platform"/>
62  
-      <feature id="org.eclipse.rcp"/>
63  
-   </features>
64  
-   <configurations>
65  
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
66  
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
67  
-
68  
-      <!-- Needed in order for the update manager to work. -->
69  
-      <plugin id="org.eclipse.equinox.common" autostart="true" startLevel="2" />
70  
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="4" />
71  
-      <plugin id="org.eclipse.update.configurator" autostart="true" level="4" />
72  
-      <property name="equinox.use.ds" value="true" />
73  
-      <property name="org.eclipse.update.reconcile" value="false" />
74  
-
75  
-      <property name="eclipse.p2.data.area" value="@config.dir/../p2/" />
76  
-      <property name="eclipse.p2.profile" value="SDKProfile" />
77  
-      <property name="eclipse.buildId" value="2.1-M2-Typesafe" />
78  
-   </configurations>
79  
-
80  
-</product>
6  org.scala-ide.sdt.core/about.mappings
... ...
@@ -1,6 +0,0 @@
1  
-# about.mappings
2  
-# contains fill-ins for about.properties
3  
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
4  
-# This file does not need to be translated.
5  
-
6  
-0=$eclipse.buildId$
6  org.scala-ide.sdt.core/build.properties
@@ -11,8 +11,4 @@ bin.includes = META-INF/,\
11 11
                about.png,\
12 12
                templates/,\
13 13
                target/lib/,\
14  
-               plugin.properties,\
15  
-               plugin_customization.ini,\
16  
-               product.png,\
17  
-               intro-scala.png,\
18  
-               about.mappings
  14
+               plugin.properties
BIN  org.scala-ide.sdt.core/intro-scala.png
25  org.scala-ide.sdt.core/plugin.properties
... ...
@@ -1,28 +1,3 @@
1 1
 JUnitShortcut.label= JUnit Test
2 2
 RunJUnitLaunchShortcut.description=Runs a set of JUnit tests
3 3
 DebugJUnitLaunchShortcut.description=Debugs a set of JUnit tests
4  
-
5  
-productIntroTitle=Scala IDE build of Eclipse SDK
6  
-productBlurb=Scala IDE build of Eclipse SDK\n\
7  
-\n\
8  
-Build id: {0}\n\
9  
-\n\
10  
-(c) LAMP/EPFL and Typesafe for Scala IDE and associated plugins\n\
11  
-\n\
12  
-The Scala IDE for Eclipse provides an integrated environment for creating Scala programs.\n\
13  
-Visit http://scala-ide.org/\n\
14  
-\n\
15  
-Typesafe Team: Luc Bourlier, Mirco Dotta, Iulian Dragos, Martin Odersky, and Hubert Plocinicak.\n\
16  
-Many thanks to David Bernard, Donna Malayeri, Eric Molitor, Matt Russell, Miles Sabin,\n\
17  
-Mirko Stocker, Joshua Suereth, Eugene Vigdorchik, and all other contributors.\n\
18  
-\n\
19  
-\n\
20  
-Eclipse SDK\n\
21  
-\n\
22  
-Version: 3.7.2\n\
23  
-\n\
24  
-(c) Copyright Eclipse contributors and others 2000, 2012.  All rights reserved.\n\
25  
-Visit http://www.eclipse.org/platform\n\
26  
-\n\
27  
-This product includes software developed by the\n\
28  
-Apache Software Foundation http://www.apache.org/
50  org.scala-ide.sdt.core/plugin.xml
@@ -768,6 +768,9 @@
768 768
      <initializer
769 769
            class="scala.tools.eclipse.logging.ui.properties.LoggingPreferencePageInitializer">
770 770
      </initializer>
  771
+     <initializer
  772
+           class="scala.tools.eclipse.PreferenceInitializer">
  773
+     </initializer>
771 774
   </extension>
772 775
 
773 776
   <extension point="org.eclipse.core.expressions.propertyTesters">
@@ -1461,51 +1464,4 @@
1461 1464
        </enablement>
1462 1465
     </moveParticipant>
1463 1466
  </extension>
1464  
- <extension
1465  
-       id="org.scala-ide.sdt.product"
1466  
-       point="org.eclipse.core.runtime.products">
1467  
-    <product
1468  
-          application="org.eclipse.ui.ide.workbench"
1469  
-          description="Scala IDE for Eclipse"
1470  
-          name="Scala IDE">
1471  
-       <property name="aboutImage" value="product.png"/>
1472  
-       <property name="aboutText" value="%productBlurb"/>
1473  
-       <property
1474  
-             name="preferenceCustomization"
1475  
-             value="plugin_customization.ini">
1476  
-       </property>
1477  
-       <property
1478  
-             name="introTitle"
1479  
-             value="%productIntroTitle"/>
1480  
-       <property
1481  
-             name="introBrandingImage"
1482  
-             value="product:intro-scala.png"/>
1483  
-       <property
1484  
-             name="startupForegroundColor"
1485  
-             value="C8D5EA"/>
1486  
-       <property
1487  
-             name="startupMessageRect"
1488  
-             value="7,220,441,20"/>
1489  
-       <property
1490  
-             name="startupProgressRect"
1491  
-             value="0,280,455,15"/> 
1492  
-       <property
1493  
-             name="buildIdLocation"
1494  
-             value="312,190">
1495  
-       </property>
1496  
-    </product>
1497  
- </extension>
1498  
- <extension point="org.eclipse.ui.intro">
1499  
-    <introProductBinding
1500  
-          introId="org.eclipse.ui.intro.universal"
1501  
-          productId="org.scala-ide.sdt.product">
1502  
-    </introProductBinding>
1503  
- </extension>
1504  
- <extension
1505  
-       point="org.eclipse.core.runtime.preferences">
1506  
-    <initializer
1507  
-          class="scala.tools.eclipse.PreferenceInitializer">
1508  
-    </initializer>
1509  
- </extension>
1510  
- 
1511 1467
 </plugin>
50  org.scala-ide.sdt.core/plugin_customization.ini
... ...
@@ -1,50 +0,0 @@
1  
-# plugin_customization.ini 
2  
-# sets default values for plug-in-specific preferences
3  
-# keys are qualified by plug-in id
4  
-# e.g., com.example.acmeplugin/myproperty=myvalue
5  
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
6  
-# "%key" are externalized strings defined in plugin_customization.properties
7  
-# This file does not need to be translated.
8  
-
9  
-# Property "org.eclipse.ui/defaultPerspectiveId" controls the 
10  
-# perspective that the workbench opens initially
11  
-org.eclipse.ui/defaultPerspectiveId=org.scala-ide.sdt.core.perspective
12  
-
13  
-# new-style tabs by default
14  
-org.eclipse.ui/SHOW_TRADITIONAL_STYLE_TABS=false
15  
-
16  
-# put the perspective switcher on the top right
17  
-org.eclipse.ui/DOCK_PERSPECTIVE_BAR=topRight
18  
-
19  
-# show progress on startup
20  
-org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP=true
21  
-
22  
-# show build id in the splash - only for nightly, integration, and milestone builds
23  
-org.eclipse.ui.workbench/SHOW_BUILDID_ON_STARTUP=true
24  
-
25  
-# use the window set by default
26  
-org.eclipse.ui/USE_WINDOW_WORKING_SET_BY_DEFAULT=true
27  
-
28  
-# Intro-related preferences (since 3.2)
29  
-
30  
-# Welcome theme to use
31  
-org.eclipse.ui.intro/INTRO_THEME = org.eclipse.ui.intro.universal.slate
32  
-
33  
-# Root page links to show in the Universal Welcome
34  
-org.eclipse.ui.intro.universal/INTRO_ROOT_PAGES = overview,tutorials,samples,whatsnew
35  
-
36  
-# Initial page layout of the Universal Welcome
37  
-org.eclipse.ui.intro.universal/INTRO_DATA = product:introData.xml
38  
-
39  
-# Order help books in table of contents
40  
-org.eclipse.help/HELP_DATA = helpData.xml
41  
-
42  
-
43  
-
44  
-# Scala IDE SDK specific settings
45  
-
46  
-# hide startup preference dialog
47  
-org.scala-ide.sdt.core/org.scala-ide.sdt.core.diagnostic.askOnUpgrade=false
48  
-
49  
-# set the content assist auto-activation to a more slower pace
50  
-org.eclipse.jdt.ui/content_assist_autoactivation_delay=500
BIN  org.scala-ide.sdt.core/product.png
1  org.scala-ide.sdt.debug.tests/.classpath
@@ -3,7 +3,6 @@
3 3
 	<classpathentry kind="src" path="src"/>
4 4
 	<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
5 5
 	<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_COMPILER_CONTAINER"/>
6  
-	<classpathentry kind="var" path="JAVA_HOME/lib/tools.jar"/>
7 6
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
8 7
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
9 8
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
1  org.scala-ide.sdt.debug/.classpath
@@ -2,7 +2,6 @@
2 2
 <classpath>
3 3
 	<classpathentry kind="src" output="target/classes" path="src"/>
4 4
 	<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_COMPILER_CONTAINER"/>
5  
-	<classpathentry kind="var" path="JAVA_HOME/lib/tools.jar"/>
6 5
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
7 6
 	<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
8 7
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
1  org.scala-ide.sdt.feature/feature.xml
@@ -87,7 +87,6 @@ SUCH DAMAGE.
87 87
       <import plugin="org.eclipse.ui.navigator"/>
88 88
       <import plugin="org.eclipse.ui.navigator.resources"/>
89 89
       <import plugin="org.apache.ant"/>
90  
-      <import plugin="org.eclipse.sdk"/> <!-- needed to be able to create a full Scala IDE SDK product -->
91 90
    </requires>
92 91
 
93 92
    <plugin

0 notes on commit cb8d966

Please sign in to comment.
Something went wrong with that request. Please try again.