diff options
| author | Michael Larabel <michael@phx-laptop.(none)> | 2008-04-24 15:14:46 -0400 |
|---|---|---|
| committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-04-24 15:14:46 -0400 |
| commit | d635dd9d105c216ddcd9145e7542e223a30c8748 (patch) | |
| tree | 4a5652c5241608da6cca99c362c3581bcbc72105 | |
| parent | 0ba9fc1cb354a875d921cce539c64d0915abe63c (diff) | |
| download | phoronix-test-suite-upstream-d635dd9d105c216ddcd9145e7542e223a30c8748.tar.gz phoronix-test-suite-upstream-d635dd9d105c216ddcd9145e7542e223a30c8748.tar.xz phoronix-test-suite-upstream-d635dd9d105c216ddcd9145e7542e223a30c8748.zip | |
Add RESULTS_VIEWER_LOCATION defintion
| -rw-r--r-- | pts-core/functions/pts-functions.php | 7 | ||||
| -rw-r--r-- | pts-core/objects/pts_Graph.php | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pts-core/functions/pts-functions.php b/pts-core/functions/pts-functions.php index bf05252..52769bf 100644 --- a/pts-core/functions/pts-functions.php +++ b/pts-core/functions/pts-functions.php @@ -39,6 +39,7 @@ define("XML_SUITE_LOCATION", "pts/benchmark-suites/"); define("DISTRO_XML_LOCATION", "pts/distro-xml/"); define("DISTRO_SCRIPT_LOCATION", "pts/distro-scripts/"); define("BENCHMARK_RESOURCE_LOCATION", "pts/benchmark-resources/"); +define("RESULTS_VIEWER_LOCATION", "pts-core/pts-results-viewer/"); define("PTS_USER_DIR", pts_find_home("~/.phoronix-test-suite/")); //define("FONT_DIRECTORY" "/usr/share/fonts/"); @@ -152,9 +153,9 @@ function pts_save_result($save_to = null, $save_results = null, $directory = nul mkdir($directory . "pts-results-viewer"); } - pts_copy("pts-core/pts-results-viewer/pts.js", $directory . "pts-results-viewer/pts.js"); - pts_copy("pts-core/pts-results-viewer/pts-results-viewer.xsl", $directory . "pts-results-viewer/pts-results-viewer.xsl"); - pts_copy("pts-core/pts-results-viewer/pts-viewer.css", $directory . "pts-results-viewer/pts-viewer.css"); + pts_copy(RESULTS_VIEWER_LOCATION . "pts.js", $directory . "pts-results-viewer/pts.js"); + pts_copy(RESULTS_VIEWER_LOCATION . "pts-results-viewer.xsl", $directory . "pts-results-viewer/pts-results-viewer.xsl"); + pts_copy(RESULTS_VIEWER_LOCATION . "pts-viewer.css", $directory . "pts-results-viewer/pts-viewer.css"); if(!is_file($save_to_dir . "/pts-results-viewer.xsl") && !is_link($save_to_dir . "/pts-results-viewer.xsl")) link($directory . "pts-results-viewer/pts-results-viewer.xsl", $save_to_dir . "/pts-results-viewer.xsl"); diff --git a/pts-core/objects/pts_Graph.php b/pts-core/objects/pts_Graph.php index 2726e49..deaee8e 100644 --- a/pts-core/objects/pts_Graph.php +++ b/pts-core/objects/pts_Graph.php @@ -88,7 +88,7 @@ class pts_Graph // Directory for TTF Fonts if(!defined("FONT_DIRECTORY")) { - putenv("GDFONTPATH=pts-core/pts-results-viewer/"); + putenv("GDFONTPATH=" . RESULTS_VIEWER_LOCATION); //putenv("GDFONTPATH=" . getcwd()); // The directory where the TTF font files should be. getcwd() will look in the same directory as this file } else |