Attachment #194023 for bug #338878

Lines 7-12 Link Here

(-)src/org/eclipse/pde/internal/build/IBuildPropertiesConstants.java (+11 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM - Initial API and implementation	9	* IBM - Initial API and implementation
		10	* Compuware Corporation - Sebastien Angers <sebastien.angers@compuware.com>
		11	* - Enabled additional mirror slicingOptions in Headless PDE Build
		12	* - https://bugs.eclipse.org/338878
10	*******************************************************************************/	13	*******************************************************************************/
11	package org.eclipse.pde.internal.build;	14	package org.eclipse.pde.internal.build;
12		15
Lines 104-109 Link Here
104	public static final String PROPERTY_P2_METADATA_REPO_NAME = "p2.metadata.repo.name"; //$NON-NLS-1$	107	public static final String PROPERTY_P2_METADATA_REPO_NAME = "p2.metadata.repo.name"; //$NON-NLS-1$
105	public static final String PROPERTY_P2_ARTIFACT_REPO_NAME = "p2.artifact.repo.name"; //$NON-NLS-1$	108	public static final String PROPERTY_P2_ARTIFACT_REPO_NAME = "p2.artifact.repo.name"; //$NON-NLS-1$
106	public static final String PROPERTY_P2_GATHERING = "p2.gathering"; //$NON-NLS-1$	109	public static final String PROPERTY_P2_GATHERING = "p2.gathering"; //$NON-NLS-1$
		110	public static final String PROPERTY_P2_MIRROR_SLICING_FILTER = "p2.mirror.slicing.filter"; //$NON-NLS-1$
		111	public static final String PROPERTY_P2_MIRROR_SLICING_FOLLOW_ONLY_FILTERED_REQS = "p2.mirror.slicing.followOnlyFilteredRequirements"; //$NON-NLS-1$
		112	public static final String PROPERTY_P2_MIRROR_SLICING_FOLLOW_STRICT = "p2.mirror.slicing.followStrict"; //$NON-NLS-1$
		113	public static final String PROPERTY_P2_MIRROR_SLICING_INCLUDE_FEATURES = "p2.mirror.slicing.includeFeatures"; //$NON-NLS-1$
		114	public static final String PROPERTY_P2_MIRROR_SLICING_INCLUDE_NON_GREEDY = "p2.mirror.slicing.includeNonGreedy"; //$NON-NLS-1$
		115	public static final String PROPERTY_P2_MIRROR_SLICING_INCLUDE_OPTIONAL = "p2.mirror.slicing.includeOptional"; //$NON-NLS-1$
		116	public static final String PROPERTY_P2_MIRROR_SLICING_LATEST_VERSION_ONLY = "p2.mirror.slicing.latestVersionOnly"; //$NON-NLS-1$
		117	public static final String PROPERTY_P2_MIRROR_SLICING_PLATFORM_FILTER = "p2.mirror.slicing.platformFilter"; //$NON-NLS-1$
107	public static final String PROPERTY_SKIP_MIRRORING = "skipMirroring"; //$NON-NLS-1$	118	public static final String PROPERTY_SKIP_MIRRORING = "skipMirroring"; //$NON-NLS-1$
108	public static final String PROPERTY_SKIP_DIRECTOR = "skipDirector"; //$NON-NLS-1$	119	public static final String PROPERTY_SKIP_DIRECTOR = "skipDirector"; //$NON-NLS-1$
109		120

Lines 7-12 Link Here

(-)src/org/eclipse/pde/internal/build/P2ConfigScriptGenerator.java (-1 / +21 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Compuware Corporation - Sebastien Angers <sebastien.angers@compuware.com>
		11	* - Enabled additional mirror slicingOptions in Headless PDE Build
		12	* - https://bugs.eclipse.org/338878
10	*******************************************************************************/	13	*******************************************************************************/
11		14
12	package org.eclipse.pde.internal.build;	15	package org.eclipse.pde.internal.build;
Lines 94-99 Link Here
94	if (productQualifier != null)	97	if (productQualifier != null)
95	script.printProperty(PROPERTY_P2_PRODUCT_QUALIFIER, productQualifier);	98	script.printProperty(PROPERTY_P2_PRODUCT_QUALIFIER, productQualifier);
96		99
		100	script.printProperty(PROPERTY_P2_MIRROR_SLICING_FILTER, ""); //$NON-NLS-1$
		101	script.printProperty(PROPERTY_P2_MIRROR_SLICING_FOLLOW_ONLY_FILTERED_REQS, FALSE);
		102	script.printProperty(PROPERTY_P2_MIRROR_SLICING_FOLLOW_STRICT, FALSE);
		103	script.printProperty(PROPERTY_P2_MIRROR_SLICING_INCLUDE_FEATURES, TRUE);
		104	script.printProperty(PROPERTY_P2_MIRROR_SLICING_INCLUDE_NON_GREEDY, FALSE);
		105	script.printProperty(PROPERTY_P2_MIRROR_SLICING_INCLUDE_OPTIONAL, havePDEUIState() ? FALSE : TRUE);
		106	script.printProperty(PROPERTY_P2_MIRROR_SLICING_LATEST_VERSION_ONLY, FALSE);
		107	script.printProperty(PROPERTY_P2_MIRROR_SLICING_PLATFORM_FILTER, ""); //$NON-NLS-1$
		108
97	script.println();	109	script.println();
98	generateCustomGatherMacro();	110	generateCustomGatherMacro();
99	}	111	}
Lines 299-306 Link Here
299		311
300	script.printStartTag("p2.mirror"); //$NON-NLS-1$	312	script.printStartTag("p2.mirror"); //$NON-NLS-1$
301	script.printTab();	313	script.printTab();
		314	// note that if a slicingOption has not been set in the build.properties, then the default was set in #generatePrologue()
