remove multi version scala distribution support

latest version of scala-ide supports multiple scala versions, so we no longer need to support multiple scala-ide distributions anymore.
ervandew · Jan 23, 2015 · c3e12f1 · c3e12f1
1 parent f85b3ae
commit c3e12f1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 71 deletions.
diff --git a/org.eclim.installer/build/resources/dependencies.xml b/org.eclim.installer/build/resources/dependencies.xml
@@ -55,7 +55,7 @@
     </dependency>
   </feature>
 
-  <feature id="sdt211" status="unreleased">
+  <feature id="sdt" status="unreleased">
     <dependency id="org.scala-ide.sdt.feature" version="4.0.0">
       <site url="http://download.scala-ide.org/sdk/lithium/e44/scala211/dev/site"/>
     </dependency>

diff --git a/org.eclim.installer/build/resources/install.properties b/org.eclim.installer/build/resources/install.properties
@@ -151,8 +151,8 @@
     Provides android development functionality.<br>\
     Requires the <a href="http://developer.android.com/tools/sdk/eclipse-adt.html">Android Development Tools</a> which will be installed if necessary.
 
-  featureList.sdt211=Scala Development for Scala 2.11.x
-  featureList.sdt211.html=\
+  featureList.sdt=Scala Development Toolkit
+  featureList.sdt.html=\
     Provides scala development functionality.<br>\
     Requires the <a href="http://scala-ide.org/">Scala IDE for Eclipse</a>.
 

diff --git a/org.eclim.installer/java/org/eclim/installer/step/FeatureProvider.java b/org.eclim.installer/java/org/eclim/installer/step/FeatureProvider.java
@@ -40,7 +40,7 @@ public class FeatureProvider
   public static final String[] FEATURES = {
     "jdt", "adt", "wst", "cdt",
     "dltk", "dltkruby", "pdt",
-    "pydev", "sdt211", "groovy"
+    "pydev", "sdt", "groovy"
   };
 
   private static final String[][] FEATURES_DEPENDS = {

diff --git a/org.eclim.sdt/build_sdt.gant b/org.eclim.sdt/build_sdt.gant
@@ -41,70 +41,3 @@ target(name: 'org.eclim.sdt.test'){
     createProject('org.eclim.sdt', 'eclim_unit_test_scala')
   }
 }
-
-target(name: 'org.eclim.sdt.plugin.dist'){
-  eclipseHome = binding.getVariable('eclipse')
-  sdtVersions = binding.getVariable('sdt.versions').split(',') as Set
-
-  // determine which version we've already built from our default eclipse home
-  for (sdtVersion in sdtVersions) {
-    try{
-      sdtHome = binding.getVariable("sdt.${sdtVersion}.home")
-    }catch(MissingPropertyException mpe){
-      fail("Missing property: sdt.${sdtVersion}.home")
-    }
-    if (sdtHome == eclipseHome){
-      echo("Using built org.eclim.sdt for scala: ${sdtVersion}")
-      updatePluginSdtVersion(sdtVersion)
-      sdtVersions.remove(sdtVersion)
-      break
-    }
-  }
-
-  // now build the versions we haven't already built
-  for (sdtVersion in sdtVersions) {
-    try{
-      sdtHome = binding.getVariable("sdt.${sdtVersion}.home")
-    }catch(MissingPropertyException mpe){
-      fail("Missing property: sdt.${sdtVersion}.home")
-    }
-
-    // if the sdt home matches our eclipse home, then we've already built this
-    // version so just use the jar that is already there
-    if (sdtHome == eclipseHome){
-      continue
-    }
-
-    echo("Building org.eclim.sdt for scala: ${sdtVersion}")
-    delete(dir: 'build/temp/lib/scala')
-    delete(dir: '${build.classes}/org.eclim.sdt')
-    // NOTE: using ant(inheritAll: false) was still carrying over some
-    // classpath remnants
-    exec(executable: '${ant.home}/bin/ant', dir: '${basedir}', failonerror: true){
-      arg(value: "-Declipse.home=${sdtHome}")
-      arg(value: '-Dplugin.name=org.eclim.sdt')
-      arg(value: 'build.eclipse.plugin')
-    }
-    updatePluginSdtVersion(sdtVersion)
-  }
-
-  // delete these so that a subsiquent regular build doesn't end up using jars
-  // from the per sdt version dist build.
-  delete(dir: 'build/temp/lib/scala')
-  delete(dir: '${build.classes}/org.eclim.sdt')
-  // shouldn't delete anything
-  delete(dir: '${build.plugins}/org.eclim.sdt_${eclim.version}', quiet: true)
-}
-
-def updatePluginSdtVersion(sdtVersion){
-  ant.move(
-    file: '${build.plugins}/org.eclim.sdt_${eclim.version}/eclim.sdt.jar',
-    tofile: "\${build.plugins}/org.eclim.sdt_\${eclim.version}/eclim.sdt${sdtVersion}.jar")
-  ant.replace(
-    file: '${build.plugins}/org.eclim.sdt_${eclim.version}/META-INF/MANIFEST.MF',
-    token: 'eclim.sdt',
-    value: "eclim.sdt${sdtVersion}")
-  ant.move(todir: "\${build.plugins}/org.eclim.sdt${sdtVersion}_\${eclim.version}"){
-    ant.fileset(dir: '${build.plugins}/org.eclim.sdt_${eclim.version}')
-  }
-}