cleanup and format
diff --git a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/displayPrereqs.php b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/displayPrereqs.php index 34fffb9..9308086 100644 --- a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/displayPrereqs.php +++ b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/displayPrereqs.php
@@ -1,63 +1,66 @@ <!-- *********** Required Prerequisites ************** --> <table border=0 cellspacing=2 cellpadding=2 width="100%"> - <tr> - <td align="left" valign="top" bgcolor="#0080C0"><font - face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites - and Handy Extras</font></td> - </tr> - <tr> - <td> - <p>These are the prerequisites to build or run these packages. All - are not necessarily required, but instead some subset. Also listed - are some frequently needed links for committer-required packages - when creating new development environments, or targets to run - against.</p> - <p> - Note that WTP as a whole requires Java 6 even though subsets of WTP - and other <a href="http://www.eclipse.org/downloads/">Eclipse - Projects</a> might run with <a - href="http://www.eclipse.org/downloads/moreinfo/jre.php">other JRE - levels</a>. - </p> - <p></p> - </td> - </tr> - <tr> - <td> - <table border=0 cellspacing=1 cellpadding=1 width="90%" - align="center"> + <tr> + <td align="left" valign="top" bgcolor="#0080C0"><font + face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites + and Handy Extras</font></td> + </tr> + <tr> + <td> + <p>These are the prerequisites to build or run these packages. All + are not necessarily required, but instead some subset. Also listed + are some frequently needed links for committer-required packages + when creating new development environments, or targets to run + against.</p> + <p> + Note that WTP as a whole requires Java 6 even though subsets of WTP + and other <a href="http://www.eclipse.org/downloads/">Eclipse + Projects</a> might run with <a + href="http://www.eclipse.org/downloads/moreinfo/jre.php">other JRE + levels</a>. + </p> + <p></p> + </td> + </tr> + <tr> + <td> + <table border=0 cellspacing=1 cellpadding=1 width="90%" + align="center"> - - - + <tr valign="middle"> + <td colspan="2"><hr /></td> + </tr> + + + + <?php include_once('dependency.properties.php'); include_once('prereqsToDisplay.php'); $eclipse_mirror_script="http://www.eclipse.org/downloads/download.php?file="; - if ("true" === $prereq_eclipseplatform) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td width=\"40%\">Eclipse Platform</td>"; - + + echo "<td width=\"50%\">"; + echo $eclipseplatform_name . " " . $eclipseplatform_description ; + echo "</td>"; //customize page depending on user's browser/platform, if we can detect it $usersPlatform = getPlatform(); // assume windows by default, since likely most frequent, even for cases where // platform is "unknown". I've noticed Opera reports 'unknown' :( - $recommendedFile=$eclipseplatformfilewindows; + $recommendedFile=$eclipse_file_win32_win32_x86; if (strcmp($usersPlatform,"linux")== 0) { - $recommendedFile=$eclipseplatformfilelinux; + $recommendedFile=$eclipse_file_linux_gtk_x86; } else if (strcmp($usersPlatform,"mac") == 0) { - $recommendedFile=$eclipseplatformfilemacosx; + $recommendedFile=$eclipse_file_macosx_carbon_ppc; } echo "<td align=\"right\">"; - echo getPrereqReferenceOrName($eclipse_mirror_script, $eclipse_mirror_prefixuri, $eclipse_url, $recommendedFile, $eclipse_fspath_prefix); - echo " or <a href=\"" . $eclipseplatformBuild_url . "\">appropriate platform</a>"; + echo getPrereqReferenceOrName($eclipse_mirror_script, $eclipseplatform_mirror_prefixuri, $eclipseplatform_url, $recommendedFile, $eclipse_fspath_prefix); + echo " or <a href=\"" . $eclipseplatform_url . "\">appropriate platform</a>"; echo " or <a href=\"" . $eclipseplatform_build_home . "\">equivalent</a></td>"; @@ -65,21 +68,13 @@ } ?> - - - - <?php if ("true" === $prereq_eclipse) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; + echo "<td width=\"50%\">"; echo $eclipse_name . " " . $eclipse_description ; - echo "</td>"; - //customize page depending on user's browser/platform, if we can detect it $usersPlatform = getPlatform(); // assume windows by default, since likely most frequent, even for cases where @@ -97,22 +92,17 @@ echo " or <a href=\"" . $eclipse_url . "\">appropriate platform</a>"; echo " or <a href=\"" . $eclipse_build_home . "\">equivalent</a></td>"; - echo " </tr>"; } ?> - - <?php if ("true" === $prereq_emfandxsd) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $emfandxsd_name . " " . $emfandxsd_description ; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $emfandxsd_mirror_prefixuri, $emfandxsd_url, $emfandxsd_file, $eclipse_fspath_prefix); @@ -121,19 +111,13 @@ } ?> - - - - <?php if ("true" === $prereq_gef) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $gef_name . " " . $gef_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $gef_mirror_prefexuri, $gef_url, $gef_file, $eclipse_fspath_prefix); @@ -143,19 +127,13 @@ } ?> - - - - <?php if ("true" === $prereq_dtp) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $dtp_name . " " . $dtp_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $dtp_mirror_prefixuri, $dtp_url, $dtp_file, $eclipse_fspath_prefix); @@ -164,20 +142,14 @@ echo " </tr>"; } ?> - - - - - + <?php if ("true" === $prereq_emftransaction) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $emftransaction_name . " " . $emftransaction_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $emftransaction_mirror_prefixuri, $emftransaction_url, $emftransaction_file, $eclipse_fspath_prefix); @@ -187,19 +159,13 @@ } ?> - - - - <?php if ("true" === $prereq_emfvalidation) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $emfvalidation_name . " " . $emfvalidation_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $emfvalidation_mirror_prefexuri, $emfvalidation_url, $emfvalidation_file, $eclipse_fspath_prefix); @@ -209,19 +175,13 @@ } ?> - - - - <?php if ("true" === $prereq_graphiti) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $graphiti_name . " " . $graphiti_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $graphiti_mirror_prefexuri, $graphiti_url, $graphiti_file, $eclipse_fspath_prefix); @@ -231,19 +191,13 @@ } ?> - - - - <?php if ("true" === $prereq_wst) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $wst_name . " " . $wst_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $wst_mirror_prefexuri, $wst_url, $wst_file, $eclipse_fspath_prefix); @@ -253,19 +207,13 @@ } ?> - - - - <?php if ("true" === $prereq_jst) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $jst_name . " " . $jst_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $jst_mirror_prefexuri, $jst_url, $jst_file, $eclipse_fspath_prefix); @@ -275,18 +223,13 @@ } ?> - - - <?php if ("true" === $prereq_wtp) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $wtp_name . " " . $wtp_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $wtp_mirror_prefexuri, $wtp_url, $wtp_file, $eclipse_fspath_prefix); @@ -296,18 +239,13 @@ } ?> - - - <?php if ("true" === $prereq_wtptests) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $wtptests_name . " " . $wtptests_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $wtptests_mirror_prefexuri, $wtptests_url, $wtptests_file, $eclipse_fspath_prefix); @@ -317,17 +255,13 @@ } ?> - - <?php if ("true" === $prereq_dltk) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $dltk_name . " " . $dltk_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $dltk_mirror_prefexuri, $dltk_url, $dltk_file, $eclipse_fspath_prefix); @@ -337,24 +271,17 @@ } ?> - <tr valign="middle"> - <td width="10%"></td> - <td colspan="2"> - <hr /></td> + <td colspan="2"><hr /></td> </tr> - - <?php if ("true" === $prereq_eclipsetestframework) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - - echo $eclipseTestFramework_name . " " . $eclipseTestFramework_description; - - echo "</td>"; + + echo "<td width=\"50%\">"; + echo $eclipseTestFramework_name . " " . $eclipseTestFramework_description; + echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $eclipseTestFramework_mirror_prefixuri, $eclipseTestFramework_url, $eclipseTestFramework_file, $eclipse_fspath_prefix); @@ -363,18 +290,13 @@ } ?> - - - <?php if ("true" === $prereq_eclipsereleng) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $eclipsereleng_name . " " . $eclipsereleng_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $eclipsereleng_mirror_prefixuri, $eclipsereleng_url, $eclipsereleng_file, $eclipse_fspath_prefix); @@ -385,13 +307,11 @@ <?php if ("true" === $prereq_orbitthirdpartyzip) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $orbitthirdpartyzip_name . " " . $orbitthirdpartyzip_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $orbitthirdpartyzip_mirror_prefixuri, $orbitthirdpartyzip_url, $orbitthirdpartyzip_file, $eclipse_fspath_prefix); @@ -402,7 +322,7 @@ </table> - </td> - </tr> + </td> + </tr> </table>
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/displayPrereqs.php b/releng.wtpbuilder/distribution/wtp.site/templateFiles/displayPrereqs.php index 34fffb9..9308086 100644 --- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/displayPrereqs.php +++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/displayPrereqs.php
@@ -1,63 +1,66 @@ <!-- *********** Required Prerequisites ************** --> <table border=0 cellspacing=2 cellpadding=2 width="100%"> - <tr> - <td align="left" valign="top" bgcolor="#0080C0"><font - face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites - and Handy Extras</font></td> - </tr> - <tr> - <td> - <p>These are the prerequisites to build or run these packages. All - are not necessarily required, but instead some subset. Also listed - are some frequently needed links for committer-required packages - when creating new development environments, or targets to run - against.</p> - <p> - Note that WTP as a whole requires Java 6 even though subsets of WTP - and other <a href="http://www.eclipse.org/downloads/">Eclipse - Projects</a> might run with <a - href="http://www.eclipse.org/downloads/moreinfo/jre.php">other JRE - levels</a>. - </p> - <p></p> - </td> - </tr> - <tr> - <td> - <table border=0 cellspacing=1 cellpadding=1 width="90%" - align="center"> + <tr> + <td align="left" valign="top" bgcolor="#0080C0"><font + face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites + and Handy Extras</font></td> + </tr> + <tr> + <td> + <p>These are the prerequisites to build or run these packages. All + are not necessarily required, but instead some subset. Also listed + are some frequently needed links for committer-required packages + when creating new development environments, or targets to run + against.</p> + <p> + Note that WTP as a whole requires Java 6 even though subsets of WTP + and other <a href="http://www.eclipse.org/downloads/">Eclipse + Projects</a> might run with <a + href="http://www.eclipse.org/downloads/moreinfo/jre.php">other JRE + levels</a>. + </p> + <p></p> + </td> + </tr> + <tr> + <td> + <table border=0 cellspacing=1 cellpadding=1 width="90%" + align="center"> - - - + <tr valign="middle"> + <td colspan="2"><hr /></td> + </tr> + + + + <?php include_once('dependency.properties.php'); include_once('prereqsToDisplay.php'); $eclipse_mirror_script="http://www.eclipse.org/downloads/download.php?file="; - if ("true" === $prereq_eclipseplatform) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td width=\"40%\">Eclipse Platform</td>"; - + + echo "<td width=\"50%\">"; + echo $eclipseplatform_name . " " . $eclipseplatform_description ; + echo "</td>"; //customize page depending on user's browser/platform, if we can detect it $usersPlatform = getPlatform(); // assume windows by default, since likely most frequent, even for cases where // platform is "unknown". I've noticed Opera reports 'unknown' :( - $recommendedFile=$eclipseplatformfilewindows; + $recommendedFile=$eclipse_file_win32_win32_x86; if (strcmp($usersPlatform,"linux")== 0) { - $recommendedFile=$eclipseplatformfilelinux; + $recommendedFile=$eclipse_file_linux_gtk_x86; } else if (strcmp($usersPlatform,"mac") == 0) { - $recommendedFile=$eclipseplatformfilemacosx; + $recommendedFile=$eclipse_file_macosx_carbon_ppc; } echo "<td align=\"right\">"; - echo getPrereqReferenceOrName($eclipse_mirror_script, $eclipse_mirror_prefixuri, $eclipse_url, $recommendedFile, $eclipse_fspath_prefix); - echo " or <a href=\"" . $eclipseplatformBuild_url . "\">appropriate platform</a>"; + echo getPrereqReferenceOrName($eclipse_mirror_script, $eclipseplatform_mirror_prefixuri, $eclipseplatform_url, $recommendedFile, $eclipse_fspath_prefix); + echo " or <a href=\"" . $eclipseplatform_url . "\">appropriate platform</a>"; echo " or <a href=\"" . $eclipseplatform_build_home . "\">equivalent</a></td>"; @@ -65,21 +68,13 @@ } ?> - - - - <?php if ("true" === $prereq_eclipse) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; + echo "<td width=\"50%\">"; echo $eclipse_name . " " . $eclipse_description ; - echo "</td>"; - //customize page depending on user's browser/platform, if we can detect it $usersPlatform = getPlatform(); // assume windows by default, since likely most frequent, even for cases where @@ -97,22 +92,17 @@ echo " or <a href=\"" . $eclipse_url . "\">appropriate platform</a>"; echo " or <a href=\"" . $eclipse_build_home . "\">equivalent</a></td>"; - echo " </tr>"; } ?> - - <?php if ("true" === $prereq_emfandxsd) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $emfandxsd_name . " " . $emfandxsd_description ; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $emfandxsd_mirror_prefixuri, $emfandxsd_url, $emfandxsd_file, $eclipse_fspath_prefix); @@ -121,19 +111,13 @@ } ?> - - - - <?php if ("true" === $prereq_gef) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $gef_name . " " . $gef_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $gef_mirror_prefexuri, $gef_url, $gef_file, $eclipse_fspath_prefix); @@ -143,19 +127,13 @@ } ?> - - - - <?php if ("true" === $prereq_dtp) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $dtp_name . " " . $dtp_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $dtp_mirror_prefixuri, $dtp_url, $dtp_file, $eclipse_fspath_prefix); @@ -164,20 +142,14 @@ echo " </tr>"; } ?> - - - - - + <?php if ("true" === $prereq_emftransaction) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $emftransaction_name . " " . $emftransaction_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $emftransaction_mirror_prefixuri, $emftransaction_url, $emftransaction_file, $eclipse_fspath_prefix); @@ -187,19 +159,13 @@ } ?> - - - - <?php if ("true" === $prereq_emfvalidation) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $emfvalidation_name . " " . $emfvalidation_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $emfvalidation_mirror_prefexuri, $emfvalidation_url, $emfvalidation_file, $eclipse_fspath_prefix); @@ -209,19 +175,13 @@ } ?> - - - - <?php if ("true" === $prereq_graphiti) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $graphiti_name . " " . $graphiti_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $graphiti_mirror_prefexuri, $graphiti_url, $graphiti_file, $eclipse_fspath_prefix); @@ -231,19 +191,13 @@ } ?> - - - - <?php if ("true" === $prereq_wst) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $wst_name . " " . $wst_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $wst_mirror_prefexuri, $wst_url, $wst_file, $eclipse_fspath_prefix); @@ -253,19 +207,13 @@ } ?> - - - - <?php if ("true" === $prereq_jst) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $jst_name . " " . $jst_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $jst_mirror_prefexuri, $jst_url, $jst_file, $eclipse_fspath_prefix); @@ -275,18 +223,13 @@ } ?> - - - <?php if ("true" === $prereq_wtp) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $wtp_name . " " . $wtp_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $wtp_mirror_prefexuri, $wtp_url, $wtp_file, $eclipse_fspath_prefix); @@ -296,18 +239,13 @@ } ?> - - - <?php if ("true" === $prereq_wtptests) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $wtptests_name . " " . $wtptests_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $wtptests_mirror_prefexuri, $wtptests_url, $wtptests_file, $eclipse_fspath_prefix); @@ -317,17 +255,13 @@ } ?> - - <?php if ("true" === $prereq_dltk) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $dltk_name . " " . $dltk_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $dltk_mirror_prefexuri, $dltk_url, $dltk_file, $eclipse_fspath_prefix); @@ -337,24 +271,17 @@ } ?> - <tr valign="middle"> - <td width="10%"></td> - <td colspan="2"> - <hr /></td> + <td colspan="2"><hr /></td> </tr> - - <?php if ("true" === $prereq_eclipsetestframework) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - - echo $eclipseTestFramework_name . " " . $eclipseTestFramework_description; - - echo "</td>"; + + echo "<td width=\"50%\">"; + echo $eclipseTestFramework_name . " " . $eclipseTestFramework_description; + echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $eclipseTestFramework_mirror_prefixuri, $eclipseTestFramework_url, $eclipseTestFramework_file, $eclipse_fspath_prefix); @@ -363,18 +290,13 @@ } ?> - - - <?php if ("true" === $prereq_eclipsereleng) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $eclipsereleng_name . " " . $eclipsereleng_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $eclipsereleng_mirror_prefixuri, $eclipsereleng_url, $eclipsereleng_file, $eclipse_fspath_prefix); @@ -385,13 +307,11 @@ <?php if ("true" === $prereq_orbitthirdpartyzip) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $orbitthirdpartyzip_name . " " . $orbitthirdpartyzip_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $orbitthirdpartyzip_mirror_prefixuri, $orbitthirdpartyzip_url, $orbitthirdpartyzip_file, $eclipse_fspath_prefix); @@ -402,7 +322,7 @@ </table> - </td> - </tr> + </td> + </tr> </table>
diff --git a/releng.wtpbuilder/distribution/wtp4x.site/templateFiles/displayPrereqs.php b/releng.wtpbuilder/distribution/wtp4x.site/templateFiles/displayPrereqs.php index 34fffb9..9308086 100644 --- a/releng.wtpbuilder/distribution/wtp4x.site/templateFiles/displayPrereqs.php +++ b/releng.wtpbuilder/distribution/wtp4x.site/templateFiles/displayPrereqs.php
@@ -1,63 +1,66 @@ <!-- *********** Required Prerequisites ************** --> <table border=0 cellspacing=2 cellpadding=2 width="100%"> - <tr> - <td align="left" valign="top" bgcolor="#0080C0"><font - face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites - and Handy Extras</font></td> - </tr> - <tr> - <td> - <p>These are the prerequisites to build or run these packages. All - are not necessarily required, but instead some subset. Also listed - are some frequently needed links for committer-required packages - when creating new development environments, or targets to run - against.</p> - <p> - Note that WTP as a whole requires Java 6 even though subsets of WTP - and other <a href="http://www.eclipse.org/downloads/">Eclipse - Projects</a> might run with <a - href="http://www.eclipse.org/downloads/moreinfo/jre.php">other JRE - levels</a>. - </p> - <p></p> - </td> - </tr> - <tr> - <td> - <table border=0 cellspacing=1 cellpadding=1 width="90%" - align="center"> + <tr> + <td align="left" valign="top" bgcolor="#0080C0"><font + face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites + and Handy Extras</font></td> + </tr> + <tr> + <td> + <p>These are the prerequisites to build or run these packages. All + are not necessarily required, but instead some subset. Also listed + are some frequently needed links for committer-required packages + when creating new development environments, or targets to run + against.</p> + <p> + Note that WTP as a whole requires Java 6 even though subsets of WTP + and other <a href="http://www.eclipse.org/downloads/">Eclipse + Projects</a> might run with <a + href="http://www.eclipse.org/downloads/moreinfo/jre.php">other JRE + levels</a>. + </p> + <p></p> + </td> + </tr> + <tr> + <td> + <table border=0 cellspacing=1 cellpadding=1 width="90%" + align="center"> - - - + <tr valign="middle"> + <td colspan="2"><hr /></td> + </tr> + + + + <?php include_once('dependency.properties.php'); include_once('prereqsToDisplay.php'); $eclipse_mirror_script="http://www.eclipse.org/downloads/download.php?file="; - if ("true" === $prereq_eclipseplatform) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td width=\"40%\">Eclipse Platform</td>"; - + + echo "<td width=\"50%\">"; + echo $eclipseplatform_name . " " . $eclipseplatform_description ; + echo "</td>"; //customize page depending on user's browser/platform, if we can detect it $usersPlatform = getPlatform(); // assume windows by default, since likely most frequent, even for cases where // platform is "unknown". I've noticed Opera reports 'unknown' :( - $recommendedFile=$eclipseplatformfilewindows; + $recommendedFile=$eclipse_file_win32_win32_x86; if (strcmp($usersPlatform,"linux")== 0) { - $recommendedFile=$eclipseplatformfilelinux; + $recommendedFile=$eclipse_file_linux_gtk_x86; } else if (strcmp($usersPlatform,"mac") == 0) { - $recommendedFile=$eclipseplatformfilemacosx; + $recommendedFile=$eclipse_file_macosx_carbon_ppc; } echo "<td align=\"right\">"; - echo getPrereqReferenceOrName($eclipse_mirror_script, $eclipse_mirror_prefixuri, $eclipse_url, $recommendedFile, $eclipse_fspath_prefix); - echo " or <a href=\"" . $eclipseplatformBuild_url . "\">appropriate platform</a>"; + echo getPrereqReferenceOrName($eclipse_mirror_script, $eclipseplatform_mirror_prefixuri, $eclipseplatform_url, $recommendedFile, $eclipse_fspath_prefix); + echo " or <a href=\"" . $eclipseplatform_url . "\">appropriate platform</a>"; echo " or <a href=\"" . $eclipseplatform_build_home . "\">equivalent</a></td>"; @@ -65,21 +68,13 @@ } ?> - - - - <?php if ("true" === $prereq_eclipse) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; + echo "<td width=\"50%\">"; echo $eclipse_name . " " . $eclipse_description ; - echo "</td>"; - //customize page depending on user's browser/platform, if we can detect it $usersPlatform = getPlatform(); // assume windows by default, since likely most frequent, even for cases where @@ -97,22 +92,17 @@ echo " or <a href=\"" . $eclipse_url . "\">appropriate platform</a>"; echo " or <a href=\"" . $eclipse_build_home . "\">equivalent</a></td>"; - echo " </tr>"; } ?> - - <?php if ("true" === $prereq_emfandxsd) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $emfandxsd_name . " " . $emfandxsd_description ; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $emfandxsd_mirror_prefixuri, $emfandxsd_url, $emfandxsd_file, $eclipse_fspath_prefix); @@ -121,19 +111,13 @@ } ?> - - - - <?php if ("true" === $prereq_gef) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $gef_name . " " . $gef_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $gef_mirror_prefexuri, $gef_url, $gef_file, $eclipse_fspath_prefix); @@ -143,19 +127,13 @@ } ?> - - - - <?php if ("true" === $prereq_dtp) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $dtp_name . " " . $dtp_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $dtp_mirror_prefixuri, $dtp_url, $dtp_file, $eclipse_fspath_prefix); @@ -164,20 +142,14 @@ echo " </tr>"; } ?> - - - - - + <?php if ("true" === $prereq_emftransaction) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $emftransaction_name . " " . $emftransaction_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $emftransaction_mirror_prefixuri, $emftransaction_url, $emftransaction_file, $eclipse_fspath_prefix); @@ -187,19 +159,13 @@ } ?> - - - - <?php if ("true" === $prereq_emfvalidation) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $emfvalidation_name . " " . $emfvalidation_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $emfvalidation_mirror_prefexuri, $emfvalidation_url, $emfvalidation_file, $eclipse_fspath_prefix); @@ -209,19 +175,13 @@ } ?> - - - - <?php if ("true" === $prereq_graphiti) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $graphiti_name . " " . $graphiti_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $graphiti_mirror_prefexuri, $graphiti_url, $graphiti_file, $eclipse_fspath_prefix); @@ -231,19 +191,13 @@ } ?> - - - - <?php if ("true" === $prereq_wst) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $wst_name . " " . $wst_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $wst_mirror_prefexuri, $wst_url, $wst_file, $eclipse_fspath_prefix); @@ -253,19 +207,13 @@ } ?> - - - - <?php if ("true" === $prereq_jst) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $jst_name . " " . $jst_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $jst_mirror_prefexuri, $jst_url, $jst_file, $eclipse_fspath_prefix); @@ -275,18 +223,13 @@ } ?> - - - <?php if ("true" === $prereq_wtp) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $wtp_name . " " . $wtp_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $wtp_mirror_prefexuri, $wtp_url, $wtp_file, $eclipse_fspath_prefix); @@ -296,18 +239,13 @@ } ?> - - - <?php if ("true" === $prereq_wtptests) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $wtptests_name . " " . $wtptests_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $wtptests_mirror_prefexuri, $wtptests_url, $wtptests_file, $eclipse_fspath_prefix); @@ -317,17 +255,13 @@ } ?> - - <?php if ("true" === $prereq_dltk) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $dltk_name . " " . $dltk_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $dltk_mirror_prefexuri, $dltk_url, $dltk_file, $eclipse_fspath_prefix); @@ -337,24 +271,17 @@ } ?> - <tr valign="middle"> - <td width="10%"></td> - <td colspan="2"> - <hr /></td> + <td colspan="2"><hr /></td> </tr> - - <?php if ("true" === $prereq_eclipsetestframework) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - - echo $eclipseTestFramework_name . " " . $eclipseTestFramework_description; - - echo "</td>"; + + echo "<td width=\"50%\">"; + echo $eclipseTestFramework_name . " " . $eclipseTestFramework_description; + echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $eclipseTestFramework_mirror_prefixuri, $eclipseTestFramework_url, $eclipseTestFramework_file, $eclipse_fspath_prefix); @@ -363,18 +290,13 @@ } ?> - - - <?php if ("true" === $prereq_eclipsereleng) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $eclipsereleng_name . " " . $eclipsereleng_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $eclipsereleng_mirror_prefixuri, $eclipsereleng_url, $eclipsereleng_file, $eclipse_fspath_prefix); @@ -385,13 +307,11 @@ <?php if ("true" === $prereq_orbitthirdpartyzip) { - echo "<tr valign=\"top\">"; - echo "<td width=\"10%\"></td>"; - echo "<td>"; - + + echo "<td width=\"50%\">"; echo $orbitthirdpartyzip_name . " " . $orbitthirdpartyzip_description; - echo "</td>"; + echo "<td align=\"right\">"; echo getPrereqReferenceOrName($eclipse_mirror_script, $orbitthirdpartyzip_mirror_prefixuri, $orbitthirdpartyzip_url, $orbitthirdpartyzip_file, $eclipse_fspath_prefix); @@ -402,7 +322,7 @@ </table> - </td> - </tr> + </td> + </tr> </table>