WebSVN – DevTools – Diff – /manifest-tool/trunk/src/gbe/DIRECTIVES/ManifestFiles.pm

 #                       --Dmf                   - Generate the Device Management Framework
 #                                                 combined archive ZIP file.
 #                       --DmfVersion=xxxx       - Generate the Device Management Framework
 #                                                 combined archive ZIP using a modified
 #                                                 version number; only for testing!
 #                       --LineLength=nnn        - Limit line length. Default is 79
+#                       --SubManifest           - Create a sub-manifest (not installable). Manifest will have no version.
+#                                                 Gives a default name, tier and subdir if not explicitly provided.
+#
 # Returns         : Nothing
+#
 sub ManifestFiles
+{
     my $imported_manifest = 0;
     my $include_md5 = 0;
     my $generate_dmf = 0;
     my $dmf_version = $::ScmBuildVersionFull;
     my $useDefaultLineWidth = 1;
+    my $is_sub_manifest = 0;
+    #
     #   Collect user options
+    #
     foreach ( @elements )
         } elsif ( m/^--LineLength=(\d+)$/i ) {
             $ManifestLineWidth = $1;
             $useDefaultLineWidth = 0;
+        } elsif (m/^--SubManifest/i) {
+            $is_sub_manifest = 1;
+            $Manifest_has_version = 0;
+            $name = $::ScmPlatform
+                unless $name;
+            $pkg_subdir = $name
+                unless $pkg_subdir;
+            $tier = 0
+                unless defined($tier);
         } else {
             ReportError ("ManifestFiles: Unknown option or argument: $_");
+        }
+    }
     $data{pkgsubdir} = $pkg_subdir;
     $data{md5} = $include_md5;
     $data{dmf} = $generate_dmf;
     $data{arch} = $default_arch;
     $data{dmf_version} = $dmf_version;
+    $data{is_sub_manifest} = $is_sub_manifest;
 #DebugDumpData("DirectiveData", \%data );
     push @Manifests, \%data;
     return;
+#
 sub _ImportManifest
