WebSVN – DevTools – Diff – /core_devl/trunk/TOOLS/create_dpkg2.pl

 my $DPKG_ROOT;
 my $PKG_BASE;
 my $bad_merge_count = 0;
 my @bad_symlinks;
 my @fileList;
+my $descPkgCount = 0;
+#
 #   Option variables
+#
 my $opt_help = 0;
 my $opt_manual = 0;
 my $opt_verbose = 0;
 my $opt_quiet = 0;
 my $opt_delete = 0;
+my $opt_override = 0;
 my $opt_merge = 0;
 my $opt_archive;
 my $opt_generic;
 my $opt_pname;
 my $opt_pversion;
     # Process any command line arguements...
     my $result = GetOptions (
                 "help:+"        => \$opt_help,              # flag, multiple use allowed
                 "manual:3"      => \$opt_help,              # flag
                 "verbose:+"     => \$opt_verbose,           # flag, multiple use allowed
+                "override!"     => \$opt_override,          # [no]flag (No longer used. Backward compat with build tool)
                 "delete!"       => \$opt_delete,            # [no]flag
                 "merge|m!"      => \$opt_merge,             # [no]flag.
                 "archive=s"     => \$opt_archive,           # string
                 "quiet+"        => \$opt_quiet,             # Flag
                 "generic!"      => \$opt_generic,           # [no]Flag
                 "pname=s"       => \$opt_pname,             # string
                 "pversion=s"    => \$opt_pversion,          # string
                 "test!"         => \$opt_test,              # [no]flag
                 "md5!"          => \$opt_md5,               # [no]flag
-                "info"          => \$opt_info,              # [no]flag
+                "info!"         => \$opt_info,              # [no]flag
                 );
+    #
     #   Process help and manual options
     #   Packages are located by looking for a file called descpkg within the
     #   main package directory.
+    #
     #   This installation process only handles one such file
+    #
+    $descPkgCount = 0;
     File::Find::find( \&pkgFind, $PKG_BASE);
+    if ($descPkgCount > 1 )
+    {
+        Warning ("Package contains multiple ($descPkgCount) descpkg files");
+    }
+}
 #-------------------------------------------------------------------------------
 # Function        : CheckDescPkg
+#
     Information1("USER          = [$USER]");
     Information ("")                                if ( $opt_merge || $opt_delete || $opt_info);
     Information ("Opt:Delete    = Enabled")         if ( $opt_delete );
     Information ("Opt:Merge     = Enabled")         if ( $opt_merge );
     Information ("Opt:TestMode  = Enabled. No Package Transferred") if ( $opt_test );
-    Information ("Opt:Info      = Enabled")        if ( $opt_info );
+    Information ("Opt:Info      = Enabled. No Package Transferred") if ( $opt_info );
     Warning     ("Sandbox Build = Yes") if ($ENV{GBE_DPKG_SBOX}) ;
     Information ("---------------------------------------------------------------");
+    #
     #   If the environment variable GBE_DPKG_SBOX is defined then the package
     # so our start dir.
     # we need to determine which file we are dealing with
     if ( ! -d $item && $file =~ /^descpkg$/ )
+    {
+        $descPkgCount++;
+        #
         #   Only grab the first one
+        #
         if ( $DESCPKG_FILE )
+        {
+            $item =~ s~$PKG_BASE/~~;
-            Warning ("Package contains multiple descpkg files");
+            Verbose ("Multiple descpkg files:", $item );
             return;
+        }
         $DESCPKG_FILE = $item;
         my($dir)= File::Basename::dirname($item);
     -help              - Brief help message
     -help -help        - Detailed help message
     -man               - Full documentation
     -quiet             - Suppress progress messages, then warning messages
     -verbose           - Display additional progress messages
+    -override          - Deprecated option
     -delete            - Delete any previous version of the package
     -[no]merge         - merge with existing version of the package
     -archive=name      - Specify archive (cache, local, main, store, sandbox, deploy)
     -pname=name        - Ensure package is named correctly
     -pversion=version  - Ensure package version is correct
     -generic           - Create a built.generic file
-    -[no]test          - Test package. Do not transfer.
     -[no]md5           - Use MD5 comparison of merged files(enabled)
+    -[no]test          - Test package. Do not transfer.
+    -[no]info          - Display packaging info. Do not transfer.
 =head1 OPTIONS
 =over 8
 This option will suppress almost all of the progress messages, except for a single
 copy message. It is intended to be used when the program is called from another
 script.
+=item B<-override>
+If this option has been deprecated. It has no effect.
+It is still present to preserve backward compatability with the automated
+build system.
 =item B<-delete>
 If this option is enabled then any previous version of the target package will
 be deleted.
 =item B<-pversion=version>
 If this option is provided, the utility will ensure that the package version is
 that expected.
-=item B<-test>
+=item B<-generic>
-If this option is enabled the utility will perform initial sanity testing, but
+This option will create a built.generic file, instead of one based on the machine
-it will not perform the copy.
+that actually built the package. This is used by the AutoBuilder toolchain.
 =item B<-[no]md5>
 If package builds are being merged then a validity check is performed using
 an MD5 digest over the current and the existing file.
 By default, it is an error for the user file to differ from the merged file.
 This option disabled the error. The test is still done and the results are
 reported.
-=item B<-generic>
+=item B<-test>
+If this option is enabled the utility will perform initial sanity testing, but
+it will not perform the copy.
+=item B<-[no]info>
-This option will create a built.generic file, instead of one based on the machine
+This option will cause the program to display information about the packaging
+process and then exit.
-that actually built the package. This is used by the AutoBuilder toolchain.
+No data will be transferred to the archive.
 =back
 =head1 DESCRIPTION
 This utility program is used to transfer a package that has been built into
 dpkg_archive. The package is then available for general consumption.
+The utility will perform several operations in the transfer process. These incude:
+=over 4
+=item *
+Create a tag file to indicate the machine that has performed the transfer
+=item *
+Create an XML file of files that have been transferred. This file contains information
+used by the build system when it releases the package, including: name, size and MD5SUM.
+=item *
+Detect file conflicts when different builds are merged into a single package. Header files are
+allowed to differ in line ending style, but other files must not conflict. The package will not be
+reproducible if file conflicts exist.
+=item *
+Suppress dead symbolic links. A valid symlink will be preserved, but invalid links will be
+removed from the transferred image.
+=back
 =head2 PACKAGE LOCATION
 The utility will locate a package by examining the following directores for
 the package description file(descpkg).

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/create_dpkg2.pl @ 4549 – Rev 4455 → 4548