diff --git a/releng.wtpbuilder/distribution/patches32x.package/build.xml b/releng.wtpbuilder/distribution/patches32x.package/build.xml index f32f1461364f81e161c7b2815ffb97646219cd62..d1b474f932c272eabd9e322b6185bb29d2fbe4e1 100644 --- a/releng.wtpbuilder/distribution/patches32x.package/build.xml +++ b/releng.wtpbuilder/distribution/patches32x.package/build.xml @@ -32,12 +32,13 @@ name="antrunnerfile" value="${wtp.builder.home}/distribution/${build.distribution}.package/createmainzips.xml"/> </ant> - +<!-- <ant antfile="${wtp.builder.home}/scripts/build/runAntRunner.xml"> <property name="antrunnerfile" value="${wtp.builder.home}/distribution/${build.distribution}.package/createjaxws.xml"/> </ant> + --> <ant antfile="${wtp.builder.home}/scripts/build/runAntRunner.xml"> <property name="antrunnerfile" diff --git a/releng.wtpbuilder/distribution/patches32x.package/createnoopzips.xml b/releng.wtpbuilder/distribution/patches32x.package/createnoopzips.xml new file mode 100644 index 0000000000000000000000000000000000000000..23e996e1fb8f844fa52416825406e3bbc17b0b6e --- /dev/null +++ b/releng.wtpbuilder/distribution/patches32x.package/createnoopzips.xml @@ -0,0 +1,212 @@ +<?xml version="1.0" encoding="UTF-8"?> + <!-- + This script is to create some zips with core, no-optional, features only. + Limited, specialized usefulness for some adopters, so these zips are not + linked or advertised. Not a standard deliverable. + + NOTE: In fact, to save a little time, these "noop" zips have been "disabled" + for now, by the 'if' variable named 'createNoopZips' ... which is not defined, so + calls to this task by main build.xml, should exit immediately and not create the zips. + This will be reinstated in the future ... or, perhaps reinstated as a seperate job. + + NOTE: the list of features are appropriate/current only for 3.2.x stream. + Some changes to jpt feature names would be needed for 3.3 stream. + + --> +<project + default="build" + basedir="."> + <!-- + These 4 properties are normally set by calling task, but for + "local" tests from command line, they can be set here. + <property + name="buildDirectory" + value="/opt/public/webtools/committers/wtp-R3.2.4-M/20110310200527"/> + <property + name="buildLabel" + value="M-3.2.4-20110310200527"/> + <property + name="wtp.builder.home" + value="/shared/webtools/projectBuilders/wtp-R3.2.4-M/webtools.releng/releng.wtpbuilder"/> + <property + name="projectname" + value="wtp-R3.2.4-M" /> + <echo message="buildDirectory: ${buildDirectory}"/> + <echo message="buildLabel: ${buildLabel}"/> + <echo message="wtp.builder.home: ${wtp.builder.home}"/> + <echo message="projectname: ${projectname}"/> + --> + <fail unless="wtp.builder.home"/> + <fail unless="projectname"/> + + <!-- = = = standard properties pattern = = = --> + <!-- + Note to be cross-platform, "environment variables" are only + appropriate for some variables, e.g. ones we set, since + properties are case sensitive, even if the environment variables + on your operating system are not, e.g. it will be ${env.Path} + not ${env.PATH} on Windows + --> + <property environment="env"/> + <!-- + Let users override standard properties, if desired. If + directory, file, or some properties do not exist, then standard + properties will be used. + --> + <property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/> + + + <!-- the flag to produce these noop zips is contained in the build.cfg file --> + <property + name="keyCfgFile" + value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/> + <echo + level="info" + message="keyCfgFile: ${keyCfgFile}"/> + <property file="${keyCfgFile}"/> + + + + + + <!-- = = = end standard properties pattern = = = --> + + + <!-- + three convenience variables to help avoid typos, etc. Should + never need to be changed + --> + <property + name="tempDir" + value="${buildDirectory}/${buildLabel}/tempdir"/> + <property + name="tempRunnableEclipse" + value="${tempDir}/eclipse"/> + <property + name="tempRepo" + value="${buildDirectory}/${buildLabel}/temprepo"/> + <target + name="build" + if="createNoopZips"> + + <antcall target="createNoOptionalZip"> + <param + name="newarchiveName" + value="wtp-noop-${buildLabel}.zip"/> + </antcall> + <antcall target="createNoOptionalSDKZip"> + <param + name="newarchiveName" + value="wtp-sdk-noop-${buildLabel}.zip"/> + </antcall> + + <antcall target="createNoOptionalTestZip"> + <param + name="newarchiveName" + value="wtp-tests-noop-${buildLabel}.zip"/> + </antcall> + </target> + <target name="createNoOptionalZip" if="createMinNoopZips"> + <ant + antfile="${wtp.builder.home}/scripts/build/ziputils.xml" + target="premirrortasks"/> + <p2.mirror + source="${buildDirectory}/${buildLabel}/repository" + destination="${tempRepo}" + log="${buildDirectory}/${buildLabel}/mirrorlog-${newarchiveName}.log" + verbose="true"> + <slicingoptions + followstrict="true" + includeNonGreedy="false" + includeOptional="false"/> + <iu id="org.eclipse.wst.web_ui.feature.feature.group"/> + <iu id="org.eclipse.jst.enterprise_ui.feature.feature.group"/> + <iu id="org.eclipse.jpt.feature.feature.group"/> + <iu id="org.eclipse.wst.xml_ui.feature.feature.group"/> + <iu id="org.eclipse.wst.jsdt.feature.feature.group"/> + <iu id="org.eclipse.wst.common.fproj.feature.group"/> + <iu id="org.eclipse.wst.server_adapters.feature.feature.group"/> + <iu id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group"/> + <iu id="org.eclipse.jst.server_ui.feature.feature.group"/> + <iu id="org.eclipse.jst.server_adapters.feature.feature.group"/> + <iu id="org.eclipse.jst.server_adapters.ext.feature.feature.group"/> + <iu id="org.eclipse.jst.web_ui.feature.feature.group"/> + <iu id="org.eclipse.jsf.feature.feature.group"/> + </p2.mirror> + <ant + antfile="${wtp.builder.home}/scripts/build/ziputils.xml" + target="postmirrortasks"/> + </target> + <target name="createNoOptionalSDKZip"> + <ant + antfile="${wtp.builder.home}/scripts/build/ziputils.xml" + target="premirrortasks"/> + <p2.mirror + source="${buildDirectory}/${buildLabel}/repository" + destination="${tempRepo}" + log="${buildDirectory}/${buildLabel}/mirrorlog-${newarchiveName}.log" + verbose="true"> + <slicingoptions + followstrict="true" + includeNonGreedy="false" + includeOptional="false"/> + <iu id="org.eclipse.wst.web_sdk.feature.feature.group"/> + <iu id="org.eclipse.jst.enterprise_sdk.feature.feature.group"/> + <iu id="org.eclipse.jpt_sdk.feature.feature.group"/> + <iu id="org.eclipse.wst.xml_sdk.feature.feature.group"/> + <iu id="org.eclipse.wst.jsdt_sdk.feature.feature.group"/> + <iu id="org.eclipse.wst.common.fproj.sdk.feature.group"/> + <iu id="org.eclipse.wst.server_adapters.sdk.feature.feature.group"/> + <iu id="org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group"/> + <iu id="org.eclipse.jst.server_sdk.feature.feature.group"/> + <iu id="org.eclipse.jst.server_adapters.sdk.feature.feature.group"/> + <iu id="org.eclipse.jst.server_adapters.ext.sdk.feature.feature.group"/> + <iu id="org.eclipse.jst.web_sdk.feature.feature.group"/> + <iu id="org.eclipse.jsf_sdk.feature.feature.group"/> + </p2.mirror> + <ant + antfile="${wtp.builder.home}/scripts/build/ziputils.xml" + target="postmirrortasks"/> + </target> + <target name="createNoOptionalTestZip"> + <ant + antfile="${wtp.builder.home}/scripts/build/ziputils.xml" + target="premirrortasks"/> + <p2.mirror + source="${buildDirectory}/${buildLabel}/repositoryunittests" + destination="${tempRepo}" + log="${buildDirectory}/${buildLabel}/mirrorlog-${newarchiveName}.log" + verbose="true"> + <slicingoptions + followstrict="true" + includeNonGreedy="false" + includeOptional="false"/> + <!-- + may eventually want to break jpt and jsf tests into "core" parts and "optional" parts. For now, exclude all. + <iu + id="org.eclipse.jpt.tests.feature.feature.group"/> + <iu + id="org.eclipse.jpt.jpa.eclipselink.tests.feature.feature.group"/> + <iu + id="org.eclipse.jst.jsf.tests.feature.feature.group"/> + --> + <iu id="org.eclipse.jst.enterprise_tests.feature.feature.group"/> + <iu id="org.eclipse.jst.server_adapters.ext_tests.feature.feature.group"/> + <iu id="org.eclipse.jst.server_tests.feature.feature.group"/> + <iu id="org.eclipse.jst.web_tests.feature.feature.group"/> + <iu id="org.eclipse.wst.common_tests.feature.feature.group"/> + <iu id="org.eclipse.wst.jsdt_tests.feature.feature.group"/> + <iu id="org.eclipse.wst.server_tests.feature.feature.group"/> + <iu id="org.eclipse.wst.web_tests.feature.feature.group"/> + <iu id="org.eclipse.wst.ws_tests.feature.feature.group"/> + <iu id="org.eclipse.wst.xml_tests.feature.feature.group"/> + <!-- not these, just core + <iu + id="org.eclipse.wtp.releng.tests.feature.feature.group"/> + --> + </p2.mirror> + <ant + antfile="${wtp.builder.home}/scripts/build/ziputils.xml" + target="postmirrortasks"/> + </target> +</project> \ No newline at end of file