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

     preinstall.rul
     postremove.rul
     preremove.rul
 );
-my ($PKG_ISHIELD_DEF_FILE) = "pkgdef.h";
+my ($ISHIELD_PKGDEF_FILE) = "pkgdef.h";
-my ($PKG_ISHIELD_DIR)      = "";
+my ($ISHIELD_PROJECTDIR) = "";
 my ($ISHIELD_PROJECT) = "";
+my ($ISHIELD_ROOT);
 my ($PKG_UTIL_DIR)   = "";
 my ($PATCH_UTIL_DIR) = "";
 my ($m_UID)  = "";
 my ($m_GID)  = "";
 my ($m_MASK) = "";
 my ($m_KEEP_MASK) = "";
 my ($m_KEEP_LINKS) = "";
 our $PkgPreviousVersionStr = "";
 our $TargetBaseDir      = "";
 our $TargetHomeDir      = "";
-our $SandBoxName        = "";
 our $ProjectAcronym     = "";
 our $TmpGlobalVariable  = ""; # used to pass variables into PERL find functions
 our %TargetDstDirStructure = ();
         # lets change to root dir and get fully qualified path from cwd and return back
         chdir($opt_r);
         $RootDir = cwd;
         chdir($CurrentDir);
-        $SandBoxName      = File::Basename::basename($RootDir);
+    }
     else
+    {
         Error("GBE_ROOT not supplied!");
+    }
     # TargetHomeDir should not really be used for anything
+    #
     $TargetHomeDir = ($TargetBaseDir ne ".") ? "$ERGAFC_BASEDIR/$TargetBaseDir" : "$ERGAFC_BASEDIR";
     $TargetHomeDir =~ s|/{2,}|/|g;
+    #
+    #   Determine InstallShield project location
+    #   Neeed to setup $PkgDir correctly
+    #
+    detectInstallShieldProject();
-    $PkgDir       = "$RootDir/pkg";
+    $PkgDir       = ($ISHIELD_ROOT ? $ISHIELD_ROOT : $RootDir) . '/pkg';
     $SrcDir       = "$RootDir/src";
     $InterfaceDir = "$RootDir/interface";
     $ReleaseDir   = "$RootDir/build/deploy";
     $PKG_UTIL_DIR   = "$InterfaceDir/deployfiles";
     Information("Target           =[$Target]");
     Verbose("BuildParts       =[" . join(',',$BuildFileInfo->getPlatformParts($Platform)) . "]");
     Information("CurrentDir       =[$CurrentDir]");
     Information("RootDir          =[$RootDir]");
-    Information("SandBoxName      =[$SandBoxName]");
     Information("Username         =[$Username]");
     Information("TargetBaseDir    =[" . ($TargetBaseDir ne "." ? $TargetBaseDir : $opt_d) . "]");
     Information("TargetHomeDir    =[$TargetHomeDir]");
-    Information("PkgBaseDir       =[$PkgBaseDir]");
     Information("SrcDir           =[$SrcDir]");
     Information("PkgDir           =[$PkgDir]");
+    Information("PkgBaseDir       =[$PkgBaseDir]");
     Information("ReleaseDir       =[$ReleaseDir]");
     Verbose("InterfaceDir     =[$InterfaceDir]");
     Verbose("DpkgScriptsDir   =[$DpkgScriptsDir]");
     Verbose("DpkgBinDir(s)    =[");
+        {
             # we want to be able to search both prod and debug dirs.
             # we can just add them together here because the lib filenames
             # are different (i.e. xxxD.so vs xxxP.so) and a P or D library
             # will only exist in one dir. i.e. P.so in prod dirs, D.so in debug dirs.
-            push @libDirList, @{$DpkgLibDirListAlternate{$select}};
+            push (@libDirList, @{$DpkgLibDirListAlternate{$select}} )
+                if ( exists($DpkgLibDirListAlternate{$select}) );
+        }
         foreach $i (@libDirList)
