Subversion Repositories DevTools

Rev

Rev 6861 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 6861 Rev 6863
Line 39... Line 39...
39 
#                   PACKAGE
 39 
#                   PACKAGE
40 
#                   VARIANT
 40 
#                   VARIANT
41 
#                   VERSION
 41 
#                   VERSION
42 
#                   PLATFORM
 42 
#                   PLATFORM
43 
#                   TYPE
 43 
#                   TYPE
- 
 
 44 
#                   ARCH
44 
#
45 
#
45 
#......................................................................#
 46 
#......................................................................#
46 
 
 47 
 
47 
require 5.006_001;
 48 
require 5.006_001;
48 
#use strict;
 49 
#use strict;
Line 219... Line 220...
219 
    #   Note: dpkg-name generates: Name _ Version _ Architecture [ _ Type ]
 220 
    #   Note: dpkg-name generates: Name _ Version _ Architecture [ _ Type ]
220 
    #
 221 
    #
221 
    #
 222 
    #
222 
    my $PkgType = $deploy_mode ? ( '_' . '$(GBE_TYPE)' ) : '' ;
 223 
    my $PkgType = $deploy_mode ? ( '_' . '$(GBE_TYPE)' ) : '' ;
223 
    my $PkgArch = GetGlobalOption('PACKAGE_ARCH', $::ScmPlatform);
 224 
    my $PkgArch = GetGlobalOption('PACKAGE_ARCH', $::ScmPlatform);
224 
        if ($noArch)
 225 
    my $Platform = $::ScmPlatform;
225 
        {
 226 
        if ($noArch) {
226 
            $PkgArch = 'all';
 227 
            $PkgArch = 'all';
- 
 
 228 
            $Platform = 'all';
227 
            $PkgType = '';
 229 
            $PkgType = '';
228 
            push @optArgs, "-NoArch";
 230 
            push @optArgs, "-NoArch";
229 
        }
 231 
        }
- 
 
 232 
 
230 
    my $PkgName = "${build_name}_${::ScmBuildVersionFull}_${PkgArch}${PkgType}.deb";
 233 
    my $PkgName = "${build_name}_${::ScmBuildVersionFull}_${Platform}${PkgType}.deb";
231 
    push @outputFiles,  $PkgName;
 234 
    push @outputFiles,  $PkgName;
232 
    push @optArgs, "-PkgArch=$PkgArch";
 235 
    push @optArgs, "-PkgArch=$PkgArch";
233 
 
 236 
 
234 
    #
 237 
    #
235 
    #   Create name for the optional TGZ file
 238 
    #   Create name for the optional TGZ file
Line 250... Line 253...
250 
            $PkgArch = 'all';
 253 
            $PkgArch = 'all';
251 
        }
 254 
        }
252 
 
 255 
 
253 
        $tarFileName =~ s~PACKAGE~${build_name}~g;
 256 
        $tarFileName =~ s~PACKAGE~${build_name}~g;
254 
        $tarFileName =~ s~VERSION~${::ScmBuildVersionFull}~g;
 257 
        $tarFileName =~ s~VERSION~${::ScmBuildVersionFull}~g;
255 
        $tarFileName =~ s~PLATFORM~${PkgArch}~g;
 258 
        $tarFileName =~ s~PLATFORM~${Platform}~g;
- 
 
 259 
        $tarFileName =~ s~ARCH~${PkgArch}~g;
256 
        $tarFileName =~ s~TYPE~\$(GBE_TYPE)~;
 260 
        $tarFileName =~ s~TYPE~\$(GBE_TYPE)~;
257 
        $tarFileName .= '.tgz' unless $tarFileName =~ m~\.tgz$~;
 261 
        $tarFileName .= '.tgz' unless $tarFileName =~ m~\.tgz$~;
258 
        push @outputFiles,  $tarFileName;
 262 
        push @outputFiles,  $tarFileName;
259 
 
 263 
 
260 
        #push @optArgs, "-TarFile=--GeneratedProg{$tarFileName}";
 264 
        #push @optArgs, "-TarFile=--GeneratedProg{$tarFileName}";