Bug 32426: Changes for opac-memberentry

[srvgit] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index b044dd1..2acf916 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -83,7 +83,7 @@ Makefile.PL - Koha packager and installer
     --db_name                    Database name (e.g. koha)
     --db_user                    Database user (e.g. kohaadmin)
     --db_pass                    Database password (e.g. katikoan)
     --db_name                    Database name (e.g. koha)
     --db_user                    Database user (e.g. kohaadmin)
     --db_pass                    Database password (e.g. katikoan)

-    --zebra_marc_format          Zebra MARC format (marc21, normarc, unimarc)
+    --zebra_marc_format          Zebra MARC format (marc21, unimarc)

     --zebra_language             Zebra language (e.g. en)
     --zebra_tokenizer            Zebra tokenizer (chr, icu)
     --zebra_user                 Zebra user (e.g. kohauser)
     --zebra_language             Zebra language (e.g. en)
     --zebra_tokenizer            Zebra tokenizer (chr, icu)
     --zebra_user                 Zebra user (e.g. kohauser)


@@ -320,6 +320,7 @@ my $target_map = {
   './docs/contributors.yaml'    => { target => 'DOC_DIR', trimdir => -1 },
   './docs/teams.yaml'           => { target => 'DOC_DIR', trimdir => -1 },
   './offline_circ'              => 'INTRANET_CGI_DIR',
   './docs/contributors.yaml'    => { target => 'DOC_DIR', trimdir => -1 },
   './docs/teams.yaml'           => { target => 'DOC_DIR', trimdir => -1 },
   './offline_circ'              => 'INTRANET_CGI_DIR',

+  './erm'                       => 'INTRANET_CGI_DIR',

   './etc'                       => { target => 'KOHA_CONF_DIR', trimdir => -1 },
   './etc/zebradb'               => { target => 'ZEBRA_CONF_DIR', trimdir => -1 },
   './etc/z3950'                 => { target => 'Z3950_CONF_DIR', trimdir => -1 },
   './etc'                       => { target => 'KOHA_CONF_DIR', trimdir => -1 },
   './etc/zebradb'               => { target => 'ZEBRA_CONF_DIR', trimdir => -1 },
   './etc/z3950'                 => { target => 'Z3950_CONF_DIR', trimdir => -1 },


@@ -352,6 +353,7 @@ my $target_map = {
   './patron_lists'              => 'INTRANET_CGI_DIR',
   './plugins'                   => 'INTRANET_CGI_DIR',
   './pos'                       => 'INTRANET_CGI_DIR',
   './patron_lists'              => 'INTRANET_CGI_DIR',
   './plugins'                   => 'INTRANET_CGI_DIR',
   './pos'                       => 'INTRANET_CGI_DIR',

+  './recalls'                   => 'INTRANET_CGI_DIR',

   './reports'                   => 'INTRANET_CGI_DIR',
   './reserve'                   => 'INTRANET_CGI_DIR',
   './reviews'                   => 'INTRANET_CGI_DIR',
   './reports'                   => 'INTRANET_CGI_DIR',
   './reserve'                   => 'INTRANET_CGI_DIR',
   './reviews'                   => 'INTRANET_CGI_DIR',


@@ -397,6 +399,9 @@ my $target_map = {
   'gulpfile.js'                 => 'NONE',
   'package.json'                => 'NONE',
   'yarn.lock'                   => 'NONE',
   'gulpfile.js'                 => 'NONE',
   'package.json'                => 'NONE',
   'yarn.lock'                   => 'NONE',

+  'cypress.json'                => 'NONE',
+  'tsconfig.json'               => 'NONE',
+  'webpack.config.js'           => 'NONE',

 };
 
 =head1 CONFIGURATION OPTIONS
 };
 
 =head1 CONFIGURATION OPTIONS


@@ -565,7 +570,7 @@ my %valid_config_values = (
   'DB_TYPE' => { 'mysql' => 1, 'Pg' => 1 },
   'DB_USE_TLS' => {'yes', 'no'},
   'INSTALL_SRU' => { 'yes' => 1, 'no' => 1 },
   'DB_TYPE' => { 'mysql' => 1, 'Pg' => 1 },
   'DB_USE_TLS' => {'yes', 'no'},
   'INSTALL_SRU' => { 'yes' => 1, 'no' => 1 },

-  'ZEBRA_MARC_FORMAT' => { 'marc21' => 1, 'normarc' => 1, 'unimarc' => 1 }, # FIXME should generate from contents of distributation
+  'ZEBRA_MARC_FORMAT' => { 'marc21' => 1, 'unimarc' => 1 }, # FIXME should generate from contents of distributation

   'ZEBRA_LANGUAGE'    => { 'cs' => 1, 'el' => 1, 'en' => 1, 'es' => 1, 'fr' => 1, 'nb' => 1, 'ru' => 1, 'uk' => 1 }, # FIXME should generate from contents of distribution
   'ZEBRA_TOKENIZER' => { chr => 1, icu => 1 },
   'RUN_DATABASE_TESTS' => { 'yes' => 1, 'no' => 1 },
   'ZEBRA_LANGUAGE'    => { 'cs' => 1, 'el' => 1, 'en' => 1, 'es' => 1, 'fr' => 1, 'nb' => 1, 'ru' => 1, 'uk' => 1 }, # FIXME should generate from contents of distribution
   'ZEBRA_TOKENIZER' => { chr => 1, icu => 1 },
   'RUN_DATABASE_TESTS' => { 'yes' => 1, 'no' => 1 },


@@ -658,6 +663,23 @@ display_configuration(\%config, $target_directories);
 my $file_map = {};
 get_file_map($target_map, $dirtree, $file_map);
 
 my $file_map = {};
 get_file_map($target_map, $dirtree, $file_map);
 

+#NOTE: List files generated by build-resources.PL, so that they're copied into blib for installation
+#INTRANET_TMPL_DIR
+$file_map->{'koha-tmpl/intranet-tmpl/prog/css/calendar.css'} = 'blib/INTRANET_TMPL_DIR/prog/css/calendar.css';
+$file_map->{'koha-tmpl/intranet-tmpl/prog/css/holds.css'} = 'blib/INTRANET_TMPL_DIR/prog/css/holds.css';
+$file_map->{'koha-tmpl/intranet-tmpl/prog/css/installer.css'} = 'blib/INTRANET_TMPL_DIR/prog/css/installer.css';
+$file_map->{'koha-tmpl/intranet-tmpl/prog/css/mainpage.css'} = 'blib/INTRANET_TMPL_DIR/prog/css/mainpage.css';
+$file_map->{'koha-tmpl/intranet-tmpl/prog/css/staff-global.css'} = 'blib/INTRANET_TMPL_DIR/prog/css/staff-global.css';
+$file_map->{'koha-tmpl/intranet-tmpl/prog/js/vue/dist/erm.js'} = 'blib/INTRANET_TMPL_DIR/prog/js/vue/dist/erm.js';
+$file_map->{'koha-tmpl/intranet-tmpl/prog/js/vue/dist/erm.js.LICENSE.txt'} = 'blib/INTRANET_TMPL_DIR/prog/js/vue/dist/erm.js.LICENSE.txt';
+#OPAC_TMPL_DIR
+$file_map->{'koha-tmpl/opac-tmpl/bootstrap/css/opac.css'} = 'blib/OPAC_TMPL_DIR/bootstrap/css/opac.css';
+$file_map->{'koha-tmpl/opac-tmpl/bootstrap/css/opac-rtl.css'} = 'blib/OPAC_TMPL_DIR/bootstrap/css/opac-rtl.css';
+$file_map->{'koha-tmpl/opac-tmpl/bootstrap/css/print.css'} = 'blib/OPAC_TMPL_DIR/bootstrap/css/print.css';
+$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';
+

 my $pl_files = {
       'rewrite-config.PL' => [
          'blib/KOHA_CONF_DIR/koha-conf.xml',
 my $pl_files = {
       'rewrite-config.PL' => [
          'blib/KOHA_CONF_DIR/koha-conf.xml',


@@ -693,7 +715,6 @@ $config{'BIB_RETRIEVAL_CFG'}  = 'retrieval-info-bib-dom.xml';
 if ($config{'INSTALL_MODE'} ne "dev") {
     push @{ $pl_files->{'rewrite-config.PL'} }, (
         'blib/PERL_MODULE_DIR/C4/Context.pm',
 if ($config{'INSTALL_MODE'} ne "dev") {
     push @{ $pl_files->{'rewrite-config.PL'} }, (
         'blib/PERL_MODULE_DIR/C4/Context.pm',

-        'blib/SCRIPT_NONDEV_DIR/kohalib.pl'

     );
 }
 
     );
 }
 


@@ -1151,7 +1172,7 @@ You must specify the primary MARC format of the
 records to be indexed by Zebra.
 
 Koha provides Zebra configuration files for MARC21,
 records to be indexed by Zebra.
 
 Koha provides Zebra configuration files for MARC21,

-NORMARC and UNIMARC.
+and UNIMARC.

 
 MARC format for Zebra indexing);
     $msg .= _add_valid_values_disp('ZEBRA_MARC_FORMAT', $valid_values);
 
 MARC format for Zebra indexing);
     $msg .= _add_valid_values_disp('ZEBRA_MARC_FORMAT', $valid_values);


@@ -1792,6 +1813,18 @@ sub postamble {
     return "$env\n";
 }
 
     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 = ();
 sub _build_perl5lib_string {
     my ($args) = @_;
     my %unique_map = ();