+        {
+#
 #------------------------------------------------------------------------------
+{
     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.
     # lets create.
+    #
     Information ("Creating target directory structure...");
-    $dirRoot = ($TargetBaseDir ne ".") ? "$PkgBaseDir/$TargetBaseDir" : $PkgBaseDir;
+    my $dirRoot = ($TargetBaseDir ne ".") ? "$PkgBaseDir/$TargetBaseDir" : $PkgBaseDir;
     make_directory( $dirRoot, 0777, "Create target dir");
-    foreach $i ( sort {$a cmp $b} values %TargetDstDirStructure )
+    foreach my $i ( sort {$a cmp $b} values %TargetDstDirStructure )
+    {
         make_directory("$dirRoot/$i", 0777);
+    }
+    #
+    #   Populate the target with InstallShield specific files
+    #
+    populateInstallShieldFiles();
+    # done.
+    return 1;
+}
+#-------------------------------------------------------------------------------
+# Function        : detectInstallShieldProject
+#
-    # lets determine if we have a InstallShield config dir
+# Description     : Detect the presence of an InstallShield project
+#
+# Inputs          : None
+#
+# Returns         : Nothing
+#
+sub detectInstallShieldProject
+{
+    # Only available on some platforms
+    #
+    return
-    if ( "$MachType" eq "win32" || "$MachType" eq "WinCE" )
+        unless ( "$MachType" eq "win32" || "$MachType" eq "WinCE" );
+    my $m_ishieldDir;
+    my $m_ishieldProjFile;
+    my $m_ishieldRoot;
+    #
+    #   Patches are different
+    #
+    if ( "x$PkgPatchNum" ne "x" )
+    {
+        # patch build.
-        # if this is a patch build i expect to find a "p" in the front of the
+        $m_ishieldProjFile = "p${PkgName}.ism";
-        # file names. we use this as a simple visual differentiation.
+        $m_ishieldDir = "p${PkgName}";
+    }
-        #
+    else
+    {
-        my $m_ishieldDir;
+        # normal build.
-        my $m_ishieldProjFile;
+        $m_ishieldProjFile = "${PkgName}.ism";
-        my $m_ishieldRoot;
+        $m_ishieldDir = "${PkgName}";
+    }
-        if ( "x$PkgPatchNum" ne "x" )
-        {
+    #
-            # patch build.
+    #   Expect the project file in one of several well known locations
-            $m_ishieldProjFile = "p${PkgName}.ism";
+    #       Root of package
-            $m_ishieldDir = "p${PkgName}";
+    #       Current directory
-        }
+    #
-        else
+    if ( -f "$RootDir/$m_ishieldProjFile" ) {
-        {
-            # normal build.
+        $m_ishieldRoot = $RootDir;
-            $m_ishieldProjFile = "${PkgName}.ism";
+    } elsif ( -f "$CurrentDir/$m_ishieldProjFile" ) {
-            $m_ishieldDir = "${PkgName}";
+        $m_ishieldRoot = $CurrentDir;
+    } else {
+        return;
-        }
+    }
+    #   Setup InstallShield definitions
-        #
+    #
-        #   Expect the project file in one of several well known locations
-        #       Root of package
+    $ISHIELD_ROOT = $m_ishieldRoot;
-        #       Current directory
+    $ISHIELD_PROJECTDIR = $m_ishieldRoot . '/' . $m_ishieldDir;
-        #
-        if ( -f "$RootDir/$m_ishieldProjFile" ) {
+    $ISHIELD_PROJECT = $m_ishieldRoot . '/' . $m_ishieldProjFile;
-            $m_ishieldRoot = $RootDir;
+    return;
+}
+#-------------------------------------------------------------------------------
+# Function        : populateInstallShieldFiles
+#
+# Description     : Copy in InstallShield Specific files
+#
+# Inputs          : Nothing
+#
+# Returns         : Nothing
+#
+sub populateInstallShieldFiles
+{
-        } elsif ( -f "$CurrentDir/$m_ishieldProjFile" ) {
+    # lets determine if we have a InstallShield config dir
+    #
+    if ( $ISHIELD_ROOT )
+    {
+        if ( ! -d $ISHIELD_PROJECTDIR )
+        {
+            Error ("Local InstallShield config dir [$ISHIELD_PROJECTDIR] does not exist.",
-            $m_ishieldRoot = $CurrentDir;
+                   "Please create before continuing.");
+        }
-        # we check for an ism file based on the pkg name
-        # if we find one we need to deal with the dir and
+        # we populate the ishield config dir with the ishieldlib files
-        # the isheildlib files.
+        #
+        Verbose("Installing Standard ishieldlib files from [$PKG_UTIL_DIR] to [$ISHIELD_PROJECTDIR]");
-        if ( defined $m_ishieldRoot )
+        foreach my $i ( @PKG_ISHIELD_FILES )
+        {
-            $m_ishieldProjFile = $m_ishieldRoot . '/' . $m_ishieldProjFile;
-            $m_ishieldDir = $m_ishieldRoot . '/' . $m_ishieldDir;
-            # here i can set the location of my IShield project dir
+            # first we remove the file (as previously it install read-only).
-            # so i can use it later if required.
-            $PKG_ISHIELD_DIR = $m_ishieldDir;
-            $ISHIELD_PROJECT = $m_ishieldProjFile;
+            unlink("$ISHIELD_PROJECTDIR/$i");
-            if ( ! -d "$m_ishieldDir" )
+            if( File::Copy::copy("$PKG_UTIL_DIR/$i", "$ISHIELD_PROJECTDIR") )
+            {
-                Error ("Local InstallShield config dir [$m_ishieldDir] does not exist.",
+                Verbose("Copied [$PKG_UTIL_DIR/$i] to [$ISHIELD_PROJECTDIR] ...");
-                       "Please create before continuing.");
+            }
             else
+            {
-                # we populate the ishield config dir with the ishieldlib files
-                #
-                my ($i);
-                Verbose("Installing Standard ishieldlib files from [$PKG_UTIL_DIR] to [$m_ishieldDir]");
-                foreach $i ( @PKG_ISHIELD_FILES )
-                {
-                    # first we remove the file (as previously it install read-only).
-                    unlink("$m_ishieldDir/$i");
-                    if( File::Copy::copy("$PKG_UTIL_DIR/$i", "$m_ishieldDir") )
-                    {
-                        Verbose("Copied [$PKG_UTIL_DIR/$i] to [$m_ishieldDir] ...");
-                    }
-                    else
-                    {
-                        Error("Failed to copy info file [$PKG_UTIL_DIR/$i] to [$m_ishieldDir] : $!");
+                Error("Failed to copy info file [$PKG_UTIL_DIR/$i] to [$ISHIELD_PROJECTDIR] : $!");
-                    }
+            }
-                }
+        }
-                # we also want to deliver the patch rule files
+        # we also want to deliver the patch rule files
-                # if this build is a patch build.
+        # if this build is a patch build.
-                #
+        #
-                if ( "x$PkgPatchNum" ne "x" )
+        if ( "x$PkgPatchNum" ne "x" )
+        {
+            Verbose("Installing Patch ishieldlib files from [$PKG_UTIL_DIR] to [$ISHIELD_PROJECTDIR]");
+            foreach my $i ( @PATCH_ISHIELD_FILES )
+            {
+                # first we remove the file (as previously it install read-only).
+                unlink("$ISHIELD_PROJECTDIR/$i");
+                if( File::Copy::copy("$PKG_UTIL_DIR/$i", "$ISHIELD_PROJECTDIR") )
+                {
-                    Verbose("Installing Patch ishieldlib files from [$PKG_UTIL_DIR] to [$m_ishieldDir]");
-                    foreach $i ( @PATCH_ISHIELD_FILES )
-                    {
-                        # first we remove the file (as previously it install read-only).
-                        unlink("$m_ishieldDir/$i");
-                        if( File::Copy::copy("$PKG_UTIL_DIR/$i", "$m_ishieldDir") )
-                        {
-                            Verbose("Copied [$PKG_UTIL_DIR/$i] to [$m_ishieldDir] ...");
+                    Verbose("Copied [$PKG_UTIL_DIR/$i] to [$ISHIELD_PROJECTDIR] ...");
-                        }
-                        else
-                        {
-                            Error("Failed to copy info file [$PKG_UTIL_DIR/$i] to [$m_ishieldDir] : $!");
-                        }
-                    }
+                }
+                else
+                {
+                    Error("Failed to copy info file [$PKG_UTIL_DIR/$i] to [$ISHIELD_PROJECTDIR] : $!");
+                }
+            }
+        }
-                # we also want to deliver the islib images to be
+        # we also want to deliver the islib images to be
-                # used by this project, we assume the image has a project
+        # used by this project, we assume the image has a project
-                # acronym prefix, and if not found we just WARN the user
+        # acronym prefix, and if not found we just WARN the user
-                #
+        #
-                # we assume our source dir is the interface/etc dir and our
+        # we assume our source dir is the interface/etc dir and our
-                # dst dir is the PkgBaseDir
+        # dst dir is the PkgBaseDir
+        #
+        Verbose("Installing ishield image files from [$DpkgEtcDir] to [$ISHIELD_PROJECTDIR]");
+        foreach my $i ( @PKG_ISHIELD_IMG_FILES )
+        {
+            my $m_islibImgFile = "$DpkgEtcDir/$ProjectAcronym" . "_" . $i;
+            if ( -f "$m_islibImgFile" )
+            {
+                if( File::Copy::copy("$m_islibImgFile", "$PkgBaseDir") )
+                {
+                    Verbose("Copied [$m_islibImgFile] to [$PkgBaseDir] ...");
+                }
+                else
+                {
+                    Error("Failed to copy info file [$m_islibImgFile] to " .
+                             "[$PkgBaseDir] : $!");
+                }
+            }
+            else
+            {
+                # we shall check for the MASS items, if the exist we copy them
+                # over. Here we assume the 'mas' acronymn is correct.
+                #
-                my ($m_islibImgFile) = "";
+                my $m_islibImgFile = "$DpkgEtcDir/mas" . "_" . $i;
-                Verbose("Installing ishield image files from [$DpkgEtcDir] to [$m_ishieldDir]");
-                foreach $i ( @PKG_ISHIELD_IMG_FILES )
+                if ( -f "$m_islibImgFile" )
+                {
-                    $m_islibImgFile = "$DpkgEtcDir/$ProjectAcronym" . "_" . $i;
-                    if ( -f "$m_islibImgFile" )
+                    if( File::Copy::copy("$m_islibImgFile", "$PkgBaseDir") )
+                    {
-                        if( File::Copy::copy("$m_islibImgFile", "$PkgBaseDir") )
-                        {
-                            Verbose("Copied [$m_islibImgFile] to [$PkgBaseDir] ...");
+                        Verbose("Copied [$m_islibImgFile] to [$PkgBaseDir] ...");
-                        }
-                        else
-                        {
-                            Error("Failed to copy info file [$m_islibImgFile] to " .
-                                     "[$PkgBaseDir] : $!");
-                        }
+                    }
                     else
+                    {
-                        # we shall check for the MASS items, if the exist we copy them
-                        # over. Here we assume the 'mas' acronymn is correct.
-                        #
-                        $m_islibImgFile = "$DpkgEtcDir/mas" . "_" . $i;
-                        if ( -f "$m_islibImgFile" )
-                        {
-                            if( File::Copy::copy("$m_islibImgFile", "$PkgBaseDir") )
-                            {
-                                Verbose("Copied [$m_islibImgFile] to [$PkgBaseDir] ...");
-                            }
-                            else
-                            {
-                                Error("Failed to copy info file [$m_islibImgFile] to " .
+                        Error("Failed to copy info file [$m_islibImgFile] to " .
-                                         "[$PkgBaseDir] : $!");
+                                 "[$PkgBaseDir] : $!");
-                            }
+                    }
-                        }
+                }
-                        else
+                else
-                        {
+                {
-                            Warning("Failed to locate ishieldlib image [xxx_$i], no image copied, " .
+                    Warning("Failed to locate ishieldlib image [xxx_$i], no image copied, " .
-                                    "check depolylib config.");
+                            "check depolylib config.");
-                        }
-                    }
+                }
+            }
+        }
-        else
-        {
-            Warning("Did not detect InstallShield project file [$m_ishieldProjFile]");
-            Warning("Not installing InstallShield library files.");
-        }
+    }
-    # done.
-    return 1;
+}
 #------------------------------------------------------------------------------
 sub generateIShieldIncludeFile ()
+#
+    }
+    #
     #   Ignore directive if the IS project was not found
+    #
-    unless( $PKG_ISHIELD_DIR )
+    unless( $ISHIELD_PROJECTDIR )
+    {
         Warning ("generateIShieldIncludeFile: Ignored as no InstallShield project was found");
         return 1
+    }
-    $outFile = "$PKG_ISHIELD_DIR/$PKG_ISHIELD_DEF_FILE";
+    $outFile = "$ISHIELD_PROJECTDIR/$ISHIELD_PKGDEF_FILE";
     # lets open the file.
+    #
     local *FILE;
     open ( FILE, "> $outFile") or

Subversion Repositories DevTools

(root)/deployfiles/trunk/src/tools/scripts/deploylib.pm – Rev 1582 → 1584