Manifest did not import certain inner classes and therefore the bundl…

…e did not wire up, explicitly adding all required packages to the plugin. Also the dependencies are different across eclipse versions, and need to handle them differently.
marcphilipp · Jun 22, 2009 · e6612cf · e6612cf
1 parent 104a9bb
commit e6612cf
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,8 +35,10 @@ org.eclipse.swtbot.junit4_x/.classpath
 org.eclipse.swtbot.junit4_x/META-INF/MANIFEST.MF
 org.eclipse.swtbot.junit4_x/build.properties
 
+org.eclipse.swtbot.eclipse.ui/META-INF/MANIFEST.MF
+
 org.eclipse.swtbot.releng/test-sandbox/passFail.txt
 org.eclipse.swtbot.swt.finder.test/keyboard.layout
 org.eclipse.swtbot.swt.finder.test/keyboard.layout.filtered
 org.eclipse.swtbot.eclipse.ui/.classpath
-org.eclipse.swtbot.eclipse.ui/build.properties
+org.eclipse.swtbot.eclipse.ui/build.properties
diff --git a/...se.swtbot.eclipse.ui/META-INF/MANIFEST.MF → ...ipse.ui/META-INF/_MANIFEST.MF_eclipse_3_4 b/...se.swtbot.eclipse.ui/META-INF/MANIFEST.MF → ...ipse.ui/META-INF/_MANIFEST.MF_eclipse_3_4
@@ -22,6 +22,8 @@ Import-Package: org.eclipse.core.resources,
  org.eclipse.jface.util,
  org.eclipse.osgi.util;version="1.1.0",
  org.eclipse.pde.core.plugin,
+ org.eclipse.pde.internal.core.util,
+ org.eclipse.pde.internal.core,
  org.eclipse.pde.internal.ui,
  org.eclipse.pde.internal.ui.launcher,
  org.eclipse.pde.ui.launcher,

