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

 our $RootDir            = "";
 our $BuildType          = "";
 our $AlternateBuildType = ""; # the opposite of $BuildType
 our $MachType           = "";
 our $MachArch           = "";
+our $MachISA            = "";
 our $Platform           = "";
 our $Product            = "";
 our $Target             = "";
 our $SrcDir             = "";
 our $PkgDir             = "";
+    {
         $Target = $opt_g;
         if ( $Target =~ /^SOLARIS/ )
+        {
             $MachType = 'sparc';
-            $MachArch = $MachType;
-            if ( $Target  =~ /X86/i )
+            if ( $Target =~ /X86/i )
+            {
-                $MachArch = 'x86';
+                $MachArch = 'i386';
+                $MachISA = "";
+            }
+            elsif ( $Target =~ /X64/i )
+            {
+                $MachArch = 'i386';
+                $MachISA = "amd64";
+            }
+            elsif ( $Target =~ /SPARC64/i )
+            {
+                $MachArch = 'sparc';
+                $MachISA = "sparcv9";
+            }
+            else
+            {
+                $MachArch = 'sparc';
+                $MachISA = "";
+            }
+        }
         elsif ( $Target =~ /^WCE/ )
+        {
             $MachType = 'WinCE';
+    #
     $Product = $opt_k ? $opt_k : $Platform;
     if ( $opt_d )
+    {
+        # if no targetbasedir then set it to "." to simulate targetbasedir
+        if ( $opt_d eq "--NoDir" || $opt_d eq "--NoTargetBaseDir" )
+        {
+            $TargetBaseDir = ".";
+        }
+        else
+        {
-        $TargetBaseDir = $opt_d;
+            $TargetBaseDir = $opt_d;
+        }
+    }
     else
+    {
         Error("Package base directory not supplied!");
+    }
     # Load all our build dependencies
+    #
     %BuildPkgArchive = $BuildFileInfo->getDpkgArchiveHash();
-    # lets define where we get our stuff from
+    # TargetHomeDir should not really be used for anything
+    #
-    if ( $ERGAFC_BASEDIR =~ m|/$| )
-    {
-        $TargetHomeDir= "$ERGAFC_BASEDIR$TargetBaseDir";
+    $TargetHomeDir = ($TargetBaseDir ne ".") ? "$ERGAFC_BASEDIR/$TargetBaseDir" : "$ERGAFC_BASEDIR";
-    }
-    else
-    {
-        $TargetHomeDir= "$ERGAFC_BASEDIR/$TargetBaseDir";
+    $TargetHomeDir =~ s|/{2,}|/|g;
-    }
     $PkgDir       = "$RootDir/pkg";
     $SrcDir       = "$RootDir/src";
     $InterfaceDir = "$RootDir/interface";
     $ReleaseDir   = "$RootDir/build/deploy";
     Information("ProjectAcronym   =[$ProjectAcronym]");
     Information("BuildType        =[$BuildType]");
     Information("MachType         =[$MachType]");
     Information("MachArch         =[$MachArch]") if ( $MachArch );
+    Information("MachISA          =[$MachISA]") if ( $MachISA );
     Information("Platform         =[$Platform]");
     Information("Product          =[$Product]");
     Information("Target           =[$Target]");
     Verbose("BuildParts       =[" . join(',',$BuildFileInfo->getPlatformParts($Platform)) . "]");
     Information("CurrentDir       =[$CurrentDir]");
     Information("RootDir          =[$RootDir]");
     Information("SandBoxName      =[$SandBoxName]");
     Information("Username         =[$Username]");
-    Information("TargetBaseDir    =[$TargetBaseDir]");
+    Information("TargetBaseDir    =[" . ($TargetBaseDir ne "." ? $TargetBaseDir : $opt_d) . "]");
     Information("TargetHomeDir    =[$TargetHomeDir]");
     Information("PkgBaseDir       =[$PkgBaseDir]");
     Information("SrcDir           =[$SrcDir]");
     Information("PkgDir           =[$PkgDir]");
     # if does not the process with log an error.
+    #
     my $targetValue;
     if ( $targetTag eq "--NoTag" )
+    {
-        $targetValue = "$PkgBaseDir/$TargetBaseDir";
+        $targetValue = ($TargetBaseDir ne ".") ? "$PkgBaseDir/$TargetBaseDir" : $PkgBaseDir;
+    }
     else
+    {
        $targetValue = getTargetDstDirValue($targetTag, "A");
+    }
 #------------------------------------------------------------------------------
+{
     Information("Cleaning any previous target file items...");
     my ($i);
+    my $dirRoot;
     #   Clean out PkgBaseDir
     #   This is the directory in which the final package image will be assembled
     #   Recreate the directory. Ensure that it does not have setgid on the directory
     #   as this will affect all the subdirectories that are created and will
     #   propergate into the target package.
     make_directory( $PkgDir, 0777, "Create target base dir");
     # lets create.
+    #
     Information ("Creating target directory structure...");
+    $dirRoot = ($TargetBaseDir ne ".") ? "$PkgBaseDir/$TargetBaseDir" : $PkgBaseDir;
-    make_directory( "$PkgBaseDir/$TargetBaseDir", 0777, "Create target dir");
+    make_directory( $dirRoot, 0777, "Create target dir");
     foreach $i ( sort {$a cmp $b} values %TargetDstDirStructure )
+    {
-        make_directory("$PkgBaseDir/$TargetBaseDir/$i", 0777);
+        make_directory("$dirRoot/$i", 0777);
+    }
     # lets determine if we have a InstallShield config dir
+    #
         Error("Incorrect number of params passed to " .
                   "getTargetDstDirValue() function.");
+    }
     my ($m_key, $m_type) = @_;
-    my $tdir;
+    my $tdir = ($TargetBaseDir ne ".") ? "$TargetBaseDir/" : "";
+    #
     #   Look up the users tag conversion hash
+    #
     if ( exists $TargetDstDirStructure{$m_key} )
+    {
-        $tdir = $TargetBaseDir . '/' . $TargetDstDirStructure{$m_key};
+        $tdir .= $TargetDstDirStructure{$m_key};
+    }
     else
+    {
         Error("Target destination dir tag [$m_key] does not exist in " .
              "TargetDstDirStructure. " ,
     printf FILE ("---------------------------------------------------------------\n");
     close FILE;
     # now we need to get the contents of the patch we are creating.
+    #
-    File::Find::find(\&getPatchContents, "$PkgBaseDir/$TargetBaseDir");
+    File::Find::find(\&getPatchContents, ($TargetBaseDir ne ".") ? "$PkgBaseDir/$TargetBaseDir" : $PkgBaseDir );
     return 1;
+}
+    }
     # lets take the passed in args.
     my ($uid, $gid) = @_;
-    # we need to determine which file we are dealing with
-    my ($protoTypeFile);
-    my ($targetBaseDir);
-    my ($pkgBaseDir);
-    $protoTypeFile = "$ProtoTypeFile";
-    $targetBaseDir = "$PkgBaseDir/$TargetBaseDir";
-    $pkgBaseDir    = "$PkgBaseDir";
     # we need to locate the prototype file
-    if ( -f "$protoTypeFile" )
+    if ( -f "$ProtoTypeFile" )
+    {
-        unlink("$protoTypeFile");
+        unlink("$ProtoTypeFile");
-        Verbose("Removing prototype file [$protoTypeFile].");
+        Verbose("Removing prototype file [$ProtoTypeFile].");
+    }
     # lets open the prototype file.
+    #
     local *FILE;
-    open ( FILE, "> $protoTypeFile") or
+    open ( FILE, "> $ProtoTypeFile") or
-        Error("Failed to open file [$protoTypeFile].");
+        Error("Failed to open file [$ProtoTypeFile].");
     # lets populate the prototype file.
     printf FILE ("i pkginfo\n");
-    if ( "x$TargetBaseDir" ne "x." )
-    {
-        printf FILE ("!search $TargetBaseDir");
-    }
-    else
-    {
-        printf FILE ("!search ");
+    printf FILE ("!search");
-    }
+    close(FILE);
     # now we need to add entries for each directory we will
     # be installing
-    File::Find::find(\&prototypeFind, "$targetBaseDir");
+    File::Find::find( \&prototypeFind, ($TargetBaseDir ne ".") ? "$PkgBaseDir/$TargetBaseDir" : $PkgBaseDir );
     # lets populate the prototype file with a newline.
-    open ( FILE, ">> $protoTypeFile") or
+    open ( FILE, ">> $ProtoTypeFile") or
-        Error("Failed to open file [$protoTypeFile].");
+        Error("Failed to open file [$ProtoTypeFile].");
     printf FILE ("\n");
     close (FILE);
     # lets put the pre-deinfed generic entries into the
+    }
     # we need to expand and complete the creation of the
     # prototype file
-    # if targetbasedir is "." the pkgproto will pick up the pkginfo and
+    # if Targetbasedir is "." the pkgproto will pick up the pkginfo and
     # prototype files so we need to remove them
     my ($m_cmd) = "pkgproto " .
                   "$TargetBaseDir " .
                   "| egrep -v \"($ProtoTypeFileName|$PkgInfoFileName)\"" .
                   "| cut -f1-4 -d' ' | sed " . '"s/\$/ ' . "$uid $gid" . '/g"' .
-                  " >> $protoTypeFile";
+                  " >> $ProtoTypeFile";
-    my ($retVal) = system("cd $pkgBaseDir; $m_cmd");
+    my ($retVal) = system("cd $PkgBaseDir; $m_cmd");
     if ( $retVal != 0 )
+    {
-        Error("Failed to create prototype file [$protoTypeFile].");
+        Error("Failed to create prototype file [$ProtoTypeFile].");
+    }
-    Information("Created prototype file [$protoTypeFile].");
+    Information("Created prototype file [$ProtoTypeFile].");
     return 1;
+}
 #------------------------------------------------------------------------------
 #        This subroutine is used to locate all associated package dirs.
 #        It also adds an entry into the prototype file for each dir.
