Attachment #177479 for bug #313940

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

View | Details | Raw Unified | Return to bug 313940
Collapse All | Expand All

Lines 24-30 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
24	org.eclipse.core.runtime.compatibility;bundle-version="[3.1.100,4.0.0)";resolution:=optional,	24	org.eclipse.core.runtime.compatibility;bundle-version="[3.1.100,4.0.0)";resolution:=optional,
25	org.eclipse.osgi;bundle-version="[3.3.0,4.0.0)",	25	org.eclipse.osgi;bundle-version="[3.3.0,4.0.0)",
26	org.eclipse.equinox.p2.jarprocessor;bundle-version="[1.0.1,2.0.0)",	26	org.eclipse.equinox.p2.jarprocessor;bundle-version="[1.0.1,2.0.0)",
27	org.eclipse.equinox.p2.publisher;bundle-version="1.1.0";resolution:=optional,	27	org.eclipse.equinox.p2.publisher;bundle-version="1.1.0",
28	org.eclipse.equinox.p2.repository.tools;bundle-version="[2.0.0,3.0.0)";resolution:=optional,	28	org.eclipse.equinox.p2.repository.tools;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
29	org.eclipse.equinox.p2.director.app;bundle-version="1.0.200"	29	org.eclipse.equinox.p2.director.app;bundle-version="1.0.200"
30	Import-Package: com.ibm.icu.util,	30	Import-Package: com.ibm.icu.util,




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;

		try {
			writer = new PrintWriter(new FileWriter(new File(dir, launcher + ".ini"))); //$NON-NLS-1$
			if (programArgs != null && programArgs.length() > 0) {
				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);
					}
				while (tokenizer.nextToken() != StreamTokenizer.TT_EOF) {
					writer.print(tokenizer.sval);
					writer.print(lineDelimiter);
				}
			}
			if (vmArgs != null && vmArgs.length() > 0) {
				writer.print("-vmargs"); //$NON-NLS-1$
				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);
					}
				while (tokenizer.nextToken() != StreamTokenizer.TT_EOF) {
					writer.print(tokenizer.sval);
					writer.print(lineDelimiter);
				}
			}
		} catch (IOException e) {

Lines 1-13 Link Here

(-)resources/234032/test.product (-4 / +10 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<?pde version="3.4"?>	2	<?pde version="3.5"?>
3		3
4	<product name="test" id="org.eclipse.pde.build.tests.test" application="rcp.application" version="1.0.0" useFeatures="false">	4	<product name="test" id="org.eclipse.pde.build.tests.test" application="rcp.application" version="1.0.0" useFeatures="false" includeLaunchers="true">
5		5
6	<configIni use="default">	6	<configIni use="default">
7	</configIni>	7	</configIni>
8		8
9	<launcherArgs>	9	<launcherArgs>
10	<vmArgs>-Dfoo=bar</vmArgs>	10	<vmArgs>-Dfoo=bar
		11	-Dschemes1="archive zip jar"
		12	"-Dschemes2=archive zip jar"</vmArgs>
11	<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>	13	<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
12	</launcherArgs>	14	</launcherArgs>
13		15
Lines 17-25 Link Here
17	<bmp/>	19	<bmp/>
18	</win>	20	</win>
19	</launcher>	21	</launcher>
20		22
		23	<vm>
		24	</vm>
		25
21	<plugins>	26	<plugins>
22	<plugin id="org.eclipse.osgi"/>	27	<plugin id="org.eclipse.osgi"/>
23	</plugins>	28	</plugins>
24		29
		30
25	</product>	31	</product>

Lines 121-126 Link Here

(-)src/org/eclipse/pde/build/internal/tests/ProductTests.java (+3 lines)
121		121
122	IFile iniFile = buildFolder.getFile("tmp/eclipse/test.app/Contents/MacOS/test.ini");	122	IFile iniFile = buildFolder.getFile("tmp/eclipse/test.app/Contents/MacOS/test.ini");
123	assertLogContainsLine(iniFile, "-Dfoo=bar");	123	assertLogContainsLine(iniFile, "-Dfoo=bar");
		124	//bug 313940
		125	assertLogContainsLine(iniFile, "-Dschemes1=archive zip jar");
		126	assertLogContainsLine(iniFile, "-Dschemes2=archive zip jar");
124	}	127	}
125		128
126	public void test237922() throws Exception {	129	public void test237922() throws Exception {

Return to bug 313940

Lines 14-19 Link Here

(-)src/org/eclipse/pde/internal/build/ProductGenerator.java (-20 / +15 lines)
14	import java.util.*;	14	import java.util.*;
15	import org.eclipse.core.runtime.*;	15	import org.eclipse.core.runtime.*;
16	import org.eclipse.equinox.frameworkadmin.BundleInfo;	16	import org.eclipse.equinox.frameworkadmin.BundleInfo;
		17	import org.eclipse.equinox.internal.p2.publisher.QuotedTokenizer;
17	import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;	18	import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
18	import org.eclipse.osgi.service.resolver.BundleDescription;	19	import org.eclipse.osgi.service.resolver.BundleDescription;
19	import org.eclipse.osgi.service.resolver.VersionRange;	20	import org.eclipse.osgi.service.resolver.VersionRange;
Lines 677-707 Link Here
677	try {	678	try {
678	writer = new PrintWriter(new FileWriter(new File(dir, launcher + ".ini"))); //$NON-NLS-1$	679	writer = new PrintWriter(new FileWriter(new File(dir, launcher + ".ini"))); //$NON-NLS-1$
679	if (programArgs != null && programArgs.length() > 0) {	680	if (programArgs != null && programArgs.length() > 0) {
680	StringReader reader = new StringReader(programArgs);	681	QuotedTokenizer tokenizer = new QuotedTokenizer(programArgs);
681	StreamTokenizer tokenizer = new StreamTokenizer(reader);	682	while (tokenizer.hasMoreTokens()) {
682	tokenizer.resetSyntax();	683	String token = tokenizer.nextToken().trim();
683	tokenizer.whitespaceChars(0, 0x20);	684	if (!token.equals("")) { //$NON-NLS-1$
684	tokenizer.wordChars(0x21, 0xFF);	685	writer.print(token);
685	tokenizer.quoteChar('"');	686	writer.print(lineDelimiter);
686	tokenizer.quoteChar('\'');	687	}
687	while (tokenizer.nextToken() != StreamTokenizer.TT_EOF) {
688	writer.print(tokenizer.sval);
689	writer.print(lineDelimiter);
690	}	688	}
691	}	689	}
692	if (vmArgs != null && vmArgs.length() > 0) {	690	if (vmArgs != null && vmArgs.length() > 0) {
693	writer.print("-vmargs"); //$NON-NLS-1$	691	writer.print("-vmargs"); //$NON-NLS-1$
694	writer.print(lineDelimiter);	692	writer.print(lineDelimiter);
695	StringReader reader = new StringReader(vmArgs);	693	QuotedTokenizer tokenizer = new QuotedTokenizer(vmArgs);
696	StreamTokenizer tokenizer = new StreamTokenizer(reader);	694	while (tokenizer.hasMoreTokens()) {
697	tokenizer.resetSyntax();	695	String token = tokenizer.nextToken().trim();
698	tokenizer.whitespaceChars(0, 0x20);	696	if (!token.equals("")) { //$NON-NLS-1$
699	tokenizer.wordChars(0x21, 0xFF);	697	writer.print(token);
700	tokenizer.quoteChar('"');	698	writer.print(lineDelimiter);
701	tokenizer.quoteChar('\'');	699	}
702	while (tokenizer.nextToken() != StreamTokenizer.TT_EOF) {
703	writer.print(tokenizer.sval);
704	writer.print(lineDelimiter);
705	}	700	}
706	}	701	}
707	} catch (IOException e) {	702	} catch (IOException e) {