Changeset 488 in genapp

Timestamp:

May 17, 2015, 2:58:27 PM (7 years ago)

Author:

ehb

Message:

 

Files:

• bin/genapp.pl (modified) (11 diffs)
• etc/perl/genapp_util.pl (modified) (3 diffs)
• languages/html5.json (modified) (1 diff)
• languages/html5/sys/sys_file_manager.php (deleted)
• modules/config.json (modified) (1 diff)
• modules/configbase.json (added)
• modules/jobmonitor.json (added)

bin/genapp.pl

@@ -119 +119 @@
         my $output  = $$use{ "output" };
         my $setexec = $$use{ "setexecutable" };
+        my $clobber = $$use{ "clobber" };
         my $inputs  = $$use{ "inputs" };
         my $minify  = $$use{ "minify" };
@@ -154 +155 @@
             print "output will be set executable\n";
         }
+        if ( $clobber ) {
+            print "output will be overwritten - used for system modules also menu accessible\n";
+        }
 
         if ( !$freq )
@@ -195 +199 @@
         }
 
-
         if ( $freq eq 'config:modules:id' )
         {
             $rplc_menu = start_json( $config, $ref_menu );
+            my $mod  = $$rplc_menu{ 'menu:modules:id' };
+            print "mod = $mod\n";
+            my $mod_f = $module_to_file{ $mod };
+            print "mod_f = $mod_f\n";
+# this should probably be loaded once in check_files()
+            $mod_json = get_file_json( $mod_f );
+            $rplc_mod = start_json( $mod_json, $ref_mod );
+        }
+
+        if ( $freq eq 'configbase:modules:id' )
+        {
+            $rplc_menu = start_json( $configbase, $ref_menu );
             my $mod  = $$rplc_menu{ 'menu:modules:id' };
             print "mod = $mod\n";
@@ -234 +249 @@
                     print "processing: $k $v\n" if $debug_main;
                     my $use_input = $k;
-                    if ( $freq =~ /^(menu|config):modules:id$/ )
+                    if ( $freq =~ /^(menu|config|configbase):modules:id$/ )
                     {
 # this should probably be loaded once in check_files()
@@ -491 +506 @@
                         } while( $rplc_menu2 = next_json( $ref_menu2, $v ) );
                     } else {
-                        if ( $v =~ /^(menu|config):modules:id$/ )
+                        if ( $v =~ /^(menu|config|configbase):modules:id$/ )
                         {
                             print "hello menu:modules:id\n" if $debug_main;
@@ -578 +593 @@
                                 }
                             }
-                            if ( $freq =~ /^(menu|config):modules:id$/ )
+                            if ( $freq =~ /^(menu|config|configbase):modules:id$/ )
                             {
                                 $rplc_mod = start_json( $mod_json, $ref_mod );
@@ -693 +708 @@
                 $use_output =~ s/__${k}__/${v}/g;
             }
-            if ( $freq =~ /^((menu|config):modules:id|menu:id)$/ )
+            if ( $freq =~ /^((menu|config|configbase):modules:id|menu:id)$/ )
             {
                 print '-'x40 . "\n" if $debug_srplc;
@@ -704 +719 @@
                 }
 
-                if ( $freq =~ /^(menu|config):modules:id$/ )
+                if ( $freq =~ /^(menu|config|configbase):modules:id$/ )
                 {
                     while ( my ( $k, $v ) = each $rplc_mod )
@@ -718 +733 @@
 
             my $fo = "output/$l/$use_output";
-            $error .= "duplicate output for $fo\n" if $created{ $fo }++;
+            $error .= "duplicate output for $fo\n" if $created{ $fo }++ && !$clobber;
             mkdir_for_file( $fo );
             my $fh;
@@ -778 +793 @@
                 print `mv $fn $fd\n`;
             }
-            if ( $freq eq 'config:modules:id' )
+            if ( $freq eq 'config:modules:id' ||
+                 $freq eq 'configbase:modules:id' ) 
             {
                 $rplc_menu = next_json( $ref_menu, 'menu:modules:id' );
@@ -784 +800 @@
                 $rplc_menu = next_json( $ref_menu, $freq ) if $freq =~ /^(menu:modules:id|menu:id)$/;
             }
-        } while ( $freq =~ /^((menu|config):modules:id|menu:id)$/ && $rplc_menu );
+        } while ( $freq =~ /^((menu|config|configbase):modules:id|menu:id)$/ && $rplc_menu );
     } # end for assembly step
     # copy over icons

etc/perl/genapp_util.pl

@@ -676 +676 @@
     undef $menu;
     undef $config;
+    undef $configbase;
     undef $directives;
     undef %rpls;
@@ -685 +686 @@
 
     my @req = (
-        'directives.json', 
-        'menu.json',
-        'config.json'
+        'directives.json'
+        ,'menu.json'
+        ,'config.json'
+        ,'configbase.json'
     );
 
@@ -789 +791 @@
         {
             $config = $json;
+        }
+
+        if ( $f eq 'configbase.json' ||
+             $f eq "$gap/modules/configbase.json" )
+        {
+            $configbase = $json;
         }
     }

languages/html5.json

@@ -82 +82 @@
                    }
                    ,{
+                    "frequency"  : "configbase:modules:id",
+                    "clobber"    : "true",
+                    "output"     : "ajax/__menu:id__/__menu:modules:id__.php",
+                    "inputs"     : [ 
+                                    { "base.php" : "once" }
+                                   ]
+                   }
+                   ,{
                     "frequency"  : "once",
                     "output"     : "ajax/mail.php",

modules/config.json

@@ -35 +35 @@
                           "label" : "files"
                          }
-                        ,{ 
-                          "id"    : "sys_file_manager",
-                          "label" : "File manager"
-                         }
+#                        ,{ 
+#                          "id"    : "sys_file_manager",
+#                          "label" : "File manager"
+#                         }
                         ,{ 
                           "id"    : "sys_job_manager",