Use the js-jquery and js-flot libraries rather than copying all the source

Criterion/Report.hs

@@ -51,6 +51,8 @@ import qualified Data.Text.Lazy.Builder as TL
 import qualified Data.Text.Lazy.IO as TL
 import qualified Data.Vector.Generic as G
 import qualified Data.Vector.Unboxed as U
+import qualified Language.Javascript.Flot as Flot
+import qualified Language.Javascript.JQuery as JQuery
 import qualified Text.Hastache as H
 
 -- | Trim long flat tails from a KDE plot.
@@ -87,10 +89,12 @@ formatReport :: [Report]
              -> IO TL.Text
 formatReport reports template = do
   templates <- getTemplateDir
-  let context "report"  = return $ MuList $ map inner reports
-      context "json"    = return $ MuVariable (encode reports)
-      context "include" = return $ MuLambdaM $ includeFile [templates]
-      context _         = return $ MuNothing
+  let context "report"    = return $ MuList $ map inner reports
+      context "json"      = return $ MuVariable (encode reports)
+      context "include"   = return $ MuLambdaM $ includeFile [templates]
+      context "js-jquery" = fmap MuVariable $ TL.readFile =<< JQuery.file
+      context "js-flot"   = fmap MuVariable $ TL.readFile =<< Flot.file Flot.Flot
+      context _           = return $ MuNothing
       encode v = TL.toLazyText . encodeToTextBuilder . toJSON $ v
       inner r@Report{..} = mkStrContextM $ \nym ->
                          case nym of

LICENSE

@@ -24,7 +24,3 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-Some files in templates/js have their own copyright and license, please
-refer to the corresponding sources in js-src/.

criterion.cabal

@@ -17,15 +17,11 @@ extra-source-files:
   examples/*.cabal
   examples/*.hs
   examples/*.html
-  js-src/flot-0.8.3.zip
-  js-src/jquery-2.1.1.js
 
 data-files:
   templates/*.css
   templates/*.tpl
-  templates/js/jquery-2.1.1.min.js
   templates/js/jquery.criterion.js
-  templates/js/jquery.flot-0.8.3.min.js
 
 description:
   This library provides a powerful but simple way to measure software
@@ -85,6 +81,8 @@ library
     filepath,
     Glob >= 0.7.2,
     hastache >= 0.6.0,
+    js-flot,
+    js-jquery,
     mtl >= 2,
     mwc-random >= 0.8.0.3,
     optparse-applicative >= 0.11,

examples/Comparison.hs

@@ -1,9 +1,7 @@
 import Criterion.Main
 
 main = defaultMain [
-   bcompare [
-     bench "exp" $ whnf exp (2 :: Double)
-   , bench "log" $ whnf log (2 :: Double)
-   , bench "sqrt" $ whnf sqrt (2 :: Double)
-   ]
+   bench "exp" $ whnf exp (2 :: Double)
+ , bench "log" $ whnf log (2 :: Double)
+ , bench "sqrt" $ whnf sqrt (2 :: Double)
  ]