Subversion Repositories DevTools

Rev

Rev 1582 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1582 Rev 1584
Line 198... Line 198...
198
    preinstall.rul 
198
    preinstall.rul 
199
    postremove.rul 
199
    postremove.rul 
200
    preremove.rul 
200
    preremove.rul 
201
);
201
);
202
                    
202
                    
203
my ($PKG_ISHIELD_DEF_FILE) = "pkgdef.h";
203
my ($ISHIELD_PKGDEF_FILE) = "pkgdef.h";
204
my ($PKG_ISHIELD_DIR)      = "";
204
my ($ISHIELD_PROJECTDIR) = "";
205
my ($ISHIELD_PROJECT) = "";
205
my ($ISHIELD_PROJECT) = "";
-
 
206
my ($ISHIELD_ROOT);
206
 
207
 
207
my ($PKG_UTIL_DIR)   = "";
208
my ($PKG_UTIL_DIR)   = "";
208
my ($PATCH_UTIL_DIR) = "";
209
my ($PATCH_UTIL_DIR) = "";
209
 
210
 
210
 
-
 
211
my ($m_UID)  = "";
211
my ($m_UID)  = "";
212
my ($m_GID)  = "";
212
my ($m_GID)  = "";
213
my ($m_MASK) = "";
213
my ($m_MASK) = "";
214
my ($m_KEEP_MASK) = "";
214
my ($m_KEEP_MASK) = "";
215
my ($m_KEEP_LINKS) = "";
215
my ($m_KEEP_LINKS) = "";
Line 288... Line 288...
288
 
288
 
289
our $PkgPreviousVersionStr = "";
289
our $PkgPreviousVersionStr = "";
290
our $TargetBaseDir      = "";
290
our $TargetBaseDir      = "";
291
our $TargetHomeDir      = "";
291
our $TargetHomeDir      = "";
292
 
292
 
293
our $SandBoxName        = "";
-
 
294
our $ProjectAcronym     = "";
293
our $ProjectAcronym     = "";
295
 
294
 
296
our $TmpGlobalVariable  = ""; # used to pass variables into PERL find functions
295
our $TmpGlobalVariable  = ""; # used to pass variables into PERL find functions
297
 
296
 
298
our %TargetDstDirStructure = ();
297
our %TargetDstDirStructure = ();
Line 384... Line 383...
384
        # lets change to root dir and get fully qualified path from cwd and return back
383
        # lets change to root dir and get fully qualified path from cwd and return back
385
        chdir($opt_r);
384
        chdir($opt_r);
386
        $RootDir = cwd;
385
        $RootDir = cwd;
387
        chdir($CurrentDir);
386
        chdir($CurrentDir);
388
 
387
 
389
        $SandBoxName      = File::Basename::basename($RootDir);
-
 
390
    }
388
    }
391
    else
389
    else
392
    {
390
    {
393
        Error("GBE_ROOT not supplied!");
391
        Error("GBE_ROOT not supplied!");
394
    }
392
    }
Line 553... Line 551...
553
    # TargetHomeDir should not really be used for anything
551
    # TargetHomeDir should not really be used for anything
554
    #
552
    #
555
    $TargetHomeDir = ($TargetBaseDir ne ".") ? "$ERGAFC_BASEDIR/$TargetBaseDir" : "$ERGAFC_BASEDIR"; 
553
    $TargetHomeDir = ($TargetBaseDir ne ".") ? "$ERGAFC_BASEDIR/$TargetBaseDir" : "$ERGAFC_BASEDIR"; 
556
    $TargetHomeDir =~ s|/{2,}|/|g;
554
    $TargetHomeDir =~ s|/{2,}|/|g;
557
 
555
 
-
 
556
    #
-
 
557
    #   Determine InstallShield project location
-
 
558
    #   Neeed to setup $PkgDir correctly
-
 
559
    #
-
 
560
    detectInstallShieldProject();
