Attachment #122791 for bug #258820

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

Lines 55-60 Link Here

(-)src/java/org/eclipse/buckminster/core/cspec/builder/CSpecBuilder.java (+12 lines)
55		55
56	private Filter m_filter;	56	private Filter m_filter;
57		57
		58	private boolean m_unpack = false;
		59
58	public ActionBuilder addAction(String actionName, boolean publ, String actorName, boolean always)	60	public ActionBuilder addAction(String actionName, boolean publ, String actorName, boolean always)
59	throws AttributeAlreadyDefinedException	61	throws AttributeAlreadyDefinedException
60	{	62	{
Lines 395-400 Link Here
395	m_generators = null;	397	m_generators = null;
396	}	398	}
397		399
		400	public boolean isUnpack()
		401	{
		402	return m_unpack;
		403	}
		404
398	public void removeAttribute(String name)	405	public void removeAttribute(String name)
399	{	406	{
400	if(m_attributes != null)	407	if(m_attributes != null)
Lines 443-448 Link Here
443	m_shortDesc = shortDesc;	450	m_shortDesc = shortDesc;
444	}	451	}
445		452
		453	public void setUnpack(boolean unpack)
		454	{
		455	m_unpack = unpack;
		456	}
		457
446	public void setVersion(IVersion version)	458	public void setVersion(IVersion version)
447	{	459	{
448	m_version = version;	460	m_version = version;

Lines 153-158 Link Here

(-)src/java/org/eclipse/buckminster/core/cspec/AbstractResolutionBuilder.java (+1 lines)
153	resBld.setVersionMatch(providerMatch.getVersionMatch());	153	resBld.setVersionMatch(providerMatch.getVersionMatch());
154	resBld.setMaterializable(reader.canMaterialize());	154	resBld.setMaterializable(reader.canMaterialize());
155	resBld.setRepository(providerMatch.getRepositoryURI());	155	resBld.setRepository(providerMatch.getRepositoryURI());
		156	resBld.setUnpack(cspecBuilder.isUnpack());
156	if(reader instanceof IFileReader)	157	if(reader instanceof IFileReader)
157	resBld.setFileInfo(((IFileReader)reader).getFileInfo());	158	resBld.setFileInfo(((IFileReader)reader).getFileInfo());
158	return new Resolution(resBld);	159	return new Resolution(resBld);

Lines 292-298 Link Here

(-)src/java/org/eclipse/buckminster/pde/internal/EclipsePlatformReaderType.java (-1 / +1 lines)
292	plugin.setModel(generatedFeatureModel);	292	plugin.setModel(generatedFeatureModel);
293	plugin.setId(id);	293	plugin.setId(id);
294	plugin.setVersion(vStr);	294	plugin.setVersion(vStr);
295	plugin.setUnpack(false);	295	plugin.setUnpack(res.isUnpack());
296	generatedFeature.addPlugins(new IFeaturePlugin[] { plugin });	296	generatedFeature.addPlugins(new IFeaturePlugin[] { plugin });
297	}	297	}
298		298

Lines 30-35 Link Here

(-)src/java/org/eclipse/buckminster/pde/cspecgen/bundle/CSpecFromBinary.java (+8 lines)
30	import org.eclipse.buckminster.core.query.model.ComponentQuery;	30	import org.eclipse.buckminster.core.query.model.ComponentQuery;
31	import org.eclipse.buckminster.core.reader.ICatalogReader;	31	import org.eclipse.buckminster.core.reader.ICatalogReader;
32	import org.eclipse.buckminster.pde.cspecgen.CSpecGenerator;	32	import org.eclipse.buckminster.pde.cspecgen.CSpecGenerator;
		33	import org.eclipse.buckminster.pde.internal.EclipseImportReader;
33	import org.eclipse.buckminster.pde.internal.model.ExternalBundleModel;	34	import org.eclipse.buckminster.pde.internal.model.ExternalBundleModel;
34	import org.eclipse.buckminster.runtime.IOUtils;	35	import org.eclipse.buckminster.runtime.IOUtils;
35	import org.eclipse.buckminster.runtime.MonitorUtils;	36	import org.eclipse.buckminster.runtime.MonitorUtils;
Lines 205-210 Link Here
205	bundleExport.getPrerequisitesBuilder().addLocalPrerequisite(importedJar);	206	bundleExport.getPrerequisitesBuilder().addLocalPrerequisite(importedJar);
206	}	207	}
207	}	208	}
		209	ICatalogReader reader = getReader();
		210	if(reader instanceof EclipseImportReader)
		211	{
		212	EclipseImportReader eclipseImportReader = (EclipseImportReader)reader;
		213	cspec.setUnpack(eclipseImportReader.isUnpack());
		214	}
		215
208	bundleExport.setProductAlias(ALIAS_OUTPUT);	216	bundleExport.setProductAlias(ALIAS_OUTPUT);
209	bundleExport.setProductBase(OUTPUT_DIR);	217	bundleExport.setProductBase(OUTPUT_DIR);
210	bundleExport.setPrerequisitesAlias(ALIAS_REQUIREMENTS);	218	bundleExport.setPrerequisitesAlias(ALIAS_REQUIREMENTS);

Lines 767-772 Link Here

(-)src/java/org/eclipse/buckminster/pde/internal/EclipseImportReaderType.java (+1 lines)
767	}	767	}
768	jarFile.delete();	768	jarFile.delete();
769	}	769	}
		770	base.setUnpack(unpack);
770		771
771	// Cache this using the remote key also so that the next time someone asks for it, the local	772	// Cache this using the remote key also so that the next time someone asks for it, the local
772	// version is returned	773	// version is returned

Lines 101-106 Link Here

(-)src/java/org/eclipse/buckminster/pde/internal/EclipseImportBase.java (+22 lines)
101		101
102	private final URL m_remoteLocation;	102	private final URL m_remoteLocation;
103		103
		104	private boolean m_unpack = false;
		105
104	private static final UUID CACHE_IMPORT_BASE_CACHE = UUID.randomUUID();	106	private static final UUID CACHE_IMPORT_BASE_CACHE = UUID.randomUUID();
105		107
106	public static EclipseImportBase obtain(NodeQuery query, String repositoryURI) throws CoreException	108	public static EclipseImportBase obtain(NodeQuery query, String repositoryURI) throws CoreException
Lines 285-288 Link Here
285	{	287	{
286	return m_remoteLocation == null;	288	return m_remoteLocation == null;
287	}	289	}
		290
		291	/**
		292	* Should this bundle be unpacked (set in the enclosing feature.xml)
		293	*
		294	* @return true if supposed to be unpacked
		295	*/
		296	boolean isUnpack()
		297	{
		298	return m_unpack;
		299	}
		300
		301	/**
		302	* Should this bundle be unpacked (set in the enclosing feature.xml)
		303	*
		304	* @param unpack
		305	*/
		306	void setUnpack(boolean unpack)
		307	{
		308	m_unpack = unpack;
		309	}
288	}	310	}

Lines 243-246 Link Here

(-)src/java/org/eclipse/buckminster/pde/internal/EclipseImportReader.java (+5 lines)
243	.getComponentName()));	243	.getComponentName()));
244	monitor.done();	244	monitor.done();
245	}	245	}
		246
		247	public boolean isUnpack()
		248	{
		249	return m_base.isUnpack();
		250	}
246	}	251	}

Return to bug 258820