* [staging/MicroPythonTestFramework][PATCH] MpyTestFrameworkPkg: use minified jquery source
@ 2018-09-04 17:51 Stephano Cetola
2018-09-04 23:18 ` Long, Qin
0 siblings, 1 reply; 2+ messages in thread
From: Stephano Cetola @ 2018-09-04 17:51 UTC (permalink / raw)
To: edk2-devel; +Cc: qin.long, Stephano Cetola
We should be using the compressed "minified" jquery source file
rather than the uncompressed version, as it will reduce the page
load times.
This updates the relevant FreeMaker templates, the readme, and
the setup script. It also corrects a small mistake in the error
text of the setup script.
Contributed-under: TianoCore Contribution Agreement 1.1.
Signed-off-by: Stephano Cetola <stephano.cetola@linux.intel.com>
---
MpyTestFrameworkPkg/README.md | 2 +-
.../ReportGenerator/src/main/resources/templates/index.ftl | 2 +-
.../src/main/resources/templates/iteration.ftl | 4 ++--
.../src/main/resources/templates/recurrentSequence.ftl | 2 +-
MpyTestFrameworkPkg/setup.py | 6 +++---
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/MpyTestFrameworkPkg/README.md b/MpyTestFrameworkPkg/README.md
index bd1579dcd3..9bcd22d843 100644
--- a/MpyTestFrameworkPkg/README.md
+++ b/MpyTestFrameworkPkg/README.md
@@ -13,7 +13,7 @@ This test framework is dependent on the MicroPython Interpreter for UEFI: [Micro
* Install [Python27](https://www.python.org/).
* Install Maven, using the official site tutorial: [Installing Apache Maven](https://maven.apache.org/install.html). JDK 1.8 is preferred.
* Download `Chart.bundle.min.js` from the [ChartJS official site](https://github.com/chartjs/Chart.js/releases) and copy it to `MpyTestFrameworkPkg\Report\resources\js`
- * Download `jquery-3.3.1.js` from the [JQuery official site](https://jquery.com/download/) and copy it to `MpyTestFrameworkPkg\Report\resources\js`
+ * Download `jquery-3.3.1.min.js` from the [JQuery official site](https://jquery.com/download/) and copy it to `MpyTestFrameworkPkg\Report\resources\js`
### Configuration
diff --git a/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templates/index.ftl b/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templates/index.ftl
index ed611f3805..d58c002baf 100644
--- a/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templates/index.ftl
+++ b/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templates/index.ftl
@@ -3,7 +3,7 @@
<title>ETS Report</title>
<link rel="stylesheet" href="../resources/css/style.css">
<script src="../resources/js/Chart.bundle.min.js"></script>
- <script src="../resources/js/jquery-3.3.1.js"></script>
+ <script src="../resources/js/jquery-3.3.1.min.js"></script>
</head>
<body>
diff --git a/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templates/iteration.ftl b/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templates/iteration.ftl
index 82b681c8a4..e3f2490215 100644
--- a/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templates/iteration.ftl
+++ b/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templates/iteration.ftl
@@ -3,7 +3,7 @@
<title>ETS Report</title>
<link rel="stylesheet" href="../../../resources/css/style.css">
<script src="../../../resources/js/Chart.bundle.min.js"></script>
- <script src="../../../resources/js/jquery-3.3.1.js"></script>
+ <script src="../../../resources/js/jquery-3.3.1.min.js"></script>
</head>
<body>
@@ -170,4 +170,4 @@
</script>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templates/recurrentSequence.ftl b/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templates/recurrentSequence.ftl
index d3c263cf91..1d09752095 100644
--- a/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templates/recurrentSequence.ftl
+++ b/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templates/recurrentSequence.ftl
@@ -3,7 +3,7 @@
<title>ETS Report</title>
<link rel="stylesheet" href="../../resources/css/style.css">
<script src="../../resources/js/Chart.bundle.min.js"></script>
- <script src="../../resources/js/jquery-3.3.1.js"></script>
+ <script src="../../resources/js/jquery-3.3.1.min.js"></script>
</head>
<body>
diff --git a/MpyTestFrameworkPkg/setup.py b/MpyTestFrameworkPkg/setup.py
index 993a4cc598..4eaf43bfed 100644
--- a/MpyTestFrameworkPkg/setup.py
+++ b/MpyTestFrameworkPkg/setup.py
@@ -31,8 +31,8 @@ def check_environment():
error_p('Please download Chart.bundle.min.js to MpyTestFrameworkPkg/Report/resources/js folder')
return False
- if not os.path.exists(origin + '/Report' + '/resources' + '/js' + '/jquery-3.3.1.js'):
- error_p('Please download jquery-3.3.1.jsChart.bundle.min.js to MpyTestFrameworkPkg/Report/resources/js folder')
+ if not os.path.exists(origin + '/Report' + '/resources' + '/js' + '/jquery-3.3.1.min.js'):
+ error_p('Please download jquery-3.3.1.min.js MpyTestFrameworkPkg/Report/resources/js folder')
return False
return True
@@ -111,4 +111,4 @@ def generate_target():
# Main procedure
if check_environment() == True:
- generate_target()
\ No newline at end of file
+ generate_target()
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [staging/MicroPythonTestFramework][PATCH] MpyTestFrameworkPkg: use minified jquery source
2018-09-04 17:51 [staging/MicroPythonTestFramework][PATCH] MpyTestFrameworkPkg: use minified jquery source Stephano Cetola
@ 2018-09-04 23:18 ` Long, Qin
0 siblings, 0 replies; 2+ messages in thread
From: Long, Qin @ 2018-09-04 23:18 UTC (permalink / raw)
To: Stephano Cetola, edk2-devel@lists.01.org
Reviewed-by: Long Qin <qin.long@intel.com>
Best Regards & Thanks,
LONG, Qin
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Stephano Cetola
> Sent: Tuesday, September 4, 2018 10:51 AM
> To: edk2-devel@lists.01.org
> Cc: Long, Qin <qin.long@intel.com>
> Subject: [edk2] [staging/MicroPythonTestFramework][PATCH]
> MpyTestFrameworkPkg: use minified jquery source
>
> We should be using the compressed "minified" jquery source file rather than the
> uncompressed version, as it will reduce the page load times.
>
> This updates the relevant FreeMaker templates, the readme, and the setup script.
> It also corrects a small mistake in the error text of the setup script.
>
> Contributed-under: TianoCore Contribution Agreement 1.1.
> Signed-off-by: Stephano Cetola <stephano.cetola@linux.intel.com>
> ---
> MpyTestFrameworkPkg/README.md | 2 +-
> .../ReportGenerator/src/main/resources/templates/index.ftl | 2 +-
> .../src/main/resources/templates/iteration.ftl | 4 ++--
> .../src/main/resources/templates/recurrentSequence.ftl | 2 +-
> MpyTestFrameworkPkg/setup.py | 6 +++---
> 5 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/MpyTestFrameworkPkg/README.md
> b/MpyTestFrameworkPkg/README.md index bd1579dcd3..9bcd22d843 100644
> --- a/MpyTestFrameworkPkg/README.md
> +++ b/MpyTestFrameworkPkg/README.md
> @@ -13,7 +13,7 @@ This test framework is dependent on the MicroPython
> Interpreter for UEFI: [Micro
> * Install [Python27](https://www.python.org/).
> * Install Maven, using the official site tutorial: [Installing Apache
> Maven](https://maven.apache.org/install.html). JDK 1.8 is preferred.
> * Download `Chart.bundle.min.js` from the [ChartJS official
> site](https://github.com/chartjs/Chart.js/releases) and copy it to
> `MpyTestFrameworkPkg\Report\resources\js`
> - * Download `jquery-3.3.1.js` from the [JQuery official
> site](https://jquery.com/download/) and copy it to
> `MpyTestFrameworkPkg\Report\resources\js`
> + * Download `jquery-3.3.1.min.js` from the [JQuery official
> + site](https://jquery.com/download/) and copy it to
> + `MpyTestFrameworkPkg\Report\resources\js`
>
> ### Configuration
>
> diff --git
> a/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templat
> es/index.ftl
> b/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templat
> es/index.ftl
> index ed611f3805..d58c002baf 100644
> ---
> a/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templat
> es/index.ftl
> +++
> b/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templ
> +++ ates/index.ftl
> @@ -3,7 +3,7 @@
> <title>ETS Report</title>
> <link rel="stylesheet" href="../resources/css/style.css">
> <script src="../resources/js/Chart.bundle.min.js"></script>
> - <script src="../resources/js/jquery-3.3.1.js"></script>
> + <script src="../resources/js/jquery-3.3.1.min.js"></script>
> </head>
>
> <body>
> diff --git
> a/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templat
> es/iteration.ftl
> b/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templat
> es/iteration.ftl
> index 82b681c8a4..e3f2490215 100644
> ---
> a/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templat
> es/iteration.ftl
> +++
> b/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templ
> +++ ates/iteration.ftl
> @@ -3,7 +3,7 @@
> <title>ETS Report</title>
> <link rel="stylesheet" href="../../../resources/css/style.css">
> <script src="../../../resources/js/Chart.bundle.min.js"></script>
> - <script src="../../../resources/js/jquery-3.3.1.js"></script>
> + <script src="../../../resources/js/jquery-3.3.1.min.js"></script>
> </head>
> <body>
>
> @@ -170,4 +170,4 @@
> </script>
>
> </body>
> -</html>
> \ No newline at end of file
> +</html>
> diff --git
> a/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templat
> es/recurrentSequence.ftl
> b/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templat
> es/recurrentSequence.ftl
> index d3c263cf91..1d09752095 100644
> ---
> a/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templat
> es/recurrentSequence.ftl
> +++
> b/MpyTestFrameworkPkg/Tools/ReportGenerator/src/main/resources/templ
> +++ ates/recurrentSequence.ftl
> @@ -3,7 +3,7 @@
> <title>ETS Report</title>
> <link rel="stylesheet" href="../../resources/css/style.css">
> <script src="../../resources/js/Chart.bundle.min.js"></script>
> - <script src="../../resources/js/jquery-3.3.1.js"></script>
> + <script src="../../resources/js/jquery-3.3.1.min.js"></script>
> </head>
>
> <body>
> diff --git a/MpyTestFrameworkPkg/setup.py b/MpyTestFrameworkPkg/setup.py
> index 993a4cc598..4eaf43bfed 100644
> --- a/MpyTestFrameworkPkg/setup.py
> +++ b/MpyTestFrameworkPkg/setup.py
> @@ -31,8 +31,8 @@ def check_environment():
> error_p('Please download Chart.bundle.min.js to
> MpyTestFrameworkPkg/Report/resources/js folder')
> return False
>
> - if not os.path.exists(origin + '/Report' + '/resources' + '/js' + '/jquery-3.3.1.js'):
> - error_p('Please download jquery-3.3.1.jsChart.bundle.min.js to
> MpyTestFrameworkPkg/Report/resources/js folder')
> + if not os.path.exists(origin + '/Report' + '/resources' + '/js' + '/jquery-
> 3.3.1.min.js'):
> + error_p('Please download jquery-3.3.1.min.js
> + MpyTestFrameworkPkg/Report/resources/js folder')
> return False
>
> return True
> @@ -111,4 +111,4 @@ def generate_target():
>
> # Main procedure
> if check_environment() == True:
> - generate_target()
> \ No newline at end of file
> + generate_target()
> --
> 2.17.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-09-04 23:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-04 17:51 [staging/MicroPythonTestFramework][PATCH] MpyTestFrameworkPkg: use minified jquery source Stephano Cetola
2018-09-04 23:18 ` Long, Qin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox