HTML2 reporter: use local copy of all JS and CSS files

Make the report folders self-contained
parttimenerd · Aug 19, 2020 · 1dafa11 · 1dafa11
1 parent a3bf632
commit 1dafa11
Show file tree

Hide file tree

Showing 14 changed files with 185 additions and 13 deletions.
diff --git a/temci/report/report.py b/temci/report/report.py
@@ -343,10 +343,12 @@ def report(self):
                 shutil.rmtree(self.misc["out"])
             else:
                 return
-        resources_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "report_resources"))
-        shutil.copytree(resources_path, self.misc["out"])
-        os.chmod(self.misc["out"], 0o755)
-        chown(self.misc["out"])
+        os.makedirs(self.misc["out"])
+        for folder in ["js", "css"]:
+            resources_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "report_resources/" + folder))
+            shutil.copytree(resources_path, self.misc["out"] + "/" + folder)
+            os.chmod(self.misc["out"] + "/" + folder, 0o755)
+            chown(self.misc["out"] + "/" + folder)
         runs = self.stats_helper.valid_runs()
         self._percent_format = self.misc["percent_format"]
         self._float_format = self.misc["float_format"]
@@ -357,15 +359,14 @@ def report(self):
     <head>
         <title>Benchmarking report</title>
         <meta charset="UTF-8"/>
-        <link rel="stylesheet" src="jquery.ui.all.css">
-        <link rel="stylesheet" src="jquery.tocify.css">
-        <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet">
-        <link rel="stylesheet" href="style.css">
-        <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
-        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
-        <script src="jquery-ui-1.9.1.custom.min.js"></script>
-        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_SVG"></script>
-        <script src="script.js"></script>
+        <link rel="stylesheet" src="css/jquery.ui.all.css">
+        <link rel="stylesheet" src="css/jquery.tocify.css">
+        <link rel="stylesheet" href="css/bootstrap.min.css">
+        <link rel="stylesheet" href="css/style.css">
+        <script src="js/jquery.min.js"></script>
+        <script src="js/bootstrap.min.js"></script>
+        <script src="js/jquery-ui-1.9.1.custom.min.js"></script>
+        <script src="js/script.js"></script>
     </head>
     <body style="font-family: sans-serif;">
         <a href="" id="hidden_link" style="display: none;"></a>
@@ -388,6 +389,7 @@ def report(self):
           </div>
         </div>
         {self._app_html}
