fixed dropin file naming for 2.xx releases
diff --git a/downloads/downloads-common.php b/downloads/downloads-common.php
index 8a9539c..74f1a93 100644
--- a/downloads/downloads-common.php
+++ b/downloads/downloads-common.php
@@ -19,14 +19,14 @@
/* config */
-$projects = array("gmf-tooling", " ");
-$PR = "gmf-tooling";
+$projects = array();
+$PR = "gmf";
$topLevel = "modeling/gmp";
-$nodownloads=array('gmf-tooling');
+$nodownloads=array();
$extraprojects=array();
$buildtypes = array("R"=>"Releases", "I"=>"Integration", "S"=>"Stable");
-//$PWD = '/home/data2/httpd/download.eclipse.org//modeling/gmp//'.$PR.'/downloads/drops';
-$PWD = $_SERVER['DOCUMENT_ROOT'].'/gmf-tooling/downloads/drops';
+$PWD = '/home/data2/httpd/download.eclipse.org//modeling/gmp//'.$PR.'/downloads/drops';
+//$PWD = $_SERVER['DOCUMENT_ROOT'].'/gmf-tooling/downloads/drops';
$dir_list = scandir($_SERVER['DOCUMENT_ROOT']);
diff --git a/downloads/downloads-scripts.php b/downloads/downloads-scripts.php
index 62f3344..ac2dc10 100644
--- a/downloads/downloads-scripts.php
+++ b/downloads/downloads-scripts.php
@@ -12,12 +12,10 @@
function doLatest($releases, $label = "Releases")
{
- #global $rssfeed, $showMax, $showAll, $sortBy;
global $showMax, $showAll, $sortBy;
if (sizeof($releases)>0)
{
print "<div class=\"homeitem3col\">\n";
- #print "<a name=\"latest\"></a><h3>${rssfeed}Latest $label</h3>\n";
print "<a name=\"latest\"></a><h3>Latest $label</h3>\n";
print "<ul class=\"releases\">\n";
$c = 0;
@@ -165,10 +163,12 @@
$flip = array_flip($projects);
$dls[$proj] = array($flip[$projct] => array(
- "<acronym title=\"Archived Update Site\"><img alt=\"Click to download archived All-In-One p2 Repo Update Site\" src=\"/modeling/images/dl-icon-update-zip.gif\"/> <b style=\"color:green\">All-In-One Update Site</b></acronym>" => "-update",
- "SDK (Tooling, Source)" => "-sdk",
- "Runtime" => "-runtime",
- "Automated Tests" => "-tests"
+ "<acronym title=\"Archived Update Site\"> <img alt=\"Click to download archived All-In-One p2 Repo Update Site\" src=\"/modeling/images/dl-icon-update-zip.gif\"/> <b style=\"color:green\">All-In-One Update Site</b></acronym>" => "-update",
+ "SDK (Tooling, Source)" => "-tooling-sdk",
+ "Runtime" => "-tooling-runtime",
+ "Runtime source"=>"-tooling-runtime-source",
+ "Automated Tests" => "-tests",
+ "Simplemap"=>"-tooling-simplemap",
));
}
@@ -201,7 +201,7 @@
{
$filePreProj = array($filePreStatic[$proj][$cnt]); // just one value to check
}
-
+ $filePreProj = array('gmf');
$tries = array();
foreach ($u as $ux)
{
@@ -209,22 +209,27 @@
{
$tries[] = "$branch/$ID/$pre2$filePre$ux-$ziplabel.zip"; // for compatibilty with uml2, where there's no "runtime" value in $ux
$tries[] = "$branch/$ID/$filePre$ux-$ziplabel.zip"; // for compatibilty with uml2, where there's no "runtime" value in $ux
- $tries[] = "$branch/$ID/$pre2$filePre$ux-incubation-$ziplabel.zip"; // for compatibilty with uml2, where there's no "runtime" value in $ux
+ $tries[] = "$branch/$ID/$pre2$filePre$ux-$ziplabel.zip"; // for compatibilty with uml2, where there's no "runtime" value in $ux
$tries[] = "$branch/$ID/$filePre$ux-incubation-$ziplabel.zip"; // for compatibilty with uml2, where there's no "runtime" value in $ux
- $tries[] = "$branch/$ID/$ux-$ziplabel.zip"; // for compatibilty with uml2, where there's no "runtime" value in $ux
+ $tries[] = "$branch/$ID/$filePre-tooling$ux-$ziplabel.zip"; // for compatibilty with uml2, where there's no "runtime" value in $ux
+
}
}
+
$outNotFound = "<i><b>$pre2</b>$filePre";
if (sizeof($u) > 1 ) {
$outNotFound .= "</i>{"; foreach ($u as $ui => $ux) {
$outNotFound .= ($ui>0 ? "," : "") . $ux;
} $outNotFound .= "}<i>";
+
+
}
else
{
$outNotFound .= $u[0];
}
$outNotFound .= "-$ziplabel ...</i>";
+
$out = "";
foreach ($tries as $y)
{
@@ -232,6 +237,18 @@
{
$out = fileFound("$PWD/", $y, $label);
break;
+ }else{
+ if(strpos($y, 'update')){
+ $name = str_replace('update', 'tooling-update' , $y);
+ $out = fileFound("$PWD/", $y, $label);
+ break;
+ };
+ if(strpos($y, 'tooling-sdk')){
+ $name = str_replace('tooling-sdk', 'sdk' , $y);
+ $out = fileFound("$PWD/", $y, $label);
+ break;
+ }
+ break;
}
}
if ($out)
@@ -242,9 +259,9 @@
}
else if (!isset($extraZips) || !is_array($extraZips) || !in_array($filePre . $u[0],$extraZips)) // $extraZips defined in downloads/index.php if necessary
{
- $echo_out .= "<li>\n";
- $echo_out .= $outNotFound;
- $echo_out .= "</li>\n";
+ // $echo_out .= "<li>\n";
+ // $echo_out .= $outNotFound;
+ // $echo_out .= "</li>\n";
}
$uu++;
}
@@ -469,18 +486,18 @@
global $downloadScript, $downloadPre, $PR, $proj;
$out = "";
- $mid = "$downloadPre/$topLevel/$proj/downloads/drops/";
+ $mid = "/modeling/gmp/gmf-tooling/downloads/drops'";
$md5files = array("$url.md5", preg_replace("#/([^/]+$)#", "/checksum/$1", $url) . ".md5");
foreach ($md5files as $md5file)
{
if (is_file($PWD.$md5file))
{
$out .= "<span style=\"float:right;\"> " . pretty_size(filesize("$PWD$url")) . " (<a href=\"" . "http://download.eclipse.org" .
- "$mid$md5file\">md5</a>)</span>"; break;
+ "$mid$md5file\">md5</a>)</span>";
+ break;
}
}
- #return $md5AlignRight ? $out . "<a href=\"$downloadScript$mid$url\">$label</a>" :
- # "<a href=\"$downloadScript$mid$url\">$icon</a> <a href=\"$downloadScript$mid$url\">$label</a>" . $out;
+
return "<span style=\"float:left;clear:left;\"><a href=\"$downloadScript$mid$url\">$icon</a> <a href=\"$downloadScript$mid$url\">$label</a></span>" . $out;
}
diff --git a/downloads/scripts.php b/downloads/scripts.php
index 5912a7f..05bc16c 100644
--- a/downloads/scripts.php
+++ b/downloads/scripts.php
@@ -157,10 +157,10 @@
global $hadLoadDirSimpleError;
if(!$hadLoadDirSimpleError)
{
- $issue =(!is_dir($dir) ? "NOT FOUND" :(!is_readable($dir) ? "NOT READABLE" : "PROBLEM"));
+ /* $issue =(!is_dir($dir) ? "NOT FOUND" :(!is_readable($dir) ? "NOT READABLE" : "PROBLEM"));
print "<p>Directory ($dir) <b>$issue</b> on mirror: <b>" . $_SERVER["HTTP_HOST"] . "</b>!</p>";
print "<p>Please report this error to <a href=\"mailto:webmaster@eclipse.org?Subject=Directory ($dir) $issue in scripts.php::loadDirSimple() on mirror " . $_SERVER["HTTP_HOST"] . "\">webmaster@eclipse.org</a>, or make directory readable.</p>";
- $hadLoadDirSimpleError = 1;
+ $hadLoadDirSimpleError = 1;*/
}
}
