Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'build/product-full-eclipse'

  • Loading branch information...
commit d2ee9fac92383c78b61ecc61932f9ec69051c273 2 parents 0dd7542 + cdff505
@skyluc skyluc authored
View
42 org.scala-ide.product/pom.xml
@@ -12,8 +12,7 @@
<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>
+ <repo.scala-ide.ecosystem>${repo.scala-ide.root}/ecosystem/dev-milestone-2.9/site/</repo.scala-ide.ecosystem>
</properties>
<profiles>
@@ -26,21 +25,16 @@
<!-- 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>
+ <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</id>
- <url>${repo.scala-ide}</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>scala-worksheet</id>
- <url>${repo.worksheet}</url>
+ <id>scala-ide ecosystem</id>
+ <url>${repo.scala-ide.ecosystem}</url>
<layout>p2</layout>
</repository>
<repository>
@@ -61,24 +55,6 @@
<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>
@@ -101,7 +77,7 @@
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
-<!-- <environment>
+ <environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
@@ -131,7 +107,7 @@
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
- --> </environments>
+ </environments>
</configuration>
</plugin>
<plugin>
@@ -161,10 +137,14 @@
</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>
View
4 org.scala-ide.product/scalaide.p2.inf
@@ -3,5 +3,5 @@ instructions.configure=\
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);
+ 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);
View
2  org.scala-ide.product/scalaide.product
@@ -74,7 +74,7 @@
<property name="eclipse.p2.data.area" value="@config.dir/../p2/" />
<property name="eclipse.p2.profile" value="SDKProfile" />
- <property name="eclipse.buildId" value="Typesafe-01" />
+ <property name="eclipse.buildId" value="2.1-M2-Typesafe" />
</configurations>
</product>
Please sign in to comment.
Something went wrong with that request. Please try again.