View | Details | Raw Unified | Return to bug 32609
Collapse All | Expand All

(-)a/Makefile.PL (-3 / +32 lines)
Lines 663-668 display_configuration(\%config, $target_directories); Link Here
663
my $file_map = {};
663
my $file_map = {};
664
get_file_map($target_map, $dirtree, $file_map);
664
get_file_map($target_map, $dirtree, $file_map);
665
665
666
#NOTE: List files generated by build-resources.PL, so that they're copied into blib for installation
667
#INTRANET_TMPL_DIR
668
$file_map->{'koha-tmpl/intranet-tmpl/prog/css/calendar.css'} = 'blib/INTRANET_TMPL_DIR/prog/css/calendar.css';
669
$file_map->{'koha-tmpl/intranet-tmpl/prog/css/holds.css'} = 'blib/INTRANET_TMPL_DIR/prog/css/holds.css';
670
$file_map->{'koha-tmpl/intranet-tmpl/prog/css/installer.css'} = 'blib/INTRANET_TMPL_DIR/prog/css/installer.css';
671
$file_map->{'koha-tmpl/intranet-tmpl/prog/css/mainpage.css'} = 'blib/INTRANET_TMPL_DIR/prog/css/mainpage.css';
672
$file_map->{'koha-tmpl/intranet-tmpl/prog/css/staff-global.css'} = 'blib/INTRANET_TMPL_DIR/prog/css/staff-global.css';
673
$file_map->{'koha-tmpl/intranet-tmpl/prog/js/vue/dist/main.js'} = 'blib/INTRANET_TMPL_DIR/prog/js/vue/dist/main.js';
674
$file_map->{'koha-tmpl/intranet-tmpl/prog/js/vue/dist/main.js.LICENSE.txt'} = 'blib/INTRANET_TMPL_DIR/prog/js/vue/dist/main.js.LICENSE.txt';
675
#OPAC_TMPL_DIR
676
$file_map->{'koha-tmpl/opac-tmpl/bootstrap/css/opac.css'} = 'blib/OPAC_TMPL_DIR/bootstrap/css/opac.css';
677
$file_map->{'koha-tmpl/opac-tmpl/bootstrap/css/opac-rtl.css'} = 'blib/OPAC_TMPL_DIR/bootstrap/css/opac-rtl.css';
678
$file_map->{'koha-tmpl/opac-tmpl/bootstrap/css/print.css'} = 'blib/OPAC_TMPL_DIR/bootstrap/css/print.css';
679
$file_map->{'koha-tmpl/opac-tmpl/bootstrap/css/print-rtl.css'} = 'blib/OPAC_TMPL_DIR/bootstrap/css/print-rtl.css';
680
$file_map->{'koha-tmpl/opac-tmpl/bootstrap/css/sco.css'} = 'blib/OPAC_TMPL_DIR/bootstrap/css/sco.css';
681
$file_map->{'koha-tmpl/opac-tmpl/bootstrap/css/sco-rtl.css'} = 'blib/OPAC_TMPL_DIR/bootstrap/css/sco-rtl.css';
682
$file_map->{'koha-tmpl/opac-tmpl/bootstrap/css/maps/opac-rtl.css.map'} = 'blib/OPAC_TMPL_DIR/bootstrap/css/maps/opac-rtl.css.map';
683
$file_map->{'koha-tmpl/opac-tmpl/bootstrap/css/maps/print-rtl.css.map'} = 'blib/OPAC_TMPL_DIR/bootstrap/css/maps/print-rtl.css.map';
684
$file_map->{'koha-tmpl/opac-tmpl/bootstrap/css/maps/sco-rtl.css.map'} = 'blib/OPAC_TMPL_DIR/bootstrap/css/maps/sco-rtl.css.map';
685
666
my $pl_files = {
686
my $pl_files = {
667
      'rewrite-config.PL' => [
687
      'rewrite-config.PL' => [
668
         'blib/KOHA_CONF_DIR/koha-conf.xml',
688
         'blib/KOHA_CONF_DIR/koha-conf.xml',
Lines 675-683 my $pl_files = { Link Here
675
	  'fix-perl-path.PL' => [	# this script ensures the correct shebang line for the platform installed on...
695
	  'fix-perl-path.PL' => [	# this script ensures the correct shebang line for the platform installed on...
676
		 'blib'
696
		 'blib'
677
		 ],
697
		 ],
678
      'build-resources.PL' => [
679
          'blib'
680
         ],
681
};
698
};
682
699
683
push @{ $pl_files->{'rewrite-config.PL'} }, (
700
push @{ $pl_files->{'rewrite-config.PL'} }, (
Lines 1799-1804 sub postamble { Link Here
1799
    return "$env\n";
1816
    return "$env\n";
1800
}
1817
}
1801
1818
1819
sub top_targets {
1820
    my $inherited = shift->SUPER::top_targets(@_);
1821
    my $compile_step;
1822
    $compile_step .= "all :: compile_css_js\n";
1823
    $compile_step .= "\t" . '$(NOECHO) $(NOOP)' . "\n";
1824
    $compile_step .= "\n";
1825
    $compile_step .= "compile_css_js:\n";
1826
    $compile_step .= "\t" . '$(PERLRUN) build-resources.PL' . "\n";
1827
    my $top_targets = $compile_step . "\n" . $inherited;
1828
    return $top_targets;
1829
}
1830
1802
sub _build_perl5lib_string {
1831
sub _build_perl5lib_string {
1803
    my ($args) = @_;
1832
    my ($args) = @_;
1804
    my %unique_map = ();
1833
    my %unique_map = ();
(-)a/build-resources.PL (-3 / +5 lines)
Lines 32-38 This helper script ensures that src JS and SCSS files are compiled for packaging Link Here
32
32
33
=cut
33
=cut
34
34
35
my $command = "yarn build:prod";
35
my $install_command = "yarn install";
36
system($command);
36
system($install_command);
37
38
my $build_command = "yarn build:prod";
39
system($build_command);
37
40
38
1;
41
1;
39
- 

Return to bug 32609