Attachment 177479 Details for Bug 313940 – patch

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

[patch] patch

313940.txt (text/plain), 5.65 KB, created by Andrew Niefer

on 2010-08-25 17:47:02 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Niefer

Created: 2010-08-25 17:47:02 EDT

Size: 5.65 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.build
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/META-INF/MANIFEST.MF,v
>retrieving revision 1.51
>diff -u -r1.51 MANIFEST.MF
>--- META-INF/MANIFEST.MF	25 Aug 2010 21:01:09 -0000	1.51
>+++ META-INF/MANIFEST.MF	25 Aug 2010 21:46:16 -0000
>@@ -24,7 +24,7 @@
>  org.eclipse.core.runtime.compatibility;bundle-version="[3.1.100,4.0.0)";resolution:=optional,
>  org.eclipse.osgi;bundle-version="[3.3.0,4.0.0)",
>  org.eclipse.equinox.p2.jarprocessor;bundle-version="[1.0.1,2.0.0)",
>- org.eclipse.equinox.p2.publisher;bundle-version="1.1.0";resolution:=optional,
>+ org.eclipse.equinox.p2.publisher;bundle-version="1.1.0",
>  org.eclipse.equinox.p2.repository.tools;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
>  org.eclipse.equinox.p2.director.app;bundle-version="1.0.200"
> Import-Package: com.ibm.icu.util,
>Index: src/org/eclipse/pde/internal/build/ProductGenerator.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ProductGenerator.java,v
>retrieving revision 1.45
>diff -u -r1.45 ProductGenerator.java
>--- src/org/eclipse/pde/internal/build/ProductGenerator.java	2 Jun 2010 20:26:25 -0000	1.45
>+++ src/org/eclipse/pde/internal/build/ProductGenerator.java	25 Aug 2010 21:46:16 -0000
>@@ -14,6 +14,7 @@
> import java.util.*;
> import org.eclipse.core.runtime.*;
> import org.eclipse.equinox.frameworkadmin.BundleInfo;
>+import org.eclipse.equinox.internal.p2.publisher.QuotedTokenizer;
> import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
> import org.eclipse.osgi.service.resolver.BundleDescription;
> import org.eclipse.osgi.service.resolver.VersionRange;
>@@ -677,31 +678,25 @@
> 		try {
> 			writer = new PrintWriter(new FileWriter(new File(dir, launcher + ".ini"))); //$NON-NLS-1$
> 			if (programArgs != null && programArgs.length() > 0) {
>-				StringReader reader = new StringReader(programArgs);
>-				StreamTokenizer tokenizer = new StreamTokenizer(reader);
>-				tokenizer.resetSyntax();
>-				tokenizer.whitespaceChars(0, 0x20);
>-				tokenizer.wordChars(0x21, 0xFF);
>-				tokenizer.quoteChar('"');
>-				tokenizer.quoteChar('\'');
>-				while (tokenizer.nextToken() != StreamTokenizer.TT_EOF) {
>-					writer.print(tokenizer.sval);
>-					writer.print(lineDelimiter);
>+				QuotedTokenizer tokenizer = new QuotedTokenizer(programArgs);
>+				while (tokenizer.hasMoreTokens()) {
>+					String token = tokenizer.nextToken().trim();
>+					if (!token.equals("")) { //$NON-NLS-1$
>+						writer.print(token);
>+						writer.print(lineDelimiter);
>+					}
> 				}
> 			}
> 			if (vmArgs != null && vmArgs.length() > 0) {
> 				writer.print("-vmargs"); //$NON-NLS-1$
> 				writer.print(lineDelimiter);
>-				StringReader reader = new StringReader(vmArgs);
>-				StreamTokenizer tokenizer = new StreamTokenizer(reader);
>-				tokenizer.resetSyntax();
>-				tokenizer.whitespaceChars(0, 0x20);
>-				tokenizer.wordChars(0x21, 0xFF);
>-				tokenizer.quoteChar('"');
>-				tokenizer.quoteChar('\'');
>-				while (tokenizer.nextToken() != StreamTokenizer.TT_EOF) {
>-					writer.print(tokenizer.sval);
>-					writer.print(lineDelimiter);
>+				QuotedTokenizer tokenizer = new QuotedTokenizer(vmArgs);
>+				while (tokenizer.hasMoreTokens()) {
>+					String token = tokenizer.nextToken().trim();
>+					if (!token.equals("")) { //$NON-NLS-1$
>+						writer.print(token);
>+						writer.print(lineDelimiter);
>+					}
> 				}
> 			}
> 		} catch (IOException e) {
>#P org.eclipse.pde.build.tests
>Index: resources/234032/test.product
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build.tests/resources/234032/test.product,v
>retrieving revision 1.1
>diff -u -r1.1 test.product
>--- resources/234032/test.product	28 May 2008 01:45:16 -0000	1.1
>+++ resources/234032/test.product	25 Aug 2010 21:46:16 -0000
>@@ -1,13 +1,15 @@
> <?xml version="1.0" encoding="UTF-8"?>
>-<?pde version="3.4"?>
>+<?pde version="3.5"?>
> 
>-<product name="test" id="org.eclipse.pde.build.tests.test" application="rcp.application" version="1.0.0" useFeatures="false">
>+<product name="test" id="org.eclipse.pde.build.tests.test" application="rcp.application" version="1.0.0" useFeatures="false" includeLaunchers="true">
> 
>    <configIni use="default">
>    </configIni>
> 
>    <launcherArgs>
>-      <vmArgs>-Dfoo=bar</vmArgs>
>+      <vmArgs>-Dfoo=bar
>+-Dschemes1=&quot;archive zip jar&quot;
>+&quot;-Dschemes2=archive zip jar&quot;</vmArgs>
>       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
>    </launcherArgs>
> 
>@@ -17,9 +19,13 @@
>          <bmp/>
>       </win>
>    </launcher>
>-   
>+
>+   <vm>
>+   </vm>
>+
>    <plugins>
>       <plugin id="org.eclipse.osgi"/>
>    </plugins>
> 
>+
> </product>
>Index: src/org/eclipse/pde/build/internal/tests/ProductTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ProductTests.java,v
>retrieving revision 1.27
>diff -u -r1.27 ProductTests.java
>--- src/org/eclipse/pde/build/internal/tests/ProductTests.java	17 Aug 2010 19:12:31 -0000	1.27
>+++ src/org/eclipse/pde/build/internal/tests/ProductTests.java	25 Aug 2010 21:46:16 -0000
>@@ -121,6 +121,9 @@
> 
> 		IFile iniFile = buildFolder.getFile("tmp/eclipse/test.app/Contents/MacOS/test.ini");
> 		assertLogContainsLine(iniFile, "-Dfoo=bar");
>+		//bug 313940
>+		assertLogContainsLine(iniFile, "-Dschemes1=archive zip jar");
>+		assertLogContainsLine(iniFile, "-Dschemes2=archive zip jar");
> 	}
> 
> 	public void test237922() throws Exception {

Actions: View | Diff

Attachments on bug 313940: 177479