Depend on compiler.jar for JS compilation, move js into static/js/

author Marius Gavrilescu <marius@ieval.ro>

Fri, 17 Apr 2015 18:23:36 +0000 (21:23 +0300)

committer Marius Gavrilescu <marius@ieval.ro>

Sat, 18 Apr 2015 08:51:57 +0000 (11:51 +0300)
author Marius Gavrilescu <marius@ieval.ro>
Fri, 17 Apr 2015 18:23:36 +0000 (21:23 +0300)
committer Marius Gavrilescu <marius@ieval.ro>
Sat, 18 Apr 2015 08:51:57 +0000 (11:51 +0300)
diff --git a/Makefile.PL b/Makefile.PL

index 6da9ecfdcc774618a09f3f493a534a5001f2746a..2bf04acdec3d5716f8d3ad3295299548f7f3a0b8 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -10,12 +10,11 @@ WriteMakefile(
         LICENSE           => 'AGPL_3',
         SIGN              => 1,
         clean             => {
-               FILES => 'static/css/ static/js.js static/js.js.gz static/js.map static/js/'
+               FILES => 'static/css/ static/js/'
         },
         BUILD_REQUIRES    => {
                 qw/CSS::Minifier::XS          0
                    File::Slurp                0
-                  JavaScript::Minifier::XS   0
                    Test::MockTime             0
                    Test::More                 0
                    Test::WWW::Mechanize::PSGI 0/,
diff --git a/make_static.PL b/make_static.PL

index 758efc1f39349e85975563488c3ba2a9ecf90dd6..44ef19e253ea28cde50b7f92d0643477f8d62f2a 100644 (file)
--- a/make_static.PL
+++ b/make_static.PL
@@ -3,7 +3,6 @@ use v5.14;
  use warnings;
  
  use CSS::Minifier::XS qw//;
-use JavaScript::Minifier::XS qw//;
  
  use Digest::SHA qw/sha256_base64/;
  use IO::Compress::Gzip qw/gzip/;
@@ -11,6 +10,7 @@ use File::Slurp qw/read_file write_file edit_file_lines/;
  
  mkdir 'static';
  mkdir 'static/css';
+mkdir 'static/js';
  
  sub gzip_file {
         my ($file) = @_;
@@ -30,17 +30,11 @@ sub make_css {
  }
  
  sub make_js {
-       if (-f 'compiler.jar') {
-               system java => -jar => 'compiler.jar', qw,-O SIMPLE --create_source_map static/js.map --js_output_file static/js.js --language_in ECMASCRIPT5_STRICT --source_map_location_mapping js/|/static/js/,, <js/*>;
-               my $js = read_file 'static/js.js';
-               write_file 'static/js.js', '//# sourceMappingURL=/static/js.map', "\n", $js;
-               system 'cp', '-rp', 'js', 'static/';
-       } else {
-               my $js;
-               $js .= read_file $_ for <js/*.js>;
-               write_file 'static/js.js', JavaScript::Minifier::XS::minify $js;
-       }
-       gzip_file 'static/js.js';
+       system java => -jar => 'compiler.jar', qw,-O SIMPLE --create_source_map static/js/js.map --js_output_file static/js/all.js --language_in ECMASCRIPT5_STRICT --source_map_location_mapping js/|/static/js/,, <js/*>;
+       my $js = read_file 'static/js/all.js';
+       write_file 'static/js/all.js', '//# sourceMappingURL=/static/js/js.map', "\n", $js;
+       system 'cp', '-rp', 'js', 'static/';
+       gzip_file 'static/js/all.js';
  }
  
  my $css_mtime = -M 'static/css/slate.css' // 0;
diff --git a/tmpl/skel.en b/tmpl/skel.en

index 459d37b1dac02e040be8189b0ea7204b3a9ef7f7..b28726c11fc377bcd0755972c6466bc7798594c2 100644 (file)
--- a/tmpl/skel.en
+++ b/tmpl/skel.en
@@ -6,7 +6,7 @@
  <link href="/static/css/cyborg.css" title="cyborg" rel="stylesheet" integrity="x">
  <link href="/static/css/slate.css" title="slate" rel="alternate stylesheet" integrity="x">
  <link href="/static/css/readable.css" title="readable" rel="alternate stylesheet" integrity="x">
-<script src="/static/js.js" type="text/javascript" async defer integrity="x"></script>
+<script src="/static/js/all.js" type="text/javascript" async defer integrity="x"></script>
  
  <body>
  <div class="container-fluid">
author	Marius Gavrilescu <marius@ieval.ro>
	Fri, 17 Apr 2015 18:23:36 +0000 (21:23 +0300)
committer	Marius Gavrilescu <marius@ieval.ro>
	Sat, 18 Apr 2015 08:51:57 +0000 (11:51 +0300)
Makefile.PL		patch \| blob \| blame \| history
make_static.PL		patch \| blob \| blame \| history
tmpl/skel.en		patch \| blob \| blame \| history