-
 
561
 
558
    $PkgDir       = "$RootDir/pkg";
562
    $PkgDir       = ($ISHIELD_ROOT ? $ISHIELD_ROOT : $RootDir) . '/pkg';
559
    $SrcDir       = "$RootDir/src"; 
563
    $SrcDir       = "$RootDir/src"; 
560
    $InterfaceDir = "$RootDir/interface";
564
    $InterfaceDir = "$RootDir/interface";
561
    $ReleaseDir   = "$RootDir/build/deploy";
565
    $ReleaseDir   = "$RootDir/build/deploy";
562
 
566
 
563
    $PKG_UTIL_DIR   = "$InterfaceDir/deployfiles";
567
    $PKG_UTIL_DIR   = "$InterfaceDir/deployfiles";
Line 812... Line 816...
812
    Information("Target           =[$Target]");
816
    Information("Target           =[$Target]");
813
    Verbose("BuildParts       =[" . join(',',$BuildFileInfo->getPlatformParts($Platform)) . "]");
817
    Verbose("BuildParts       =[" . join(',',$BuildFileInfo->getPlatformParts($Platform)) . "]");
814
    
818
    
815
    Information("CurrentDir       =[$CurrentDir]");
819
    Information("CurrentDir       =[$CurrentDir]");
816
    Information("RootDir          =[$RootDir]");
820
    Information("RootDir          =[$RootDir]");
817
    Information("SandBoxName      =[$SandBoxName]");
-
 
818
    Information("Username         =[$Username]");
821
    Information("Username         =[$Username]");
819
 
822
 
820
    Information("TargetBaseDir    =[" . ($TargetBaseDir ne "." ? $TargetBaseDir : $opt_d) . "]");
823
    Information("TargetBaseDir    =[" . ($TargetBaseDir ne "." ? $TargetBaseDir : $opt_d) . "]");
821
    Information("TargetHomeDir    =[$TargetHomeDir]");
824
    Information("TargetHomeDir    =[$TargetHomeDir]");
822
 
825
 
823
    Information("PkgBaseDir       =[$PkgBaseDir]");
-
 
824
    Information("SrcDir           =[$SrcDir]");
826
    Information("SrcDir           =[$SrcDir]");
825
    Information("PkgDir           =[$PkgDir]");
827
    Information("PkgDir           =[$PkgDir]");
-
 
828
    Information("PkgBaseDir       =[$PkgBaseDir]");
826
    Information("ReleaseDir       =[$ReleaseDir]");
829
    Information("ReleaseDir       =[$ReleaseDir]");
827
 
830
 
828
    Verbose("InterfaceDir     =[$InterfaceDir]");
831
    Verbose("InterfaceDir     =[$InterfaceDir]");
829
    Verbose("DpkgScriptsDir   =[$DpkgScriptsDir]");
832
    Verbose("DpkgScriptsDir   =[$DpkgScriptsDir]");
830
    Verbose("DpkgBinDir(s)    =[");
833
    Verbose("DpkgBinDir(s)    =[");
Line 3155... Line 3158...
3155
        {
3158
        {
3156
            # we want to be able to search both prod and debug dirs. 
3159
            # we want to be able to search both prod and debug dirs. 
3157
            # we can just add them together here because the lib filenames
3160
            # we can just add them together here because the lib filenames
3158
            # are different (i.e. xxxD.so vs xxxP.so) and a P or D library 
3161
            # are different (i.e. xxxD.so vs xxxP.so) and a P or D library 
3159
            # will only exist in one dir. i.e. P.so in prod dirs, D.so in debug dirs.
3162
            # will only exist in one dir. i.e. P.so in prod dirs, D.so in debug dirs.
3160
            push @libDirList, @{$DpkgLibDirListAlternate{$select}};
3163
            push (@libDirList, @{$DpkgLibDirListAlternate{$select}} )
-
 
3164
                if ( exists($DpkgLibDirListAlternate{$select}) );
3161
        }
3165
        }
