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

 my ($VENDOR_DESC)            = "ERG Transit Systems Ltd";
 my ($CATEGORY_DESC)          = "application";
 my ($ERGAFC_BASEDIR)         = "/afc";
 my ($MAXINST)                = "1000";
-my ($PROJECT_ACRONYM_LENGTH) = 3;
 my ($PKG_OVERVIEW)           = "To Be Defined.";
 my (@PATCH_INFO_FILES) = qw (
     checkinstall
     copyright
+        }
+    }
     if ($opt_v)
+    {
-        if( "$opt_v" =~ m/^[0-9]*\.[0-9]*\.[0-9]*-[0-9]*\.[a-z][a-z][a-z]$/ ) # N.N.N-N.ppp
+        if( "$opt_v" =~ m/^(\d*)\.(\d*)\.(\d*)-(\d*)\.([a-z]{2,3})$/ ) # N.N.N-N.ppp
+        {
-            my ($s1, $s2) = split (/-/, $opt_v);
-            my ($s1a, $s1b, $s1c) = split (/\./, $s1);
+            my ($s1, $s2, $s3, $s4, $s5) = ($1, $2, $3, $4, $5);
-            my ($s2a, $s2b) = split (/\./, $s2);
-            $PkgVersionStr = sprintf("%02s%02s%02s", $s1a,$s1b,$s1c);
+            $PkgVersionStr = sprintf("%02s%02s%02s", $s1,$s2,$s3);
-            $PkgVersion  = "$s1";
+            $PkgVersion  = "$s1\.$s2\.$s3";
-            $PkgBuildNum = "$s2a";
+            $PkgBuildNum = $s4;
-            if ( length("$s2b") == $PROJECT_ACRONYM_LENGTH )
-            {
-                $ProjectAcronym   = $s2b;
+            $ProjectAcronym   = $s5;
-            }
-            else
-            {
-                Error("-v command line arg [$opt_v] has invalid format",
-                      "Required format is N.N.N-B.ppp where:",
-                      "    N is an integer",
-                      "    B is an integer",
-                      "    ppp is the project acronym",
-                      "Check propject acronym.");
-            }
+        }
-        elsif( "$opt_v" =~ m/^[0-9]*\.[0-9]*\.[0-9]*\.[a-z][a-z][a-z]$/ ) # N.N.N.ppp
+        elsif( "$opt_v" =~ m/^(\d*)\.(\d*)\.(\d*)\.([a-z]{2,3})$/ ) # N.N.N.ppp
         {
-            my ($tmpVar) = $opt_v;
-            $tmpVar =~ s/^([0-9]*)\.([0-9]*)\.([0-9]*)\.([a-z][a-z][a-z])$/$1,$2,$3,$4/g;
-            my ($s1, $s2, $s3, $s4) = split (/,/, $tmpVar);
+            my ($s1, $s2, $s3, $s4) = ($1, $2, $3, $4);
             $PkgVersionStr = sprintf("%02s%02s%02s", $s1,$s2,$s3);
             $PkgVersion  = "$s1\.$s2\.$s3";
             $PkgBuildNum = "1";
-            if ( length("$s4") == $PROJECT_ACRONYM_LENGTH )
-            {
-                $ProjectAcronym   = $s4;
+            $ProjectAcronym   = $s4;
-            }
-            else
-            {
-                Error("-v command line arg [$opt_v] has invalid format",
-                      "Required format is N.N.N.ppp where:",
-                      "    N is an integer",
-                      "    ppp is the project acronym",
-                      "Check propject acronym.");
-            }
+        }
         else
+        {
             Error("-v command line arg [$opt_v] has invalid format",
                   "Allowed formats are N.N.N-B.ppp and N.N.N.ppp where:",
                   "    B is an integer",
                   "    ppp is the project acronym",
                   "Check propject acronym.");
+        }
         $PkgVersionUser  = $opt_v;
+    }
     else