diff --git a/org.eclipse.swtbot.eclipse.ui/META-INF/_MANIFEST.MF_eclipse_3_5 b/org.eclipse.swtbot.eclipse.ui/META-INF/_MANIFEST.MF_eclipse_3_5
@@ -0,0 +1,41 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: SWTBot Eclipse UI Plug-in (incubation)
+Bundle-SymbolicName: org.eclipse.swtbot.eclipse.ui;singleton:=true
+Bundle-Version: 2.0.0.qualifier
+Bundle-Activator: org.eclipse.swtbot.eclipse.ui.Activator
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: Eclipse.org
+Export-Package: org.eclipse.swtbot.eclipse.ui,
+ org.eclipse.swtbot.eclipse.ui.preferences
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: org.eclipse.core.resources,
+ org.eclipse.core.runtime;version="3.4.0",
+ org.eclipse.core.runtime.preferences;version="3.2.0",
+ org.eclipse.debug.core,
+ org.eclipse.jdt.core,
+ org.eclipse.jdt.junit.launcher,
+ org.eclipse.jdt.launching,
+ org.eclipse.jdt.ui,
+ org.eclipse.jface.preference,
+ org.eclipse.jface.resource,
+ org.eclipse.jface.util,
+ org.eclipse.osgi.util;version="1.1.0",
+ org.eclipse.pde.core.plugin,
+ org.eclipse.pde.ui.launcher,
+ org.eclipse.swtbot.eclipse.finder.matchers,
+ org.eclipse.swtbot.eclipse.finder.waits,
+ org.eclipse.swtbot.swt.finder,
+ org.eclipse.swtbot.swt.finder.finders,
+ org.eclipse.swtbot.swt.finder.matchers,
+ org.eclipse.swtbot.swt.finder.utils,
+ org.eclipse.swtbot.swt.finder.waits,
+ org.eclipse.ui,
+ org.eclipse.ui.plugin,
+ org.hamcrest;version="1.1.0",
+ org.junit;version="4.5.0",
+ org.osgi.framework;version="1.4.0",
+ org.eclipse.swt.widgets,
+ org.eclipse.debug.ui,
+ org.eclipse.core.runtime.jobs
+
diff --git a/...e.ui/src_eclipse_3.5/org/eclipse/swtbot/eclipse/ui/SWTBotLaunchConfigurationDelegate.java b/...e.ui/src_eclipse_3.5/org/eclipse/swtbot/eclipse/ui/SWTBotLaunchConfigurationDelegate.java
@@ -16,14 +16,15 @@
 
 /**
  * A launch delegate for launching JUnit Plug-in tests.
- * 
+ *
  * @since 3.3
  */
 @SuppressWarnings("all")
 public class SWTBotLaunchConfigurationDelegate extends JUnitLaunchConfigurationDelegate {
 
 	public static final String	LAUNCH_CONFIG_ID	= "org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig";	//$NON-NLS-1$
 
+	@Override
 	protected String getApplication(ILaunchConfiguration configuration) {
 		return Activator.APPLICATION_ID;
 	}

diff --git a/org.eclipse.swtbot.releng/build.xml b/org.eclipse.swtbot.releng/build.xml
@@ -103,31 +103,33 @@
 			</fileset>
 		</sync>
 	</target>
-	
+
 	<target name="make-substitutions-4.5" if="isJunit4.5">
 		<!-- make substitutions in the eclipse-ui plugin. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=274083#c5 -->
 		<copy file="../org.eclipse.swtbot.eclipse.ui/_build.properties.eclipse_3_5" tofile="../org.eclipse.swtbot.eclipse.ui/build.properties" overwrite="true" />
+		<copy file="../org.eclipse.swtbot.eclipse.ui/META-INF/_MANIFEST.MF_eclipse_3_5" tofile="../org.eclipse.swtbot.eclipse.ui/META-INF/MANIFEST.MF" overwrite="true" />
 		<copy file="../org.eclipse.swtbot.eclipse.ui/_classpath.eclipse_3_5" tofile="../org.eclipse.swtbot.eclipse.ui/.classpath" overwrite="true" />
 
 		<!-- make substitutions in the junit plugin -->
 		<copy file="../org.eclipse.swtbot.junit4_x/META-INF/MANIFEST.MF_junit4_5" tofile="../org.eclipse.swtbot.junit4_x/META-INF/MANIFEST.MF" overwrite="true" />
 		<copy file="../org.eclipse.swtbot.junit4_x/_build.properties.junit4_5" tofile="../org.eclipse.swtbot.junit4_x/build.properties" overwrite="true" />
-		<copy file="../org.eclipse.swtbot.junit4_x/_classpath.junit4_5" tofile="../org.eclipse.swtbot.junit4_x/.classpath" overwrite="true" />		
+		<copy file="../org.eclipse.swtbot.junit4_x/_classpath.junit4_5" tofile="../org.eclipse.swtbot.junit4_x/.classpath" overwrite="true" />
 	</target>
-	
+
 	<target name="make-substitutions-4.3" unless="isJunit4.5">
 		<!-- make substitutions in the eclipse-ui plugin. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=274083#c5 -->
 		<copy file="../org.eclipse.swtbot.eclipse.ui/_build.properties.eclipse_3_4" tofile="../org.eclipse.swtbot.eclipse.ui/build.properties" overwrite="true" />
+		<copy file="../org.eclipse.swtbot.eclipse.ui/META-INF/_MANIFEST.MF_eclipse_3_4" tofile="../org.eclipse.swtbot.eclipse.ui/META-INF/MANIFEST.MF" overwrite="true" />
 		<copy file="../org.eclipse.swtbot.eclipse.ui/_classpath.eclipse_3_4" tofile="../org.eclipse.swtbot.eclipse.ui/.classpath" overwrite="true" />
 
 		<!-- make substitutions in the junit plugin -->
 		<copy file="../org.eclipse.swtbot.junit4_x/META-INF/MANIFEST.MF_junit4_3" tofile="../org.eclipse.swtbot.junit4_x/META-INF/MANIFEST.MF" overwrite="true" />
 		<copy file="../org.eclipse.swtbot.junit4_x/_build.properties.junit4_3" tofile="../org.eclipse.swtbot.junit4_x/build.properties" overwrite="true" />
-		<copy file="../org.eclipse.swtbot.junit4_x/_classpath.junit4_3" tofile="../org.eclipse.swtbot.junit4_x/.classpath" overwrite="true" />		
+		<copy file="../org.eclipse.swtbot.junit4_x/_classpath.junit4_3" tofile="../org.eclipse.swtbot.junit4_x/.classpath" overwrite="true" />
 	</target>
-	
+
 	<target name="make-substitutions" depends="guess-junit-version, make-substitutions-4.5, make-substitutions-4.3" />
-	
+
 	<target name="extract-eclipse">
 		<condition property="setupTarget" value="setup-zip">
 			<contains string="${eclipse.sdk.archive}" substring=".zip" />