diff options
| author | David Williams | 2014-06-01 17:30:43 +0000 |
|---|---|---|
| committer | David Williams | 2014-06-01 17:30:43 +0000 |
| commit | 129000f969e21883fee9088847e7af77bbe09df9 (patch) | |
| tree | e3f56353a6c5006e0b5590f84a15cc4ee0c5ee5c /eclipse.platform.releng.tychoeclipsebuilder | |
| parent | 413d41cf335e568ce6380ead10da152a3d83afc8 (diff) | |
| download | eclipse.platform.releng.aggregator-129000f969e21883fee9088847e7af77bbe09df9.tar.gz eclipse.platform.releng.aggregator-129000f969e21883fee9088847e7af77bbe09df9.tar.xz eclipse.platform.releng.aggregator-129000f969e21883fee9088847e7af77bbe09df9.zip | |
Bug 409076 - establish standard formatting
removed trailing spaces and tabs
Diffstat (limited to 'eclipse.platform.releng.tychoeclipsebuilder')
42 files changed, 578 insertions, 764 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product index aabe87277..84c22c3ad 100755 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product @@ -62,7 +62,7 @@ including, but not limited to the following locations: - Feature directories Note: if a Feature made available by the Eclipse Foundation is installed using the -Provisioning Technology (as defined below), you must agree to a license ("Feature +Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/JUNIT.XSL b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/JUNIT.XSL index c23a4a397..464ac84c8 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/JUNIT.XSL +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/JUNIT.XSL @@ -140,7 +140,7 @@ return curtop; } } - + function keyHandler(e) { if (typeof(e) == "undefined") { e = event; @@ -153,7 +153,7 @@ } } } - + function jumpToNextError(forward) { if (typeof(document.getElementsByClassName) == "undefined") { document.getElementsByClassName = function (className) { @@ -202,10 +202,10 @@ if (target) { target.scrollIntoView(); } - + return false; } - + document.onkeydown = keyHandler; ]]> </script> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/apiexclude/exclude_list_external.txt b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/apiexclude/exclude_list_external.txt index 511839aa8..e7af56276 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/apiexclude/exclude_list_external.txt +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/apiexclude/exclude_list_external.txt @@ -1,7 +1,7 @@ -# See +# See # https://bugs.eclipse.org/bugs/show_bug.cgi?id=429406#c7 # Excluding only "known issues" -# +# ## DOC BUNDLES #org.eclipse.jdt.doc.isv #org.eclipse.jdt.doc.user diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/api-tools-builder.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/api-tools-builder.xml index 3f1500857..4bef39dd5 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/api-tools-builder.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/api-tools-builder.xml @@ -1,21 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- ====================================================================== - Jun 4, 2013 11:06:50 AM +<!-- ====================================================================== + Jun 4, 2013 11:06:50 AM - API Tools builder integration + API Tools builder integration This buildfile calls all of the post-build Ant tasks - + This buildfile requires the apitooling-ant.jar and the api-tasks.properties file from the org.eclipse.pde.api.tools bundle - - mrennie + + mrennie ====================================================================== --> <project name="API Tools builder integration" default="apiToolsReports"> - - + + <!-- The default target that calls apitooling.apifreeze, apitooling.analysis and apitooling.apideprecation and their respective _reportconversion tasks @@ -24,7 +24,7 @@ name="apiToolsReports" depends="init"> - + <!-- make a dir to place the XML and HTML output in, per build --> <property name="report" @@ -37,7 +37,7 @@ <property name="freeze_html" value="${report}/freeze_report.html" /> - + <!-- grab the currently built + zipped build --> <property name="current_location" @@ -47,7 +47,7 @@ <property name="baseline" value="${reference}/${previousBaselineFilename}" /> - + <!-- create properties for the filters --> <property name="exclude_list_location" @@ -55,16 +55,16 @@ <property name="exclude_list_external_location" value="${EBuilderDir}/eclipse/apiexclude/exclude_list_external.txt" /> - + <!-- run the freeze task --> <antcall target="dofreezeReport" /> - + <!-- create the Ant filterstore directory --> <property name="filter_store" value="${buildDirectory}/${buildLabel}/apifilters" /> <mkdir dir="${filter_store}" /> - + <!-- copy all of the .api_filters files out of the plugins from their source --> <copy todir="${filter_store}"> <fileset @@ -74,7 +74,7 @@ from=".*(org.eclipse.*\/)(\.settings\/)(\.api_filters)" to="\1\3" /> </copy> - + <!-- create a zip of API filters --> <property name="apifilterzip" @@ -84,7 +84,7 @@ dir="${report}"> <arg line="-r ${apifilterzip} ${filter_store}" /> </exec> - + <!-- create HTML output directory --> <property name="analysis_html" @@ -92,7 +92,7 @@ <property name="analysis_report" value="${report}/analysis/xml" /> - + <!-- run the analysis --> <apitooling.analysis baseline="${baseline}" @@ -112,7 +112,7 @@ <property name="deprecation_html" value="${report}/deprecation/apideprecation.html" /> - + <!-- run the deprecation tasks --> <apitooling.apideprecation baseline="${baseline}" @@ -129,7 +129,7 @@ name="init" unless="apitoolinginitialized" depends="getfreezereference"> - + <!-- The name for the build - i.e. I20130603-2000 --> <fail unless="buildLabel" @@ -140,9 +140,9 @@ <fail unless="previousBaselineFilename" message="previousBaselineFilename must be provided" /> - - <!-- - The ?on-disk? location of the previous Eclipse build - for example Eclipse 4.2.2 + + <!-- + The ?on-disk? location of the previous Eclipse build - for example Eclipse 4.2.2 If not defined, assume same as file name ... otherwise, assume can be used for "human readable name"? --> <property @@ -151,13 +151,13 @@ <fail unless="previousBaseURL" - message="full URL of previous build must be provided" /> - + message="full URL of previous build must be provided" /> + <!-- Default buildDirectory --> <fail unless="buildDirectory" message="buildDirectory much be provided" /> - + <!-- a dir to extract previous baselines in ... remember not to copy apitoolingreference to downloads --> <property name="reference" @@ -167,7 +167,7 @@ <get dest="${reference}" src="${previousBaseURL}" /> - <!-- no need to unzip? + <!-- no need to unzip? <unzip src="${reference}/${previousBaselineFilename}" dest="${reference}" /> @@ -178,7 +178,7 @@ value="true" /> </target> - + <!-- there will not always be a freeze report, only after M6 --> <target name="getfreezereference" @@ -200,14 +200,14 @@ <get dest="${freezereference}" src="${freezeBaseURL}" /> - <!-- no need to unzip? + <!-- no need to unzip? <unzip src="${freezereference}/${freezeFilename}" dest="${freezereference}" /> --> </target> - + <!-- there will not always be a freeze report, only after M6 --> <target name="dofreezeReport" diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/eclipse_compare.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/eclipse_compare.xml index a7c747420..d57793649 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/eclipse_compare.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/eclipse_compare.xml @@ -7,8 +7,8 @@ depends="checkAvailability, init" if="propertyFileAvailable"> <echo message="Genererating comparator log summaries ..." /> - <!-- - we get these properties so we can print out the repository + <!-- + we get these properties so we can print out the repository used by comparator, 'comparator.repo'. --> <loadproperties srcfile="${buildDirectory}/${buildId}/mavenproperties.properties" /> @@ -27,8 +27,8 @@ <target name="init" unless="eclipse_compare.initialized"> - <!-- - if this property file is not available, that means some other part of the build + <!-- + if this property file is not available, that means some other part of the build failed (or intentionally skipped) so there is no ability to do this task. Having the explicit check here has advantage of avoiding error messages in error log. --> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/process-artifacts.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/process-artifacts.xml index 6329e8f92..cfb3a3547 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/process-artifacts.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/process-artifacts.xml @@ -5,16 +5,16 @@ name="processArtifacts" depends="doRemoves,doMirror"> - <!-- if not specified, assume doPack = false ... maintains default behavior, if nothing done --> + <!-- if not specified, assume doPack = false ... maintains default behavior, if nothing done --> <property name="doPack" value="false" /> - <!-- - This call is to get MD5 hash sums included. We do NOT call pack, since + <!-- + This call is to get MD5 hash sums included. We do NOT call pack, since already should be packed, where appropriate. This is a work around we can likely remove eventually. See bug 406263. - For PATCH_BUILDs we call twice, once with doPack=false, (do we can do zip file, - without pack.gz files, and a second time, with doPack=true, for - better access via http. + For PATCH_BUILDs we call twice, once with doPack=false, (do we can do zip file, + without pack.gz files, and a second time, with doPack=true, for + better access via http. --> <p2.process.artifacts pack="${doPack}" repositoryPath="file://${siteDirOnBuildMachine}" /> @@ -32,11 +32,11 @@ needed in final repo --> <!-- - Note: There should be only one category to remove, the "Uncategorized" one that Tycho - always creates (see bug 404103) so if there is ever any we want to leave, + Note: There should be only one category to remove, the "Uncategorized" one that Tycho + always creates (see bug 404103) so if there is ever any we want to leave, we'll need to make the final iu query more exact. - See bug 406389 for why we remove rcp.configuration.feature ... - it too is a "build time" mechanism, but not valid to install. + See bug 406389 for why we remove rcp.configuration.feature ... + it too is a "build time" mechanism, but not valid to install. --> <p2.remove.iu> <repository location="file://${siteDirOnBuildMachine}" /> @@ -53,20 +53,20 @@ name="repositoryDir" value="/shared/webtools/committers/wtp-R3.3.0-I/20101209114749/S-3.3.0M4-20101209114749/repository" /> - <!-- - Note: we mirror first (with comparator) to leave original repository in build machines - drop directory untouched. That allows for emergency "redos" without rebuilding, plus, - in case there are differences, it - allows an easy way to compare "old" with "new" (at least for a few days), until - build drop is cleaned off. + <!-- + Note: we mirror first (with comparator) to leave original repository in build machines + drop directory untouched. That allows for emergency "redos" without rebuilding, plus, + in case there are differences, it + allows an easy way to compare "old" with "new" (at least for a few days), until + build drop is cleaned off. --> - - <!-- - We run this mirror task, rather than a straight copy, in order to - do a sanity check with traditional comparator. There should be few differences - from buildtime comparator log, but might be some special cases, such as when - third party jars change. See - https://bugs.eclipse.org/bugs/show_bug.cgi?id=402448 + + <!-- + We run this mirror task, rather than a straight copy, in order to + do a sanity check with traditional comparator. There should be few differences + from buildtime comparator log, but might be some special cases, such as when + third party jars change. See + https://bugs.eclipse.org/bugs/show_bug.cgi?id=402448 --> <echo message="Mirroring main repo: ${repositoryDir}" /> <echo message=" to build machine location: ${siteDirOnBuildMachine}" /> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml index b556b6905..5a46d2f70 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml @@ -15,28 +15,28 @@ <antcall target="generateIndex" /> <antcall target="getStaticFiles" /> </target> - + <target name="generateIndex"> - + <property name="class" value="org.eclipse.releng.generators.TestResultsGenerator" /> <taskdef name="indexResults" classname="${class}" /> - + <!-- isBuildTested: true|false should JUnit plugin test results be used to generate index page dropTokenList: comma separated list of strings which should be replaced by the fileName attribute settings in the testManifest.xml. xmlDirectoryName: path to directory containing JUnit plugin test results in xml format (see doc is org.eclipse.test). dropDirectoryName: path to directory containing the result of the build. - testResultsTemplateFileName: path to template file used to generate page with links to JUnit test results + testResultsTemplateFileName: path to template file used to generate page with links to JUnit test results testResultsHtmlFileName: name of file which will be generated with links to JUnit test results dropHtmlFileName: name of generated index page hrefTestResultsTargetPath: relative path from index page to directory containing JUnit html test results hrefCompileLogsTargetPath: relative path from index page directory containing compilelogs testManifestFileName: name of xml file containing descriptions of zip types and log files - - + + --> - + <property name="xmlDirectoryName" value="${result}/testresults/xml" /> <property name="dropDirectoryName" value="${result}" /> <property name="testResultsTemplateFileName" value="${basedir}/templateFiles/testResults.php.template" /> @@ -48,8 +48,8 @@ <property name="compileLogsDirectoryName" value="${result}/compilelogs" /> <property name="testManifestFileName" value="${basedir}/testManifest.xml" /> - - <indexResults + + <indexResults isBuildTested="${isBuildTested}" buildType="${buildType}" dropTokenList="${dropTokenList}" @@ -68,25 +68,25 @@ /> - + <!-- Insert Build Name ... apparently still required, until we can update indexing task directly --> <replace file="${result}/${indexFileName}" token="@build@" value="${buildId}"/> - + <replace dir="${result}" value="${buildId}"> <include name="**/*.php"/> <replacetoken><![CDATA[@build@]]></replacetoken> </replace> - + <replace file="${result}/${indexFileName}" token="@buildlabel@" value="${buildId}"/> <replace dir="${result}" value="${buildId}"> <include name="**/*.php"/> <replacetoken><![CDATA[@buildlabel@]]></replacetoken> </replace> - - <!-- TODO: fix so these replace's are not required --> - + + <!-- TODO: fix so these replace's are not required --> + </target> @@ -95,12 +95,12 @@ <copy todir="${result}"> <fileset dir="staticDropFiles" /> </copy> - + <!--copy buildnotes from plugin directories--> <mkdir dir="${result}/buildnotes" /> <copy todir="${result}/buildnotes" flatten="true"> <fileset dir="${buildDirectory}/plugins" includes="**/buildnotes_*.html" /> </copy> </target> - + </project>
\ No newline at end of file diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/clickThroughs/eclipse-SDK-linux-gtk-ppc.tar.gz.txt b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/clickThroughs/eclipse-SDK-linux-gtk-ppc.tar.gz.txt index c891077c3..133952430 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/clickThroughs/eclipse-SDK-linux-gtk-ppc.tar.gz.txt +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/clickThroughs/eclipse-SDK-linux-gtk-ppc.tar.gz.txt @@ -1,3 +1,3 @@ When running on the IBM Java 5.0 VM, Eclipse crashes while the user is typing in an editor. If using this VM you must disable the JIT - with the -Xnojit vm argument to avoid the crashes (https://bugs.eclipse.org/bugs/show_bug.cgi?id=116730). The command line for launching Eclipse with this vm should be: + with the -Xnojit vm argument to avoid the crashes (https://bugs.eclipse.org/bugs/show_bug.cgi?id=116730). The command line for launching Eclipse with this vm should be: "eclipse -vmargs -Dosgi.locking=none -Xnojit".
\ No newline at end of file diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/clickThroughs/eclipse-SDK-solaris-gtk.zip.txt b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/clickThroughs/eclipse-SDK-solaris-gtk.zip.txt index 513ac504b..cbf9d3cb5 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/clickThroughs/eclipse-SDK-solaris-gtk.zip.txt +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/clickThroughs/eclipse-SDK-solaris-gtk.zip.txt @@ -1,4 +1,4 @@ -This version of Eclipse works best with the latest version of GTK+ 2, but the earliest -version supported is GTK+ 2.10. +This version of Eclipse works best with the latest version of GTK+ 2, but the earliest +version supported is GTK+ 2.10. The GTK libraries must be available on the library path (i.e. LD_LIBRARY_PATH). diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/clickThroughs/eclipse-platform-solaris-gtk.zip.txt b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/clickThroughs/eclipse-platform-solaris-gtk.zip.txt index 513ac504b..cbf9d3cb5 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/clickThroughs/eclipse-platform-solaris-gtk.zip.txt +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/clickThroughs/eclipse-platform-solaris-gtk.zip.txt @@ -1,4 +1,4 @@ -This version of Eclipse works best with the latest version of GTK+ 2, but the earliest -version supported is GTK+ 2.10. +This version of Eclipse works best with the latest version of GTK+ 2, but the earliest +version supported is GTK+ 2.10. The GTK libraries must be available on the library path (i.e. LD_LIBRARY_PATH). diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/extras/produceChecksum.sh b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/extras/produceChecksum.sh index bf3862838..15018db1f 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/extras/produceChecksum.sh +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/extras/produceChecksum.sh @@ -37,5 +37,5 @@ do echo [sha1] ${jarfile} sha1sum -b ${jarfile} > checksum/${jarfile}.sha1 echo [sha512] ${jarfile} - sha512sum -b ${jarfile} > checksum/${jarfile}.sha512 + sha512sum -b ${jarfile} > checksum/${jarfile}.sha512 done diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilder.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilder.xml index 22e79ea83..ef0ec7e5e 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilder.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilder.xml @@ -86,8 +86,8 @@ <property name="cvsProject" value="org.eclipse.releng.basebuilder" /> - - <!-- the desired folder name (made to stay consistent with cvs module name, though Git project + + <!-- the desired folder name (made to stay consistent with cvs module name, though Git project is named eclipse.platform.releng.basebuilder fil--> <property name="folderName" @@ -106,7 +106,7 @@ <echo message="cvsProject: ${cvsProject}" /> <echo message="fetchSource: ${fetchSource}" /> - <!-- leave useGit undefined to imply to use CVS. Callers can override git defaults with -DfetchSource=cvs + <!-- leave useGit undefined to imply to use CVS. Callers can override git defaults with -DfetchSource=cvs or, anything besides 'git' implies cvs. --> <condition @@ -145,9 +145,9 @@ <property name="getBaseBuilderInitialized" value="true" /> - + <echoproperties description="Echo properties at end of init in getBaseBuilder."/> - + </target> @@ -217,13 +217,13 @@ <!-- we've moved the files, now to remove the empty dir --> <delete dir="${WORKSPACE}/eclipse.platform.releng.basebuilder-${builderVersion}" /> - <!-- not sure why I couldn't get globmapper to work here with unzip? - <globmapper + <!-- not sure why I couldn't get globmapper to work here with unzip? + <globmapper from="eclipse.platform.releng.basebuilder-${builderVersion}/*" to="${folderName}/*" /> --> - <!-- + <!-- cleanup (may eventually want to "cache" this zip file, so no need to re-fetch if already exists --> <delete file="${WORKSPACE}/basebuilder-${builderVersion}.zip" /> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml index 7ce6c9ba7..3dc426c9e 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml @@ -81,7 +81,7 @@ </condition> <echo message="TMP: ${TMP}" /> <!-- - TODO: need make platform independendent, as in test.xml, to compute right one. + TODO: need make platform independendent, as in test.xml, to compute right one. (and, pass in?) (and make "version" variable) --> @@ -109,7 +109,7 @@ name="webtools.feature" value="org.eclipse.wtp.releng.tools.feature.feature.group" /> - + <!-- assign defaults if not on hudson, for local testing if nothing else --> <property name="WORKSPACE" @@ -125,8 +125,8 @@ <property name="cvsProject" value="org.eclipse.releng.basebuilder" /> - - <!-- the desired folder name (made to stay consistent with cvs module name, though Git project + + <!-- the desired folder name (made to stay consistent with cvs module name, though Git project is named eclipse.platform.releng.basebuilder fil--> <property name="folderName" @@ -147,7 +147,7 @@ <echo message="cvsProject: ${cvsProject}" /> <echo message="fetchSource: ${fetchSource}" /> - <!-- leave useGit undefined to imply to use CVS. Callers can override git defaults with -DfetchSource=cvs + <!-- leave useGit undefined to imply to use CVS. Callers can override git defaults with -DfetchSource=cvs or, anything besides 'git' implies cvs. --> <condition @@ -241,7 +241,7 @@ <arg line="-vmargs -Djava.io.tmpdir=${TMP}" /> </exec> - <!-- we "move" so the directory structure so it flat under basebuilder ... + <!-- we "move" so the directory structure so it flat under basebuilder ... for compatibility to older code/scripts --> <move todir="${WORKSPACE}/${folderName}"> <fileset dir="${TMP}/eclipse/"> @@ -251,7 +251,7 @@ <echo message="platform and tools installed, platform ${platformFile}, fetched using tychoeclipsebuilder/getBaseBuilderAndTools.xml" /> - + </target> <target name="doGetBaseBuilder" @@ -312,13 +312,13 @@ <!-- we've moved the files, now to remove the empty dir --> <delete dir="${WORKSPACE}/eclipse.platform.releng.basebuilder-${builderVersion}" /> - <!-- not sure why I couldn't get globmapper to work here with unzip? - <globmapper + <!-- not sure why I couldn't get globmapper to work here with unzip? + <globmapper from="eclipse.platform.releng.basebuilder-${builderVersion}/*" to="${folderName}/*" /> --> - <!-- + <!-- cleanup (may eventually want to "cache" this zip file, so no need to re-fetch if already exists --> <delete file="${WORKSPACE}/basebuilder-${builderVersion}.zip" /> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml index d9bfe4cd2..0955a28c7 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml @@ -1,7 +1,7 @@ <project name="Helper targets" default="noDefault"> - + <fail unless="EBuilderDir" message="EBuilderDir (tychoeclipsebuilder dir) must be passed in to this script" /> <fail unless="postingDirectory" message="postingDirectory must be passed to this script." /> <fail unless="buildLabel" message="buildLabel must be passed to this script." /> @@ -9,9 +9,9 @@ name="publishingContent" value="${EBuilderDir}/eclipse/publishingFiles" /> - - - + + + <!-- ===================================================================== --> <!-- Set of helper targets for building the Eclipse SDK --> <!-- ===================================================================== --> @@ -231,7 +231,7 @@ description="Preparing to post the build..."> <fail unless="AGGR_DIR" message="AGGR_DIR must be defined for this this script" /> - + <mkdir dir="${postingDirectory}/${buildLabel}/checksum" /> <exec executable="sh" diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/performanceTestManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/performanceTestManifest.xml index b2a102816..62271fc56 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/performanceTestManifest.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/performanceTestManifest.xml @@ -12,4 +12,3 @@ </logFiles> </topLevel> -
\ No newline at end of file diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/details.html b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/details.html index 0510aabb7..3f00a2f89 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/details.html +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/details.html @@ -330,11 +330,11 @@ if (window.attachEvent) </a> <p> This plug-in provides features that can help committers with the - Eclipse development process. It is not intended as a "tool to extend", - or provide API, etc. It is a simple utility. You can install the tool from the usual + Eclipse development process. It is not intended as a "tool to extend", + or provide API, etc. It is a simple utility. You can install the tool from the usual Eclipse Project repositories, or the zipped repo provided on the download page. - Since it uses several "internal" non-API methods, you may have to have one that "matches" - the version of your development environment. + Since it uses several "internal" non-API methods, you may have to have one that "matches" + the version of your development environment. </p> <p>Currently, the tool provides two important functions.</p> <ol> @@ -343,28 +343,28 @@ if (window.attachEvent) projects in the Resource Perspective. This action will sanity check the copyright notices in all the *.java and *.properties files. It compares the "end dates" with the last - time the file was changed. It works with either Git repositories, or CVS. + time the file was changed. It works with either Git repositories, or CVS. Copyrights will be updated automatically where the tool deems appropriate. A copyright.log file will be written to the workspace directory noting odd conflicts that need to be looked at and manually confirmed or modified. You will need to commit any changes yourself. </li> - <li><b>Validate Versions Match</b>. Once turned on, in preferences, the bundle version - in the MANIFEST.MF file will be compared with the artifact version in the pom.xml file. - If they "mismatch", then a marker is left in problems view, so the incorrect version - can be fixed before being committed for a build. Mismatched versions can cause Tycho/Maven builds to - fail and it is - easy to change the version on one spot and forget the other, so all committers are encourage - to use and turn on this tool. + <li><b>Validate Versions Match</b>. Once turned on, in preferences, the bundle version + in the MANIFEST.MF file will be compared with the artifact version in the pom.xml file. + If they "mismatch", then a marker is left in problems view, so the incorrect version + can be fixed before being committed for a build. Mismatched versions can cause Tycho/Maven builds to + fail and it is + easy to change the version on one spot and forget the other, so all committers are encourage + to use and turn on this tool. </li> </ol> - <p>Older tools for use with CVS: The following tools are for using with CVS map files, - and while we have every expectation they still work fine, they are not actively used by - many committers now that most have moved to use to Git, so in theory they might be less stable. If you - still have a use for them, that's great, and if you find bugs, we'll accept them as - valid, but will likely require a high quality patch before much effort is spent on it, since - they are a low priority for the Eclipse Platform team. + <p>Older tools for use with CVS: The following tools are for using with CVS map files, + and while we have every expectation they still work fine, they are not actively used by + many committers now that most have moved to use to Git, so in theory they might be less stable. If you + still have a use for them, that's great, and if you find bugs, we'll accept them as + valid, but will likely require a high quality patch before much effort is spent on it, since + they are a low priority for the Eclipse Platform team. <ol> <li><b>Release</b> to the Team menu. This action will Tag selected projects with the specified version diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticRepoSiteFiles/Mbuilds/composite/index.htmlORIG b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticRepoSiteFiles/Mbuilds/composite/index.htmlORIG index 95877f797..2df69f83b 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticRepoSiteFiles/Mbuilds/composite/index.htmlORIG +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticRepoSiteFiles/Mbuilds/composite/index.htmlORIG @@ -33,7 +33,7 @@ a:hover { <p> This particular repository site is for <a href="http://wiki.eclipse.org/Kepler">Kepler</a> (pre-release) <a - href="http://wiki.eclipse.org/Eclipse_Project_Update_Sites">Maintenance + href="http://wiki.eclipse.org/Eclipse_Project_Update_Sites">Maintenance builds</a>. </p> <p> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticRepoSiteFiles/Mbuilds/simple/index.htmlORIG b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticRepoSiteFiles/Mbuilds/simple/index.htmlORIG index 95877f797..2df69f83b 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticRepoSiteFiles/Mbuilds/simple/index.htmlORIG +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticRepoSiteFiles/Mbuilds/simple/index.htmlORIG @@ -33,7 +33,7 @@ a:hover { <p> This particular repository site is for <a href="http://wiki.eclipse.org/Kepler">Kepler</a> (pre-release) <a - href="http://wiki.eclipse.org/Eclipse_Project_Update_Sites">Maintenance + href="http://wiki.eclipse.org/Eclipse_Project_Update_Sites">Maintenance builds</a>. </p> <p> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticRepoSiteFiles/Xbuilds/composite/index.htmlORIG b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticRepoSiteFiles/Xbuilds/composite/index.htmlORIG index 95877f797..2df69f83b 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticRepoSiteFiles/Xbuilds/composite/index.htmlORIG +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticRepoSiteFiles/Xbuilds/composite/index.htmlORIG @@ -33,7 +33,7 @@ a:hover { <p> This particular repository site is for <a href="http://wiki.eclipse.org/Kepler">Kepler</a> (pre-release) <a - href="http://wiki.eclipse.org/Eclipse_Project_Update_Sites">Maintenance + href="http://wiki.eclipse.org/Eclipse_Project_Update_Sites">Maintenance builds</a>. </p> <p> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticRepoSiteFiles/Xbuilds/simple/index.htmlORIG b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticRepoSiteFiles/Xbuilds/simple/index.htmlORIG index 95877f797..2df69f83b 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticRepoSiteFiles/Xbuilds/simple/index.htmlORIG +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticRepoSiteFiles/Xbuilds/simple/index.htmlORIG @@ -33,7 +33,7 @@ a:hover { <p> This particular repository site is for <a href="http://wiki.eclipse.org/Kepler">Kepler</a> (pre-release) <a - href="http://wiki.eclipse.org/Eclipse_Project_Update_Sites">Maintenance + href="http://wiki.eclipse.org/Eclipse_Project_Update_Sites">Maintenance builds</a>. </p> <p> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template index b029f3763..1be41e8ee 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template @@ -120,7 +120,7 @@ if (file_exists("pom_updates/index.html")) { } ?> <?php -// check if test build only, just to give warning of oversite. +// check if test build only, just to give warning of oversite. // see bug 404545 if (isset($testbuildonly) && ($testbuildonly)) { echo "<tr><td width=\"75%\">\n"; @@ -149,12 +149,12 @@ if (isset ($BUILD_FAILED) ) { echo "Specifically, see <a href=\"buildlogs/$SPECIFIC_LOG\">the log with errors</a>, \n"; echo "or a <a href=\"$summaryFile[0]\">summary</a>. <br /> \n"; echo "Or see traditional <a href=\"testResults.php\">Compile Logs</a> (if any). \n"; - } + } echo "</td><tr>"; // early end to table, since build failed is all we'll print. echo "</table>"; - - + + } else { ?> @@ -168,11 +168,11 @@ else { <div> - <table BORDER=0 CELLSPACING=5 CELLPADDING=2 WIDTH="100%" > + <table BORDER=0 CELLSPACING=5 CELLPADDING=2 WIDTH="100%" > <?php //$servername = $_SERVER["SERVER_NAME"]; if (! preg_match("/.eclipse.org/i",$servername)) { - echo "<tr> To download a file via HTTP click on its corresponding http link below."; + echo "<tr> To download a file via HTTP click on its corresponding http link below."; } else { echo "<tr>"; } ?> @@ -192,10 +192,10 @@ if($testResultsStatus == "pending") { echo "<li><a title=\"Tests are pending\" href=\"testResults.php\">View the <b>test results</b> for the current build.</a></li>"; } else if($testResultsStatus == "successful") { - echo "<li><a title=\"Test results have no failures\" href=\"testResults.php\">View the <b><font color=\"#00FF00\">test results</font></b> for the current build.</a></li>"; + echo "<li><a title=\"Test results have no failures\" href=\"testResults.php\">View the <b><font color=\"#00FF00\">test results</font></b> for the current build.</a></li>"; } else if($testResultsStatus == "failed") { - echo "<li><a title=\"Test results have failures\" href=\"testResults.php\">View the <b><font color=\"#FF0000\">test results</font></b> for the current build.</a></li>"; + echo "<li><a title=\"Test results have failures\" href=\"testResults.php\">View the <b><font color=\"#FF0000\">test results</font></b> for the current build.</a></li>"; } else { echo "<li><a href=\"testResults.php\">View the <b>test results</b> for the current build.</a></li>"; @@ -214,11 +214,11 @@ if (file_exists("performance/performance.php")) { <li><a href="http://wiki.eclipse.org/Platform-releng/How_to_check_integrity_of_downloads">How to verify a download.</a></li> <?php -# place holder: we don't currently produce these reports, and -# when we do, will need some work here. -# FWIW, we may want to construct elaborate query into CGit for this, -# even though that'd be elaborate, would get user to an area where -# they coudl tweak query, if desired? +# place holder: we don't currently produce these reports, and +# when we do, will need some work here. +# FWIW, we may want to construct elaborate query into CGit for this, +# even though that'd be elaborate, would get user to an area where +# they coudl tweak query, if desired? if (file_exists("report.txt")) { echo "<p><a href=\"report.txt\">Report of changes</a> from previous build.</p>"; } @@ -265,7 +265,7 @@ function genLinks($servername,$BUILD_ID,$zipfile) { global $clickthroughstr; global $BUILD_DIR_SEG; - + $httplink = "$clickthroughstr$zipfile"; $httplabel = "(http)"; $httpline = "<div align=\"left\"><a href=\"$httplink\">$httplabel</a>"; @@ -275,18 +275,18 @@ function genLinks($servername,$BUILD_ID,$zipfile) { echo "  "; echo "<td>$filesize</td>"; echo "<td>$zipfile</td>"; - // make relative so works on build.eclipse.org -- should not be relative. link to checksum should be absolute, so a "mirror" couldn't change it, - // bsed on changes it made to the package. - // TODO: can make some future variables so it has one value on "build" server, and another value on - // downloads, such as in buildproperties.php (value would get changed in "promtoe" script). - // Also handy/needed when doing "local test builds". - // Remember, md5 and sha1 are still in "checksum" directory, for at least initial Luna release, just not linked to. See bug + // make relative so works on build.eclipse.org -- should not be relative. link to checksum should be absolute, so a "mirror" couldn't change it, + // bsed on changes it made to the package. + // TODO: can make some future variables so it has one value on "build" server, and another value on + // downloads, such as in buildproperties.php (value would get changed in "promtoe" script). + // Also handy/needed when doing "local test builds". + // Remember, md5 and sha1 are still in "checksum" directory, for at least initial Luna release, just not linked to. See bug // https://bugs.eclipse.org/bugs/show_bug.cgi?id=423714 echo "<td><a href=\"http://download.eclipse.org/eclipse/downloads/drops4/$BUILD_DIR_SEG/checksum/$zipfile.sha512\">[SHA512]</a></td>"; //echo "<td><a href=\"./checksum/$zipfile.md5\">(md5)</a>"; //echo " <a href=\"./checksum/$zipfile.sha1\">(sha1)</a>"; } -?> +?> <table align="left" BORDER=0 CELLSPACING=5 CELLPADDING=2 WIDTH="100%"> @@ -301,10 +301,10 @@ $STREAM_MINOR = $streamArr[1]; $STREAM_SERVICE = $streamArr[2]; // We expect $BUILD_ID to be defined in buildproperties.php -// But it can be defined several times in reference URI, such as once in directory name, +// But it can be defined several times in reference URI, such as once in directory name, // and once in filename. We want the directory-like part. -// And to complicate things, in S and R builds, the segment is no longer BUILD_ID, -// but a more complicated concatination. +// And to complicate things, in S and R builds, the segment is no longer BUILD_ID, +// but a more complicated concatination. if ($BUILD_TYPE === "N" || $BUILD_TYPE === "I" || $BUILD_TYPE === "M" || $BUILD_TYPE === "P" || $BUILD_TYPE === "X" || $BUILD_TYPE === "Y") { $STREAM_REPO_NAME=$STREAM_MAJOR.".".$STREAM_MINOR."-".$BUILD_TYPE."-"."builds"; } else { @@ -316,7 +316,7 @@ if ($BUILD_TYPE === "N" || $BUILD_TYPE === "I" || $BUILD_TYPE === "M" || $BUILD_ } else { echo "Unexpected value of BUILD_TYPE: $BUILD_TYPE. <br />"; - // We'll make an assumption that might work. + // We'll make an assumption that might work. $STREAM_REPO_NAME=$STREAM_MAJOR.".".$STREAM_MINOR."-".$BUILD_TYPE."-"."builds"; } } @@ -327,7 +327,7 @@ $STREAM_REPO_URL="http://download.eclipse.org/eclipse/updates/".$STREAM_REPO_NAM $pos = strpos($BUILD_ID, "RC"); if ($pos === false) { $isRC = false; -} else { +} else { $isRC = true; } @@ -340,15 +340,15 @@ if ($BUILD_TYPE === "N" || $BUILD_TYPE === "I" || $BUILD_TYPE === "P" || $BUILD_ $BUILD_REPO_NAME=$STREAM_REPO_NAME."/".$BUILD_TYPE."-".$BUILD_ID."-".$timestamp; } else { echo "Unexpected value of BUILD_TYPE: $BUILD_TYPE. <br />\n"; - // We'll make an assumption that might work. + // We'll make an assumption that might work. $BUILD_REPO_NAME=$STREAM_REPO_NAME."/".$BUILD_ID; } } $BUILD_REPO_URL="http://download.eclipse.org/eclipse/updates/".$BUILD_REPO_NAME; -// checking for existence is especially important for BUILD_REPOs, since they might have been removed. -// but we do it here too for sanity check. -// relative patch can be either 3 or 4 "up", depending on if on downloads, or build machine. +// checking for existence is especially important for BUILD_REPOs, since they might have been removed. +// but we do it here too for sanity check. +// relative patch can be either 3 or 4 "up", depending on if on downloads, or build machine. // either can be used to "prove existance". $relativePath4="../../../.."; $relativePath3="../../.."; @@ -357,7 +357,7 @@ if ((file_exists("$relativePath3/updates/".$STREAM_REPO_NAME)) || (file_exists(" echo "<p>To update your Eclipse installation to this development stream, you can use the software repository at<br />\n"; echo " <a href=\"$STREAM_REPO_URL\">$STREAM_REPO_URL</a><br />\n"; echo "</tr> \n"; -} +} if ((file_exists("$relativePath3/updates/"."$BUILD_REPO_NAME")) || (file_exists("$relativePath4/updates/"."$BUILD_REPO_NAME")) ) { echo "<tr> \n"; echo "<p>To update your build to use this specific build, you can use the software repository at<br />\n"; @@ -419,16 +419,16 @@ if ((file_exists("$relativePath3/updates/"."$BUILD_REPO_NAME")) || (file_exists( //http://www.php.net/manual/en/function.glob.php#102691 if (is_array($icubasefiles) && sizeof($icubasefiles) > 0) { ?> <TR> <TD ALIGN=RIGHT VALIGN=TOP WIDTH="5%"> <DIV ALIGN="left"><B>Status</B></DIV></TD><TD WIDTH="36%"><B>Platform</B></TD><?php column($_SERVER["SERVER_NAME"]); ?> -</TR> - %icubase% +</TR> + %icubase% <?php } else { ?> <tr><td> <p>ICU4J (bundle named com.ibm.icu) provides advanced Unicode and Globalization support for -software applications. The full version is included in the Eclipse SDK. +software applications. The full version is included in the Eclipse SDK. For those that do not need that support and -need a smaller footprint when building their own products, there is a subset of ICU4J, "com.ibm.icu.base" available -from <a href="http://download.eclipse.org/tools/orbit/downloads/">Orbit Downloads</a>. [That subset -used to be provided on this Eclipse download page but was removed to avoid +need a smaller footprint when building their own products, there is a subset of ICU4J, "com.ibm.icu.base" available +from <a href="http://download.eclipse.org/tools/orbit/downloads/">Orbit Downloads</a>. [That subset +used to be provided on this Eclipse download page but was removed to avoid unnecessary duplication (see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=395003">bug 395003</a>).]</p> </td></tr> <?php } ?> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.templatejava8patch b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.templatejava8patch index dda4483a8..bfb6c6b25 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.templatejava8patch +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.templatejava8patch @@ -106,7 +106,7 @@ if (file_exists("pom_updates/index.html")) { } ?> <?php -// check if test build only, just to give warning of oversite. +// check if test build only, just to give warning of oversite. // see bug 404545 if (isset($testbuildonly) && ($testbuildonly)) { echo "<tr><td width=\"75%\">\n"; @@ -135,18 +135,18 @@ if (isset ($BUILD_FAILED) ) { echo "Specifically, see <a href=\"buildlogs/$SPECIFIC_LOG\">the log with errors</a>, \n"; echo "or a <a href=\"$summaryFile[0]\">summary</a>. <br /> \n"; echo "Or see traditional <a href=\"testResults.php\">Compile Logs</a> (if any). \n"; - } + } echo "</td><tr>"; // early end to table, since build failed is all we'll print. echo "</table>"; - - + + } else { ?> <tr> <td width="75%"> - The page provides access to + The page provides access to Eclipse Java 8 Support (BETA) - This is an implementation of an early-draft specification developed under the Java Community Process (JCP) and is made available for testing and evaluation purposes only. The code is not compatible with any specification of the JCP. </td> </tr> @@ -154,11 +154,11 @@ else { <div> - <table BORDER=0 CELLSPACING=5 CELLPADDING=2 WIDTH="100%" > + <table BORDER=0 CELLSPACING=5 CELLPADDING=2 WIDTH="100%" > <?php //$servername = $_SERVER["SERVER_NAME"]; if (! preg_match("/.eclipse.org/i",$servername)) { - echo "<tr> To download a file via HTTP click on its corresponding http link below."; + echo "<tr> To download a file via HTTP click on its corresponding http link below."; } else { echo "<tr>"; } ?> @@ -173,15 +173,15 @@ if (! preg_match("/.eclipse.org/i",$servername)) { //$testResultsStatus = "%testsStatus%"; // for PATCH_BUILDS, no tests $testResultsStatus = ""; - + if($testResultsStatus === "pending") { echo "<li><a title=\"Tests are pending\" href=\"testResults.php\">View the <b>test results</b> for the current build.</a></li>"; } else if($testResultsStatus === "successful") { - echo "<li><a title=\"Test results have no failures\" href=\"testResults.php\">View the <b><font color=\"#00FF00\">test results</font></b> for the current build.</a></li>"; + echo "<li><a title=\"Test results have no failures\" href=\"testResults.php\">View the <b><font color=\"#00FF00\">test results</font></b> for the current build.</a></li>"; } else if($testResultsStatus === "failed") { - echo "<li><a title=\"Test results have failures\" href=\"testResults.php\">View the <b><font color=\"#FF0000\">test results</font></b> for the current build.</a></li>"; + echo "<li><a title=\"Test results have failures\" href=\"testResults.php\">View the <b><font color=\"#FF0000\">test results</font></b> for the current build.</a></li>"; } else { echo "<li><a href=\"testResults.php\">View the <b>test results</b> for the current build.</a></li>"; @@ -251,7 +251,7 @@ function genLinks($servername,$BUILD_ID,$zipfile) { echo "<td><a href=\"./checksum/$zipfile.md5\">(md5)</a>"; echo " <a href=\"./checksum/$zipfile.sha1\">(sha1)</a>"; } -?> +?> <table align="left" BORDER=0 CELLSPACING=5 CELLPADDING=2 WIDTH="100%"> @@ -266,10 +266,10 @@ $STREAM_MINOR = $streamArr[1]; $STREAM_SERVICE = $streamArr[2]; // We expect $BUILD_ID to be defined in buildproperties.php -// But it can be defined several times in reference URI, such as once in directory name, +// But it can be defined several times in reference URI, such as once in directory name, // and once in filename. We want the directory-like part. -// And to complicate things, in S and R builds, the segment is no longer BUILD_ID, -// but a more complicated concatination. +// And to complicate things, in S and R builds, the segment is no longer BUILD_ID, +// but a more complicated concatination. if ($BUILD_TYPE === "N" || $BUILD_TYPE === "P" || $BUILD_TYPE === "I" || $BUILD_TYPE === "M" || $BUILD_TYPE === "X" || $BUILD_TYPE === "Y") { $STREAM_REPO_NAME=$STREAM_MAJOR.".".$STREAM_MINOR."-".$BUILD_TYPE."-"."builds"; } else { @@ -281,13 +281,13 @@ if ($BUILD_TYPE === "N" || $BUILD_TYPE === "P" || $BUILD_TYPE === "I" || $BUILD_ } else { echo "Unexpected value of BUILD_TYPE: $BUILD_TYPE. <br />"; - // We'll make an assumption that might work. + // We'll make an assumption that might work. $STREAM_REPO_NAME=$STREAM_MAJOR.".".$STREAM_MINOR."-".$BUILD_TYPE."-"."builds"; } } } -// assuming "patch_build" means on build machine only, for now. +// assuming "patch_build" means on build machine only, for now. if ( (isset($PATCH_BUILD)) && (strlen($PATCH_BUILD) > 0) ) { $STREAM_REPO_URL="http://build.eclipse.org/eclipse/builds/4P/siteDir/updates/".$STREAM_REPO_NAME; } else { @@ -296,7 +296,7 @@ if ( (isset($PATCH_BUILD)) && (strlen($PATCH_BUILD) > 0) ) { $pos = strpos($BUILD_ID, "RC"); if ($pos === false) { $isRC = false; -} else { +} else { $isRC = true; } @@ -309,19 +309,19 @@ if ($BUILD_TYPE === "N" || $BUILD_TYPE === "P" || $BUILD_TYPE === "I" || $BUILD_ $BUILD_REPO_NAME=$STREAM_REPO_NAME."/".$BUILD_TYPE."-".$BUILD_ID."-".$timestamp; } else { echo "Unexpected value of BUILD_TYPE: $BUILD_TYPE. <br />\n"; - // We'll make an assumption that might work. + // We'll make an assumption that might work. $BUILD_REPO_NAME=$STREAM_REPO_NAME."/".$BUILD_ID; } } -// assuming "patch_build" means on build machine only, for now. +// assuming "patch_build" means on build machine only, for now. if ( (isset($PATCH_BUILD)) && (strlen($PATCH_BUILD) > 0) ) { $BUILD_REPO_URL="http://build.eclipse.org/eclipse/builds/4P/siteDir/updates/".$BUILD_REPO_NAME; } else { $BUILD_REPO_URL="http://download.eclipse.org/eclipse/updates/".$BUILD_REPO_NAME; } -// checking for existence is especially important for BUILD_REPOs, since they might have been removed. -// but we do it here too for sanity check. +// checking for existence is especially important for BUILD_REPOs, since they might have been removed. +// but we do it here too for sanity check. if ($servername === "build.eclipse.org") { $relativePath="../../../../"; } @@ -333,7 +333,7 @@ if (file_exists("$relativePath/updates/".$STREAM_REPO_NAME)) { echo "<p>To update your Eclipse installation to this development stream, you can use the software repository at<br />\n"; echo " <a href=\"$STREAM_REPO_URL\">$STREAM_REPO_URL</a><br />\n"; echo "</tr> \n"; -} +} if (file_exists("$relativePath/updates/"."$BUILD_REPO_NAME")) { echo "<tr> \n"; echo "<p>To update your build to use this specific build, you can use the software repository at<br />\n"; @@ -348,11 +348,11 @@ if (file_exists("$relativePath/updates/"."$BUILD_REPO_NAME")) { <h3><a name="Zipped Repo"> Zipped Repository (patch only) <a href="details.html#ZippedRepo"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3> <table BORDER=0 CELLSPACING=2 CELLPADDING=0 WIDTH="99%" bordercolor="#999999" > <tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"><b> </b></div></td><td width="36%"><b>Platform</b></td><?php column($servername); ?> -</tr> +</tr> <tr><td> </td> <td>Zipped Repo </td><td><?php genLinks($_SERVER["SERVER_NAME"],$BUILD_ID,"java8patch-$BUILD_ID-repository.zip"); ?></td> -</tr> +</tr> </table> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/performance.php.template b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/performance.php.template index 37c7be6b4..5c512a06d 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/performance.php.template +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/performance.php.template @@ -77,7 +77,7 @@ Console output logs <?php echo "$buildName"; ?> </FONT></B></TD></TR></TABLE><P> $index++; } } - + aDirectory.closedir(); sort($logentries); @@ -89,7 +89,7 @@ Console output logs <?php echo "$buildName"; ?> </FONT></B></TD></TR></TABLE><P> echo "</tr>"; $hasNotes = true; } - + if (!$hasNotes) { echo "<br>There are no test logs for this build."; } diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/platform.php.template b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/platform.php.template index efb4d330f..3fa04bc7e 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/platform.php.template +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/platform.php.template @@ -103,28 +103,28 @@ include("buildproperties.php"); <?php $servername = $_SERVER["SERVER_NAME"]; if (! preg_match("/.eclipse.org/i",$servername)) { - echo "<tr> To download a file via HTTP click on its corresponding http link below."; + echo "<tr> To download a file via HTTP click on its corresponding http link below."; } else { echo "<tr>"; } ?> </table> </div> - + <div class="homeitem"> <h3>Related Links</h3> <ul class="midlist"> <li><a href="buildNotes.php">View the <b>build notes</b> for the current build.</a></li> - + <?php $testResultsStatus = "%testsStatus%"; if($testResultsStatus == "pending") { echo "<li><a title=\"Tests are pending\" href=\"testResults.php\">View the <b>test results</b> for the current build.</a></li>"; } else if($testResultsStatus == "successful") { - echo "<li><a title=\"Tests are successful\" href=\"testResults.php\">View the <b><font color=\"#00FF00\">test results</font></b> for the current build.</a></li>"; + echo "<li><a title=\"Tests are successful\" href=\"testResults.php\">View the <b><font color=\"#00FF00\">test results</font></b> for the current build.</a></li>"; } else if($testResultsStatus == "failed") { - echo "<li><a title=\"Tests have failures\" href=\"testResults.php\">View the <b><font color=\"#FF0000\">test results</font></b> for the current build.</a></li>"; + echo "<li><a title=\"Tests have failures\" href=\"testResults.php\">View the <b><font color=\"#FF0000\">test results</font></b> for the current build.</a></li>"; } else { echo "<li><a href=\"testResults.php\">View the <b>test results</b> for the current build.</a></li>"; @@ -133,7 +133,7 @@ include("buildproperties.php"); echo "<li><a href=\"performance/performance.php\">View the <b>performance results</b> for the current build.</a></li>"; } ?> - + <li><a href="directory.txt">View the <b>map file entries</b> for the current build.</a></li></ul> </div> @@ -148,12 +148,12 @@ include("buildproperties.php"); <li><a href="winPlatform.php#EclipseSDK">Windows Platform</a></li> <li><a href="linPlatform.php#EclipseSDK">Linux Platform</a></li> <li><a href="solPlatform.php#EclipseSDK">Solaris Platform</a></li> - <li><a href="aixPlatform.php#EclipseSDK">AIX Platform</a></li> + <li><a href="aixPlatform.php#EclipseSDK">AIX Platform</a></li> <li><a href="macPlatform.php#EclipseSDK">Macintosh Platform</a></li> <li><a href="hpuxPlatform.php#EclipseSDK">HP-UX Platform</a></li> </ul> </div> -</div> +</div> <?php function column($servername) { @@ -213,7 +213,7 @@ if (preg_match("/.eclipse.org/i",$servername)) { echo "<td><a href=\"http://download.eclipse.org/eclipse/downloads/drops/$BUILD_ID/checksum/$zipfile.md5\">(md5)</a>"; echo " <a href=\"http://download.eclipse.org/eclipse/downloads/drops/$BUILD_ID/checksum/$zipfile.sha1\">(sha1)</a>"; } -?> +?> <table align="left" BORDER=0 CELLSPACING=5 CELLPADDING=2 WIDTH="100%"> <tr><td><div class="homeitem3col"> @@ -221,7 +221,7 @@ if (preg_match("/.eclipse.org/i",$servername)) { <table BORDER=0 CELLSPACING=2 CELLPADDING=0 WIDTH="99%" bordercolor="#999999" > <tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"><b>Status</b></div></td><td width="36%"><b>Platform</b></td><?php column($_SERVER["SERVER_NAME"]); ?> </tr> %sdk% </table><?php - + ?> </div></td></tr> @@ -273,16 +273,16 @@ if (preg_match("/.eclipse.org/i",$servername)) { //http://www.php.net/manual/en/function.glob.php#102691 if (is_array($icubasefiles) && sizeof($icubasefiles) > 0) { ?> <TR> <TD ALIGN=RIGHT VALIGN=TOP WIDTH="5%"> <DIV ALIGN="left"><B>Status</B></DIV></TD><TD WIDTH="36%"><B>Platform</B></TD><?php column($_SERVER["SERVER_NAME"]); ?> -</TR> - %icubase% +</TR> + %icubase% <?php } else { ?> <tr><td> <p>ICU4J (bundle named com.ibm.icu) provides advanced Unicode and Globalization support for -software applications. The full version is included in the Eclipse SDK. +software applications. The full version is included in the Eclipse SDK. For those that do not need that support and -need a smaller footprint when building their own products, there is a subset of ICU4J, "com.ibm.icu.base" available -from <a href="http://download.eclipse.org/tools/orbit/downloads/">Orbit Downloads</a>. [That subset -used to be provided on this Eclipse download page but was removed to avoid +need a smaller footprint when building their own products, there is a subset of ICU4J, "com.ibm.icu.base" available +from <a href="http://download.eclipse.org/tools/orbit/downloads/">Orbit Downloads</a>. [That subset +used to be provided on this Eclipse download page but was removed to avoid unnecessary duplication (see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=395003">bug 395003</a>).] </p> </td></tr> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/testResults.php.template b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/testResults.php.template index 641a4f391..e72e69200 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/testResults.php.template +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/testResults.php.template @@ -197,7 +197,7 @@ if (file_exists("testNotes.html")) { <th width="20%">Win 7, 1.7 VM</th> <th><th width="20%"></th> </tr> -%testresults% +%testresults% </table> </br> </div> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml index 459f32c51..990d12499 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml @@ -1,23 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <topLevel> -<zipTypes> +<zipTypes> <zipType name="Eclipse SDK"> <platform id="SW" name="Windows (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-SDK-@build@-win32.zip"></platform> - <platform id="SWX8664" name="Windows (x86_64) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-SDK-@build@-win32-x86_64.zip"></platform> - <platform id="SLG2" name="Linux (x86/GTK+) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-SDK-@build@-linux-gtk.tar.gz"></platform> - <platform id="SLG264" name="Linux (x86_64/GTK+) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-SDK-@build@-linux-gtk-x86_64.tar.gz"></platform> + <platform id="SWX8664" name="Windows (x86_64) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-SDK-@build@-win32-x86_64.zip"></platform> + <platform id="SLG2" name="Linux (x86/GTK+) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-SDK-@build@-linux-gtk.tar.gz"></platform> + <platform id="SLG264" name="Linux (x86_64/GTK+) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-SDK-@build@-linux-gtk-x86_64.tar.gz"></platform> <platform id="SLG2PPC" name="Linux (PPC/GTK+) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-SDK-@build@-linux-gtk-ppc.tar.gz"></platform> <platform id="SLG2PPC64" name="Linux (PPC64/GTK+) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-SDK-@build@-linux-gtk-ppc64.tar.gz"></platform> <platform id="SLG2S390X" name="Linux (s390x/GTK+) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-SDK-@build@-linux-gtk-s390x.tar.gz"></platform> <platform id="SLG2S390" name="Linux (s390/GTK+) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-SDK-@build@-linux-gtk-s390.tar.gz"></platform> <platform id="SSG" name="Solaris 10 (SPARC/GTK+)" fileName="eclipse-SDK-@build@-solaris-gtk.zip"></platform> <platform id="SSGX" name="Solaris 10 (x86/GTK+)" fileName="eclipse-SDK-@build@-solaris-gtk-x86.zip"></platform> - <platform id="SSHPUX" name="HP-UX (ia64/GTK+)" fileName="eclipse-SDK-@build@-hpux-gtk-ia64.zip"></platform> + <platform id="SSHPUX" name="HP-UX (ia64/GTK+)" fileName="eclipse-SDK-@build@-hpux-gtk-ia64.zip"></platform> <platform id="SAG" name="AIX (PPC/GTK+)" fileName="eclipse-SDK-@build@-aix-gtk-ppc.zip"></platform> - <platform id="SAGPPC64" name="AIX (PPC64/GTK+)" fileName="eclipse-SDK-@build@-aix-gtk-ppc64.zip"></platform> + <platform id="SAGPPC64" name="AIX (PPC64/GTK+)" fileName="eclipse-SDK-@build@-aix-gtk-ppc64.zip"></platform> <platform id="SMCC" name="Mac OSX (Mac/Cocoa) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-SDK-@build@-macosx-cocoa.tar.gz"></platform> - <platform id="SMCC64" name="Mac OSX (Mac/Cocoa/x86_64) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-SDK-@build@-macosx-cocoa-x86_64.tar.gz"></platform> - <!-- + <platform id="SMCC64" name="Mac OSX (Mac/Cocoa/x86_64) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-SDK-@build@-macosx-cocoa-x86_64.tar.gz"></platform> + <!-- <platform id="SAA2" name='Source Build (Source in .zip) (<a href="srcIncludedBuildInstructions.html">instructions</a>)' fileName="eclipse-sourceBuild-srcIncluded-@build@.zip"></platform> <platform id="SAA" name='Source Build (Source fetched via CVS) (<a href="srcFetchBuildInstructions.html">instructions</a>)' fileName="eclipse-sourceBuild-srcFetch-@build@.zip"></platform> --> @@ -28,7 +28,7 @@ <platform id="JT" name="All" fileName="eclipse-Automated-Tests-@build@.zip"></platform> </zipType> - <zipType name="Example plug-ins"> + <zipType name="Example plug-ins"> <platform id="EA" name="<img src = "repo.gif"> Eclipse Examples Repo" fileName="org.eclipse.sdk.examples.source-@build@.zip"></platform> </zipType> @@ -38,8 +38,8 @@ <zipType name="RCP SDK"> <platform id="RCPSR" name="<img src = "repo.gif"> RCP Source Repo " fileName="org.eclipse.rcp.source-@build@.zip"></platform> - </zipType> - + </zipType> + <zipType name="Delta Pack"> <platform id="DeltaPack" name="All" fileName="eclipse-@build@-delta-pack.zip"></platform> </zipType> @@ -50,30 +50,30 @@ <zipType name="Platform Runtime Binary"> <platform id="PW" name="Windows (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-platform-@build@-win32.zip"></platform> - <platform id="PWX8664" name="Windows (x86_64) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-platform-@build@-win32-x86_64.zip"></platform> + <platform id="PWX8664" name="Windows (x86_64) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-platform-@build@-win32-x86_64.zip"></platform> <platform id="PLG2" name="Linux (x86/GTK+) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-platform-@build@-linux-gtk.tar.gz"></platform> - <platform id="PLG264" name="Linux (x86_64/GTK+) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-platform-@build@-linux-gtk-x86_64.tar.gz"></platform> + <platform id="PLG264" name="Linux (x86_64/GTK+) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-platform-@build@-linux-gtk-x86_64.tar.gz"></platform> <platform id="PLG2PPC" name="Linux (PPC/GTK+) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-platform-@build@-linux-gtk-ppc.tar.gz"></platform> <platform id="PLG2PPC64" name="Linux (PPC64/GTK+) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-platform-@build@-linux-gtk-ppc64.tar.gz"></platform> <platform id="PLG2S390X" name="Linux (s390x/GTK+) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-platform-@build@-linux-gtk-s390x.tar.gz"></platform> <platform id="PLG2S390" name="Linux (s390/GTK+) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-platform-@build@-linux-gtk-s390.tar.gz"></platform> <platform id="PSG" name="Solaris 10 (SPARC/GTK+)" fileName="eclipse-platform-@build@-solaris-gtk.zip"></platform> <platform id="PSGX" name="Solaris 10 (x86/GTK+)" fileName="eclipse-platform-@build@-solaris-gtk-x86.zip"></platform> - <platform id="PHPUX" name="HPUX (ia64/GTK+)" fileName="eclipse-platform-@build@-hpux-gtk-ia64.zip"></platform> - <platform id="PAG" name="AIX (PPC/GTK)" fileName="eclipse-platform-@build@-aix-gtk-ppc.zip"></platform> - <platform id="PAGPPC64" name="AIX (PPC64/GTK)" fileName="eclipse-platform-@build@-aix-gtk-ppc64.zip"></platform> + <platform id="PHPUX" name="HPUX (ia64/GTK+)" fileName="eclipse-platform-@build@-hpux-gtk-ia64.zip"></platform> + <platform id="PAG" name="AIX (PPC/GTK)" fileName="eclipse-platform-@build@-aix-gtk-ppc.zip"></platform> + <platform id="PAGPPC64" name="AIX (PPC64/GTK)" fileName="eclipse-platform-@build@-aix-gtk-ppc64.zip"></platform> <platform id="PMCC" name="Mac OSX (Mac/Cocoa) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-platform-@build@-macosx-cocoa.tar.gz"></platform> - <platform id="PMCC64" name="Mac OSX (Mac/Cocoa/x86_64)(<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-platform-@build@-macosx-cocoa-x86_64.tar.gz"></platform> + <platform id="PMCC64" name="Mac OSX (Mac/Cocoa/x86_64)(<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="eclipse-platform-@build@-macosx-cocoa-x86_64.tar.gz"></platform> <platform id="PLR" name="<img src = "repo.gif"> Platform Runtime Repo " fileName="org.eclipse.platform-@build@.zip"></platform> </zipType> - + <zipType name="JDT Runtime Binary"> <platform id="JRR" name="<img src = "repo.gif"> JDT Runtime Repo " fileName="org.eclipse.jdt-@build@.zip"></platform> </zipType> <zipType name="JDT SDK"> <platform id="JSR" name="<img src = "repo.gif"> JDT Source Repo " fileName="org.eclipse.jdt.source-@build@.zip"></platform> - </zipType> + </zipType> <zipType name="JDTC"> <platform id="ECJ" name="All" fileName="ecj-@build@.jar"></platform> @@ -82,35 +82,35 @@ <zipType name="PDE Runtime"> <platform id="PRR" name="<img src = "repo.gif"> PDE Repo " fileName="org.eclipse.pde-@build@.zip"></platform> - <platform id="PAR" name="<img src = "repo.gif"> PDE API Tools execution environment fragments repo" fileName="org.eclipse.pde.api.tools.ee.feature-@build@.zip"></platform> - </zipType> - - <zipType name="PDE SDK"> + <platform id="PAR" name="<img src = "repo.gif"> PDE API Tools execution environment fragments repo" fileName="org.eclipse.pde.api.tools.ee.feature-@build@.zip"></platform> + </zipType> + + <zipType name="PDE SDK"> <platform id="PSR" name="<img src = "repo.gif"> PDE Source Repo " fileName="org.eclipse.pde.source-@build@.zip"></platform> </zipType> - - <zipType name="CVS Runtime"> + + <zipType name="CVS Runtime"> <platform id="CRR" name="<img src = "repo.gif"> CVS Runtime Repo " fileName="org.eclipse.cvs-@build@.zip"></platform> </zipType> - - <zipType name="CVS SDK"> + + <zipType name="CVS SDK"> <platform id="CSR" name="<img src = "repo.gif"> CVS Source Repo " fileName="org.eclipse.cvs.source-@build@.zip"></platform> </zipType> <zipType name="SWT"> <platform id="SWTW" name="Windows (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="swt-@build@-win32-win32-x86.zip"></platform> - <platform id="SWTWX86_64" name="Windows (x86_64) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="swt-@build@-win32-win32-x86_64.zip"></platform> + <platform id="SWTWX86_64" name="Windows (x86_64) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="swt-@build@-win32-win32-x86_64.zip"></platform> <platform id="SWTLG2" name="Linux (x86/GTK+) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="swt-@build@-gtk-linux-x86.zip"></platform> - <platform id="SWTLG64" name="Linux (x86_64/GTK+) (<a href="http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/platform-swt-home/faq.html#gtk64">Instructions</a>)" fileName="swt-@build@-gtk-linux-x86_64.zip"></platform> - <platform id="SWTLG2PPC" name="Linux (PPC/GTK+) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="swt-@build@-gtk-linux-ppc.zip"></platform> - <platform id="SWTLG2PPC64" name="Linux (PPC64/GTK+) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="swt-@build@-gtk-linux-ppc64.zip"></platform> + <platform id="SWTLG64" name="Linux (x86_64/GTK+) (<a href="http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/platform-swt-home/faq.html#gtk64">Instructions</a>)" fileName="swt-@build@-gtk-linux-x86_64.zip"></platform> + <platform id="SWTLG2PPC" name="Linux (PPC/GTK+) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="swt-@build@-gtk-linux-ppc.zip"></platform> + <platform id="SWTLG2PPC64" name="Linux (PPC64/GTK+) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="swt-@build@-gtk-linux-ppc64.zip"></platform> <platform id="SWTSG" name="Solaris 10 (SPARC/GTK+)" fileName="swt-@build@-gtk-solaris-sparc.zip"></platform> - <platform id="SWTSGX" name="Solaris 10 (x86/GTK+)" fileName="swt-@build@-gtk-solaris-x86.zip"></platform> - <platform id="SWTHP" name="HPUX (ia64/GTK+)" fileName="swt-@build@-gtk-hpux-ia64.zip"></platform> - <platform id="SWTAG" name="AIX (PPC/GTK+)" fileName="swt-@build@-gtk-aix-ppc.zip"></platform> - <platform id="SWTAGPPC64" name="AIX (PPC64/GTK+)" fileName="swt-@build@-gtk-aix-ppc64.zip"></platform> + <platform id="SWTSGX" name="Solaris 10 (x86/GTK+)" fileName="swt-@build@-gtk-solaris-x86.zip"></platform> + <platform id="SWTHP" name="HPUX (ia64/GTK+)" fileName="swt-@build@-gtk-hpux-ia64.zip"></platform> + <platform id="SWTAG" name="AIX (PPC/GTK+)" fileName="swt-@build@-gtk-aix-ppc.zip"></platform> + <platform id="SWTAGPPC64" name="AIX (PPC64/GTK+)" fileName="swt-@build@-gtk-aix-ppc64.zip"></platform> <platform id="SWTMCC" name="Mac OSX (Mac/Cocoa) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="swt-@build@-cocoa-macosx.zip"></platform> - <platform id="SWTMCC64" name="Mac OSX (Mac/Cocoa/x86_64) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="swt-@build@-cocoa-macosx-x86_64.zip"></platform> + <platform id="SWTMCC64" name="Mac OSX (Mac/Cocoa/x86_64) (<a href="http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments">Supported Versions</a>)" fileName="swt-@build@-cocoa-macosx-x86_64.zip"></platform> </zipType> <zipType name="RelEng Tool plug-in"> @@ -129,7 +129,7 @@ <effectedFile id="SAM"></effectedFile> <effectedFile id="SHM"></effectedFile> <!--effectedFile id="SNP"></effectedFile--> - <effectedFile id="SMCC"></effectedFile> + <effectedFile id="SMCC"></effectedFile> <effectedFile id="JA"></effectedFile> <effectedFile id="JMC"></effectedFile> <effectedFile id="JASDK"></effectedFile> @@ -151,7 +151,7 @@ <effectedFile id="JASDK"></effectedFile> <effectedFile id="JMCSDK"></effectedFile> </logFile> - + <logFile name="plugins\org.eclipse.jdt.debug.ui_*\jdiui.jar.bin.xml" type="compile"> <effectedFile id="SW"></effectedFile> <effectedFile id="SLM"></effectedFile> @@ -200,7 +200,7 @@ <effectedFile id="JASDK"></effectedFile> <effectedFile id="JMCSDK"></effectedFile> </logFile> - + <logFile name="plugins\org.eclipse.jdt.junit_*\junitsupport.jar.bin.xml" type="compile"> <effectedFile id="SW"></effectedFile> <effectedFile id="SLM"></effectedFile> @@ -256,7 +256,7 @@ <effectedFile id="RCPLG2"></effectedFile> <effectedFile id="RCPSDKLG2"></effectedFile> </logFile> - + <logFile name="plugins\org.eclipse.swt.gtk64_*\ws\gtk\swt.jar.bin.xml" type="compile"> <effectedFile id="SLG264"></effectedFile> <effectedFile id="PLG264"></effectedFile> @@ -274,7 +274,7 @@ <effectedFile id="RCPLG264"></effectedFile> <effectedFile id="RCPSDKLG264"></effectedFile> </logFile> - + <logFile name="plugins\org.eclipse.swt.gtk64_*\ws\gtk\swt-mozilla.jar.bin.xml" type="compile"> <effectedFile id="SLG264"></effectedFile> <effectedFile id="PLG264"></effectedFile> @@ -283,7 +283,7 @@ <effectedFile id="RCPLG264"></effectedFile> <effectedFile id="RCPSDKLG264"></effectedFile> </logFile> - + <logFile name="plugins\org.eclipse.swt.gtk_*\ws\gtk\swt.jar.bin.xml" type="compile"> <effectedFile id="SLM"></effectedFile> <effectedFile id="PLM"></effectedFile> @@ -299,7 +299,7 @@ <effectedFile id="PHM"></effectedFile> <effectedFile id="PSMSDK"></effectedFile> <effectedFile id="PHMSDK"></effectedFile> - + <effectedFile id="SWTLM"></effectedFile> <effectedFile id="SWTAM"></effectedFile> <effectedFile id="SWTSM"></effectedFile> @@ -311,14 +311,14 @@ </logFile> <logFile name="plugins\org.eclipse.swt.win32_*\ws\win32\swt.jar.bin.xml" type="compile"> - <effectedFile id="SW"></effectedFile> + <effectedFile id="SW"></effectedFile> <effectedFile id="PW"></effectedFile> <effectedFile id="PWSDK"></effectedFile> <effectedFile id="SWTW"></effectedFile> <effectedFile id="RCPW"></effectedFile> <effectedFile id="RCPSDKW"></effectedFile> </logFile> - + <logFile name="plugins\org.eclipse.scripting.examples_*\scriptex1.jar.bin.xml" type="compile"> <effectedFile id="EW"></effectedFile> <effectedFile id="EA"></effectedFile> @@ -372,7 +372,7 @@ <effectedFile id="EW"></effectedFile> <effectedFile id="EA"></effectedFile> </logFile> - + <logFile name="plugins\org.eclipse.core.tests.harness_*\testharness.jar.bin.xml" type="compile"> <effectedFile id="JT"></effectedFile> </logFile> @@ -380,27 +380,27 @@ <logFile name="plugins\org.eclipse.core.tests.runtime_*\runtimetests.jar.bin.xml" type="compile"> <effectedFile id="JT"></effectedFile> </logFile> - + <logFile name="plugins\org.eclipse.core.tests.resources_*\resourcestests.jar.bin.xml" type="compile"> <effectedFile id="JT"></effectedFile> </logFile> - + <logFile name="plugins\org.eclipse.jdt.debug.tests_*\javadebugtests.jar.bin.xml" type="compile"> <effectedFile id="JT"></effectedFile> </logFile> - + <logFile name="plugins\org.eclipse.jdt.ui.tests_*\javauitests.jar.bin.xml" type="compile"> <effectedFile id="JT"></effectedFile> </logFile> - + <logFile name="plugins\org.eclipse.jdt.ui.tests.refactoring_*\refactoringtests.jar.bin.xml" type="compile"> <effectedFile id="JT"></effectedFile> </logFile> - + <logFile name="plugins\org.eclipse.swt.tests_*\swttests.jar.bin.xml" type="compile"> <effectedFile id="JT"></effectedFile> </logFile> - + <logFile name="plugins\org.eclipse.ui.tests_*\uitests.jar.bin.xml" type="compile"> <effectedFile id="JT"></effectedFile> </logFile> @@ -412,11 +412,11 @@ <logFile name="plugins\org.eclipse.team.tests.cvs.core_*\cvstests.jar.bin.xml" type="compile"> <effectedFile id="JT"></effectedFile> </logFile> - + <logFile name="plugins\org.eclipse.jdt.core.tests.builder_*\jdtcoretestsbuilder.jar.bin.xml" type="compile"> <effectedFile id="JT"></effectedFile> </logFile> - + <logFile name="plugins\org.eclipse.jdt.core.tests.compiler_*\jdtcoretestscompiler.jar.bin.xml" type="compile"> <effectedFile id="JT"></effectedFile> </logFile> @@ -440,7 +440,7 @@ <effectedFile id="RE"></effectedFile> </logFile> -<!-- +<!-- <logFile name="org.eclipse.releng.tests_macosx.cocoa.x86_5.0.xml"> <effectedFile id="SMCC"></effectedFile> </logFile> @@ -808,7 +808,7 @@ <effectedFile id="SMCC"></effectedFile> </logFile> -<!-- +<!-- <logFile name="org.eclipse.ui.tests.views.properties.tabbed_macosx.cocoa.x86_5.0.xml"> <effectedFile id="PMC"></effectedFile> <effectedFile id="PMCSDK"></effectedFile> @@ -819,7 +819,7 @@ <effectedFile id="SMCC"></effectedFile> </logFile> --> - + <logFile name="org.eclipse.ui.workbench.texteditor.tests_macosx.cocoa.x86_5.0.xml"> <effectedFile id="PMC"></effectedFile> <effectedFile id="PMCSDK"></effectedFile> @@ -979,7 +979,7 @@ <effectedFile id="SLG2"></effectedFile> </logFile> -<!-- +<!-- <logFile name="org.eclipse.ui.tests.views.properties.tabbed_linux.gtk.x86_6.0.xml"> <effectedFile id="PLG2"></effectedFile> <effectedFile id="PLG2SDK"></effectedFile> @@ -990,7 +990,7 @@ <effectedFile id="SLG2"></effectedFile> </logFile> --> - + <logFile name="org.eclipse.ui.workbench.texteditor.tests_linux.gtk.x86_6.0.xml"> <effectedFile id="PLG2"></effectedFile> <effectedFile id="PLG2SDK"></effectedFile> @@ -1098,7 +1098,7 @@ <effectedFile id="RCPMC"></effectedFile> <effectedFile id="RCPMCSDK"></effectedFile> <effectedFile id="PMC"></effectedFile> - <effectedFile id="PMCSDK"></effectedFile> + <effectedFile id="PMCSDK"></effectedFile> <effectedFile id="SMCC"></effectedFile> </logFile> @@ -1106,7 +1106,7 @@ <effectedFile id="RCPMC"></effectedFile> <effectedFile id="RCPMCSDK"></effectedFile> <effectedFile id="PMC"></effectedFile> - <effectedFile id="PMCSDK"></effectedFile> + <effectedFile id="PMCSDK"></effectedFile> <effectedFile id="SMCC"></effectedFile> </logFile> @@ -1114,11 +1114,11 @@ <effectedFile id="RCPMC"></effectedFile> <effectedFile id="RCPMCSDK"></effectedFile> <effectedFile id="PMC"></effectedFile> - <effectedFile id="PMCSDK"></effectedFile> + <effectedFile id="PMCSDK"></effectedFile> <effectedFile id="SMCC"></effectedFile> </logFile> -<!-- +<!-- <logFile name="org.eclipse.ui.tests.rcp_macosx.cocoa.x86_5.0.xml"> <effectedFile id="RCPMC"></effectedFile> <effectedFile id="RCPMCSDK"></effectedFile> @@ -1131,7 +1131,7 @@ <effectedFile id="SMCC"></effectedFile> </logFile> --> - + <logFile name="org.eclipse.ui.tests.forms_macosx.cocoa.x86_5.0.xml"> <effectedFile id="RCPMC"></effectedFile> <effectedFile id="RCPMCSDK"></effectedFile> @@ -1220,7 +1220,7 @@ <effectedFile id="RCPLG2"></effectedFile> <effectedFile id="RCPLG2SDK"></effectedFile> <effectedFile id="PLG2"></effectedFile> - <effectedFile id="PLG2SDK"></effectedFile> + <effectedFile id="PLG2SDK"></effectedFile> <effectedFile id="SLG2"></effectedFile> </logFile> @@ -1240,7 +1240,7 @@ <effectedFile id="SLG2"></effectedFile> </logFile> -<!-- +<!-- <logFile name="org.eclipse.ui.tests.rcp_linux.gtk.x86_6.0.xml"> <effectedFile id="RCPLG2"></effectedFile> <effectedFile id="RCPLG2SDK"></effectedFile> @@ -1253,7 +1253,7 @@ <effectedFile id="SLG2"></effectedFile> </logFile> --> - + <logFile name="org.eclipse.ui.tests.forms_linux.gtk.x86_6.0.xml"> <effectedFile id="RCPLG2"></effectedFile> <effectedFile id="RCPLG2SDK"></effectedFile> @@ -1351,7 +1351,7 @@ <effectedFile id="RCPW"></effectedFile> <effectedFile id="RCPWSDK"></effectedFile> <effectedFile id="PW"></effectedFile> - <effectedFile id="PWSDK"></effectedFile> + <effectedFile id="PWSDK"></effectedFile> <effectedFile id="SW"></effectedFile> </logFile> @@ -1359,11 +1359,11 @@ <effectedFile id="RCPW"></effectedFile> <effectedFile id="RCPWSDK"></effectedFile> <effectedFile id="PW"></effectedFile> - <effectedFile id="PWSDK"></effectedFile> + <effectedFile id="PWSDK"></effectedFile> <effectedFile id="SW"></effectedFile> </logFile> -<!-- +<!-- <logFile name="org.eclipse.ui.tests.rcp_win32.win32.x86_7.0.xml"> <effectedFile id="RCPW"></effectedFile> <effectedFile id="RCPWSDK"></effectedFile> @@ -1376,7 +1376,7 @@ <effectedFile id="SW"></effectedFile> </logFile> --> - + <logFile name="org.eclipse.ui.tests.forms_win32.win32.x86_7.0.xml"> <effectedFile id="RCPW"></effectedFile> <effectedFile id="RCPWSDK"></effectedFile> @@ -1389,12 +1389,12 @@ <effectedFile id="SW"></effectedFile> </logFile> -<!-- +<!-- <logFile name="org.eclipse.releng.tests_win32.win32.x86_7.0.xml"> <effectedFile id="SW"></effectedFile> </logFile> --> - + <logFile name="org.eclipse.pde.ui.tests_win32.win32.x86_7.0.xml"> <effectedFile id="PDE"></effectedFile> <effectedFile id="PDESDK"></effectedFile> @@ -1639,7 +1639,7 @@ <effectedFile id="SW"></effectedFile> </logFile> -<!-- +<!-- <logFile name="org.eclipse.ui.tests.views.properties.tabbed_win32.win32.x86_7.0.xml"> <effectedFile id="PW"></effectedFile> <effectedFile id="PWSDK"></effectedFile> @@ -1680,8 +1680,7 @@ <effectedFile id="PDE"></effectedFile> <effectedFile id="PDESDK"></effectedFile> <effectedFile id="SW"></effectedFile> -</logFile> +</logFile> </logFiles> </topLevel> -
\ No newline at end of file diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product index 29cd847a9..1f84c61a2 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product @@ -62,7 +62,7 @@ including, but not limited to the following locations: - Feature directories Note: if a Feature made available by the Eclipse Foundation is installed using the -Provisioning Technology (as defined below), you must agree to a license ("Feature +Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.p2.inf index 291db0580..c3a4a9c21 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.p2.inf +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.p2.inf @@ -1,7 +1,7 @@ -#A bit funcky way to exclude a file, but recommended in +#A bit funcky way to exclude a file, but recommended in #http://stackoverflow.com/questions/11829809/maven-tycho-how-to-exclude-eclipsec-exe-in-a-product-build -#(along with a nother approach that used ant-run). +#(along with a nother approach that used ant-run). # http://dev.eclipse.org/mhonarc/lists/tycho-user/msg03071.html # technically, only needed for windows, but probably not worth the filtering? instructions.configure=org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipsec.exe); diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product index 2efb1f004..67baf790f 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product @@ -85,7 +85,7 @@ including, but not limited to the following locations: - Feature directories Note: if a Feature made available by the Eclipse Foundation is installed using the -Provisioning Technology (as defined below), you must agree to a license ("Feature +Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml index 3cd029e53..be7acc640 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml @@ -10,26 +10,26 @@ <target name="all" depends="init"> <antcall target="equinoxlaunchers" /> </target> - + <target name="equinoxlaunchers"> <property name="archiveRoot" value="launchers" /> <buildRepos os="win32" ws="win32" arch="x86" archiveName="${archiveRoot}-win32.win32.x86.${buildId}.zip" /> - <buildRepos os="win32" ws="win32" arch="x86_64" archiveName="${archiveRoot}-win32.win32.x86_64.${buildId}.zip" /> + <buildRepos os="win32" ws="win32" arch="x86_64" archiveName="${archiveRoot}-win32.win32.x86_64.${buildId}.zip" /> <buildRepos os="linux" ws="gtk" arch="x86" archiveName="${archiveRoot}-linux.gtk.x86.${buildId}.tar.gz" /> - <buildRepos os="linux" ws="gtk" arch="x86_64" archiveName="${archiveRoot}-linux.gtk.x86_64.${buildId}.tar.gz" /> + <buildRepos os="linux" ws="gtk" arch="x86_64" archiveName="${archiveRoot}-linux.gtk.x86_64.${buildId}.tar.gz" /> <buildRepos os="linux" ws="gtk" arch="ppc" archiveName="${archiveRoot}-linux.gtk.ppc.${buildId}.tar.gz" /> <buildRepos os="linux" ws="gtk" arch="ppc64" archiveName="${archiveRoot}-linux.gtk.ppc64.${buildId}.tar.gz" /> <buildRepos os="solaris" ws="gtk" arch="sparc" archiveName="${archiveRoot}-solaris.gtk.sparc.${buildId}.zip" /> <buildRepos os="solaris" ws="gtk" arch="x86" archiveName="${archiveRoot}-solaris.gtk.x86.${buildId}.zip" /> - <!-- + <!-- for master, kepler, hpux,gtk is provided for ia64 (only). for maintentnace branches, juno, hpux,gtk is provided for ia64_32 (only). --> - <buildRepos os="hpux" ws="gtk" arch="ia64" archiveName="${archiveRoot}-hpux.gtk.ia64.${buildId}.zip" /> + <buildRepos os="hpux" ws="gtk" arch="ia64" archiveName="${archiveRoot}-hpux.gtk.ia64.${buildId}.zip" /> <buildRepos os="aix" ws="gtk" arch="ppc" archiveName="${archiveRoot}-aix.gtk.ppc.${buildId}.zip" /> - <buildRepos os="aix" ws="gtk" arch="ppc64" archiveName="${archiveRoot}-aix.gtk.ppc64.${buildId}.zip" /> + <buildRepos os="aix" ws="gtk" arch="ppc64" archiveName="${archiveRoot}-aix.gtk.ppc64.${buildId}.zip" /> <buildRepos os="macosx" ws="cocoa" arch="x86" archiveName="${archiveRoot}-macosx.cocoa.x86.${buildId}.tar.gz" /> <buildRepos os="macosx" ws="cocoa" arch="x86_64" archiveName="${archiveRoot}-macosx.cocoa.x86_64.${buildId}.tar.gz" /> </target> @@ -54,7 +54,7 @@ <slicingOptions platformFilter="@{os},@{ws},@{arch}" includeOptional="false" includeNonGreedy="false" followStrict="true" /> </p2.mirror> <p2.repo2runnable destination="${featureTemp2}/eclipse"> - <source dir="${featureTempRoot}" includes="${featureTempDir}" /> + <source dir="${featureTempRoot}" includes="${featureTempDir}" /> </p2.repo2runnable> <delete> <fileset dir="${featureTemp2}/eclipse" includes="*.jar" /> @@ -81,7 +81,7 @@ <antcall target="${compress.target}"> <param name="dir" value="${featureTemp2}" /> <param name="filename" value="${archiveName}" /> - </antcall> + </antcall> </target> <target name="compress-zip"> @@ -96,7 +96,7 @@ <arg line='-c "tar -cvzf ${dir}/${filename} *"' /> </exec> <move file="${dir}/${filename}" tofile="${archiveFullPath}" /> - </target> + </target> </project> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/helper.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/helper.xml index e6a1b6e53..f181a2d5a 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/helper.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/helper.xml @@ -1,207 +1,133 @@ -<project - name="Build specific targets and properties" - default="noDefault" - basedir="."> - - <target - name="init" - unless="helperInitialized"> - <fail - unless="postingDirectory" - message="Eclipse drop directory must be provided (yes, even for Equinox drop site creation)." /> - - <fail - unless="equinoxPostingDirectory" - message="Root (or parent) of Equinox drop direcotry to be created must be provided." /> - - <fail - unless="eqpublishingContent" - message="Root of Equinox template and static files must be provided." /> - - <fail - unless="EBuilderDir" - message="Root of Eclipse Builder (or Tycho Eclipse Builder) must be provided." /> - - <property environment="env" /> - +<project name="Build specific targets and properties" default="noDefault" basedir="."> + + <target name="init" unless="helperInitialized"> + <fail unless="postingDirectory" message="Eclipse drop directory must be provided (yes, even for Equinox drop site creation)." /> + + <fail unless="equinoxPostingDirectory" message="Root (or parent) of Equinox drop direcotry to be created must be provided." /> + + <fail unless="eqpublishingContent" message="Root of Equinox template and static files must be provided." /> + + <fail unless="EBuilderDir" message="Root of Eclipse Builder (or Tycho Eclipse Builder) must be provided." /> + + <property environment="env" /> + <!-- we typically expect TMP_DIR to be set in environnment. But, if not, /tmp might work. --> - <condition - property="TMP" - value="${env.TMP_DIR}" - else="/tmp"> - <isset property="env.TMP_DIR" /> - </condition> + <condition property="TMP" value="${env.TMP_DIR}" else="/tmp"> + <isset property="env.TMP_DIR" /> + </condition> <!-- make dir, in case we are first to use it, unlikely as that is --> - <mkdir dir="$TMP" /> - <echo message="DEBUG: echo properties at start of equinox publish" /> - <echoproperties /> - <property - name="helperInitialized" - value="true" /> - - </target> - <target - name="publish" - depends="init"> + <mkdir dir="$TMP" /> + <echo message="DEBUG: echo properties at start of equinox publish" /> + <echoproperties /> + <property name="helperInitialized" value="true" /> + + </target> + <target name="publish" depends="init"> <!-- there are three "buildproperties.* files, each with same variables defined/used during the build, such as BUILD_ID, etc. One for PHP, one for Ant, and one for BASH scripts. The one for PHP is most likely to be useful on download site. --> - <copy todir="${equinoxPostingDirectory}/${buildId}"> - <fileset - dir="${postingDirectory}" - includes="buildproperties.*" /> - </copy> - - <!-- + <copy todir="${equinoxPostingDirectory}/${buildId}"> + <fileset dir="${postingDirectory}" includes="buildproperties.*" /> + </copy> + + <!-- These two steps were "blindly" copied from previosly eclipsebuilder, buildAll.xml file. - They were the only two things done for equininox before "publish" was called, so we call + They were the only two things done for equininox before "publish" was called, so we call them as the first step of "publish". --> <!-- <ant antfile="${EBuilderDir}/equinox/buildConfigs/equinox/build.xml" /> --> - <ant antfile="${EBuilderDir}/equinox/buildConfigs/equinox-launchers/build.xml" /> - - <!-- copy orbit files to equinox download directory (I'm not sure this is necessary any longer?) --> - <copy - todir="${equinoxPostingDirectory}/${buildDir}" - overwrite="true"> - <fileset - dir="${buildRepo}/plugins" - includes="org.apache.felix.gogo.*,javax.servlet_*,javax.servlet.jsp_*,org.apache.commons.logging_*,javax.el_*" - excludes="*.source_*, *.jar.pack.gz" /> - </copy> + <ant antfile="${EBuilderDir}/equinox/buildConfigs/equinox-launchers/build.xml" /> + + <!-- copy orbit files to equinox download directory (I'm not sure this is necessary any longer?) --> + <copy todir="${equinoxPostingDirectory}/${buildDir}" overwrite="true"> + <fileset dir="${buildRepo}/plugins" includes="org.apache.felix.gogo.*,javax.servlet_*,javax.servlet.jsp_*,org.apache.commons.logging_*,javax.el_*" excludes="*.source_*, *.jar.pack.gz" /> + </copy> + + <antcall target="updateTestManifests" /> - <antcall target="updateTestManifests" /> + <property name="generatorClass" value="org.eclipse.releng.generators.EclipseTestResultsGenerator" /> - <property - name="generatorClass" - value="org.eclipse.releng.generators.EclipseTestResultsGenerator" /> + <available classname="${generatorClass}" property="class" value="${generatorClass}" /> - <available - classname="${generatorClass}" - property="class" - value="${generatorClass}" /> + <!-- generate md5s and sha1s for bundles --> + <mkdir dir="${equinoxPostingDirectory}/${buildDir}/checksum" /> + <exec executable="sh" dir="${equinoxPostingDirectory}/${buildDir}"> + <arg line="${EBuilderDir}/eclipse/extras/produceChecksum.sh" /> + </exec> - <!-- generate md5s and sha1s for bundles --> - <mkdir dir="${equinoxPostingDirectory}/${buildDir}/checksum" /> - <exec - executable="sh" - dir="${equinoxPostingDirectory}/${buildDir}"> - <arg line="${EBuilderDir}/eclipse/extras/produceChecksum.sh" /> - </exec> - - <!--post clickThroughs. Removed 03/26/2013. There are no clickthroughs for current equinox. - if ever added back, will have to be re-worked. + <!--post clickThroughs. Removed 03/26/2013. There are no clickthroughs for current equinox. + if ever added back, will have to be re-worked. <copy todir="${equinoxPostingDirectory}/${buildDir}"> <fileset dir="${buildDirectory}/maps/org.eclipse.releng" includes="clickThroughs/" /> </copy> --> - - <!--copy compile logs to this posting directory. Not sure needed. Is this where API reports come from? --> - <copy - todir="${equinoxPostingDirectory}/${buildDir}" - overwrite="true"> - <fileset - dir="${postingDirectory}" - includes="compilelogs/**/plugins/org.eclipse.osgi*/**,compilelogs/**/plugins/org.eclipse.equinox*/**" - excludes="compilelogs/**/plugins/org.eclipse.osgi.test*/**" /> - </copy> - - <!--post directory.txt. Removed 03/26/2013. I don't think ever displayed on Equinox page. - and current directory.txt has limited usefulness. + <!--copy compile logs to this posting directory. Not sure needed. Is this where API reports come from? --> + <copy todir="${equinoxPostingDirectory}/${buildDir}" overwrite="true"> + <fileset dir="${postingDirectory}" includes="compilelogs/**/plugins/org.eclipse.osgi*/**,compilelogs/**/plugins/org.eclipse.equinox*/**" excludes="compilelogs/**/plugins/org.eclipse.osgi.test*/**" /> + </copy> + + + <!--post directory.txt. Removed 03/26/2013. I don't think ever displayed on Equinox page. + and current directory.txt has limited usefulness. <copy file="${buildDirectory}/directory.txt" todir="${equinoxPostingDirectory}/${buildDir}" /> --> - <copy todir="${equinoxPostingDirectory}/${buildDir}"> - <fileset dir="${eqpublishingContent}/staticDropFiles" /> - </copy> + <copy todir="${equinoxPostingDirectory}/${buildDir}"> + <fileset dir="${eqpublishingContent}/staticDropFiles" /> + </copy> + + <!-- regenerate the index page with links to test results. + Removed 3/26/20113. There are no test results, at this point on initial promote, + and for at least past year and a half we have never "reran" this to pick up + test results. I do not see any test results links on DL page .... though, + probably could be in icons. + Turns out we still need to run the "indexer" to update DL page, even though + there are no test results. That's how it fills in the symbols in drop token list. + --> + <property name="class" value="org.eclipse.releng.generators.TestResultsGenerator" /> + <taskdef name="indexResults" classname="${class}" /> - <!-- regenerate the index page with links to test results. - Removed 3/26/20113. There are no test results, at this point on initial promote, - and for at least past year and a half we have never "reran" this to pick up - test results. I do not see any test results links on DL page .... though, - probably could be in icons. - Turns out we still need to run the "indexer" to update DL page, even though - there are no test results. That's how it fills in the symbols in drop token list. - --> - <property - name="class" - value="org.eclipse.releng.generators.TestResultsGenerator" /> - <taskdef - name="indexResults" - classname="${class}" /> - <!-- equinox uses same test results --> - + <!-- provisioning removed per bug 368488 dropTokenList="%equinox%,%framework%,%extrabundles%,%other%,%provisioning%,%launchers%,%osgistarterkits%" --> - <indexResults - isBuildTested="false" - buildType="${buildType}" - dropTokenList="%equinox%,%framework%,%extrabundles%,%other%,%launchers%,%osgistarterkits%" - platformIdentifierToken="%platform%" - platformSpecificTemplateList="" - dropHtmlFileName="index.php" - xmlDirectoryName="${postingDirectory}/testresults/xml" - dropDirectoryName="${equinoxPostingDirectory}/${buildDir}" - testResultsTemplateFileName="${eqpublishingContent}/templateFiles/testResults.php.template" - dropTemplateFileName="${eqpublishingContent}/templateFiles/index.php.template" - testResultsHtmlFileName="testResults.php" - hrefTestResultsTargetPath="../../../downloads/drops/${buildDir}/testresults/html" - hrefCompileLogsTargetPath="compilelogs" - compileLogsDirectoryName="${equinoxPostingDirectory}/${buildDir}/compilelogs" - testManifestFileName="${eqpublishingContent}/testManifest.xml" /> - - - </target> - - - <target - name="updateTestManifests" - depends="init"> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.app" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.console" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.supplement" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.device" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.event" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.launcher" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.log" /> - </antcall> + <indexResults isBuildTested="false" buildType="${buildType}" dropTokenList="%equinox%,%framework%,%extrabundles%,%other%,%launchers%,%osgistarterkits%" platformIdentifierToken="%platform%" platformSpecificTemplateList="" dropHtmlFileName="index.php" xmlDirectoryName="${postingDirectory}/testresults/xml" dropDirectoryName="${equinoxPostingDirectory}/${buildDir}" testResultsTemplateFileName="${eqpublishingContent}/templateFiles/testResults.php.template" dropTemplateFileName="${eqpublishingContent}/templateFiles/index.php.template" testResultsHtmlFileName="testResults.php" hrefTestResultsTargetPath="../../../downloads/drops/${buildDir}/testresults/html" hrefCompileLogsTargetPath="compilelogs" compileLogsDirectoryName="${equinoxPostingDirectory}/${buildDir}/compilelogs" testManifestFileName="${eqpublishingContent}/testManifest.xml" /> + + + </target> + + + <target name="updateTestManifests" depends="init"> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.app" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.console" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.supplement" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.device" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.event" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.launcher" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.log" /> + </antcall> <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=376921 <antcall target="updateTestManifest"> <param @@ -209,11 +135,9 @@ value="org.eclipse.equinox.initializer" /> </antcall> --> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.region" /> - </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.region" /> + </antcall> <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=376921 <antcall target="updateTestManifest"> <param @@ -221,272 +145,164 @@ value="org.eclipse.equinox.console.supportability" /> </antcall> --> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.metatype" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.useradmin" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.osgi" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.osgi.util" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.osgi.services" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.registry" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.preferences" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.common" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.cm" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.ds" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.http" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.http.jetty" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.io" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.ip" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.jsp.jasper" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.jsp.jasper.registry" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.http.registry" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.http.servlet" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.http.servletbridge" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.servletbridge" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.transforms.hook" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.transforms.xslt" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.util" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.wireadmin" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="javax.servlet" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="javax.servlet.jsp" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="javax.el" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.apache.commons.logging" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.apache.felix.gogo.command" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.apache.felix.gogo.runtime" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.apache.felix.gogo.shell" /> - </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.metatype" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.useradmin" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.osgi" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.osgi.util" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.osgi.services" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.registry" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.preferences" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.common" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.cm" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.ds" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.http" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.http.jetty" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.io" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.ip" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.jsp.jasper" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.jsp.jasper.registry" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.http.registry" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.http.servlet" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.http.servletbridge" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.servletbridge" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.transforms.hook" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.transforms.xslt" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.util" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.wireadmin" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="javax.servlet" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="javax.servlet.jsp" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="javax.el" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.apache.commons.logging" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.apache.felix.gogo.command" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.apache.felix.gogo.runtime" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.apache.felix.gogo.shell" /> + </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.simpleconfigurator" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.concurrent" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.coordinator" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.equinox.region" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.jetty.continuation" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.jetty.security" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.jetty.util" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.jetty.http" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.jetty.http" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.jetty.server" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.jetty.io" /> - </antcall> - <antcall target="updateTestManifest"> - <param - name="bundle.id" - value="org.eclipse.jetty.servlet" /> - </antcall> - </target> - - <!-- ===================================================================== --> - <!-- Helper targets --> - <!-- ===================================================================== --> - <target - name="updateTestManifest" - depends="init"> - <apply - executable="ls" - output="${TMP}/${bundle.id}.txt" - dir="${equinoxPostingDirectory}/${buildDir}"> - <fileset dir="${equinoxPostingDirectory}/${buildDir}"> - <patternset> - <include name="${bundle.id}*.jar" /> - </patternset> - </fileset> - </apply> - - <replaceregexp - file="${TMP}/${bundle.id}.txt" - match="/.+/" - replace="" /> - <replaceregexp - file="${TMP}/${bundle.id}.txt" - match="\.jar" - replace="" /> - <replaceregexp - file="${TMP}/${bundle.id}.txt" - match="\n" - replace="" /> - <loadfile - property="bundle.jar" - srcFile="${TMP}/${bundle.id}.txt" - failonerror="off" /> - <delete - file="${TMP}/${bundle.id}.txt" - failonerror="false" /> - <replace - file="${eqpublishingContent}/testManifest.xml" - token="@${bundle.id}@" - value="${bundle.jar}" /> - </target> - - - <!-- ===================================================================== --> - <!-- Default target --> - <!-- ===================================================================== --> - <target name="noDefault"> - <echo message="You must specify a target when invoking this file" /> - </target> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.simpleconfigurator" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.concurrent" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.coordinator" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.equinox.region" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.jetty.continuation" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.jetty.security" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.jetty.util" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.jetty.http" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.jetty.http" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.jetty.server" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.jetty.io" /> + </antcall> + <antcall target="updateTestManifest"> + <param name="bundle.id" value="org.eclipse.jetty.servlet" /> + </antcall> + </target> + + <!-- ===================================================================== --> + <!-- Helper targets --> + <!-- ===================================================================== --> + <target name="updateTestManifest" depends="init"> + <apply executable="ls" output="${TMP}/${bundle.id}.txt" dir="${equinoxPostingDirectory}/${buildDir}"> + <fileset dir="${equinoxPostingDirectory}/${buildDir}"> + <patternset> + <include name="${bundle.id}*.jar" /> + </patternset> + </fileset> + </apply> + + <replaceregexp file="${TMP}/${bundle.id}.txt" match="/.+/" replace="" /> + <replaceregexp file="${TMP}/${bundle.id}.txt" match="\.jar" replace="" /> + <replaceregexp file="${TMP}/${bundle.id}.txt" match="\n" replace="" /> + <loadfile property="bundle.jar" srcFile="${TMP}/${bundle.id}.txt" failonerror="off" /> + <delete file="${TMP}/${bundle.id}.txt" failonerror="false" /> + <replace file="${eqpublishingContent}/testManifest.xml" token="@${bundle.id}@" value="${bundle.jar}" /> + </target> + + + <!-- ===================================================================== --> + <!-- Default target --> + <!-- ===================================================================== --> + <target name="noDefault"> + <echo message="You must specify a target when invoking this file" /> + </target> </project> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/templateFiles/index.php.template b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/templateFiles/index.php.template index 0fff6890d..728933386 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/templateFiles/index.php.template +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/templateFiles/index.php.template @@ -1,15 +1,15 @@ -<?php +<?php //ini_set("display_errors", "true"); //error_reporting (E_ALL); - + require_once("../../../eclipse.org-common/system/app.class.php"); require_once("../../../eclipse.org-common/system/nav.class.php"); require_once("../../../eclipse.org-common/system/menu.class.php"); require_once("build.php"); - // we rely on this file to get $BUILD_ID, etc. + // we rely on this file to get $BUILD_ID, etc. include("buildproperties.php"); - + $App = new App(); $Nav = new Nav(); $Menu = new Menu(); @@ -17,11 +17,11 @@ # Begin: page-specific settings. Change these. $pageTitle = "Equinox $BUILD_TYPE_NAME Build: $BUILD_ID"; $pageKeywords = "equinox, osgi, framework, runtime, download"; - $pageAuthor = "Equinox committers"; + $pageAuthor = "Equinox committers"; $generateDropSize = 'generateDropSize'; $generateChecksumLinks = 'generateChecksumLinks'; $buildlabel = "$EQ_BUILD_DIR_SEG"; - + $html = <<<EOHTML @@ -102,7 +102,7 @@ </table> </div> </div> - + <div class="homeitem3col"> <h3><a onclick="expandCollapse('osgistarterkits.bundles');"><img id="osgistarterkits.bundles.button" src="http://eclipse.org/equinox/images/arrow.png"/></a> OSGi starter kits</h3> <p>A useful collection of Equinox bundles packaged as a ready to run system. This include the framework, p2 and other frequently used service implementations. </p> @@ -143,7 +143,7 @@ <tr> <td align="center"><img src="/equinox/images/sha1.png"/></td> <td>Click to get the SHA512 hash for the corresponding build artifact</td> - </tr> + </tr> <tr> <td align="center"><img src="http://eclipse.org/equinox/images/arrow.png"/></td> <td>Click to expand section.</td> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/templateFiles/testResults.php.template b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/templateFiles/testResults.php.template index e00143e6a..880c5d35d 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/templateFiles/testResults.php.template +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/templateFiles/testResults.php.template @@ -5,12 +5,12 @@ $parts = explode("/", getcwd()); $parts2 = explode("-", $parts[count($parts) - 1]); $buildName = $parts2[0] . "-" . $parts2[1]; - + // Get build type names $fileHandle = fopen("./dlconfig2.txt", "r"); while (!feof($fileHandle)) { - + $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0 $parts = explode(",", $aLine); $dropNames[trim($parts[0])] = trim($parts[1]); diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product index d3f5b876a..85205ed9a 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product @@ -90,7 +90,7 @@ including, but not limited to the following locations: - Feature directories Note: if a Feature made available by the Eclipse Foundation is installed using the -Provisioning Technology (as defined below), you must agree to a license ("Feature +Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product index 970f4623a..9459a7e19 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product @@ -90,7 +90,7 @@ including, but not limited to the following locations: - Feature directories Note: if a Feature made available by the Eclipse Foundation is installed using the -Provisioning Technology (as defined below), you must agree to a license ("Feature +Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/config.product b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/config.product index e16cd1217..b06536165 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/config.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/config.product @@ -66,7 +66,7 @@ including, but not limited to the following locations: - Feature directories Note: if a Feature made available by the Eclipse Foundation is installed using the -Provisioning Technology (as defined below), you must agree to a license ("Feature +Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/feature.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/feature.xml index 8bfcbfe9f..0122cee88 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/feature.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/feature.xml @@ -17,5 +17,5 @@ <license url="%licenseURL"> %license </license> - + </feature> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product index 8486d2798..f3c4d31df 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product @@ -90,7 +90,7 @@ including, but not limited to the following locations: - Feature directories Note: if a Feature made available by the Eclipse Foundation is installed using the -Provisioning Technology (as defined below), you must agree to a license ("Feature +Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product b/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product index ae510db05..14115055b 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product @@ -88,7 +88,7 @@ including, but not limited to the following locations: - Feature directories Note: if a Feature made available by the Eclipse Foundation is installed using the -Provisioning Technology (as defined below), you must agree to a license ("Feature +Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform diff --git a/eclipse.platform.releng.tychoeclipsebuilder/repos/build.xml b/eclipse.platform.releng.tychoeclipsebuilder/repos/build.xml index 649b72a18..af0838067 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/repos/build.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/repos/build.xml @@ -102,6 +102,6 @@ <property name="archiveFullPath" value="${postingDirectory}/${buildLabel}/${archiveName}" /> <exec executable="zip" dir="${featureTemp}"> <arg line="${archiveFullPath} -r ." /> - </exec> + </exec> </target> </project> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/repos/platformrepo.xml b/eclipse.platform.releng.tychoeclipsebuilder/repos/platformrepo.xml index e5569fdd6..1cd2dcebd 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/repos/platformrepo.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/repos/platformrepo.xml @@ -39,8 +39,8 @@ <iu id="org.eclipse.platform.source.feature.group" version="" /> <iu id="org.eclipse.equinox.p2.user.ui.feature.group" version="" /> <iu id="org.eclipse.equinox.p2.user.ui.source.feature.group" version="" /> - <iu id="org.eclipse.rcp.configuration.feature.group" version="" /> - <iu id="org.eclipse.equinox.executable.feature.group" version="" /> + <iu id="org.eclipse.rcp.configuration.feature.group" version="" /> + <iu id="org.eclipse.equinox.executable.feature.group" version="" /> <iu id="org.eclipse.platform.sdk" version="" /> <slicingOptions includeOptional="false" includeNonGreedy="false" /> </p2.mirror> @@ -58,6 +58,6 @@ <property name="archiveFullPath" value="${postingDirectory}/${buildLabel}/${archiveName}" /> <exec executable="zip" dir="${featureTemp}"> <arg line="${archiveFullPath} -r ." /> - </exec> + </exec> </target> </project>
\ No newline at end of file diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product index 0483e6c7e..19c15b967 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product @@ -90,7 +90,7 @@ including, but not limited to the following locations: - Feature directories Note: if a Feature made available by the Eclipse Foundation is installed using the -Provisioning Technology (as defined below), you must agree to a license ("Feature +Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform |