diff options
author | david_williams | 2010-10-04 05:00:47 +0000 |
---|---|---|
committer | david_williams | 2010-10-04 05:00:47 +0000 |
commit | b91c5b9c674d19c83169a28693afd114fec7c6a6 (patch) | |
tree | 5160d70afa897b58615479df6360e634e5a554c9 | |
parent | 783f90713bb2af9686b9a63544d06115cf018992 (diff) | |
download | webtools.maps-b91c5b9c674d19c83169a28693afd114fec7c6a6.tar.gz webtools.maps-b91c5b9c674d19c83169a28693afd114fec7c6a6.tar.xz webtools.maps-b91c5b9c674d19c83169a28693afd114fec7c6a6.zip |
cleanup and simplify
-rw-r--r-- | releng/helios/dependencies.properties | 62 | ||||
-rw-r--r-- | releng/maps/build.cfg | 8 | ||||
-rw-r--r-- | releng/maps/wtp-releng.map | 2 |
3 files changed, 51 insertions, 21 deletions
diff --git a/releng/helios/dependencies.properties b/releng/helios/dependencies.properties index 3314482f8..ec169f808 100644 --- a/releng/helios/dependencies.properties +++ b/releng/helios/dependencies.properties @@ -110,11 +110,13 @@ eclipseplatform.build.home=http://download.eclipse.org/eclipse/downloads/ eclipsetestFramework.id=${wtp.eclipse.build.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.name=Eclipse Test Framework v3.6. -eclipseTestFramework.description=Infrastructure to assist running automated JUnits. +eclipseTestFramework.description=Infrastructure to assist running automated JUnits. Provided only as archived repository. eclipseTestFramework.mirror.prefixuri=${eclipse.mirror.prefixuri} eclipseTestFramework.build.home=${eclipse.build.home} +#eclipseTestFramework.tobeinstalledfeaturegroups=org.eclipse.test.feature.group ####################################################################################### @@ -125,7 +127,7 @@ eclipseTestFramework.build.home=${eclipse.build.home} 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. +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} @@ -138,9 +140,9 @@ eclipsereleng.build.home=${eclipse.build.home} # groupID : emf emf.id=2.6.1 -emf.dir.id=R201009141218 +emf.dir.id=2.6.x/R201009141218 -emf.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.6.x/${emf.dir.id} +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 @@ -151,7 +153,7 @@ 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/2.6.x/${emfsourcedoc.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 @@ -164,7 +166,7 @@ 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/2.6.x/${emfxsd.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 @@ -174,7 +176,7 @@ 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/2.6.x/${emfsourcedoc.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 @@ -185,13 +187,15 @@ 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/2.6.x/${emfandxsd.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 @@ -207,13 +211,13 @@ 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 @@ -223,11 +227,13 @@ gef.build.home=http://download.eclipse.org/tools/gef/downloads/ 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 ####################################################################################### @@ -358,20 +364,35 @@ jst.mirror.prefixuri=${wst.mirror.prefixuri} jst.url=${wst.url} # WTP -wtp.file=wtp-sdk-R-3.2.2-20100915173744.zip +wtp.id=R-3.2.2-20100915173744 +wtp.dir.id=R3.2.2/R-3.2.2-20100915173744 +wtp.file=wtp-sdk-${wtp.id}.zip wtp.name=WTP -wtp.description=WTP for Patch Builds +wtp.description=Release used for Patch Builds wtp.build.home=http://download.eclipse.org/webtools/downloads/ -wtp.mirror.prefixuri=/webtools/downloads/drops/R3.2.2/R-3.2.2-20100915173744 +swtp.mirror.prefixuri=/webtools/downloads/drops/${wtp.dir.id} wtp.url=http://download.eclipse.org${wtp.mirror.prefixuri} # WTP tests, for patch builds -wtptests.file = wtp-tests-R-3.2.2-20100915173744.zip +wtptests.id=${wtp.id} +wtptests.dir.id=${wtp.dir.id} +wtptests.file = wtp-tests-${wtptests.id}.zip wtptests.name = WTP Tests 3.2.2 wtptests.description = WTP Tests 3.2.2 for Patch Builds wtptests.build.home=http://download.eclipse.org/webtools/downloads/ -wtptests.mirror.prefixuri=/webtools/downloads/drops/R3.2.2/R-3.2.2-20100915173744 -wtptests.url=http://download.eclipse.org${wtp.mirror.prefixuri} +wtptests.mirror.prefixuri=/webtools/downloads/drops/${wtptests.dir.id} +wtptests.url=http://download.eclipse.org${wtptests.mirror.prefixuri} + + +wtpandtests.id=${wtp.id} +wtpandtests.dir.id=${wtp.dir.id} +wtpandtests.repo = wtp-and-tests-buildrepo-${wtpandtests.id}.zip +wtpandtests.name = WTP Tests 3.2.2 +wtpandtests.description = WTP Tests 3.2.2 for Patch Builds +wtpandtests.build.home=http://download.eclipse.org/webtools/downloads/ +wtpandtests.mirror.prefixuri=/webtools/downloads/drops/${wtpandtests.dir.id} +wtpandtests.url=http://download.eclipse.org${wtpandtests.mirror.prefixuri} +wtpandtests.tobeinstalledfeaturegroups=org.eclipse.jpt.tests.feature.feature.group,org.eclipse.jst.enterprise_tests.feature.feature.group,org.eclipse.jst.jsf.tests.feature.feature.group,org.eclipse.jst.server_adapters.ext_tests.feature.feature.group,org.eclipse.jst.server_tests.feature.feature.group,org.eclipse.jst.web_tests.feature.feature.group,org.eclipse.jst.ws.cxf_tests.feature.feature.group,org.eclipse.jst.ws.jaxws.dom_tests.feature.feature.group,org.eclipse.jst.ws.jaxws_tests.feature.feature.group,org.eclipse.wst.common_tests.feature.feature.group,org.eclipse.wst.jsdt_tests.feature.feature.group,org.eclipse.wst.server_tests.feature.feature.group,org.eclipse.wst.web_tests.feature.feature.group,org.eclipse.wst.ws_tests.feature.feature.group,org.eclipse.wst.xml_tests.feature.feature.group,org.eclipse.wst.xsl_tests.feature.feature.group,org.eclipse.wtp.releng.tests.feature.feature.group,org.eclipse.wst.common.fproj.sdk.feature.group,org.eclipse.wst.jsdt_sdk.feature.feature.group,org.eclipse.wst.xml_sdk.feature.feature.group,org.eclipse.wst.web_sdk.feature.feature.group,org.eclipse.wst.xsl_sdk.feature.feature.group,org.eclipse.wst.server_adapters.sdk.feature.feature.group,org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group,org.eclipse.jst.server_sdk.feature.feature.group,org.eclipse.jst.web_sdk.feature.feature.group,org.eclipse.jst.enterprise_sdk.feature.feature.group,org.eclipse.jst.server_adapters.sdk.feature.feature.group,org.eclipse.jst.server_adapters.ext.sdk.feature.feature.group,org.eclipse.jst.ws.axis2tools_sdk.feature.feature.group,org.eclipse.jst.ws.jaxws_sdk.feature.feature.group,org.eclipse.jst.ws.cxf_sdk.feature.feature.group,org.eclipse.jst.ws.jaxws.dom_sdk.feature.feature.group,org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature.feature.group,org.eclipse.jst.webpageeditor_sdk.feature.feature.group,org.eclipse.jsf_sdk.feature.feature.group,org.eclipse.jpt_sdk.feature.feature.group,org.eclipse.jpt.eclipselink_sdk.feature.feature.group ### DLTK @@ -384,3 +405,12 @@ dltk.description=DLTK Code and Source. dltk.build.home=http://download.eclipse.org/technology/dltk/downloads/ +# WST or XML is required for XSL build + +wst.file=wst-sdk-R-3.2.0-20100615235519.zip +wst.name=WST +wst.description=WST +wst.build.home=http://download.eclipse.org/webtools/downloads/drops/R3.2.0/R-3.2.0-20100615235519 +wst.mirror.prefixuri=/webtools/downloads/drops/R3.2.0/R-3.2.0-20100615235519 +wst.url=http://download.eclipse.org/${wst.mirror.prefixuri} + diff --git a/releng/maps/build.cfg b/releng/maps/build.cfg index 035b6387d..b17180b4e 100644 --- a/releng/maps/build.cfg +++ b/releng/maps/build.cfg @@ -44,10 +44,10 @@ doCreateFprojZips=yes # arguments for relent tests (that vary by stream) # omit qualifierArgValue to not flag a unit test error for "warnings" -#qualifierArgValue=-countQualifierIncreaseOnlyAsError -qualifierArgValue= -referenceIDArgValue=R-3.2.1-20100730021206 -referenceURLArgValue=http://download.eclipse.org/webtools/downloads/drops/R3.2.1/R-3.2.1-20100730021206/versioningReference_R-3.2.1-20100730021206.xml +qualifierArgValue=-countQualifierIncreaseOnlyAsError +#qualifierArgValue= +referenceIDArgValue=R-3.2.2-20100915173744 +referenceURLArgValue=http://download.eclipse.org/webtools/downloads/drops/R3.2.2/R-3.2.2-20100915173744/versioningReference_R-3.2.2-20100915173744.xml # omit to not test testToReferenceArgValue=-testToReference # omit to not list diff --git a/releng/maps/wtp-releng.map b/releng/maps/wtp-releng.map index db2af358e..92a6235e8 100644 --- a/releng/maps/wtp-releng.map +++ b/releng/maps/wtp-releng.map @@ -4,4 +4,4 @@ !* used in our releng tests, when JUnits run feature@org.eclipse.wtp.releng.tests.feature=v201005241530,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/features/org.eclipse.wtp.releng.tests.feature plugin@org.eclipse.wtp.releng.versionchecker=v201005261451,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/org.eclipse.wtp.releng.versionchecker -plugin@org.eclipse.wtp.releng.tests=v201009290909,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/tests/org.eclipse.wtp.releng.tests
\ No newline at end of file +plugin@org.eclipse.wtp.releng.tests=v201010032030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/tests/org.eclipse.wtp.releng.tests
\ No newline at end of file |