Attachment 113624 Details for Bug 248767 – patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch

248767.txt (text/plain), 12.83 KB, created by Andrew Niefer

on 2008-09-26 15:39:38 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Niefer

Created: 2008-09-26 15:39:38 EDT

Size: 12.83 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.build
>Index: src/org/eclipse/pde/internal/build/builder/ClasspathComputer3_0.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ClasspathComputer3_0.java,v
>retrieving revision 1.44
>diff -u -r1.44 ClasspathComputer3_0.java
>--- src/org/eclipse/pde/internal/build/builder/ClasspathComputer3_0.java	18 Apr 2008 21:06:52 -0000	1.44
>+++ src/org/eclipse/pde/internal/build/builder/ClasspathComputer3_0.java	26 Sep 2008 19:39:20 -0000
>@@ -180,7 +180,8 @@
> 		String root = generator.getLocation(model);
> 		IPath base = Utils.makeRelative(new Path(root), new Path(baseLocation));
> 		Properties modelProps = getBuildPropertiesFor(model);
>-		ModelBuildScriptGenerator.specialDotProcessing(modelProps, libraries);
>+		if (modelProps != AbstractScriptGenerator.MissingProperties.getInstance())
>+			ModelBuildScriptGenerator.specialDotProcessing(modelProps, libraries);
> 		for (int i = 0; i < libraries.length; i++) {
> 			addDevEntries(model, baseLocation, classpath, Utils.getArrayFromString(modelProps.getProperty(PROPERTY_OUTPUT_PREFIX + libraries[i])), modelProps);
> 			addPathAndCheck(model, base, libraries[i], modelProps, classpath);
>#P org.eclipse.pde.build.tests
>Index: src/org/eclipse/pde/build/internal/tests/ScriptGenerationTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ScriptGenerationTests.java,v
>retrieving revision 1.23
>diff -u -r1.23 ScriptGenerationTests.java
>--- src/org/eclipse/pde/build/internal/tests/ScriptGenerationTests.java	24 Sep 2008 22:16:49 -0000	1.23
>+++ src/org/eclipse/pde/build/internal/tests/ScriptGenerationTests.java	26 Sep 2008 19:39:21 -0000
>@@ -653,4 +653,27 @@
> 		}
> 		assertLogContainsLines(buildFolder.getFile("log.log"), new String [] {"Problem occurred while considering plugin: Test Bundle org.foo.", "invalid format"});
> 	}
>+
>+	public void testBug248767() throws Exception {
>+		IFolder rootFolder = newTest("248767");
>+
>+		// Build 1 creates a binary version of A
>+		IFolder build1 = rootFolder.getFolder("build1");
>+		Utils.generateFeature(build1, "F1", null, new String[] {"A;unpack=true", "org.eclipse.osgi"});
>+		Properties properties = BuildConfiguration.getBuilderProperties(build1);
>+		properties.put("topLevelElementId", "F1");
>+		properties.put("archivesFormat", "*,*,*-folder");
>+		Utils.storeBuildProperties(build1, properties);
>+		runBuild(build1);
>+		build1.refreshLocal(IResource.DEPTH_INFINITE, null);
>+		
>+		//Build 2 compiles B against binary A
>+		IFolder build2 = rootFolder.getFolder("build2");
>+		Utils.generateFeature(build2, "F2", null, new String[] {"A", "B"});
>+		properties = BuildConfiguration.getBuilderProperties(build2);
>+		properties.put("topLevelElementId", "F2");
>+		properties.put("baseLocation", build1.getFolder("tmp/eclipse").getLocation().toOSString());
>+		Utils.storeBuildProperties(build2, properties);
>+		runBuild(build2);
>+	}
> }
>Index: resources/248767/build1/plugins/A/library/a/Activator.java
>===================================================================
>RCS file: resources/248767/build1/plugins/A/library/a/Activator.java
>diff -N resources/248767/build1/plugins/A/library/a/Activator.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ resources/248767/build1/plugins/A/library/a/Activator.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,35 @@
>+package a;
>+
>+import org.osgi.framework.BundleContext;
>+
>+/**
>+ * The activator class controls the plug-in life cycle
>+ */
>+public class Activator {
>+	private static BundleContext myContext = null;
>+	private static Application myApplication = null;
>+	
>+	/**
>+	 * The constructor
>+	 */
>+	private Activator() {
>+	}
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
>+	 */
>+	public void start(BundleContext context) throws Exception {
>+		myContext = context;
>+		myApplication = new Application();
>+	}
>+	
>+	public static BundleContext getContext() {
>+		return myContext;
>+	}
>+	
>+	public static Application getApplication() {
>+		return myApplication;
>+	}
>+
>+}
>Index: resources/248767/build2/plugins/B/.classpath
>===================================================================
>RCS file: resources/248767/build2/plugins/B/.classpath
>diff -N resources/248767/build2/plugins/B/.classpath
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ resources/248767/build2/plugins/B/.classpath	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,7 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<classpath>
>+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
>+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
>+	<classpathentry kind="src" path="src"/>
>+	<classpathentry kind="output" path="bin"/>
>+</classpath>
>Index: resources/248767/build1/plugins/A/src/a/Application.java
>===================================================================
>RCS file: resources/248767/build1/plugins/A/src/a/Application.java
>diff -N resources/248767/build1/plugins/A/src/a/Application.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ resources/248767/build1/plugins/A/src/a/Application.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,24 @@
>+package a;
>+
>+import org.eclipse.osgi.service.runnable.ParameterizedRunnable;
>+
>+/**
>+ * This class controls all aspects of the application's execution
>+ */
>+public class Application implements ParameterizedRunnable {
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
>+	 */
>+	public Object run(Object context) {
>+		System.out.println("Hello RCP World!");
>+		return null;
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.app.IApplication#stop()
>+	 */
>+	public void stop() {
>+		// nothing to do
>+	}
>+}
>Index: resources/248767/build1/plugins/A/.project
>===================================================================
>RCS file: resources/248767/build1/plugins/A/.project
>diff -N resources/248767/build1/plugins/A/.project
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ resources/248767/build1/plugins/A/.project	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,28 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<projectDescription>
>+	<name>A</name>
>+	<comment></comment>
>+	<projects>
>+	</projects>
>+	<buildSpec>
>+		<buildCommand>
>+			<name>org.eclipse.jdt.core.javabuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
>+			<name>org.eclipse.pde.ManifestBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
>+			<name>org.eclipse.pde.SchemaBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+	</buildSpec>
>+	<natures>
>+		<nature>org.eclipse.pde.PluginNature</nature>
>+		<nature>org.eclipse.jdt.core.javanature</nature>
>+	</natures>
>+</projectDescription>
>Index: resources/248767/build2/plugins/B/META-INF/MANIFEST.MF
>===================================================================
>RCS file: resources/248767/build2/plugins/B/META-INF/MANIFEST.MF
>diff -N resources/248767/build2/plugins/B/META-INF/MANIFEST.MF
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ resources/248767/build2/plugins/B/META-INF/MANIFEST.MF	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,10 @@
>+Manifest-Version: 1.0
>+Bundle-ManifestVersion: 2
>+Bundle-Name: B Plug-in
>+Bundle-SymbolicName: B
>+Bundle-Version: 1.0.0
>+Bundle-Activator: b.Activator
>+Require-Bundle: A;bundle-version="1.0.0",
>+ org.eclipse.osgi;bundle-version="3.5.0"
>+Bundle-RequiredExecutionEnvironment: J2SE-1.5
>+Bundle-ActivationPolicy: lazy
>Index: resources/248767/build1/plugins/A/plugin.xml
>===================================================================
>RCS file: resources/248767/build1/plugins/A/plugin.xml
>diff -N resources/248767/build1/plugins/A/plugin.xml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ resources/248767/build1/plugins/A/plugin.xml	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,15 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<?eclipse version="3.2"?>
>+<plugin>
>+
>+   <extension
>+         id="application"
>+         point="org.eclipse.core.runtime.applications">
>+      <application>
>+         <run
>+               class="a.Application">
>+         </run>
>+      </application>
>+   </extension>
>+
>+</plugin>
>Index: resources/248767/build2/plugins/B/.project
>===================================================================
>RCS file: resources/248767/build2/plugins/B/.project
>diff -N resources/248767/build2/plugins/B/.project
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ resources/248767/build2/plugins/B/.project	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,28 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<projectDescription>
>+	<name>B</name>
>+	<comment></comment>
>+	<projects>
>+	</projects>
>+	<buildSpec>
>+		<buildCommand>
>+			<name>org.eclipse.jdt.core.javabuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
>+			<name>org.eclipse.pde.ManifestBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
>+			<name>org.eclipse.pde.SchemaBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+	</buildSpec>
>+	<natures>
>+		<nature>org.eclipse.pde.PluginNature</nature>
>+		<nature>org.eclipse.jdt.core.javanature</nature>
>+	</natures>
>+</projectDescription>
>Index: resources/248767/build1/plugins/A/.classpath
>===================================================================
>RCS file: resources/248767/build1/plugins/A/.classpath
>diff -N resources/248767/build1/plugins/A/.classpath
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ resources/248767/build1/plugins/A/.classpath	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,8 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<classpath>
>+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
>+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
>+	<classpathentry kind="src" path="src"/>
>+	<classpathentry kind="src" output="bin_lib" path="library"/>
>+	<classpathentry kind="output" path="bin"/>
>+</classpath>
>Index: resources/248767/build2/plugins/B/build.properties
>===================================================================
>RCS file: resources/248767/build2/plugins/B/build.properties
>diff -N resources/248767/build2/plugins/B/build.properties
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ resources/248767/build2/plugins/B/build.properties	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,4 @@
>+source.. = src/
>+output.. = bin/
>+bin.includes = META-INF/,\
>+               .
>Index: resources/248767/build2/plugins/B/src/b/Activator.java
>===================================================================
>RCS file: resources/248767/build2/plugins/B/src/b/Activator.java
>diff -N resources/248767/build2/plugins/B/src/b/Activator.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ resources/248767/build2/plugins/B/src/b/Activator.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,20 @@
>+package b;
>+
>+import org.osgi.framework.BundleContext;
>+
>+import a.Application;
>+
>+/**
>+ * The activator class controls the plug-in life cycle
>+ */
>+public class Activator {
>+	/**
>+	 * The constructor
>+	 */
>+	public Activator() {
>+		BundleContext context = a.Activator.getContext();
>+		context.getBundle();
>+		Application app = new Application();
>+		app.run(null);
>+	}
>+}
>Index: resources/248767/build1/plugins/A/build.properties
>===================================================================
>RCS file: resources/248767/build1/plugins/A/build.properties
>diff -N resources/248767/build1/plugins/A/build.properties
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ resources/248767/build1/plugins/A/build.properties	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,10 @@
>+source.. = src/
>+output.. = bin/
>+bin.includes = plugin.xml,\
>+               META-INF/,\
>+               .,\
>+               library.jar
>+jars.compile.order = .,\
>+                     library.jar
>+source.library.jar = library/
>+output.library.jar = bin_lib/
>Index: resources/248767/build1/plugins/A/META-INF/MANIFEST.MF
>===================================================================
>RCS file: resources/248767/build1/plugins/A/META-INF/MANIFEST.MF
>diff -N resources/248767/build1/plugins/A/META-INF/MANIFEST.MF
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ resources/248767/build1/plugins/A/META-INF/MANIFEST.MF	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,11 @@
>+Manifest-Version: 1.0
>+Bundle-ManifestVersion: 2
>+Bundle-Name: A Plug-in
>+Bundle-SymbolicName: A; singleton:=true
>+Bundle-Version: 1.0.0
>+Bundle-Activator: a.Activator
>+Bundle-ClassPath: ., library.jar
>+Bundle-RequiredExecutionEnvironment: J2SE-1.5
>+Bundle-ActivationPolicy: lazy
>+Export-Package: a
>+Require-Bundle: org.eclipse.osgi;bundle-version="3.5.0"

Actions: View | Diff

Attachments on bug 248767: 113624