+        <script src="js/custom-mathjax.min.js"></script>
         <script>
             $(function () {{
                 $('[data-toggle="popover"]').popover({{"content": function(){{

diff --git a/temci/report/report_resources/css/bootstrap.min.css b/temci/report/report_resources/css/bootstrap.min.css
diff --git a/...report/report_resources/jquery.tocify.css → ...rt/report_resources/css/jquery.tocify.css b/...report/report_resources/jquery.tocify.css → ...rt/report_resources/css/jquery.tocify.css
diff --git a/...report/report_resources/jquery.ui.all.css → ...rt/report_resources/css/jquery.ui.all.css b/...report/report_resources/jquery.ui.all.css → ...rt/report_resources/css/jquery.ui.all.css
diff --git a/temci/report/report_resources/style.css → temci/report/report_resources/css/style.css b/temci/report/report_resources/style.css → temci/report/report_resources/css/style.css
diff --git a/temci/report/report_resources/custom-mathjax.js b/temci/report/report_resources/custom-mathjax.js
@@ -0,0 +1,47 @@
+// Source: http://docs.mathjax.org/en/latest/web/webpack.html
+//
+//  Initialize the MathJax startup code
+//
+require('mathjax-full/components/src/startup/lib/startup.js');
+
+//
+//  Get the loader module and indicate the modules that
+//  will be loaded by hand below
+//
+const {Loader} = require('mathjax-full/js/components/loader.js');
+Loader.preLoad(
+  'loader', 'startup',
+  'core',
+  'input/tex-base',
+  '[tex]/ams',
+  'output/svg', 'output/svg/fonts/tex.js',
+);
+
+//
+// Load the components that we want to combine into one component
+//   (the ones listed in the preLoad() call above)
+//
+require('mathjax-full/components/src/core/core.js');
+
+require('mathjax-full/components/src/input/tex-base/tex-base.js');
+require('mathjax-full/components/src/input/tex/extensions/ams/ams.js');
+
+require('mathjax-full/components/src/output/svg/svg.js');
+require('mathjax-full/components/src/output/svg/fonts/tex/tex.js');
+
+
+//
+// Update the configuration to include any updated values
+//
+const {insert} = require('mathjax-full/js/util/Options.js');
+insert(MathJax.config, {
+  tex: {
+    packages: {'[+]': ['ams']}
+  }
+});
+
+//
+// Loading this component will cause all the normal startup
+//   operations to be performed
+//
+require('mathjax-full/components/src/startup/startup.js');
diff --git a/temci/report/report_resources/custom-mathjax.min.js b/temci/report/report_resources/custom-mathjax.min.js
@@ -0,0 +1,16 @@
+/*************************************************************
+ *
+ *  Copyright (c) 2017 The MathJax Consortium
+ *
+ *  Licensed under the Apache License, Version 2.0 (the License);
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an AS IS BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
diff --git a/temci/report/report_resources/download.sh b/temci/report/report_resources/download.sh
@@ -0,0 +1,62 @@
+#! /bin/sh
+
+# Downloads all JS and CSS files
+# requires npm to be installed
+
+set -e
+target_dir=$(dirname $(readlink -f $0))
+cd $target_dir
+
+# build mathjax
+
+collect_dir="$target_dir/tmp"
+custom_folder="$collect_dir/custom-mathjax"
+mkdir -p $collect_dir
+mkdir -p $custom_folder
+cp webpack.config.js $custom_folder
+cp custom-mathjax.js $custom_folder
+cd $collect_dir
+
+npm install mathjax-full@3
+npm uninstall webpack --save-dev || echo 1
+npm install webpack --save-dev
+npm install webpack-cli
+npm install uglifyjs-webpack-plugin
+npm install @babel/core
+npm install @babel/preset-env
+npm install babel-core
+npm install babel-preset-env
+npm install babel-loader
+
+cd $custom_folder
+npm install @babel/core                            
+npm install @babel/preset-env
+../node_modules/mathjax-full/components/bin/makeAll
+echo "/*************************************************************
+ *
+ *  Copyright (c) 2017 The MathJax Consortium
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an \"AS IS\" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */" > $target_dir/js/custom-mathjax.min.js
+cat custom-mathjax.min.js >> $target_dir/js/custom-mathjax.min.js
+
+cd $target_dir
+
+
+rm -r $collect_dir
+cd css
+wget https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css -O bootstrap.min.css
+cd ../js
+wget https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js -O jquery.min.js
+wget https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js -O bootstrap.min.js
+
diff --git a/temci/report/report_resources/js/bootstrap.min.js b/temci/report/report_resources/js/bootstrap.min.js
diff --git a/temci/report/report_resources/js/custom-mathjax.min.js b/temci/report/report_resources/js/custom-mathjax.min.js
diff --git a/...t_resources/jquery-ui-1.9.1.custom.min.js → ...esources/js/jquery-ui-1.9.1.custom.min.js b/...t_resources/jquery-ui-1.9.1.custom.min.js → ...esources/js/jquery-ui-1.9.1.custom.min.js
diff --git a/temci/report/report_resources/js/jquery.min.js b/temci/report/report_resources/js/jquery.min.js
diff --git a/temci/report/report_resources/script.js → temci/report/report_resources/js/script.js b/temci/report/report_resources/script.js → temci/report/report_resources/js/script.js
diff --git a/temci/report/report_resources/webpack.config.js b/temci/report/report_resources/webpack.config.js
@@ -0,0 +1,11 @@
+// Source: http://docs.mathjax.org/en/latest/web/webpack.html
+
+const PACKAGE = require('mathjax-full/components/webpack.common.js');
+
+module.exports = PACKAGE(
+  'custom-mathjax',                     // the name of the package to build
+  '../node_modules/mathjax-full/js',    // location of the mathjax library
+  [],                                   // packages to link to
+  __dirname,                            // our directory
+  '.'                                   // where to put the packaged component
+);