WebSVN – DevTools – Diff – /deployfiles/trunk/src/tools/scripts/deploylib.pm

+    #
     #   Convert the package name into a real path name to the package as
     #   held in dpkg_archive. Do not use the copy in the 'interface' directory
+    #
-    for my $entry ( $BuildFileInfo->getBuildPkgRules() )
-    {
-        next unless ( $entry->{'DNAME'} eq $pkgName );
-        $src_base_dir = $entry->{'ROOT'};
-        Verbose ("Discovered package in: $src_base_dir");
-    }
-    Error ("installDpkgArchivePkgRaw: Package not located: $pkgName")
+    $src_base_dir = LocatePackageBase ( "installDpkgArchivePkgRaw", $pkgName );
-        unless ( $src_base_dir );
-    Error ("installDpkgArchivePkgRaw: Package directory not found: $src_base_dir")
-        unless ( -d $src_base_dir );
+    #
     #   Build up a list of files to copy
     #   Creating a list allows:
     #       Simplified coding
 #                                             or a reference to a list of files
 #                       $targetTag          - Symbolic name of target
 #                       Options             - Optional options
+#
 # Options:
-#                   --SelectFrom=xxxx       - Limits foile source selection
+#                   --SelectFrom=xxxx       - Limits file source selection
 #                                             By default all LIB sources are searched.
 #                                             The selector should be a Platform, Product
 #                                             ,Target or MachineType
+#
+#
 #                       Options             - Optional options
+#
 # Options:
 #                   --NoLink                - same as 3rd arg == nolinks
 #                   --Link                  - Default
-#                   --SelectFrom=xxxx       - Limits foile source selection
+#                   --SelectFrom=xxxx       - Limits file source selection
 #                                             By default all LIB sources are searched.
 #                                             The selector should be a Platform, Product
 #                                             ,Target or MachineType
+#
 # SourceFile options:
 #       source location to a predefined destination location that is based on
 #       the build type.
+#
 #       The sub routine also updates to the prototype file with an appropriate
 #       entry for the associated file.
+# Inputs:
+#       sDirTag                 - Source directory tag
+#       sfile                   - Source File Name [Mandatory]
+#       tfile                   - Not sure. Used in the prototype file.
+#                                 Suggest using the same name as sfile
+#
 #       If it has any problems it will log an error and stop processing.
+#
 #------------------------------------------------------------------------------
+{
     my ($sDirTag, $sfile, $tfile) = @_;
     # we must have a filename.
+    #
-    if ( "x$sfile" eq "x" )
+    unless ( $sfile )
+    {
         Error("Source filename not supplied. Check deploy config.");
+    }
     # lets check to see if the local src dir tag exists
     # if does not the process with log an error.
+    #
     my ($sDirValue) = getLocalDirValue("$sDirTag", "A");
 # Description:
 #       This sub-routine is used to return the local dir value from
 #       %LocalSrcDirStructure based on providing the
 #       associated key.
+#
+#
+# Input:
+#       m_key               - A symbolic directory name to be found in the
+#                             LocalSrcDirStructure
+#
+#                             A Package Name of the form
+#                             --Package=PackageName,subdir
+#
+#                             A directory within the interface directory
+#                             --Interface=subdir
+#
+#                             This form is only valid for an ABS address
+#
+#       m_type              - "A"   Absolute address
+#                             else  Relative address
+#
 #       If the value does not exist then it will return an error
 #       and terminate processing.
+#
 #------------------------------------------------------------------------------
+{
         Error("Incorrect number of params passed to " .
                   "getLocalDirValue() function.");
+    }
     my ($m_key, $m_type) = @_;
+    #
+    #   Determine the type of lookup
+    #
+    if ( $m_key =~ m~^--Interface=(.*)~ )
+    {
+        Error("Locating Interface directory must be used in conjunction with an Absolute path")
+            unless ( $m_type eq 'A' );
+        my $SubDir = $1;
+        my $Dir = "$InterfaceDir/$SubDir";
+        Error ("Interface subdirectory not found: $SubDir" )
+            unless ( -d $Dir );
+        return $Dir;
+    }
+    if ( $m_key =~ m~^--Package=(.*)~ )
+    {
+        Error("Locating local source directory must be used in conjunction with an Absolute path")
+            unless ( $m_type eq 'A' );
+        #
+        #   Locate directory within a package
+        #
+        my ($PkgName, $PkgSubDir) = split /[\/,]/, $1, 2;
+        Error ("--Package requres a package name and a subdirectory") unless ( $PkgName && $PkgSubDir );
+        my $PkgDir = LocatePackageBase( "getLocalDirValue", $PkgName, $PkgSubDir );
+        return $PkgDir;
+    }
+    #
+    #   Locate the directory within the LocalSrcDirStructure
+    #   This is a symbolic reference to a local directory
+    #
     if (exists  $LocalSrcDirStructure{$m_key} )
+    {
         if ( "$m_type" eq "A" )
+        {
-            return "$SrcDir/" .
-                   "$LocalSrcDirStructure{$m_key}";
+            return "$SrcDir/$LocalSrcDirStructure{$m_key}";
+        }
         else
+        {
             return "$LocalSrcDirStructure{$m_key}";
+        }
+    {
         Information("Renamed [$m_tfileLoc] to [$m_ifileLoc] ...");
+    }
     else
+    {
-        Error("Failed to crename file [$m_tfileLoc] to [$m_ifileLoc]: $!");
+        Error("Failed to rename file [$m_tfileLoc] to [$m_ifileLoc]: $!");
+    }
     return 1;
+}
     #   Not for me
+    #
     return 0;
+}
+#-------------------------------------------------------------------------------
+# Function        : LocatePackageBase
+#
+# Description     : Locate a package and return the path to a directory within
+#                   the package
+#
+# Inputs          : $ufn            - User function. Error reporting
+#                   $PkgName        - Name of the Package
+#                   $PkgSubDir      - Subdir within the package
+#
+#
+# Returns         : Absolute path to a directory within the package
+#
+my %LocatePackageBase_cache;
+sub LocatePackageBase
+{
+    my ( $ufn, $PkgName, $PkgSubDir ) = @_;
+    my $src_base_dir;
+    if ( exists $LocatePackageBase_cache{$PkgName} )
+    {
+        $src_base_dir = $LocatePackageBase_cache{$PkgName};
+    }
+    else
+    {
+        #
+        #   Convert the package name into a real path name to the package as
+        #   held in dpkg_archive. Do not use the copy in the 'interface' directory
+        #
+        for my $entry ( $BuildFileInfo->getBuildPkgRules() )
+        {
+            next unless ( $entry->{'DNAME'} eq $PkgName );
+            $src_base_dir = $entry->{'ROOT'};
+            Verbose ("Discovered package in: $src_base_dir");
+        }
+        Error ("$ufn: Package not located: $PkgName")
+            unless ( $src_base_dir );
+        Error ("$ufn: Package directory not found: $src_base_dir")
+            unless ( -d $src_base_dir );
+        #
+        #   Mainatin a cache of located packages
+        #
+        $LocatePackageBase_cache{$PkgName} = $src_base_dir;
+    }
+    if ( $PkgSubDir )
+    {
+        $src_base_dir .= '/' . $PkgSubDir;
+        Error ("$ufn: Package subdirectory not found: $PkgSubDir" )
+            unless ( -d $src_base_dir );
+    }
+    return $src_base_dir;
+}
 #------------------------------------------------------------------------------
 ;

Subversion Repositories DevTools

(root)/deployfiles/trunk/src/tools/scripts/deploylib.pm – Rev 1544 → 1546