Attachment #128840 for bug #268667

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

Lines 4-10 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
4	Bundle-SymbolicName: org.eclipse.ajdt.ui; singleton:=true	4	Bundle-SymbolicName: org.eclipse.ajdt.ui; singleton:=true
5	Bundle-Version: 1.6.3.20090122141228	5	Bundle-Version: 1.6.3.20090122141228
6	Bundle-Activator: org.eclipse.ajdt.ui.AspectJUIPlugin	6	Bundle-Activator: org.eclipse.ajdt.ui.AspectJUIPlugin
7	Bundle-Vendor: %providerName	7	Bundle-Vendor: CROZ
8	Bundle-Localization: plugin	8	Bundle-Localization: plugin
9	Export-Package: org.eclipse.ajdt.internal.builder;x-friends:="org.eclipse.ajdt.ui.tests,	9	Export-Package: org.eclipse.ajdt.internal.builder;x-friends:="org.eclipse.ajdt.ui.tests,
10	org.eclipse.ajdt.mylyn.ui",	10	org.eclipse.ajdt.mylyn.ui",

Lines 6-12 Link Here

(-).project (-1 / +2 lines)
6	</projects>	6	</projects>
7	<buildSpec>	7	<buildSpec>
8	<buildCommand>	8	<buildCommand>
9	<name>org.eclipse.jdt.core.javabuilder</name>	9	<name>org.eclipse.ajdt.core.ajbuilder</name>
10	<arguments>	10	<arguments>
11	</arguments>	11	</arguments>
12	</buildCommand>	12	</buildCommand>
Lines 22-27 Link Here
22	</buildCommand>	22	</buildCommand>
23	</buildSpec>	23	</buildSpec>
24	<natures>	24	<natures>
		25	<nature>org.eclipse.ajdt.ui.ajnature</nature>
25	<nature>org.eclipse.pde.PluginNature</nature>	26	<nature>org.eclipse.pde.PluginNature</nature>
26	<nature>org.eclipse.jdt.core.javanature</nature>	27	<nature>org.eclipse.jdt.core.javanature</nature>
27	</natures>	28	</natures>





	private String[] getBuildExecutionTargets() {
		if (fInfo.exportSource)
			return new String[] {"build.jars", "build.sources"}; //$NON-NLS-1$ //$NON-NLS-2$
		return new String[] {"build.jars"}; //$NON-NLS-1$
	}

	/**


	/**
	 * Execute the script at the given location.
	 *
	 * @param location the script to run
	 * @param targets the targets in the script to run, use <code>null</code> to run all
	 * @param properties map of user properties

					fAntBuildProperties.put(id, BuildUtilities.getBootClasspath(id));
			}
			fAntBuildProperties.put(IXMLConstants.PROPERTY_JAVAC_FAIL_ON_ERROR, "false"); //$NON-NLS-1$
			fAntBuildProperties.put(IXMLConstants.PROPERTY_JAVAC_DEBUG_INFO, "on"); //$NON-NLS-1$
			fAntBuildProperties.put(IXMLConstants.PROPERTY_JAVAC_VERBOSE, "false"); //$NON-NLS-1$

			Preferences pref = JavaCore.getPlugin().getPluginPreferences();

	/**
	* Adds the necessary properties to invoke the p2 metadata generator.  This method will
	* be called when creating the ant build properties map.
	*
	* @param map the map to add generator properties to
	*/
	protected void setP2MetaDataProperties(Map map) {

		generator.setStateExtraData(TargetPlatformHelper.getBundleClasspaths(TargetPlatformHelper.getPDEState()), TargetPlatformHelper.getPatchMap(TargetPlatformHelper.getPDEState()));
		AbstractScriptGenerator.setForceUpdateJar(false);
		AbstractScriptGenerator.setEmbeddedSource(fInfo.exportSource);

		// iloncar: allowbinarycycles
		Properties properties = new Properties();
		properties.put(IBuildPropertiesConstants.PROPERTY_ALLOW_BINARY_CYCLES, Boolean.toString(fInfo.allowBinaryCycles));
		generator.setImmutableAntProperties(properties);
	}

	protected State getState(String os, String ws, String arch) {

			Dictionary properties = dictionaries[i];
			properties.put("osgi.os", os); //$NON-NLS-1$
			properties.put("osgi.ws", ws); //$NON-NLS-1$
			properties.put("osgi.arch", arch); //$NON-NLS-1$
		}
		fStateCopy.resolve(false);
		return fStateCopy;

					if (shouldAddPlugin(bundle, environment)) {
						Element plugin = doc.createElement("plugin"); //$NON-NLS-1$
						plugin.setAttribute("id", bundle.getSymbolicName()); //$NON-NLS-1$
						plugin.setAttribute("version", bundle.getVersion().toString()); //$NON-NLS-1$
						setAdditionalAttributes(plugin, bundle);
						root.appendChild(plugin);
					}

Return to bug 268667

Lines 357-364 Link Here