302	script.print("\t<slicingOptions"); //$NON-NLS-1$	315	script.print("\t<slicingOptions"); //$NON-NLS-1$
303	script.printAttribute("includeNonGreedy", FALSE, true); //$NON-NLS-1$	316	script.printAttribute("includeNonGreedy", Utils.getPropertyFormat(PROPERTY_P2_MIRROR_SLICING_INCLUDE_NON_GREEDY), true); //$NON-NLS-1$
		317	script.printAttribute("filter", Utils.getPropertyFormat(PROPERTY_P2_MIRROR_SLICING_FILTER), true); //$NON-NLS-1$
		318	script.printAttribute("followOnlyFilteredRequirements", Utils.getPropertyFormat(PROPERTY_P2_MIRROR_SLICING_FOLLOW_ONLY_FILTERED_REQS), true); //$NON-NLS-1$
		319	script.printAttribute("followStrict", Utils.getPropertyFormat(PROPERTY_P2_MIRROR_SLICING_FOLLOW_STRICT), true); //$NON-NLS-1$
		320	script.printAttribute("includeFeatures", Utils.getPropertyFormat(PROPERTY_P2_MIRROR_SLICING_INCLUDE_FEATURES), true); //$NON-NLS-1$
		321	script.printAttribute("includeOptional", Utils.getPropertyFormat(PROPERTY_P2_MIRROR_SLICING_INCLUDE_OPTIONAL), true); //$NON-NLS-1$
		322	script.printAttribute("latestVersionOnly", Utils.getPropertyFormat(PROPERTY_P2_MIRROR_SLICING_LATEST_VERSION_ONLY), true); //$NON-NLS-1$
		323	script.printAttribute("platformFilter", Utils.getPropertyFormat(PROPERTY_P2_MIRROR_SLICING_PLATFORM_FILTER), true); //$NON-NLS-1$
304	script.println("/>"); //$NON-NLS-1$	324	script.println("/>"); //$NON-NLS-1$
305		325
306	script.printTab();	326	script.printTab();

Lines 7-12 Link Here

(-)templates/headless-build/build.properties (+17 lines)
7	#	7	#
8	# Contributors:	8	# Contributors:
9	# IBM Corporation - initial API and implementation	9	# IBM Corporation - initial API and implementation
		10	# Compuware Corporation - Sebastien Angers <sebastien.angers@compuware.com>
		11	# - Enabled additional mirror slicingOptions in Headless PDE Build
		12	# - https://bugs.eclipse.org/338878
10	###############################################################################	13	###############################################################################
11	#####################	14	#####################
12	# Parameters describing how and where to execute the build.	15	# Parameters describing how and where to execute the build.
Lines 117-122 Link Here
117	#Control the creation of a file containing the version included in each configuration - on by default	120	#Control the creation of a file containing the version included in each configuration - on by default
118	#generateVersionsLists=false	121	#generateVersionsLists=false
119		122
		123	############ REPO MIRROR SLICING CONTROL ############
		124	# Default values for the slicingOptions of the p2.mirror Ant target used to generate the p2 repo (buildRepo)
		125	# Note that the default values used by PDE/Build are different from the default values for p2.mirror's slicingOptions
		126	# See http://help.eclipse.org/topic//org.eclipse.platform.doc.isv/guide/p2_repositorytasks.htm for the details
		127	# of each setting.
		128	#p2.mirror.slicing.filter=
		129	#p2.mirror.slicing.followOnlyFilteredRequirements=false
		130	#p2.mirror.slicing.followStrict=false
		131	#p2.mirror.slicing.includeFeatures=true
		132	#p2.mirror.slicing.includeNonGreedy=false
		133	#p2.mirror.slicing.includeOptional=true
		134	#p2.mirror.slicing.platformFilter=
		135	#p2.mirror.slicing.latestVersionOnly=false
		136
120	############## SOURCE BUNDLE CONTROL ################	137	############## SOURCE BUNDLE CONTROL ################
121	# Set this property to have source bundles created and output into build repository.	138	# Set this property to have source bundles created and output into build repository.
122	# This does NOT put them in the build output (e.g., product) itself.	139	# This does NOT put them in the build output (e.g., product) itself.

Return to bug 338878