+    {
         Error("Package Version not supplied!");
+#
 #       The sub routine also updates to the prototype file with an appropriate
 #       entry for the associated file.
 # Inputs:
 #       sDirTag                 - Source directory tag
+#                                 Or --Package=name,subdir
+#                                 Or --Interface=subdir
 #       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.
 #       The sub routine also updates to the prototype file with an appropriate
 #       entry for the associated file.
+#
 #       If it has any problems it will log an error and stop processing.
+#
+# Inputs:
+#       sDirTag                 - Source directory tag
+#                                 Or --Package=name,subdir
+#                                 Or --Interface=subdir
+#       sfile                   - Source File Name [Mandatory]
+#       tfile                   - Not sure. Used in the prototype file.
+#                                 Suggest using the same name as sfile
+#       class                   - Class Name
 #------------------------------------------------------------------------------
+{
     # correct number of parameters?
     if ( ($#_+1) != 4 )
+    {
+{
     Information("Cleaning any previous target file items...");
     my ($i);
-    # Clean out PkgBaseDir
+    #   Clean out PkgBaseDir
-    # This is the directory in whcih the final package image will be assembled
+    #   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.
+    #
-    rmDirectory("$PkgBaseDir");
+    rmDirectory( $PkgBaseDir );
+    make_directory( $PkgDir, 0777, "Create target base dir");
     # lets create.
+    #
     Information ("Creating target directory structure...");
     make_directory( "$PkgBaseDir/$TargetBaseDir", 0777, "Create target dir");
 # Description     : This sub-routine is used to copy a local deployment file into
 #                   the target destination dir.
+#
 # Inputs          : m_srcDirTag             - Tag for Source Dir name
 #                                             Tag defined in %LocalSrcDirStructure
+#                                             Or --Package=name,subdir
+#                                             Or --Interface=subdir
+#
 #                   m_sfile                 - Name of the source file
 #                   m_targetDirTag          - Tag for the target directory
 #                                             Tag defined in %TargetDstDirStructure
 #                   m_nfile                 - Target filename
 #                                             Must be specified. If set to "", then
+    {
         Warning("Unable to retrieve Release Manager Release Notes: LWP module missing");
         return 0;
+    }
+    our $GBE_RM_URL;
+    EnvImport('GBE_RM_URL');
     Information("Retrieving Release Notes From Release Manager...Please wait...");
     my $user_agent = LWP::UserAgent->new( timeout => 30 );
-    my $response = $user_agent->get('http://erg:8002/ManagerSuite/Release_Manager/_adhoc_release_notes.asp?pv_id='. $RmPkgDetails->pv_id(),
+    my $response = $user_agent->get( $GBE_RM_URL . '/_adhoc_release_notes.asp?pv_id='. $RmPkgDetails->pv_id(),
                                     ':content_file' => "$PkgReleaseNote\.html");
     if ( $response->is_success )
+    {
         Verbose("Retrieved Release Manager HTML Release note [$PkgReleaseNote\.html]");
         return 1;
+    }
     else
+    {
         Verbose2 ( "$text: $name [$umask_text] - already exists");
+    }
+    #
+    #   Ensure that the target directory is not setgid
+    #   as this will mess up the Solaris packaging process. The setgid on the
+    #   directories will be propergated into the final package. This is not good.
+    #
+    #   If the user gets directories with SETGID, then they  must be created
+    #   specifically after the directory has been created.
+    #
+    #   Why is this a problem? Seen when a build user has directory setgid
+    #   for the purposes of making the directory accessible by many.
+    #
+    if ( -g $name )
+    {
+        system ('chmod', 'g-s', $name );
+        Error ("Cannot remove setGID on directory.", "Dir: $name") if ( -g $name );
+    }
+}
 #-------------------------------------------------------------------------------
 # Function        : ActivePlatform

Subversion Repositories DevTools

(root)/deployfiles/trunk/src/tools/scripts/deploylib.pm – Rev 1552 → 1554