prep for 3.2.3 patches build - upgrade to latest patch builder and process
diff --git a/releng/helios/dependencies.properties b/releng/helios/dependencies.properties index 3bebc46..b3bd4a2 100644 --- a/releng/helios/dependencies.properties +++ b/releng/helios/dependencies.properties
@@ -38,6 +38,9 @@ ####################################################################################### +# Orbit dependency. +# Note that this data is used for "display" only. +# During the build, the required bundles are fetched based on the orbitBundles.map file. orbitthirdpartyzip.build.dir=R20100519200754 orbitthirdpartyzip.build.id=R20100519200754 @@ -57,6 +60,239 @@ ####################################################################################### +# Eclipse builder used to run and compile the build +# groupID : eclipsebuilder +eclipsebuilder.id=3.6.2 +eclipsebuilder.dir=R-3.6.2-201102101200 +eclipsebuilder.name=Eclipse SDK v3.6.2 +eclipsebuilder.description=(Platform, PDE, JDT) + +eclipsebuilder.mirror.prefixuri=/eclipse/downloads/drops/${eclipse.dir} +eclipsebuilder.url=http://download.eclipse.org${eclipse.mirror.prefixuri} +eclipsebuilder.file.linux-gtk-x86=eclipse-SDK-${eclipse.id}-linux-gtk.tar.gz +eclipsebuilder.file.linux-gtk-ppc=eclipse-SDK-${eclipse.id}-linux-gtk-ppc.tar.gz +eclipsebuilder.file.win32-win32-x86=eclipse-SDK-${eclipse.id}-win32.zip +eclipsebuilder.file.macosx-carbon-ppc=eclipse-SDK-${eclipse.id}-macosx-carbon.tar.gz +eclipsebuilder.build.home=http://download.eclipse.org/eclipse/downloads/ + + +####################################################################################### +# WTP builder tools that provide our custom build tasks +# groupID : wtpBuildTools +# Remember this is not (and could not be) the one that is built during the run. +# If updates needed, can do a seperate run (of "wtpbuilder job") and promote that T-build specificially. +wtpBuildTools.id=I-3.3.0-20110308040211 +wtpBuildTools.dir.id=T3.3.0/I-3.3.0-20110308040211 + +wtpBuildTools.mirror.prefixuri=/webtools/downloads/drops/${wtpBuildTools.dir.id} +wtpBuildTools.file= + +wtpBuildTools.repo=wtpbuildTools-repo-${wtpBuildTools.id}.zip +wtpBuildTools.tobeinstalledfeaturegroups=org.eclipse.wtp.releng.tools.feature.feature.group + +wtpBuildTools.name=WTP Tools +wtpBuildTools.description=WTP Releng Buider Tools + +wtpBuildTools.url=http://download.eclipse.org${wtpBuildTools.mirror.prefixuri} +wtpBuildTools.build.home=http://download.eclipse.org/webtools/downloads/ + +####################################################################################### +# Eclipse SDK Dependency +# groupID : eclipse + +eclipse.id=3.6.2 +eclipse.dir=R-3.6.2-201102101200 + +eclipse.name=Eclipse SDK v3.6.2 +eclipse.description=(Platform, PDE, JDT) + +eclipse.mirror.prefixuri=/eclipse/downloads/drops/${eclipse.dir} +eclipse.url=http://download.eclipse.org${eclipse.mirror.prefixuri} +eclipse.file.linux-gtk-x86=eclipse-SDK-${eclipse.id}-linux-gtk.tar.gz +eclipse.file.linux-gtk-ppc=eclipse-SDK-${eclipse.id}-linux-gtk-ppc.tar.gz +eclipse.file.win32-win32-x86=eclipse-SDK-${eclipse.id}-win32.zip +eclipse.file.macosx-carbon-ppc=eclipse-SDK-${eclipse.id}-macosx-carbon.tar.gz +eclipse.build.home=http://download.eclipse.org/eclipse/downloads/ + +####################################################################################### + +eclipseplatform.name=Eclipse Platform v3.6 +eclipseplatform.description=Eclipse Platform v3.6 +eclipseplatform.mirror.prefixuri=/eclipse/downloads/drops/${eclipse.dir} +eclipseplatform.url=http://download.eclipse.org${eclipse.mirror.prefixuri} +eclipseplatform.file.linux-gtk-x86=eclipse-platform-${eclipse.id}-linux-gtk.tar.gz +eclipseplatform.file.linux-gtk-ppc=eclipse-platform-${eclipse.id}-linux-gtk-ppc.tar.gz +eclipseplatform.file.win32-win32-x86=eclipse-platform-${eclipse.id}-win32.zip +eclipseplatform.file.macosx-carbon-ppc=eclipse-platform-${eclipse.id}-macosx-carbon.tar.gz +eclipseplatform.build.home=http://download.eclipse.org/eclipse/downloads/ +eclipseplatform.repo= +# +#eclipseplatform.tobeinstalledfeaturegroups=org.eclipse.help.appserver + +####################################################################################### +# Eclipse Test Framework +# groupID : eclipseTestFramework + +eclipseTestFramework.id=${eclipse.id} +eclipseTestFramework.url=http://download.eclipse.org${eclipse.mirror.prefixuri} +eclipseTestFramework.file=eclipse-test-framework-${eclipseTestFramework.id}.zip + +eclipseTestFramework.repo=eclipse-test-framework-${eclipseTestFramework.id}.zip +#eclipseTestFramework.tobeinstalledfeaturegroups=org.eclipse.test.feature.group + +eclipseTestFramework.name=Eclipse Test Framework v3.6. +eclipseTestFramework.description=Infrastructure to assist running automated JUnits. +eclipseTestFramework.mirror.prefixuri=${eclipse.mirror.prefixuri} +eclipseTestFramework.build.home=${eclipse.build.home} + +####################################################################################### +# Eclipse releng tool +# For display only. Purely a handy link for committers. Not used during build. + +eclipsereleng.url=http://download.eclipse.org${eclipse.mirror.prefixuri} +eclipsereleng.file=org.eclipse.releng.tools-${eclipse.id}.zip +eclipsereleng.name=Eclipse Releng Tool v3.6. +eclipsereleng.description=Team tool to assist in releasing code. (provided as archived repository) +eclipsereleng.mirror.prefixuri=${eclipse.mirror.prefixuri} +eclipsereleng.build.home=${eclipse.build.home} + +####################################################################################### +# Eclipse 4.1 SDK Dependency +# groupID : e4x + +e4x.build.id= +e4x.build.dir= +e4x.name= +e4x.description= + +e4x.mirror.prefixuri= +e4x.url= +e4x.file.linux-gtk-x86= +e4x.file.linux-gtk-ppc= +e4x.file.win32-win32-x86= +e4x.file.macosx-carbon-ppc= +e4x.build.home= + +####################################################################################### +# Eclipse Modeling Framework (EMF) and EMF XSD Dependency +# We used the "combined" emf and xsd distribution for convience. +# groupID : emfandxsd + +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=317256 +emfandxsd.id=2.6.1 +emfandxsd.dir.id=2.6.x/R201009141218 + +emfandxsd.mirror.prefixuri=/modeling/emf/emf/downloads/drops/${emfandxsd.dir.id} +emfandxsd.file=emf-xsd-SDK-${emfandxsd.id}.zip + +emfandxsd.repo=emf-xsd-Update-${emfandxsd.id}.zip +emfandxsd.tobeinstalledfeaturegroups=org.eclipse.emf.sdk.feature.group,org.eclipse.xsd.sdk.feature.group + +emfandxsd.name=EMF and XSD SDK +emfandxsd.description=Combined EMF and EMF-XSD SDK. + +emfandxsd.url=http://archive.eclipse.org${emfandxsd.mirror.prefixuri} +emfandxsd.build.home=http://www.eclipse.org/modeling/emf/downloads/ + + +####################################################################################### +# Eclipse Modeling Framework (EMF) Transaction Dependency +# groupID : emftransaction + +emftransaction.id= +emftransaction.dir.id= + +emftransaction.mirror.prefixuri= +emftransaction.file= + +emftransaction.repo= +emftransaction.tobeinstalledfeaturegroups= + +emftransaction.name= +emftransaction.description= + +emftransaction.url= +emftransaction.build.home= + + +####################################################################################### +# Eclipse Modeling Framework (EMF) Validation Dependency +# groupID : emfvalidation + +emfvalidation.id= +emfvalidation.dir.id= + +emfvalidation.mirror.prefixuri= +emfvalidation.file= + +emfvalidation.repo= +emfvalidation.tobeinstalledfeaturegroups= + +emfvalidation.name= +emfvalidation.description= + +emfvalidation.url= +emfvalidation.build.home= + +################################################################################# +# Graphiti Dependency +# groupID : graphiti + +graphiti.id= +graphiti.dir.id= + +graphiti.mirror.prefixuri= +graphiti.file= + +graphiti.repo= +graphiti.tobeinstalledfeaturegroups= + +graphiti.name= +graphiti.description= + +graphiti.url= +graphiti.build.home= + + + +####################################################################################### + +# Eclipse Graphical Editing Framework (GEF) Dependency +# groupID : gef + +gef.id=3.6.2 +gef.dir.id=3.6.2/R201102251600 + +gef.mirror.prefixuri=/tools/gef/downloads/drops/${gef.dir.id} +gef.file=GEF-SDK-${gef.id}.zip + +gef.repo=GEF-Update-${gef.id}.zip +#gef.tobeinstalledfeaturegroups=org.eclipse.gef.sdk.feature.group + +gef.name=GEF SDK 3.6.2 +gef.description=(Code and Source) + +gef.url=http://download.eclipse.org${gef.mirror.prefixuri} + +gef.build.home=http://download.eclipse.org/tools/gef/downloads/ + +####################################################################################### +# Eclipse Data Tools Platform (DTP) Dependency +# groupID : dtp + +dtp.mirror.prefixuri=/datatools/downloads/1.8 +dtp.file=dtp-sdk_1.8.2.zip + +dtp.repo=dtp-p2repo_1.8.2.zip +dtp.tobeinstalledfeaturegroups=org.eclipse.datatools.enablement.feature.feature.group,org.eclipse.datatools.sqldevtools.feature.feature.group,org.eclipse.datatools.connectivity.feature.feature.group + +dtp.name=DTP sdk v1.8.2 +dtp.description=(Code and Source) + +dtp.url=http://download.eclipse.org${dtp.mirror.prefixuri} +dtp.build.home=http://www.eclipse.org/datatools/downloads.php + +####################################################################################### # SourceForge DITA-OT # DITA zip to be downloaded # DITA will be used for Eclipse Help @@ -65,175 +301,6 @@ dita.file=DITA-OT1.2.1_bin-ASL.zip dita.name=SourceForge DITA-OT 1.2.1 dita.description=DITA-OT 1.2.1 Binary ASL Distribution -####################################################################################### - -wtp.eclipse.build.id=3.6.2 -wtp.eclipse.build.dir=R-3.6.2-201102101200 -eclipse.name=Eclipse SDK v3.6.x -eclipse.description=Eclipse SDK v3.6.x - -####################################################################################### -# Eclipse SDK Dependency -# Eclipse zip to be downloaded -# Eclipse SDK will be used for building the distribution -# groupID : eclipse - -eclipse.mirror.prefixuri=/eclipse/downloads/drops/${wtp.eclipse.build.dir} -eclipse.url=http://download.eclipse.org${eclipse.mirror.prefixuri} -eclipse.file.linux-gtk-x86=eclipse-SDK-${wtp.eclipse.build.id}-linux-gtk.tar.gz -eclipse.file.linux-gtk-ppc=eclipse-SDK-${wtp.eclipse.build.id}-linux-gtk-ppc.tar.gz -eclipse.file.win32-win32-x86=eclipse-SDK-${wtp.eclipse.build.id}-win32.zip -eclipse.file.macosx-carbon-ppc=eclipse-SDK-${wtp.eclipse.build.id}-macosx-carbon.tar.gz -eclipse.build.home=http://download.eclipse.org/eclipse/downloads/ - -####################################################################################### - -eclipseplatform.name=Eclipse Platform v3.6 -eclipseplatform.description=Eclipse Platform v3.6 -eclipseplatform.mirror.prefixuri=/eclipse/downloads/drops/${wtp.eclipse.build.dir} -eclipseplatform.url=http://download.eclipse.org${eclipse.mirror.prefixuri} -eclipseplatform.file.linux-gtk-x86=eclipse-platform-${wtp.eclipse.build.id}-linux-gtk.tar.gz -eclipseplatform.file.linux-gtk-ppc=eclipse-platform-${wtp.eclipse.build.id}-linux-gtk-ppc.tar.gz -eclipseplatform.file.win32-win32-x86=eclipse-platform-${wtp.eclipse.build.id}-win32.zip -eclipseplatform.file.macosx-carbon-ppc=eclipse-platform-${wtp.eclipse.build.id}-macosx-carbon.tar.gz -eclipseplatform.build.home=http://download.eclipse.org/eclipse/downloads/ - -####################################################################################### - - -####################################################################################### -# Eclipse Test Framework -# Eclipse Test Framework support zip to be downloaded -# Eclipse Test Framework will be used for testing and building the tests -# groupID : eclipseTestFramework - -eclipsetestFramework.id=${wtp.eclipse.build.id} -eclipseTestFramework.url=http://download.eclipse.org${eclipse.mirror.prefixuri} -eclipseTestFramework.file=eclipse-test-framework-${eclipsetestFramework.id}.zip - -eclipseTestFramework.name=Eclipse Test Framework v3.6. -eclipseTestFramework.description=Infrastructure to assist running automated JUnits. -eclipseTestFramework.mirror.prefixuri=${eclipse.mirror.prefixuri} -eclipseTestFramework.build.home=${eclipse.build.home} - -####################################################################################### - -####################################################################################### -# Eclipse releng tool -# purely a handy link for committers - -eclipsereleng.url=http://download.eclipse.org${eclipse.mirror.prefixuri} -eclipsereleng.file=org.eclipse.releng.tools-${wtp.eclipse.build.id}.zip -eclipsereleng.name=Eclipse Releng Tool v3.6. -eclipsereleng.description=Team tool to assist in releasing code. (provided as archived repository) -eclipsereleng.mirror.prefixuri=${eclipse.mirror.prefixuri} -eclipsereleng.build.home=${eclipse.build.home} - -####################################################################################### - -####################################################################################### -# Eclipse Modeling Framework (EMF) Dependency -# EMF zip to be downloaded -# EMF XSD SDK will be used for building the distribution -# groupID : emf - -emf.id=2.6.1 -emf.dir.id=2.6.x/R201009141218 - -emf.mirror.prefixuri=/modeling/emf/emf/downloads/drops/${emf.dir.id} -emf.file=emf-runtime-${emf.id}.zip -emf.name=EMF v2.6.1 Runtime - -emf.url=http://archive.eclipse.org${emf.mirror.prefixuri} -emf.description=Minimum executable code. -emf.build.home=http://www.eclipse.org/modeling/emf/downloads/ - -emfsourcedoc.id=${emf.id} -emfsourcedoc.dir.id=${emf.dir.id} - -emfsourcedoc.mirror.prefixuri=/modeling/emf/emf/downloads/drops/${emfsourcedoc.dir.id} -emfsourcedoc.file=emf-sourcedoc-${emfsourcedoc.id}.zip -emfsourcedoc.name=EMF v2.6.1 Source and Docs - -emfsourcedoc.url=http://archive.eclipse.org${emf.mirror.prefixuri} -emfsourcedoc.description=Additional download with Source and Documentation. -emfsourcedoc.build.home=http://www.eclipse.org/modeling/emf/downloads/ - - -####################################################################################### - -emfxsd.id=${emf.id} -emfxsd.dir.id=${emf.dir.id} -emfxsd.mirror.prefixuri=/modeling/emf/emf/downloads/drops/${emfxsd.dir.id} -emfxsd.file=xsd-runtime-${emfxsd.id}.zip -emfxsd.name=EMF XSD v2.6.1 Runtime - -emfxsd.url=http://download.eclipse.org${emfxsd.mirror.prefixuri} -emfxsd.description=Minimum executable code. -emfxsd.build.home=http://www.eclipse.org/modeling/emf/downloads/ - -emfxsdsourcedoc.id=${emfxsd.id} -emfxsdsourcedoc.dir.id=${emfxsd.dir.id} -emfxsdsourcedoc.mirror.prefixuri=/modeling/emf/emf/downloads/drops/${emfsourcedoc.dir.id} -emfxsdsourcedoc.file=xsd-sourcedoc-${emfsourcedoc.id}.zip -emfxsdsourcedoc.name=EMF XSD v2.6.1 Source and Docs - -emfxsdsourcedoc.url=http://download.eclipse.org${emf.mirror.prefixuri} -emfxsdsourcedoc.description=Additional download with Source and Documentation. -emfxsdsourcedoc.build.home=http://www.eclipse.org/modeling/emf/downloads/ - -# https://bugs.eclipse.org/bugs/show_bug.cgi?id=317256 -emfandxsd.id=${emf.id} -emfandxsd.dir.id=${emf.dir.id} -emfandxsd.mirror.prefixuri=/modeling/emf/emf/downloads/drops/${emfandxsd.dir.id} -emfandxsd.file=emf-xsd-SDK-${emfandxsd.id}.zip -emfandxsd.repo=emf-xsd-Update-${emfandxsd.id}.zip -emfandxsd.name=EMF and XSD SDK - -emfandxsd.url=http://download.eclipse.org${emfandxsd.mirror.prefixuri} -emfandxsd.description=Combined EMF and EMF-XSD SDK. -emfandxsd.build.home=http://www.eclipse.org/modeling/emf/downloads/ -emfandxsd.tobeinstalledfeaturegroups=org.eclipse.emf.sdk.feature.group,org.eclipse.xsd.sdk.feature.group - - - -####################################################################################### - -# Eclipse Graphical Editing Framework (GEF) Dependency -# GEF zip to be downloaded -# GEF SDK will be used for building the distribution -# groupID : gef - -gef.id=3.6.1 -gef.dir.id=R201009132020 - -gef.mirror.prefixuri=/tools/gef/downloads/drops/3.6.1/${gef.dir.id} -gef.file=GEF-SDK-${gef.id}.zip -#gef.repo=GEF-Update-${gef.id}.zip -gef.name=GEF SDK 3.6.1 - -gef.url=http://download.eclipse.org${gef.mirror.prefixuri} -gef.description=GEF Code and Source. -gef.build.home=http://download.eclipse.org/tools/gef/downloads/ -#gef.tobeinstalledfeaturegroups=org.eclipse.gef.sdk.feature.group - -####################################################################################### -# Eclipse Data Tools Platform (DTP) Dependency -# DTP zip to be downloaded -# DTP SDK will be used for building the distribution -# groupID : dtp - -dtp.mirror.prefixuri=/datatools/downloads/1.8 -dtp.file=dtp-sdk_1.8.1.zip -dtp.repo=dtp-p2repo_1.8.1.zip -dtp.name=DTP sdk v1.8.1 - -dtp.url=http://download.eclipse.org${dtp.mirror.prefixuri} -dtp.description=Code and Source. -dtp.build.home=http://www.eclipse.org/datatools/downloads.php -dtp.tobeinstalledfeaturegroups=org.eclipse.datatools.enablement.feature.feature.group,org.eclipse.datatools.sqldevtools.feature.feature.group,org.eclipse.datatools.connectivity.feature.feature.group - -####################################################################################### ####################################################################################### # Jakarta Tomcat Dependency
diff --git a/releng/maps/build.cfg b/releng/maps/build.cfg index 3f5fb5b..856cd36 100644 --- a/releng/maps/build.cfg +++ b/releng/maps/build.cfg
@@ -1,42 +1,28 @@ -builderVersion=v201202022200 +builderVersion=v201110171622 #builderVersion=v201101270441 -eclipse.builder=org.eclipse.releng.basebuilder -# this r36x_v20110209 version of base builder was adopted specifically -# to avoid a JDT compiler regression. It is unlikely the regression would -# effect our code, but, using this version a) makes sure, -# and b) makes us (stay) consistent with what the Eclipse platform uses. -# For more details, see messages in this thread: http://dev.eclipse.org/mhonarc/lists/eclipse-pmc/msg01356.html -eclipse.builder.version=r36x_v20110209 -# previously used version of base builder -# eclipse.builder.version=R36_RC4 -# uncomment if its desired to 'force' fetch of eclipse builder -# (if not already defined from elsewhere) -eclipse.builder.fetch=true - -# WTP specific builder. Remember this is not (and could not be) the one that is built during the run. -# If updates needed, a seperate run (possibly of "wtpbuilder job"). -wtpBuildTools.url=http://download.eclipse.org/webtools/downloads/drops/T3.3.0/I-3.3.0-20100922145151/buildrepository/wtp-buildTools/plugins/ -wtpBuildTools.file=org.eclipse.wtp.releng.tools_1.1.3.v201009221438.jar - - +# old signing method +#builderVersion=v201106202122 # This parameter is specific to the compiler # being used (JDT Compiler, in our case). # 'showversion' causes the version of JDT Compiler to be # printed to the compiler log file. #compilerArg=-showversion -encoding ISO-8859-1 -warn:-discouraged,serial,raw -compilerArg=-showversion -encoding ISO-8859-1 -warn:-serial,raw,typeHiding,unchecked +#compilerArg=-showversion -encoding ISO-8859-1 -warn:-serial,raw,typeHiding,unchecked +compilerArg=-showversion -encoding ISO-8859-1 -warn:-serial,-raw,-typeHiding,-unchecked,-discouraged ############################################################# -# Other inline resolved properties -pde.builder.path=${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder} -# Beginning with 33M5, the startup.jar was removed. Currently, in basebuilder, -# this launcher is provided without version number. If we ever move to use plain -# eclipse, we'll need a bit of script find and rename (or set the variable). -# to ever "go backwards" this one variable could be ${pde.builder.path}/startup.jar -eclipse.launcher=${pde.builder.path}/plugins/org.eclipse.equinox.launcher.jar -#eclipse.launcher=${pde.builder.path}/startup.jar + +# eclipse.builder.location.name should be empty, if using tranditional basebuilder from eclipse releng (e.g. our patch builds still do) +eclipse.builder.location.name=eclipse +# These last two are use in other scripts, the eclipse.builder.location.name above is not (at least, should not be). +eclipse.builder.base.install.dir=${env.BASE_BUILDERS}/${projectname} +pde.builder.path=${eclipse.builder.base.install.dir}/${eclipse.builder.location.name} + +# uncomment if its desired to 'force' fetch of eclipse builder +# (if not already defined from elsewhere) +eclipse.builder.fetch=true buildDirectory=${env.PROJECT_PROJECTS}/${projectname}/workdir @@ -71,3 +57,8 @@ jsdtFeatureIUs=org.eclipse.wst.jsdt.feature.feature.group,org.eclipse.wst.jsdt.feature.source.feature.group,org.eclipse.wst.jsdt_sdk.feature.feature.group baseComparatorRepoDir=${env.BUILD_HOME}/maintenance + +createNoopZips=true + +# uncomment to restore batch build customization of access rules (for fewer "discouraged access" warnings) +#customizeAccessRules=true \ No newline at end of file
diff --git a/releng/maps/comparatorfilter.properties b/releng/maps/comparatorfilter.properties index fe6df9e..7d59c6e 100644 --- a/releng/maps/comparatorfilter.properties +++ b/releng/maps/comparatorfilter.properties
@@ -40,6 +40,7 @@ org.eclipse.jst.server.ui.doc.user|\ org.eclipse.jst.ws.jaxws.doc.user|\ org.eclipse.jst.jsf.doc.user|\ +org.eclipse.wst.jsdt.doc|\ org.eclipse.wst.common.project.facet.doc.api\ ).*$ comparator.docbuildxml.comparison =