Download path fixed
diff --git a/downloads/downloads-common.php b/downloads/downloads-common.php
index 4ee3dd8..6c0388c 100644
--- a/downloads/downloads-common.php
+++ b/downloads/downloads-common.php
@@ -20,6 +20,7 @@
$projects = array("gmf-tooling");
$PR = "gmf-tooling";
+$topLevel = "modeling/gmp";
$nodownloads=array();
$extraprojects=array("gmf-tooling");
@@ -82,14 +83,14 @@
$showBuildResults = !isset($_GET["light"]) && !isset($_GET["nostatus"]); // suppress display of status to render page faster
//$PWD = "/home/data2/httpd/download.eclipse.org/$topLevel/$PR/downloads/drops";
-//$PWD = $_SERVER["DOCUMENT_ROOT"] ."/$PR/downloads/drops";
-$PWD = "/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/downloads/drops";
+$PWD = $_SERVER["DOCUMENT_ROOT"] ."/$PR/downloads/drops";
+//$PWD = '/home/data/httpd/download.eclipse.org/'.$topLevel.'/'.$PR.'/downloads/drops';
$downloadScript = getdownloadScript($PR);
$downloadPre = "";
print "<div id=\"midcolumn\">\n";
-print "<h2>GMF Tooling P2 Repositories & SDK Dropins ([MG]-varDump-added)</h2>\n";
+print "<h2>GMF Tooling P2 Repositories & SDK Dropins ([talons-1])</h2>\n";
print "<p>This page provides a bundled P2 repository and different SDK dropins (in runnable form) for each build.</p>";
$branches = loadDirSimple($PWD, ".*", "d");
diff --git a/downloads/scripts.php b/downloads/scripts.php
index 63981bc..650a2b7 100644
--- a/downloads/scripts.php
+++ b/downloads/scripts.php
@@ -13,11 +13,12 @@
global $PR, $App;
debug ("<br/>getPWD <b>PR = </b>$PR, <b>suf = </b>$suf</br>", 2);
$PWDs = array();
-
+ $PR = "gmf-tooling";
if($doDynCheck)
{
//dynamic assignments
$PWD = $App->getDownloadBasePath() . "/$PR/" . $suf;
+ $PWD = "/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/downloads/drops";
$PWDs[] = $PWD;
//second dynamic assignment
@@ -70,6 +71,11 @@
if(PWD_check($PWD, $suf))
{
$data = array(
+ 2=>array(
+ "checkdir" => "/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/downloads/drops",
+ "tries" => array("/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/downloads/drops",
+ "/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/downloads/drops",)
+ ),
4 => array(
"checkdir" => "/home/data/httpd/download.eclipse.org/",
"tries" => array("/home/data/httpd/download.eclipse.org/$suf",
@@ -108,7 +114,8 @@
}
}
}
-$PWD = "/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/downloads/drops";
+
+$PWD = "/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/downloads/drops";
krsort($PWDs);
