Browse Source

Version dependencies in plug-ins and features relaxed.

au@andreasunger.net 14 years ago
parent
commit
587487ac26

+ 1 - 1
org.eclipselabs.mscript/features/org.eclipselabs.mscript-feature/feature.xml

@@ -22,7 +22,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.xtext.runtime" version="1.0.1"/>
+      <import feature="org.eclipse.xtext.runtime" version="1.0.0"/>
    </requires>
 
    <plugin

+ 0 - 1
org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.codegen.c.ide.core/META-INF/MANIFEST.MF

@@ -7,7 +7,6 @@ Bundle-Activator: org.eclipselabs.mscript.codegen.c.ide.core.CodegenCIDECorePlug
 Bundle-Vendor: Mscript Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.core;bundle-version="3.6.0",
- org.eclipse.xtext;bundle-version="1.0.1",
  org.eclipselabs.mscript.language;bundle-version="0.1.0",
  org.eclipselabs.mscript.codegen.c;bundle-version="0.1.0",
  org.eclipselabs.mscript.computation.engine;bundle-version="0.1.0",

+ 0 - 17
org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.codegen.c.ide.core/src/org/eclipselabs/mscript/codegen/c/ide/core/CodegenCIDECorePlugin.java

@@ -1,13 +1,8 @@
 package org.eclipselabs.mscript.codegen.c.ide.core;
 
 import org.eclipse.core.runtime.Plugin;
-import org.eclipselabs.mscript.language.MscriptRuntimeModule;
-import org.eclipselabs.mscript.language.parser.antlr.MscriptParser;
 import org.osgi.framework.BundleContext;
 
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
 public class CodegenCIDECorePlugin extends Plugin {
 
 	// The plug-in ID
@@ -16,8 +11,6 @@ public class CodegenCIDECorePlugin extends Plugin {
 	// The shared instance
 	private static CodegenCIDECorePlugin plugin;
 	
-	private MscriptParser mscriptParser;
-
 	/**
 	 * The constructor
 	 */
@@ -31,9 +24,6 @@ public class CodegenCIDECorePlugin extends Plugin {
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
-
-		Injector injector = Guice.createInjector(new MscriptRuntimeModule());
-		mscriptParser = injector.getInstance(MscriptParser.class);
 	}
 
 	/*
@@ -54,11 +44,4 @@ public class CodegenCIDECorePlugin extends Plugin {
 		return plugin;
 	}
 
-	/**
-	 * @return the mscriptParser
-	 */
-	public MscriptParser getMscriptParser() {
-		return mscriptParser;
-	}
-
 }

+ 1 - 1
org.eclipselabs.mscript/plugins/org.eclipselabs.mscript.codegen.c.ide.ui/META-INF/MANIFEST.MF

@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipselabs.mscript.codegen.c.ide.ui.CodegenCIDEUIPlugin
 Bundle-Vendor: Mscript Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui;bundle-version="3.6.0",
- org.eclipse.ui.ide;bundle-version="3.6.1",
+ org.eclipse.ui.ide;bundle-version="3.6.0",
  org.eclipse.debug.ui;bundle-version="3.6.0",
  org.eclipselabs.mscript.ide.core;bundle-version="0.1.0",
  org.eclipselabs.mscript.codegen.c.ide.core;bundle-version="0.1.0"