(-)src/org/eclipse/ajdt/internal/core/exports/FeatureExportOperation.java (-7 / +12 lines)
357		357
358	private String[] getBuildExecutionTargets() {	358	private String[] getBuildExecutionTargets() {
359	if (fInfo.exportSource)	359	if (fInfo.exportSource)
360	return new String[] {"build.jars", "build.sources"}; //$NON-NLS-1$ //$NON-NLS-2$	360	return new String[] {"build.jars", "build.sources"}; //$NON-NLS-1$ //$NON-NLS-2$
361	return new String[] {"build.jars"}; //$NON-NLS-1$	361	return new String[] {"build.jars"}; //$NON-NLS-1$
362	}	362	}
363		363
364	/**	364	/**
Lines 363-369 Link Here
363		363
364	/**	364	/**
365	* Execute the script at the given location.	365	* Execute the script at the given location.
366	*	366	*
367	* @param location the script to run	367	* @param location the script to run
368	* @param targets the targets in the script to run, use <code>null</code> to run all	368	* @param targets the targets in the script to run, use <code>null</code> to run all
369	* @param properties map of user properties	369	* @param properties map of user properties
Lines 447-453 Link Here
447	fAntBuildProperties.put(id, BuildUtilities.getBootClasspath(id));	447	fAntBuildProperties.put(id, BuildUtilities.getBootClasspath(id));
448	}	448	}
449	fAntBuildProperties.put(IXMLConstants.PROPERTY_JAVAC_FAIL_ON_ERROR, "false"); //$NON-NLS-1$	449	fAntBuildProperties.put(IXMLConstants.PROPERTY_JAVAC_FAIL_ON_ERROR, "false"); //$NON-NLS-1$
450	fAntBuildProperties.put(IXMLConstants.PROPERTY_JAVAC_DEBUG_INFO, "on"); //$NON-NLS-1$	450	fAntBuildProperties.put(IXMLConstants.PROPERTY_JAVAC_DEBUG_INFO, "on"); //$NON-NLS-1$
451	fAntBuildProperties.put(IXMLConstants.PROPERTY_JAVAC_VERBOSE, "false"); //$NON-NLS-1$	451	fAntBuildProperties.put(IXMLConstants.PROPERTY_JAVAC_VERBOSE, "false"); //$NON-NLS-1$
452		452
453	Preferences pref = JavaCore.getPlugin().getPluginPreferences();	453	Preferences pref = JavaCore.getPlugin().getPluginPreferences();
Lines 488-494 Link Here
488	/**	488	/**
489	* Adds the necessary properties to invoke the p2 metadata generator. This method will	489	* Adds the necessary properties to invoke the p2 metadata generator. This method will
490	* be called when creating the ant build properties map.	490	* be called when creating the ant build properties map.
491	*	491	*
492	* @param map the map to add generator properties to	492	* @param map the map to add generator properties to
493	*/	493	*/
494	protected void setP2MetaDataProperties(Map map) {	494	protected void setP2MetaDataProperties(Map map) {
Lines 574-579 Link Here
574	generator.setStateExtraData(TargetPlatformHelper.getBundleClasspaths(TargetPlatformHelper.getPDEState()), TargetPlatformHelper.getPatchMap(TargetPlatformHelper.getPDEState()));	574	generator.setStateExtraData(TargetPlatformHelper.getBundleClasspaths(TargetPlatformHelper.getPDEState()), TargetPlatformHelper.getPatchMap(TargetPlatformHelper.getPDEState()));
575	AbstractScriptGenerator.setForceUpdateJar(false);	575	AbstractScriptGenerator.setForceUpdateJar(false);
576	AbstractScriptGenerator.setEmbeddedSource(fInfo.exportSource);	576	AbstractScriptGenerator.setEmbeddedSource(fInfo.exportSource);
		577
		578	// iloncar: allowbinarycycles
		579	Properties properties = new Properties();
		580	properties.put(IBuildPropertiesConstants.PROPERTY_ALLOW_BINARY_CYCLES, Boolean.toString(fInfo.allowBinaryCycles));
		581	generator.setImmutableAntProperties(properties);
577	}	582	}
578		583
579	protected State getState(String os, String ws, String arch) {	584	protected State getState(String os, String ws, String arch) {
Lines 590-596 Link Here
590	Dictionary properties = dictionaries[i];	595	Dictionary properties = dictionaries[i];
591	properties.put("osgi.os", os); //$NON-NLS-1$	596	properties.put("osgi.os", os); //$NON-NLS-1$
592	properties.put("osgi.ws", ws); //$NON-NLS-1$	597	properties.put("osgi.ws", ws); //$NON-NLS-1$
593	properties.put("osgi.arch", arch); //$NON-NLS-1$	598	properties.put("osgi.arch", arch); //$NON-NLS-1$
594	}	599	}
595	fStateCopy.resolve(false);	600	fStateCopy.resolve(false);
596	return fStateCopy;	601	return fStateCopy;
Lines 755-761 Link Here
755	if (shouldAddPlugin(bundle, environment)) {	760	if (shouldAddPlugin(bundle, environment)) {
756	Element plugin = doc.createElement("plugin"); //$NON-NLS-1$	761	Element plugin = doc.createElement("plugin"); //$NON-NLS-1$
757	plugin.setAttribute("id", bundle.getSymbolicName()); //$NON-NLS-1$	762	plugin.setAttribute("id", bundle.getSymbolicName()); //$NON-NLS-1$
758	plugin.setAttribute("version", bundle.getVersion().toString()); //$NON-NLS-1$	763	plugin.setAttribute("version", bundle.getVersion().toString()); //$NON-NLS-1$
759	setAdditionalAttributes(plugin, bundle);	764	setAdditionalAttributes(plugin, bundle);
760	root.appendChild(plugin);	765	root.appendChild(plugin);
761	}	766	}