Subversion Repositories DevTools

Rev

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

Rev 1564 Rev 1568
Line 249... Line 249...
249 
our $CurrentDir         = "";
 249 
our $CurrentDir         = "";
250 
our $RootDir            = "";
 250 
our $RootDir            = "";
251 
our $BuildType          = "";
 251 
our $BuildType          = "";
252 
our $AlternateBuildType = ""; # the opposite of $BuildType
 252 
our $AlternateBuildType = ""; # the opposite of $BuildType
253 
our $MachType           = "";
 253 
our $MachType           = "";
- 
 
 254 
our $MachArch           = "";
254 
our $Platform           = "";
 255 
our $Platform           = "";
255 
our $Product            = "";
 256 
our $Product            = "";
256 
our $Target             = "";
 257 
our $Target             = "";
257 
our $SrcDir             = "";
 258 
our $SrcDir             = "";
258 
our $PkgDir             = "";
 259 
our $PkgDir             = "";
Line 408... Line 409...
408 
    {
 409 
    {
409 
        $Target = $opt_g;
 410 
        $Target = $opt_g;
410 
        if ( $Target =~ /^SOLARIS/ )
 411 
        if ( $Target =~ /^SOLARIS/ )
411 
        {
 412 
        {
412 
            $MachType = 'sparc';
 413 
            $MachType = 'sparc';
- 
 
 414 
            $MachArch = $MachType;
- 
 
 415 
            if ( $Target  =~ /X86/i )
- 
 
 416 
            {
- 
 
 417 
                $MachArch = 'x86';
- 
 
 418 
            }
413 
        }
 419 
        }
414 
        elsif ( $Target =~ /^WCE/ )
 420 
        elsif ( $Target =~ /^WCE/ )
415 
        {
 421 
        {
416 
            $MachType = 'WinCE';
 422 
            $MachType = 'WinCE';
417 
        }
 423 
        }
Line 777... Line 783...
777 
    Information("PkgPreviousVersionStr=[$PkgPreviousVersionStr]");
 783 
    Information("PkgPreviousVersionStr=[$PkgPreviousVersionStr]");
778 
 
 784 
 
779 
    Information("ProjectAcronym   =[$ProjectAcronym]");
 785 
    Information("ProjectAcronym   =[$ProjectAcronym]");
780 
    Information("BuildType        =[$BuildType]");
 786 
    Information("BuildType        =[$BuildType]");
781 
    Information("MachType         =[$MachType]");
 787 
    Information("MachType         =[$MachType]");
- 
 
 788 
    Information("MachArch         =[$MachArch]") if ( $MachArch );
782 
    Information("Platform         =[$Platform]");
 789 
    Information("Platform         =[$Platform]");
783 
    Information("Product          =[$Product]");
 790 
    Information("Product          =[$Product]");
784 
    Information("Target           =[$Target]");
 791 
    Information("Target           =[$Target]");
785 
    Verbose("BuildParts       =[" . join(',',$BuildFileInfo->getPlatformParts($Platform)) . "]");
 792 
    Verbose("BuildParts       =[" . join(',',$BuildFileInfo->getPlatformParts($Platform)) . "]");
786
793
Line 5654... Line 5661...
5654 
    printf FILE ("PKG=$PkgName\n");
 5661 
    printf FILE ("PKG=$PkgName\n");
5655 
 
 5662 
 
5656 
 
 5663 
 
5657 
    # here we deal with the new version number format
 5664 
    # here we deal with the new version number format
5658 
    #
 5665 
    #
- 
 
 5666 
    Error ("Internal: MachArch is not defined") unless ( $MachArch );
5659 
    printf FILE ("NAME=$PkgNameLong\n");
 5667 
    printf FILE ("NAME=$PkgNameLong\n");
5660 
    printf FILE ("VERSION=$PkgVersion.$ProjectAcronym\n");
 5668 
    printf FILE ("VERSION=$PkgVersion.$ProjectAcronym\n");
5661 
    printf FILE ("ARCH=$MachType\n");
 5669 
    printf FILE ("ARCH=$MachArch\n");
5662 
    printf FILE ("VENDOR=$VENDOR_DESC\n");
 5670 
    printf FILE ("VENDOR=$VENDOR_DESC\n");
5663 
    printf FILE ("DESC=$PkgDesc\n");
 5671 
    printf FILE ("DESC=$PkgDesc\n");
5664 
    printf FILE ("CATEGORY=$CATEGORY_DESC\n");
 5672 
    printf FILE ("CATEGORY=$CATEGORY_DESC\n");
5665 
    printf FILE ("BASEDIR=$ERGAFC_BASEDIR\n");
 5673 
    printf FILE ("BASEDIR=$ERGAFC_BASEDIR\n");
5666 
    printf FILE ("TARGETBASEDIR=$TargetBaseDir\n");
 5674 
    printf FILE ("TARGETBASEDIR=$TargetBaseDir\n");
Line 6074... Line 6082...
6074 
            {
 6082 
            {
6075 
                chmodFile("$startingPoint/$item", $perms);
 6083 
                chmodFile("$startingPoint/$item", $perms);
6076 
            }
 6084 
            }
6077 
        }
 6085 
        }
6078 
    }
 6086 
    }
6079 
    close (DIR);
 6087 
    closedir (DIR);
6080 
 
 6088 
 
6081 
    # lets deal with starting dir
 6089 
    # lets deal with starting dir
6082 
    #
6090 
    #
6083 
    chmodFile("$startingPoint", $perms);
 6091 
    chmodFile("$startingPoint", $perms);
6084 
 
 6092