Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #199 from skyluc/build/product-full-eclipse

Adds a full eclipse product build
  • Loading branch information...
commit 03642569050f8e637817e0ae747f86f2caf0e533 2 parents 68d5484 + e3989e5
@dragos dragos authored
View
1  org.scala-ide.product/.gitignore
@@ -0,0 +1 @@
+target/
View
176 org.scala-ide.product/pom.xml
@@ -0,0 +1,176 @@
+<?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>${repo.scala-ide.root}/nightly-update-master-29x</repo.scala-ide>
+ <repo.worksheet>${repo.scala-ide.root}/nightly-build-worksheet-scalaide21-29/site/</repo.worksheet>
+ </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>${repo.scala-ide.root}/nightly-update-master-trunk</repo.scala-ide>
+ <repo.worksheet>${repo.scala-ide.root}/nightly-build-worksheet-scalaide21-210/site/</repo.worksheet>
+ </properties>
+ </profile>
+ </profiles>
+
+ <repositories>
+ <repository>
+ <id>scala-ide</id>
+ <url>${repo.scala-ide}</url>
+ <layout>p2</layout>
+ </repository>
+ <repository>
+ <id>scala-worksheet</id>
+ <url>${repo.worksheet}</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>
+ <repository>
+ <id>scala-refactoring</id>
+ <name>Scala Refactoring p2 repository</name>
+ <layout>p2</layout>
+ <url>${repo.scala-refactoring}</url>
+ </repository>
+ <repository>
+ <id>scalariform</id>
+ <name>Scalariform Scala p2 repository</name>
+ <layout>p2</layout>
+ <url>${repo.scalariform}</url>
+ </repository>
+ <repository>
+ <id>equinox.launcher</id>
+ <name>Equinox weaving launcher p2 repository</name>
+ <layout>p2</layout>
+ <url>${repo.equinox.launcher}</url>
+ </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>
+ <products>
+ <product>
+ <id>scalaide.product.id</id>
+ <rootFolder>eclipse</rootFolder>
+ </product>
+ </products>
+ <installFeatures>true</installFeatures>
+ <profile>SDKProfile</profile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
View
7 org.scala-ide.product/scalaide.p2.inf
@@ -0,0 +1,7 @@
+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/nightly-update-master-29x,name:Scala IDE);\
+ addRepository(type:1,location:http${#58}//download.scala-ide.org/nightly-update-master-29x,name:Scala IDE);
View
80 org.scala-ide.product/scalaide.product
@@ -0,0 +1,80 @@
+<?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="Typesafe-01" />
+ </configurations>
+
+</product>
View
6 org.scala-ide.sdt.core/about.mappings
@@ -0,0 +1,6 @@
+# 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$
View
6 org.scala-ide.sdt.core/build.properties
@@ -11,4 +11,8 @@ bin.includes = META-INF/,\
about.png,\
templates/,\
target/lib/,\
- plugin.properties
+ plugin.properties,\
+ plugin_customization.ini,\
+ product.png,\
+ intro-scala.png,\
+ about.mappings
View
BIN  org.scala-ide.sdt.core/intro-scala.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
24 org.scala-ide.sdt.core/plugin.properties
@@ -2,3 +2,27 @@ 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/
View
47 org.scala-ide.sdt.core/plugin.xml
@@ -1464,4 +1464,51 @@
</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>
View
50 org.scala-ide.sdt.core/plugin_customization.ini
@@ -0,0 +1,50 @@
+# plugin_customization.ini
+# sets default values for plug-in-specific preferences
+# keys are qualified by plug-in id
+# e.g., com.example.acmeplugin/myproperty=myvalue
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in plugin_customization.properties
+# This file does not need to be translated.
+
+# Property "org.eclipse.ui/defaultPerspectiveId" controls the
+# perspective that the workbench opens initially
+org.eclipse.ui/defaultPerspectiveId=org.scala-ide.sdt.core.perspective
+
+# new-style tabs by default
+org.eclipse.ui/SHOW_TRADITIONAL_STYLE_TABS=false
+
+# put the perspective switcher on the top right
+org.eclipse.ui/DOCK_PERSPECTIVE_BAR=topRight
+
+# show progress on startup
+org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP=true
+
+# show build id in the splash - only for nightly, integration, and milestone builds
+org.eclipse.ui.workbench/SHOW_BUILDID_ON_STARTUP=true
+
+# use the window set by default
+org.eclipse.ui/USE_WINDOW_WORKING_SET_BY_DEFAULT=true
+
+# Intro-related preferences (since 3.2)
+
+# Welcome theme to use
+org.eclipse.ui.intro/INTRO_THEME = org.eclipse.ui.intro.universal.slate
+
+# Root page links to show in the Universal Welcome
+org.eclipse.ui.intro.universal/INTRO_ROOT_PAGES = overview,tutorials,samples,whatsnew
+
+# Initial page layout of the Universal Welcome
+org.eclipse.ui.intro.universal/INTRO_DATA = product:introData.xml
+
+# Order help books in table of contents
+org.eclipse.help/HELP_DATA = helpData.xml
+
+
+
+# Scala IDE SDK specific settings
+
+# hide startup preference dialog
+org.scala-ide.sdt.core/org.scala-ide.sdt.core.diagnostic.askOnUpgrade=false
+
+# set the content assist auto-activation to a more slower pace
+org.eclipse.jdt.ui/content_assist_autoactivation_delay=500
View
BIN  org.scala-ide.sdt.core/product.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
14 org.scala-ide.sdt.core/src/scala/tools/eclipse/PreferenceInitializer.scala
@@ -0,0 +1,14 @@
+package scala.tools.eclipse
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer
+import org.eclipse.core.runtime.preferences.DefaultScope
+import scala.tools.eclipse.diagnostic.StartupDiagnostics
+
+class PreferenceInitializer extends AbstractPreferenceInitializer {
+
+ def initializeDefaultPreferences(): Unit = {
+ val node = new DefaultScope().getNode("org.scala-ide.sdt.core");
+ node.putBoolean(StartupDiagnostics.ASK_DIAGNOSTICS, true);
+ }
+
+}
View
3  org.scala-ide.sdt.core/src/scala/tools/eclipse/diagnostic/StartupDiagnostics.scala
@@ -14,7 +14,7 @@ object StartupDiagnostics extends HasLogger {
import ScalaPlugin.plugin
private val INSTALLED_VERSION_KEY = plugin.pluginId + ".diagnostic.currentPluginVersion"
- private val ASK_DIAGNOSTICS = plugin.pluginId + ".diagnostic.askOnUpgrade"
+ val ASK_DIAGNOSTICS = plugin.pluginId + ".diagnostic.askOnUpgrade"
private val weavingState = new WeavingStateConfigurer
@@ -22,7 +22,6 @@ object StartupDiagnostics extends HasLogger {
val prefStore = plugin.getPreferenceStore
val previousVersion = prefStore.getString(INSTALLED_VERSION_KEY)
val currentVersion = plugin.getBundle.getVersion.toString
- prefStore.setDefault(ASK_DIAGNOSTICS, true)
val askDiagnostics = prefStore.getBoolean(ASK_DIAGNOSTICS)
logger.info("startup diagnostics: previous version = " + previousVersion)
View
1  org.scala-ide.sdt.feature/feature.xml
@@ -87,6 +87,7 @@ SUCH DAMAGE.
<import plugin="org.eclipse.ui.navigator"/>
<import plugin="org.eclipse.ui.navigator.resources"/>
<import plugin="org.apache.ant"/>
+ <import plugin="org.eclipse.sdk"/> <!-- needed to be able to create a full Scala IDE SDK product -->
</requires>
<plugin
Please sign in to comment.
Something went wrong with that request. Please try again.