Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 32609: (follow-up) enhance Makefile.PL

Browse source 
This patch adds a new target to the Makefile which gets
called as the first step of the "all" target. This means
that CSS and JS files get compiled every time "make" is
called.

(Note: Since the "install" target depends on "all", it will
 be re-run at install time.)

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 550bb87ecb)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
David Cook 2023-01-31 02:31:37 +00:00 committed by Martin Renvoize
parent 0c6a06dd00
commit 894fec6bc7
Signed by: martin.renvoize
GPG key ID: 422B469130441A0F
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Makefile.PL
View file

@ -679,6 +679,9 @@ $file_map->{'koha-tmpl/opac-tmpl/bootstrap/css/print.css'} = 'blib/OPAC_TMPL_DIR
$file_map->{'koha-tmpl/opac-tmpl/bootstrap/css/print-rtl.css'} = 'blib/OPAC_TMPL_DIR/bootstrap/css/print-rtl.css';
$file_map->{'koha-tmpl/opac-tmpl/bootstrap/css/sco.css'} = 'blib/OPAC_TMPL_DIR/bootstrap/css/sco.css';
$file_map->{'koha-tmpl/opac-tmpl/bootstrap/css/sco-rtl.css'} = 'blib/OPAC_TMPL_DIR/bootstrap/css/sco-rtl.css';
$file_map->{'koha-tmpl/opac-tmpl/bootstrap/css/maps/opac-rtl.css.map'} = 'blib/OPAC_TMPL_DIR/bootstrap/css/maps/opac-rtl.css.map';
$file_map->{'koha-tmpl/opac-tmpl/bootstrap/css/maps/print-rtl.css.map'} = 'blib/OPAC_TMPL_DIR/bootstrap/css/maps/print-rtl.css.map';
$file_map->{'koha-tmpl/opac-tmpl/bootstrap/css/maps/sco-rtl.css.map'} = 'blib/OPAC_TMPL_DIR/bootstrap/css/maps/sco-rtl.css.map';
my $pl_files = {
'rewrite-config.PL' => [
@ -692,9 +695,6 @@ my $pl_files = {
'fix-perl-path.PL' => [ # this script ensures the correct shebang line for the platform installed on...
'blib'
],
'build-resources.PL' => [
'blib'
],
};
push @{ $pl_files->{'rewrite-config.PL'} }, (
@ -1816,6 +1816,18 @@ sub postamble {
return "$env\n";
}
sub top_targets {
my $inherited = shift->SUPER::top_targets(@_);
my $compile_step;
$compile_step .= "all :: compile_css_js\n";
$compile_step .= "\t" . '$(NOECHO) $(NOOP)' . "\n";
$compile_step .= "\n";
$compile_step .= "compile_css_js:\n";
$compile_step .= "\t" . '$(PERLRUN) build-resources.PL' . "\n";
my $top_targets = $compile_step . "\n" . $inherited;
return $top_targets;
}
sub _build_perl5lib_string {
my ($args) = @_;
my %unique_map = ();

7
build-resources.PL
View file

@ -32,7 +32,10 @@ This helper script ensures that src JS and SCSS files are compiled for packaging
=cut
my $command = "yarn build:prod";
system($command);
my $install_command = "yarn install";
system($install_command);
my $build_command = "yarn build:prod";
system($build_command);
1;