3162
 
3166
 
3163
        foreach $i (@libDirList)
3167
        foreach $i (@libDirList)
3164
        {
3168
        {
3165
 
3169
 
Line 4146... Line 4150...
4146
#
4150
#
4147
#------------------------------------------------------------------------------
4151
#------------------------------------------------------------------------------
4148
{
4152
{
4149
    Information("Cleaning any previous target file items...");
4153
    Information("Cleaning any previous target file items...");
4150
 
4154
 
4151
    my ($i);
-
 
4152
    my $dirRoot;
-
 
4153
    #   Clean out PkgBaseDir
4155
    #   Clean out PkgBaseDir
4154
    #   This is the directory in which the final package image will be assembled
4156
    #   This is the directory in which the final package image will be assembled
4155
    #   Recreate the directory. Ensure that it does not have setgid on the directory
4157
    #   Recreate the directory. Ensure that it does not have setgid on the directory
4156
    #   as this will affect all the subdirectories that are created and will
4158
    #   as this will affect all the subdirectories that are created and will
4157
    #   propergate into the target package.
4159
    #   propergate into the target package.
Line 4161... Line 4163...
4161
 
4163
 
4162
    # lets create.
4164
    # lets create.
4163
    #
4165
    #
4164
    Information ("Creating target directory structure...");
4166
    Information ("Creating target directory structure...");
4165
    
4167
    
4166
    $dirRoot = ($TargetBaseDir ne ".") ? "$PkgBaseDir/$TargetBaseDir" : $PkgBaseDir;
4168
    my $dirRoot = ($TargetBaseDir ne ".") ? "$PkgBaseDir/$TargetBaseDir" : $PkgBaseDir;
4167
    make_directory( $dirRoot, 0777, "Create target dir");
4169
    make_directory( $dirRoot, 0777, "Create target dir");
4168
 
4170
 
4169
    foreach $i ( sort {$a cmp $b} values %TargetDstDirStructure )
4171
    foreach my $i ( sort {$a cmp $b} values %TargetDstDirStructure )
4170
    {
4172
    {
4171
        make_directory("$dirRoot/$i", 0777);
4173
        make_directory("$dirRoot/$i", 0777);
4172
    }
4174
    }
-
 
4175
    #
-
 
4176
    #   Populate the target with InstallShield specific files
-
 
4177
    #
-
 
4178
    populateInstallShieldFiles();
4173
 
4179
 
4174
 
4180
 
-
 
4181
    # done.
-
 
4182
    return 1;
-
 
4183
}
-
 
4184
 
-
 
4185
#-------------------------------------------------------------------------------
-
 
4186
# Function        : detectInstallShieldProject
-
 
4187
#
4175
    # lets determine if we have a InstallShield config dir
4188
# Description     : Detect the presence of an InstallShield project
-
 
4189
#
-
 
4190
# Inputs          : None
-
 
4191
#
-
 
4192
# Returns         : Nothing
-
 
4193
#
-
 
4194
sub detectInstallShieldProject
-
 
4195
{
-
 
4196
    # Only available on some platforms
4176
    #
4197
    #
-
 
4198
    return
4177
    if ( "$MachType" eq "win32" || "$MachType" eq "WinCE" )
4199
        unless ( "$MachType" eq "win32" || "$MachType" eq "WinCE" );
-
 
4200
 
-
 
4201
    my $m_ishieldDir;
-
 
4202
    my $m_ishieldProjFile;
-
 
4203
    my $m_ishieldRoot;
-
 
4204
    #
-
 
4205
    #   Patches are different
-
 
4206
    #
-
 
4207
    if ( "x$PkgPatchNum" ne "x" )
4178
    {
4208
    {
-
 
4209
        # patch build.
4179
        # if this is a patch build i expect to find a "p" in the front of the
4210
        $m_ishieldProjFile = "p${PkgName}.ism";
4180
        # file names. we use this as a simple visual differentiation.
4211
        $m_ishieldDir = "p${PkgName}";
-
 
4212
    }
4181
        #
4213
    else
-
 
4214
    {
4182
        my $m_ishieldDir;
4215
        # normal build.
4183
        my $m_ishieldProjFile;
4216
        $m_ishieldProjFile = "${PkgName}.ism";
4184
        my $m_ishieldRoot;
4217
        $m_ishieldDir = "${PkgName}";
-
 
4218
    }
4185
 
4219
 
4186
        if ( "x$PkgPatchNum" ne "x" )
-
 
4187
        {
4220
    #
4188
            # patch build.
4221
    #   Expect the project file in one of several well known locations
4189
            $m_ishieldProjFile = "p${PkgName}.ism";
4222
    #       Root of package
4190
            $m_ishieldDir = "p${PkgName}";
4223
    #       Current directory
4191
        }
4224
    #
4192
        else
4225
    if ( -f "$RootDir/$m_ishieldProjFile" ) {
4193
        {
-
 
4194
            # normal build.
4226
        $m_ishieldRoot = $RootDir;
4195
            $m_ishieldProjFile = "${PkgName}.ism";
4227
    } elsif ( -f "$CurrentDir/$m_ishieldProjFile" ) {
4196
            $m_ishieldDir = "${PkgName}";
4228
        $m_ishieldRoot = $CurrentDir;
-
 
4229
    } else {
-
 
4230
        return;
4197
        }
4231
    }
4198
 
4232
 
-
 
4233
    #   Setup InstallShield definitions
4199
        #
4234
    #
4200
        #   Expect the project file in one of several well known locations
-
 
4201
        #       Root of package
4235
    $ISHIELD_ROOT = $m_ishieldRoot;
4202
        #       Current directory
4236
    $ISHIELD_PROJECTDIR = $m_ishieldRoot . '/' . $m_ishieldDir;
4203
        #
-
 
4204
        if ( -f "$RootDir/$m_ishieldProjFile" ) {
4237
    $ISHIELD_PROJECT = $m_ishieldRoot . '/' . $m_ishieldProjFile;
4205
            $m_ishieldRoot = $RootDir;
4238
    return;
-
 
4239
}
4206
 
4240
 
-
 
4241
#-------------------------------------------------------------------------------
-
 
4242
# Function        : populateInstallShieldFiles
-
 
4243
#
-
 
4244
# Description     : Copy in InstallShield Specific files
-
 
4245
#
-
 
4246
# Inputs          : Nothing
-
 
4247
#
-
 
4248
# Returns         : Nothing
-
 
4249
#
-
 
4250
sub populateInstallShieldFiles
-
 
4251
{
4207
        } elsif ( -f "$CurrentDir/$m_ishieldProjFile" ) {
4252
    # lets determine if we have a InstallShield config dir
-
 
4253
    #
-
 
4254
    if ( $ISHIELD_ROOT )
-
 
4255
    {
-
 
4256
        if ( ! -d $ISHIELD_PROJECTDIR )
-
 
4257
        {
-
 
4258
            Error ("Local InstallShield config dir [$ISHIELD_PROJECTDIR] does not exist.",
4208
            $m_ishieldRoot = $CurrentDir;
4259
                   "Please create before continuing.");
4209
        }
4260
        }
4210
 
4261
 
4211
 
-
 
4212
        # we check for an ism file based on the pkg name
-
 
4213
        # if we find one we need to deal with the dir and
4262
        # we populate the ishield config dir with the ishieldlib files
4214
        # the isheildlib files.
-
 
4215
        #
4263
        #
-
 
4264
        Verbose("Installing Standard ishieldlib files from [$PKG_UTIL_DIR] to [$ISHIELD_PROJECTDIR]");
4216
        if ( defined $m_ishieldRoot )
4265
        foreach my $i ( @PKG_ISHIELD_FILES )
4217
        {
4266
        {
4218
            $m_ishieldProjFile = $m_ishieldRoot . '/' . $m_ishieldProjFile;
-
 
4219
            $m_ishieldDir = $m_ishieldRoot . '/' . $m_ishieldDir;
-
 
4220
 
-
 
4221
            # here i can set the location of my IShield project dir
4267
            # first we remove the file (as previously it install read-only).
4222
            # so i can use it later if required.
-
 
4223
            $PKG_ISHIELD_DIR = $m_ishieldDir;
-
 
4224
            $ISHIELD_PROJECT = $m_ishieldProjFile;
4268
            unlink("$ISHIELD_PROJECTDIR/$i");
4225
 
-
 
4226
            if ( ! -d "$m_ishieldDir" )
4269
            if( File::Copy::copy("$PKG_UTIL_DIR/$i", "$ISHIELD_PROJECTDIR") )
4227
            {
4270
            {
4228
                Error ("Local InstallShield config dir [$m_ishieldDir] does not exist.",
4271
                Verbose("Copied [$PKG_UTIL_DIR/$i] to [$ISHIELD_PROJECTDIR] ...");
4229
                       "Please create before continuing.");
-
 
4230
            }
4272
            }
4231
            else
4273
            else
4232
            {
4274
            {
4233
                # we populate the ishield config dir with the ishieldlib files
-
 
4234
                #
-
 
4235
                my ($i);
-
 
4236
                Verbose("Installing Standard ishieldlib files from [$PKG_UTIL_DIR] to [$m_ishieldDir]");
-
 
4237
                foreach $i ( @PKG_ISHIELD_FILES )
-
 
4238
                {
-
 
4239
                    # first we remove the file (as previously it install read-only).
-
 
4240
                    unlink("$m_ishieldDir/$i");
-
 
4241
                    if( File::Copy::copy("$PKG_UTIL_DIR/$i", "$m_ishieldDir") )
-
 
4242
                    {
-
 
4243
                        Verbose("Copied [$PKG_UTIL_DIR/$i] to [$m_ishieldDir] ...");
-
 
4244
                    }
-
 
4245
                    else
-
 
4246
                    {
-
 
4247
                        Error("Failed to copy info file [$PKG_UTIL_DIR/$i] to [$m_ishieldDir] : $!");
4275
                Error("Failed to copy info file [$PKG_UTIL_DIR/$i] to [$ISHIELD_PROJECTDIR] : $!");
4248
                    }
4276
            }
4249
                }
4277
        }
4250
 
4278
 
4251
 
4279
 
4252
                # we also want to deliver the patch rule files
4280
        # we also want to deliver the patch rule files
4253
                # if this build is a patch build.
4281
        # if this build is a patch build.
4254
                #
4282
        #
4255
                if ( "x$PkgPatchNum" ne "x" )
4283
        if ( "x$PkgPatchNum" ne "x" )
-
 
4284
        {
-
 
4285
            Verbose("Installing Patch ishieldlib files from [$PKG_UTIL_DIR] to [$ISHIELD_PROJECTDIR]");
-
 
4286
            foreach my $i ( @PATCH_ISHIELD_FILES )
-
 
4287
            {
-
 
4288
                # first we remove the file (as previously it install read-only).
-
 
4289
                unlink("$ISHIELD_PROJECTDIR/$i");
-
 
4290
                if( File::Copy::copy("$PKG_UTIL_DIR/$i", "$ISHIELD_PROJECTDIR") )
4256
                {
4291
                {
4257
                    Verbose("Installing Patch ishieldlib files from [$PKG_UTIL_DIR] to [$m_ishieldDir]");
-
 
4258
                    foreach $i ( @PATCH_ISHIELD_FILES )
-
 
4259
                    {
-
 
4260
                        # first we remove the file (as previously it install read-only).
-
 
4261
                        unlink("$m_ishieldDir/$i");
-
 
4262
                        if( File::Copy::copy("$PKG_UTIL_DIR/$i", "$m_ishieldDir") )
-
 
4263
                        {
-
 
4264
                            Verbose("Copied [$PKG_UTIL_DIR/$i] to [$m_ishieldDir] ...");
4292
                    Verbose("Copied [$PKG_UTIL_DIR/$i] to [$ISHIELD_PROJECTDIR] ...");
4265
                        }
-
 
4266
                        else
-
 
4267
                        {
-
 
4268
                            Error("Failed to copy info file [$PKG_UTIL_DIR/$i] to [$m_ishieldDir] : $!");
-
 
4269
                        }
-
 
4270
                    }
-
 
4271
                }
4293
                }
-
 
4294
                else
-
 
4295
                {
-
 
4296
                    Error("Failed to copy info file [$PKG_UTIL_DIR/$i] to [$ISHIELD_PROJECTDIR] : $!");
-
 
4297
                }
-
 
4298
            }
-
 
4299
        }
4272
 
4300
 
4273
 
4301
 
4274
                # we also want to deliver the islib images to be
4302
        # we also want to deliver the islib images to be
4275
                # used by this project, we assume the image has a project
4303
        # used by this project, we assume the image has a project
4276
                # acronym prefix, and if not found we just WARN the user
4304
        # acronym prefix, and if not found we just WARN the user
4277
                #
4305
        #
4278
                # we assume our source dir is the interface/etc dir and our
4306
        # we assume our source dir is the interface/etc dir and our
4279
                # dst dir is the PkgBaseDir
4307
        # dst dir is the PkgBaseDir
-
 
4308
        #
-
 
4309
        Verbose("Installing ishield image files from [$DpkgEtcDir] to [$ISHIELD_PROJECTDIR]");
-
 
4310
        foreach my $i ( @PKG_ISHIELD_IMG_FILES )
-
 
4311
        {
-
 
4312
            my $m_islibImgFile = "$DpkgEtcDir/$ProjectAcronym" . "_" . $i;
-
 
4313
            if ( -f "$m_islibImgFile" )
-
 
4314
            {
-
 
4315
                if( File::Copy::copy("$m_islibImgFile", "$PkgBaseDir") )
-
 
4316
                {
-
 
4317
                    Verbose("Copied [$m_islibImgFile] to [$PkgBaseDir] ...");
-
 
4318
                }
-
 
4319
                else
-
 
4320
                {
-
 
4321
                    Error("Failed to copy info file [$m_islibImgFile] to " .
-
 
4322
                             "[$PkgBaseDir] : $!");
-
 
4323
                }
-
 
4324
            }
-
 
4325
            else
-
 
4326
            {
-
 
4327
                # we shall check for the MASS items, if the exist we copy them
-
 
4328
                # over. Here we assume the 'mas' acronymn is correct.
4280
                #
4329
                #
4281
                my ($m_islibImgFile) = "";
4330
                my $m_islibImgFile = "$DpkgEtcDir/mas" . "_" . $i;
4282
                Verbose("Installing ishield image files from [$DpkgEtcDir] to [$m_ishieldDir]");
-
 
4283
                foreach $i ( @PKG_ISHIELD_IMG_FILES )
4331
                if ( -f "$m_islibImgFile" )
4284
                {
4332
                {
4285
                    $m_islibImgFile = "$DpkgEtcDir/$ProjectAcronym" . "_" . $i;
-
 
4286
                    if ( -f "$m_islibImgFile" )
4333
                    if( File::Copy::copy("$m_islibImgFile", "$PkgBaseDir") )
4287
                    {
4334
                    {
4288
                        if( File::Copy::copy("$m_islibImgFile", "$PkgBaseDir") )
-
 
4289
                        {
-
 
4290
                            Verbose("Copied [$m_islibImgFile] to [$PkgBaseDir] ...");
4335
                        Verbose("Copied [$m_islibImgFile] to [$PkgBaseDir] ...");
4291
                        }
-
 
4292
                        else
-
 
4293
                        {
-
 
4294
                            Error("Failed to copy info file [$m_islibImgFile] to " .
-
 
4295
                                     "[$PkgBaseDir] : $!");
-
 
4296
                        }
-
 
4297
                    }
4336
                    }
4298
                    else
4337
                    else
4299
                    {
4338
                    {
4300
                        # we shall check for the MASS items, if the exist we copy them
-
 
4301
                        # over. Here we assume the 'mas' acronymn is correct.
-
 
4302
                        #
-
 
4303
                        $m_islibImgFile = "$DpkgEtcDir/mas" . "_" . $i;
-
 
4304
                        if ( -f "$m_islibImgFile" )
-
 
4305
                        {
-
 
4306
                            if( File::Copy::copy("$m_islibImgFile", "$PkgBaseDir") )
-
 
4307
                            {
-
 
4308
                                Verbose("Copied [$m_islibImgFile] to [$PkgBaseDir] ...");
-
 
4309
                            }
-
 
4310
                            else
-
 
4311
                            {
-
 
4312
                                Error("Failed to copy info file [$m_islibImgFile] to " .
4339
                        Error("Failed to copy info file [$m_islibImgFile] to " .
4313
                                         "[$PkgBaseDir] : $!");
4340
                                 "[$PkgBaseDir] : $!");
4314
                            } 
4341
                    } 
4315
                        } 
4342
                } 
4316
                        else
4343
                else
4317
                        {
4344
                {
4318
                            Warning("Failed to locate ishieldlib image [xxx_$i], no image copied, " .
4345
                    Warning("Failed to locate ishieldlib image [xxx_$i], no image copied, " .
4319
                                    "check depolylib config.");
4346
                            "check depolylib config.");
4320
                        }
-
 
4321
                    }
-
 
4322
                }
4347
                }
4323
 
-
 
4324
            }
4348
            }
4325
        }
4349
        }
4326
        else
-
 
4327
        {
-
 
4328
            Warning("Did not detect InstallShield project file [$m_ishieldProjFile]");
-
 
4329
            Warning("Not installing InstallShield library files.");
-
 
4330
        }
-
 
4331
    }
4350
    }
4332
 
-
 
4333
    # done.
-
 
4334
    return 1;
-
 
4335
}
4351
}
4336
 
4352
 
4337
#------------------------------------------------------------------------------
4353
#------------------------------------------------------------------------------
4338
sub generateIShieldIncludeFile ()
4354
sub generateIShieldIncludeFile ()
4339
#
4355
#
Line 4353... Line 4369...
4353
    }
4369
    }
4354
 
4370
 
4355
    #
4371
    #
4356
    #   Ignore directive if the IS project was not found
4372
    #   Ignore directive if the IS project was not found
4357
    #
4373
    #
4358
    unless( $PKG_ISHIELD_DIR )
4374
    unless( $ISHIELD_PROJECTDIR )
4359
    {
4375
    {
4360
        Warning ("generateIShieldIncludeFile: Ignored as no InstallShield project was found");
4376
        Warning ("generateIShieldIncludeFile: Ignored as no InstallShield project was found");
4361
        return 1
4377
        return 1
4362
    }
4378
    }
4363
 
4379
 
4364
    $outFile = "$PKG_ISHIELD_DIR/$PKG_ISHIELD_DEF_FILE";
4380
    $outFile = "$ISHIELD_PROJECTDIR/$ISHIELD_PKGDEF_FILE";
4365
 
4381
 
4366
    # lets open the file.
4382
    # lets open the file.
4367
    #
4383
    #
4368
    local *FILE;
4384
    local *FILE;
4369
    open ( FILE, "> $outFile") or
4385
    open ( FILE, "> $outFile") or