+{
     my ($args, $tier, $name) = @_;
     my @file_contents;
-    my @file_list;
+    my @item_list;
+    #
     #   Locate the mugfile subdir
+    #
     my $package_name = $args;
+        #
         #   Part lines and determine files
+        #
         next unless ( $_ );
-        next if ( m~\s*#~ );
+        if (( m~\s*#~ ) || ( m~\s*\[~ )) {
+            push @item_list, { 'comment' => $_ };
-        next if ( m~\s*\[~ );
+            next;
+        }
-        my( $aname, $atier, $afile) = split(/\s*\,\s*/, $_);
+        my( $aname, $atier, $afile, @additionnal_info) = split(/\s*\,\s*/, $_);
 #            print "---------- $_\n";
 #            print "T: $atier, N:$aname, F:$afile\n";
+        my $file =  { 'file_name' => $afile
+                    , 'file_info' => \@additionnal_info
+                    };
-        push @file_list, $afile;
+        push @item_list, $file;
+        #
         #   Rewrite the name and tier
+        #
         if ($rewrite)
     #   just been read in.
+    #
     $package_dirs{$pkg_root}{used} = 1;
     $manifest =~ s~.*/~~;
     return { 'contents' => \@file_contents,
-              'files' => \@file_list,
+              'items' => \@item_list,
               'file_base' => $pkg_dir,
               'manifest' => $manifest,
               'pkg_dir' => $pkg_root,
               'tier' => $first_tier,
               'name' => $first_name,
     open (MF, '>', $manifest_file ) || Error ("Cannot create the Manifest file: $manifest_file");
     binmode (MF);
+    if ($Manifests[0]->{is_sub_manifest} == 1) {
+        print_mf ("# Package $::ScmBuildPackage $::ScmBuildVersion built: $::CurrentTime");
+    } else {
-    print_mf ("# PackageName: $::ScmBuildPackage");
+        print_mf ("# PackageName: $::ScmBuildPackage");
-    print_mf ("# PackageVersion: $::ScmBuildVersion");
+        print_mf ("# PackageVersion: $::ScmBuildVersion");
-    print_mf ("# BuildDate: $::CurrentTime");
+        print_mf ("# BuildDate: $::CurrentTime");
-    print_mf ("#");
+        print_mf ("#");
-    print_mf ("[Version],$::ScmBuildVersion");
+        print_mf ("[Version],$::ScmBuildVersion");
-    print_mf ("#");
+        print_mf ("#");
+    }
+    #
     #   Process each tier in the order presented in the source file
+    #
     my $last_was_comment = 0;
     foreach my $entry ( @Manifests )
+    {
-    #print_mf ("#");
 #DebugDumpData ( "Manifest Entry", $entry );
         my $tier = $entry->{tier};
         my $name = $entry->{name};
             print_mf ('#') if ( $last_was_comment );
             if ( my $file = $fentry->{'file'} )
+            {
                 my $base_file = StripDir( $file );
                 my @items = ($name, $tier, $base_file);
                 if ($include_md5) {
                     my $md5 = digest_file_hex($file, 'MD5');
                     push @items, "MD5=$md5" ;
+                }
                 if (exists $entry->{fileVersions} && exists $entry->{fileVersions}{$file} ) {
                     push @items, "VERSION=" . $entry->{fileVersions}{$file};
+                }
                 print_mf (join (',', @items));
                 PackageFile ('*', $file, '--Subdir=' . $pkgdir, '--Strip' );
                 $last_was_comment = 0;
+            }
                 $last_was_comment = 0;
+                #
                 #   Insert the entire manifest
                 #   Items are:
                 #        contents
-                #        files
+                #        items:
+                #               file_name + arrays of file_info
+                #           or  comment line to copy
                 #        file_base
                 #        manifest
+                #
 #DebugDumpData ( "Embedded Manifest Entry", $emf );
+                if ($emf->{'rewrite'}) {
-                print_mf ( '## Included Manifest: ' .  $emf->{'manifest'}  );
+                    foreach my $item ( @{$emf->{'items'}}) {
+                        if (defined($item->{'file_name'}))
+                        {
+                            my @items = ($name, $tier, $item->{'file_name'});
+                            my $md5_added = 0;
+                            foreach my $info (@{$item->{'file_info'}}) {
+                                push @items, $info;
+                                $md5_added = 1 if ($info =~ m~^MD5=~i);
+                            }
+                            if ($include_md5 && $md5_added == 0) { # add md5 if requested and not already added from submanifest
+                                my $md5 = digest_file_hex($emf->{'file_base'} . '/' . $item->{'file_name'}, 'MD5');
+                                push @items, "MD5=$md5";
+                            }
+                            print_mf (join (',', @items));
+                            PackageFile ('*', $emf->{'file_base'}. '/' . $item->{'file_name'}, '--Subdir=' . $pkgdir, '--Strip' );
+                        }
+                        elsif (defined($item->{'comment'})) {
+                            print_mf($item->{'comment'});
+                        }
+                    }
+                    print_mf('#');
+                }
+                else {
-                print_mf ($_) foreach  ( @{$emf->{'contents'}} );
+                    print_mf ($_) foreach  ( @{$emf->{'contents'}} );
+                    foreach my $item ( @{$emf->{'items'}}) {
-                PackageFile ('*', $emf->{'file_base'}. '/' . $_, '--Subdir=' . $pkgdir, '--Strip' )foreach  ( @{$emf->{'files'}});;
+                        PackageFile ('*', $emf->{'file_base'}. '/' . $item->{'file_name'}, '--Subdir=' . $pkgdir, '--Strip' )
-                print_mf ( '## End Included Manifest' );
+                            if (defined($item->{'file_name'}));
+                    }
+                    print_mf('#');
+                }
+            }
+        }
+        #
         #   Expand out the entire MUG directory
+    }
+    #
     #   Complete the creation of the Manifest File
+    #
-    print_mf ("#");
-    print_mf ("# End of File");
+    print_mf ("# end of $::ScmBuildPackage");
     close MF;
     ErrorDoExit();
+    #
     #   Sanity test of packages that did not provide a debian file

Subversion Repositories DevTools

(root)/manifest-tool/trunk/src/gbe/DIRECTIVES/ManifestFiles.pm – Rev 6314 → 6364