diff --git a/tools/packaging/TestCasePackagerConfig.py b/tools/packaging/TestCasePackagerConfig.py
index 9364556d708dc42fa418eb5c56a92ecbe6ec27f7..e92f27b93358de311e61fc55128f6f4444203212 100644
--- a/tools/packaging/TestCasePackagerConfig.py
+++ b/tools/packaging/TestCasePackagerConfig.py
@@ -26,12 +26,11 @@ import stat
#--Globals---------------------------------------------------------------------
MAX_CASES_PER_JSON = 1000
+WEBSITE_SHORT_NAME = "website2"
+
#Directories under "test\suite\" containing ES5 test chapter directories
#with *.js tests underneath them
-TEST_CONTRIB_DIRS = ["sputnik_converted", "ietestcenter"]
-
-#Global scope source files found directly under "test\suite\".
-GLOBAL_SCOPE_FILES = ["SputnikGlobalScope.js", "IETCGlobalScope.js"]
+TEST_CONTRIB_DIRS = ["converted"]
#Path to the root of the Hg repository (relative to this file's location)
TEST262_ROOT = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..", "..")
@@ -45,18 +44,19 @@ TEST262_CASES_DIR = os.path.join(TEST262_ROOT, "test", "suite")
TEST262_HARNESS_DIR = os.path.join(TEST262_ROOT, "test", "harness")
#Directory full of website test cases (ported over from TEST262_CASES_DIR)
-TEST262_WEB_CASES_DIR = os.path.join(TEST262_ROOT, "website", "resources", "scripts", "testcases")
+TEST262_WEB_CASES_DIR = os.path.join(TEST262_ROOT, WEBSITE_SHORT_NAME, "json")
#Directory containing the website's test harness (ported over from TEST262_HARNESS_DIR)
-TEST262_WEB_HARNESS_DIR = os.path.join(TEST262_ROOT, "website", "resources", "scripts", "global")
+TEST262_WEB_HARNESS_DIR = os.path.join(TEST262_ROOT, WEBSITE_SHORT_NAME, "harness")
#Path to the ported test case files on the actual website as opposed to the Hg layout
-WEBSITE_CASES_PATH = "resources/scripts/testcases/"
+WEBSITE_CASES_PATH = "json/"
#The name of a file which contains a list of tests which should be disabled in test262.
#These tests are either invalid as-per ES5 or have issues with the test262 web harness.
EXCLUDED_FILENAME = os.path.join(TEST262_ROOT, "test", "config", "excludelist.xml")
+
#------------------------------------------------------------------------------
TEMPLATE_LINES = None
@@ -70,7 +70,7 @@ def generateHarness(harnessType, jsonName, title):
TEMPLATE_LINES = []
with open(os.path.join(os.getcwd(), "templates","runner." + harnessType + ".html"), "r") as f:
TEMPLATE_LINES = f.readlines()
- fileName = os.path.join(TEST262_ROOT, "website", jsonName.replace(".json", ".html"))
+ fileName = os.path.join(TEST262_ROOT, WEBSITE_SHORT_NAME, jsonName.replace(".json", ".html"))
fileNameExists = False
if os.path.exists(fileName):
SC_HELPER.edit(fileName)
diff --git a/tools/packaging/common.py b/tools/packaging/common.py
new file mode 100644
index 0000000000000000000000000000000000000000..ba4ffba5dd47d75a0c5a2099ba4a0680be58eec2
--- /dev/null
+++ b/tools/packaging/common.py
@@ -0,0 +1,13 @@
+#--Imports---------------------------------------------------------------------
+
+#--Stubs-----------------------------------------------------------------------
+
+
+
+#--Globals---------------------------------------------------------------------
+
+
+#--Helpers--------------------------------------------------------------------#
+
+
+#--MAIN------------------------------------------------------------------------
diff --git a/tools/packaging/packager.py b/tools/packaging/packager.py
index 7c7a02d14516869489446b5001fb916952fe8fbb..f1ee23e5f4f2d73b505a6aa128ba77b98536888b 100644
--- a/tools/packaging/packager.py
+++ b/tools/packaging/packager.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2009 Microsoft Corporation
+# Copyright (c) 2011 Microsoft Corporation
#
# Redistribution and use in source and binary forms, with or without modification, are permitted provided
# that the following conditions are met:
@@ -291,18 +291,4 @@ if TEST262_HARNESS_DIR!=TEST262_WEB_HARNESS_DIR:
if not fileExists:
SC_HELPER.add(toFilename)
-#Copying the global scope files over as well
-#TODO: really the HTML harness file should be generated as well...
-print ""
-print "Deploying global scope metadata files to 'TEST262_WEB_HARNESS_DIR'..."
-for gsf in GLOBAL_SCOPE_FILES:
- toFilename = os.path.join(TEST262_WEB_CASES_DIR, gsf)
- fileExists = os.path.exists(toFilename)
- if fileExists:
- SC_HELPER.edit(toFilename)
- shutil.copy(os.path.join(TEST262_CASES_DIR, gsf),
- toFilename)
- if not fileExists:
- SC_HELPER.add(toFilename)
-
print "Done."
diff --git a/tools/packaging/templates/runner.test262.html b/tools/packaging/templates/runner.test262.html
index 3bfea29f2585a296a9326e193bebdd213682cd83..47331606f06df60df65ae2926042d0a17187b33a 100644
--- a/tools/packaging/templates/runner.test262.html
+++ b/tools/packaging/templates/runner.test262.html
@@ -2,20 +2,18 @@
<html dir="ltr" xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<script type="text/javascript" src="resources/scripts/global/jquery-1.4.2.min.js"></script>
-<script type="text/javascript" src="resources/scripts/global/sections.js"></script>
+<script type="text/javascript" src="harness/jquery-1.4.2.min.js"></script>
+<script type="text/javascript" src="harness/sections.js"></script>
<script type="text/javascript">
//Globals
- var TEST_LIST_PATH = "resources/scripts/testcases/testcaseslist.json";
+ var TEST_LIST_PATH = "json/testcaseslist.json";
</script>
-<script type="text/javascript" src="resources/scripts/global/sth.js"></script>
-<script type="text/javascript" src="resources/scripts/global/sta.js"></script>
-<script type="text/javascript" src="resources/scripts/global/jqueryprogressbar.js"></script>
-<script type="text/javascript" src="resources/scripts/global/helper.js"></script>
-<script type="text/javascript" src="resources/scripts/global/jquery.base64.js"></script>
-<script type="text/javascript" src="resources/scripts/global/sputnikLib.js"></script>
-<script type="text/javascript" src="resources/scripts/testcases/SputnikGlobalScope.js"></script>
-<script type="text/javascript" src="resources/scripts/testcases/IETCGlobalScope.js"></script>
+<script type="text/javascript" src="harness/sth.js"></script>
+<script type="text/javascript" src="harness/sta.js"></script>
+<script type="text/javascript" src="harness/jqueryprogressbar.js"></script>
+<script type="text/javascript" src="harness/helper.js"></script>
+<script type="text/javascript" src="harness/jquery.base64.js"></script>
+<script type="text/javascript" src="harness/sputnikLib.js"></script>
<script language="javascript" type="text/javascript">
//To support all the browsers
$(window).resize(ResizeLoadIndicator);
@@ -32,7 +30,7 @@
</script>
<title>ECMAScript Test262</title>
-<link href="resources/styles/style.css" media="screen" rel="stylesheet" title="CSS" type="text/css" />
+<link href="styles/style.css" media="screen" rel="stylesheet" title="CSS" type="text/css" />
</head>
<body>
<div class="indicatorContainer" oncontextmenu="return false;">
@@ -40,7 +38,7 @@
<div class="disabledBackground"></div>
<div id="loadingIndicator">
<div>
- <img src="./resources/images/spinner.gif" alt="Loading..." />
+ <img src="./images/spinner.gif" alt="Loading..." />
<span>Loading...</span>
</div>
</div>
@@ -49,7 +47,7 @@
<div class="wrapper">
<!-- This Container holds the Logo -->
<div class="logoHeader">
- <div class="logoBg"><img src="resources/images/logo.png" /></div>
+ <div class="logoBg"><img src="images/logo.png" /></div>
<div class="ecmascriptbacklink">
<p><a href='javascript:void(window.open("http://www.ecmascript.org/"));'>ECMAScript.org</a></p>
</div>
@@ -106,7 +104,7 @@
<div class="progressBarHolder">
<div id="progressbar"></div>
<div class="progressBarButtons">
- <img src="resources/images/reset.png" class="button-reset"/> <img src="resources/images/start.png" class="button-start" id="btnStart"/>
+ <img src="images/reset.png" class="button-reset"/> <img src="images/start.png" class="button-start" id="btnStart"/>
</div>
<div style="clear: both;"></div>
</div>
@@ -149,7 +147,7 @@
Test Suite Ver.: <span class="targetTestSuiteVersion"></span> <span class="separator">|</span> Test Suite Date: <span class="targetTestSuiteDate"></span>
</div>
<div class="downloadLinks">
- <p><a class="anchor-download-xml" id="ancGenXMLReport"><strong>Download results as XML</strong></a></p> <!--| <strong><a href="resources/scripts/testcases.zip">Download Source</a></strong></p>-->
+ <p><a class="anchor-download-xml" id="ancGenXMLReport"><strong>Download results as XML</strong></a></p> <!--| <strong><a href="scripts/testcases.zip">Download Source</a></strong></p>-->
</div>
<div id="legend" class="hide">
<label class="reportGreen">Green:</label> 100%
diff --git a/website/resources/images/back.png b/website/images/back.png
similarity index 100%
rename from website/resources/images/back.png
rename to website/images/back.png
diff --git a/website/resources/images/button_bg.png b/website/images/button_bg.png
similarity index 100%
rename from website/resources/images/button_bg.png
rename to website/images/button_bg.png
diff --git a/website/resources/images/ecmascriptlogo.png b/website/images/ecmascriptlogo.png
similarity index 100%
rename from website/resources/images/ecmascriptlogo.png
rename to website/images/ecmascriptlogo.png
diff --git a/website/resources/images/fade.jpg b/website/images/fade.jpg
similarity index 100%
rename from website/resources/images/fade.jpg
rename to website/images/fade.jpg
diff --git a/website/resources/images/logo.png b/website/images/logo.png
similarity index 100%
rename from website/resources/images/logo.png
rename to website/images/logo.png
diff --git a/website/resources/images/pause.png b/website/images/pause.png
similarity index 100%
rename from website/resources/images/pause.png
rename to website/images/pause.png
diff --git a/website/resources/images/progressbarbg.png b/website/images/progressbarbg.png
similarity index 100%
rename from website/resources/images/progressbarbg.png
rename to website/images/progressbarbg.png
diff --git a/website/resources/images/rerun.png b/website/images/rerun.png
similarity index 100%
rename from website/resources/images/rerun.png
rename to website/images/rerun.png
diff --git a/website/resources/images/reset.png b/website/images/reset.png
similarity index 100%
rename from website/resources/images/reset.png
rename to website/images/reset.png
diff --git a/website/resources/images/resume.png b/website/images/resume.png
similarity index 100%
rename from website/resources/images/resume.png
rename to website/images/resume.png
diff --git a/website/resources/images/selectedbutton_bg.png b/website/images/selectedbutton_bg.png
similarity index 100%
rename from website/resources/images/selectedbutton_bg.png
rename to website/images/selectedbutton_bg.png
diff --git a/website/resources/images/spinner.gif b/website/images/spinner.gif
similarity index 100%
rename from website/resources/images/spinner.gif
rename to website/images/spinner.gif
diff --git a/website/resources/images/splitter.png b/website/images/splitter.png
similarity index 100%
rename from website/resources/images/splitter.png
rename to website/images/splitter.png
diff --git a/website/resources/images/start.png b/website/images/start.png
similarity index 100%
rename from website/resources/images/start.png
rename to website/images/start.png
diff --git a/website/resources/images/stop.png b/website/images/stop.png
similarity index 100%
rename from website/resources/images/stop.png
rename to website/images/stop.png
diff --git a/website/resources/images/tblheaderbg.png b/website/images/tblheaderbg.png
similarity index 100%
rename from website/resources/images/tblheaderbg.png
rename to website/images/tblheaderbg.png
diff --git a/website/resources/images/tblreportheaderbg.png b/website/images/tblreportheaderbg.png
similarity index 100%
rename from website/resources/images/tblreportheaderbg.png
rename to website/images/tblreportheaderbg.png
diff --git a/website/resources/images/tblsectionheader.png b/website/images/tblsectionheader.png
similarity index 100%
rename from website/resources/images/tblsectionheader.png
rename to website/images/tblsectionheader.png
diff --git a/website/resources/images/tc39.png b/website/images/tc39.png
similarity index 100%
rename from website/resources/images/tc39.png
rename to website/images/tc39.png
diff --git a/website/resources/styles/style.css b/website/styles/style.css
similarity index 100%
rename from website/resources/styles/style.css
rename to website/styles/style.css