Changeset 4431

Timestamp:

04/14/09 23:32:57 (4 years ago)

Author:

jow

Message:

build/mklar.pl:

• fix heisenbug with file list padding
• call luac if available
• include non-lua files
• include cbi models and controllers

Files:

• luci/trunk/build/mklar.pl (modified) (4 diffs)

luci/trunk/build/mklar.pl

@@ -40 +40 @@
 
     # Skip .svn foo
-    ( $File::Find::name !~ m{/\.svn\z} ) || return;
-
-    # Skip non-lua files
-    ( $File::Find::name =~ m{\.lua\z} ) || return;
-
-    # Skip i18n files
-    ( $File::Find::name !~ m{/i18n/} ) || return;
-    
-    # Exclude cbi models and controllers for now
-    ( $File::Find::name !~ m{/controller/} && $File::Find::name !~ m{/model/cbi/} ) || return;
+    ( $File::Find::name !~ m{/\.svn\b} ) || return;
 
     # Exclude luci-statistics and lucittpd for now
@@ -58 +49 @@
     $file =~ s{^.+/luasrc/}{luci/};
 
-    if( open F, "< $_" )
+    my $command = ( $File::Find::name =~ m{\.lua\z} && $ENV{LUAC} )
+        ? "$ENV{LUAC} -o - $_ |" : "< $_";
+
+    if( open F, $command )
     {
         warn sprintf "Member at 0x%08X: %s\n", $offset, $file;
@@ -67 +61 @@
 
         $index[-1][0] = $offset;
-        
+
         while( read F, my $buffer, 4096 ) {
             $size += length $buffer;
@@ -98 +92 @@
 my $listsize = length $filelist;
 push @index, [ $offset, $listsize, "", 0xFFFF, undef ];
-warn sprintf "Filelist at 0x%08X\n", $offset;
+
+warn sprintf "Filelist at 0x%08X, length 0x%08X\n", $offset, $listsize;
+
+print $filelist;
+$offset += $listsize;
 
 if( $listsize % 4 )
 {
-    $listsize += ( 4 - ($listsize % 4) );
-    $filelist .= "\0" x ( 4 - ($listsize % 4) );
+    $offset += ( 4 - ($listsize % 4) );
+    print "\0" x ( 4 - ($listsize % 4) );
 }
-
-print $filelist;
-$offset += $listsize;