+#
 #------------------------------------------------------------------------------
+{
-    my($file)= "$File::Find::name";
+    my ($file)  = $File::Find::name;
-    my($base)= File::Basename::basename($file);
-    # we get the absolute path from the find, but we only require
-    # a relative path from the starting dir.
-    # so our start dir.
-    # we need to determine whiich file we are dealing with
-    my ($pfile);
-    my ($tDir);
-    $pfile = "$ProtoTypeFile";
-    $tDir = "$PkgBaseDir/$TargetBaseDir";
-    if ( "$file" ne "$tDir" )
-    {
-        if ( -d "$file" )
-        {
-            my ($m_sfile) = $file;
-            if ( "x$TargetBaseDir" eq "x." )
+    # Our topdir will either be $PkgBaseDir or $PkgBaseDir/$TargetBaseDir (if there is a TargetBaseDir).
-            {
-                $tDir = $tDir . "/";
+    # if we have PKgBaseDir only we dont want to include this in the search path,
-                $file =~ s/$tDir//;
+    # if TargetBaseDir is defined we include it in the search paths
-            }
-            else
+    if ( $file ne $PkgBaseDir && -d $file )
-            {
+    {
+        # we get the absolute path from the find, but we only require a relative path from the starting dir.
-                $file =~ s/$tDir/$TargetBaseDir/;
+        # So remove PkgBaseDir from path and include all dirs below it including TargetBaseDir if there is one
-            }
+        $file =~ s|$PkgBaseDir/*||;
-            open ( FILE, ">> $pfile") or
+        open ( FILE, ">> $ProtoTypeFile") or
-                 Error("Failed to open file [$pfile].");
+             Error("Failed to open file [$ProtoTypeFile].");
-            # lets populate the prototype file.
+        # lets populate the prototype file.
-            printf FILE (" $file");
+        printf FILE (" $file");
-            close (FILE);
+        close (FILE);
-        }
+    }
+}
 #------------------------------------------------------------------------------
+    #
     Error ("Internal: MachArch is not defined") unless ( $MachArch );
     printf FILE ("NAME=$PkgNameLong\n");
     printf FILE ("VERSION=$PkgVersion.$ProjectAcronym\n");
     printf FILE ("ARCH=$MachArch\n");
+    printf FILE ("SUNW_ISA=$MachISA\n") if ( $MachISA );
     printf FILE ("VENDOR=$VENDOR_DESC\n");
     printf FILE ("DESC=$PkgDesc\n");
     printf FILE ("CATEGORY=$CATEGORY_DESC\n");
     printf FILE ("BASEDIR=$ERGAFC_BASEDIR\n");
-    printf FILE ("TARGETBASEDIR=$TargetBaseDir\n");
+    printf FILE ("TARGETBASEDIR=$TargetBaseDir\n") unless ( $TargetBaseDir eq "." );
     printf FILE ("CLASSES=$PkgInfoClasses\n");
     foreach my $param ( @_ )
+    {
         printf FILE "$param\n";
     # lets take the passed in args.
     my ($uid, $gid, $mask) = @args;
-    # we need to determine whiich file we are dealing with
-    my ($protoTypeFile);
-    my ($targetBaseDir);
-    my ($pkgBaseDir);
-    $protoTypeFile = "$ProtoTypeFile";
-    $targetBaseDir = "$PkgBaseDir/$TargetBaseDir";
-    $pkgBaseDir    = "$PkgBaseDir";
     # we need to locate the prototype file
-    if ( -f "$protoTypeFile" )
+    if ( -f "$ProtoTypeFile" )
+    {
-        unlink("$protoTypeFile");
+        unlink("$ProtoTypeFile");
-        Verbose("Removing prototype file [$protoTypeFile].");
+        Verbose("Removing prototype file [$ProtoTypeFile].");
+    }
     # lets open the prototype file.
+    #
     local *FILE;
-    open ( FILE, "> $protoTypeFile") or
+    open ( FILE, "> $ProtoTypeFile") or
-        Error("Failed to open file [$protoTypeFile].");
+        Error("Failed to open file [$ProtoTypeFile].");
     # lets populate the prototype file.
     printf FILE ("!default $mask $uid $gid\n");
     printf FILE ("i pkginfo\n");
     close (FILE);
     $m_KEEP_LINKS = $opt_keep_links;
     # now we need to add entries for each directory we will
     # be installing
-    File::Find::find(\&prototype2Find, "$targetBaseDir");
+    File::Find::find( \&prototype2Find, ($TargetBaseDir ne ".") ? "$PkgBaseDir/$TargetBaseDir" : $PkgBaseDir );
     # lets populate the prototype file with a newline.
-    open ( FILE, ">> $protoTypeFile") or
+    open ( FILE, ">> $ProtoTypeFile") or
-        Error("Failed to open file [$protoTypeFile].");
+        Error("Failed to open file [$ProtoTypeFile].");
     printf FILE ("\n");
     close (FILE);
-    Information("Created prototype file [$protoTypeFile].");
+    Information("Created prototype file [$ProtoTypeFile].");
     return 1;
+}
+#------------------------------------------------------------------------------
+sub prototype2Find
+#
+#    Description:
+#        This subroutine is used to locate all associated package dirs.
+#        It also adds an entry into the prototype file for each dir.
+#
+#------------------------------------------------------------------------------
+{
+    my $file = $File::Find::name;
+    # Our topdir will either be $PkgBaseDir or $PkgBaseDir/$TargetBaseDir (if there is a TargetBaseDir).
+    # if we have PkgBaseDir only we dont want to include this in the prototype file,
+    # if TargetBaseDir is defined we include it in the prototype
+    if ( $file ne $PkgBaseDir )
+    {
+        my ($sfile) = $file;
+        # we get the absolute path from the find, but we only require a relative path from the starting dir.
+        # So remove PkgBaseDir from path and include all dirs below it including TargetBaseDir if there is one
+        $file =~ s|$PkgBaseDir/*||;
+        # if TargetBaseDir is "." then find will find the pkginfo & prototype files so we need to exclude them
+        if ( $file ne $ProtoTypeFileName && $file ne $PkgInfoFileName )
+        {
+            my $fmask = $m_MASK;
+            if ( $m_KEEP_MASK )
+            {
+                $fmask = sprintf "%lo", ( (stat($sfile))[2]) & 07777;
+            }
+            open ( FILE, ">> $ProtoTypeFile") or
+                Error("Failed to open file [$ProtoTypeFile].");
+            if ( $m_KEEP_LINKS && -l "$sfile" )
+            {
+                my $linkDest = readlink($sfile);
+                Warning("Link $sfile has an absolute path, may not be a problem but make sure its what you want") if ( $linkDest =~ /^\// );
+                printf FILE ("s none $file=$linkDest\n");
+            }
+            elsif ( -f $sfile )
+            {
+                printf FILE ("f none $file=$file $fmask $m_UID $m_GID\n");
+            }
+            elsif ( -d $sfile )
+            {
+                printf FILE ("d none $file $fmask $m_UID $m_GID\n");
+            }
+            close (FILE);
+        }
+    }
+}
 #-------------------------------------------------------------------------------
 # Function        : createZip
+#
 # Description     : Create a ZIp file of a given directory
+#
     Error ("createZip: Zip file not created") if ( $rv );
+}
-#------------------------------------------------------------------------------
-sub prototype2Find
-#
-#    Description:
-#        This subroutine is used to locate all associated package dirs.
-#        It also adds an entry into the prototype file for each dir.
-#
-#------------------------------------------------------------------------------
-{
-    my $file = $File::Find::name;
-    my $fullfile = $file;
-    my $base = File::Basename::basename($file);
-    # we get the absolute path from the find, but we only require
-    # a relative path from the starting dir.
-    # so our start dir.
-    # we need to determine which file we are dealing with
-    my ($pfile);
-    my ($tDir);
-    $pfile = "$ProtoTypeFile";
-    $tDir = "$PkgBaseDir/$TargetBaseDir";
-    if ( "$file" ne "$tDir" )
-    {
-        my ($m_sfile) = $file;
-        if ( "x$TargetBaseDir" eq "x." )
-        {
-            $tDir = $tDir . "/";
-            $file =~ s/$tDir//;
-        }
-        else
-        {
-            $file =~ s/$tDir/$TargetBaseDir/;
-        }
-        # if TargetBaseDir is "." then find will find the pkginfo & prototype
-        # files so we need to exclude them
-        if ( "$file" ne "$ProtoTypeFileName" &&
-             "$file" ne "$PkgInfoFileName")
-        {
-            my $fmask = $m_MASK;
-            if ( $m_KEEP_MASK )
-            {
-                $fmask = sprintf "%lo", ( (stat($fullfile))[2]) & 07777;
-            }
-            open ( FILE, ">> $pfile") or
-                Error("Failed to open file [$pfile].");
-            if ( $m_KEEP_LINKS && -l "$m_sfile" )
-            {
-                my $linkDest = readlink($m_sfile);
-                Warning("Link $m_sfile has an absolute path, may not be a problem but make sure its what you want") if ( $linkDest =~ /^\// );
-                printf FILE ("s none $file=$linkDest\n");
-            }
-            elsif ( -f "$m_sfile" )
-            {
-                printf FILE ("f none $file=$file $fmask $m_UID $m_GID\n");
-            }
-            elsif ( -d "$m_sfile" )
-            {
-                printf FILE ("d none $file $fmask $m_UID $m_GID\n");
-            }
-            close (FILE);
-        }
-    }
-}
 #-------------------------------------------------------------------------------
 # Function        : convertFile
+#
 # Description     : This sub-routine is used to remove all carrage return\line
 #                   feeds from a line and replace them with the platform
     my ($m_tmpDir) = "$PkgBaseDir/dpkg_archive";
     make_directory( $m_tmpDir, 0777 );
     # 2. we create a sub-directory with the package name
+    #
-    $m_tmpDir = "$PkgBaseDir/dpkg_archive/$TargetBaseDir";
+    $m_tmpDir = ($TargetBaseDir ne ".") ? "$PkgBaseDir/dpkg_archive/$TargetBaseDir" : "$PkgBaseDir/dpkg_archive";
     make_directory( $m_tmpDir, 0777 );
     # 3. we create a sub-directory with the package version number
+    #
-    my ($m_tmpDir2) = "$PkgBaseDir/dpkg_archive/$TargetBaseDir/" .
+    my ($m_tmpDir2) = "$m_tmpDir/${PkgVersion}.${ProjectAcronym}";
-                      "$PkgVersion" .  "." . "$ProjectAcronym";
     make_directory( $m_tmpDir2, 0777 );
     # 4. we replacate the contents of the original outputdir/package name
     #    to do this we shall execute a find starting within the original package target dir
     #    any copy all items we find to the new location under the dpkg_archive/package/version dir.
+    #
-    File::Find::find( \&DpkgFind, "$PkgBaseDir/$TargetBaseDir");
+    File::Find::find( \&DpkgFind, ($TargetBaseDir ne ".") ? "$PkgBaseDir/$TargetBaseDir" : $PkgBaseDir );
     # 5. we create a descpkg file, with the Package Name, Version and Desc
+    #
-    my ($m_DescPkgFile) = "$PkgBaseDir/dpkg_archive/$TargetBaseDir/$PkgVersion\.$ProjectAcronym/descpkg";
+    my ($m_DescPkgFile) = "$m_tmpDir2/descpkg";
     # now we need to update the prototype file
+    #
     local *FILE;
     open ( FILE, ">> $m_DescPkgFile") or
     # we get the absolute path from the find, but we only require
     # a relative path from the starting dir.
+    my $srcdir = ($TargetBaseDir ne ".") ? "$PkgBaseDir/$TargetBaseDir" : $PkgBaseDir;
+    my $dstdir = ($TargetBaseDir ne ".") ? "$PkgBaseDir/dpkg_archive/$TargetBaseDir" : "$PkgBaseDir/dpkg_archive";
     # we need to determine which file we are dealing with
     if ( ! -d "$item")
+    {
         my ($m_sfile) = $item;
-        $item =~ s/$PkgBaseDir\/$TargetBaseDir/$PkgBaseDir\/dpkg_archive\/$TargetBaseDir\/$PkgVersion\.$ProjectAcronym/;
+        $item =~ s|$srcdir|$dstdir/$PkgVersion\.$ProjectAcronym|;
         if(File::Copy::copy("$m_sfile", "$item"))
+        {
             Verbose("Copied [$base] to [$item] ...");
+        }
             Error("Failed to copy pkg file [$m_sfile] to [$item]: $!");
+        }
+    }
     else
+    {
+        # if no TargetBaseDir then we will pick up dpkg_archive dir so lets prune it
+        if ( $_ eq "dpkg_archive" )
+        {
+            $File::Find::prune = 1;
+        }
+        else
+        {
-        # we have found a dir
+            # we have found a dir
-        my ($m_sDir) = $item;
+            my ($m_sDir) = $item;
-        $item =~ s~$PkgBaseDir/$TargetBaseDir~$PkgBaseDir/dpkg_archive/$TargetBaseDir/$PkgVersion\.$ProjectAcronym~;
+            $item =~ s|$srcdir|$dstdir/$PkgVersion\.$ProjectAcronym|;
-        make_directory( $item, 0777 );
+            make_directory( $item, 0777 );
+        }
+    }
+}
 # This is now depricated
+    {
         $targetValue = getTargetDstDirValue($targetTag, "A");
+    }
     else
+    {
-        $targetValue = "$PkgBaseDir/$TargetBaseDir";
+        $targetValue = ($TargetBaseDir ne ".") ? "$PkgBaseDir/$TargetBaseDir" : $PkgBaseDir;
+    }
     $filename = $targetValue . '/' . $filename;
+    #

Subversion Repositories DevTools

(root)/deployfiles/trunk/src/tools/scripts/deploylib.pm – Rev 1568 → 1570