Subversion Repositories DevTools

Rev

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

Rev 6490 Rev 6531
Line 229... Line 229...
229 
            $PkgType = '';
 229 
            $PkgType = '';
230 
            push @optArgs, "-NoArch";
 230 
            push @optArgs, "-NoArch";
231 
        }
 231 
        }
232 
 
 232 
 
233 
    my $PkgName = "${build_name}_${::ScmBuildVersionFull}_${Platform}${PkgType}.deb";
 233 
    my $PkgName = "${build_name}_${::ScmBuildVersionFull}_${Platform}${PkgType}.deb";
234 
    push @outputFiles,  $PkgName;
 - 
 
235 
    push @optArgs, "-PkgArch=$PkgArch";
 234 
    push @optArgs, "-PkgArch=$PkgArch";
- 
 
 235 
    unless ($tarOnly) {
- 
 
 236 
        push (@outputFiles, $PkgName);
- 
 
 237 
        push @optArgs, "-Output=--GeneratedProg{$PkgName}";
- 
 
 238 
    }
236 
 
 239 
 
237 
    #
 240 
    #
238 
    #   Create name for the optional TGZ file
 241 
    #   Create name for the optional TGZ file
239 
    #       Allow user to specify parts of the name symbolically
 242 
    #       Allow user to specify parts of the name symbolically
240 
    #
 243 
    #
Line 259... Line 262...
259 
        $tarFileName =~ s~ARCH~${PkgArch}~g;
 262 
        $tarFileName =~ s~ARCH~${PkgArch}~g;
260 
        $tarFileName =~ s~TYPE~\$(GBE_TYPE)~;
 263 
        $tarFileName =~ s~TYPE~\$(GBE_TYPE)~;
261 
        $tarFileName .= '.tgz' unless $tarFileName =~ m~\.tgz$~;
 264 
        $tarFileName .= '.tgz' unless $tarFileName =~ m~\.tgz$~;
262 
        push @outputFiles,  $tarFileName;
 265 
        push @outputFiles,  $tarFileName;
263 
 
 266 
 
264 
        #push @optArgs, "-TarFile=--GeneratedProg{$tarFileName}";
 267 
        push @optArgs, "-TarFile=--GeneratedProg{$tarFileName}";
265 
        push @optArgs, "-TarFile=$tarFileName";
 268 
#        push @optArgs, "-TarFile=$tarFileName";
266 
        push (@optArgs, '-TarOnly' ) if $tarOnly;
 269 
        push (@optArgs, '-TarOnly' ) if $tarOnly;
267 
    }
 270 
    }
268 
 
 271 
 
269 
    #
 272 
    #
270 
    #   Simply use Generate Files
 273 
    #   Simply use Generate Files
Line 305... Line 308...
305 
 
 308 
 
306 
                        "-genDeb",                                # Type to generate
 309 
                        "-genDeb",                                # Type to generate
307 
                        "-Script=--Prerequisite($script)",        # Packager script
 310 
                        "-Script=--Prerequisite($script)",        # Packager script
308 
                        "-Name=$build_name",                      # Massaged Package Name
 311 
                        "-Name=$build_name",                      # Massaged Package Name
309 
                        "-Variant=$build_variant",                # Variant Name
 312 
                        "-Variant=$build_variant",                # Variant Name
310 
                        "-Output=--GeneratedProg{$PkgName}",      # Specify output file
 - 
 
311 
                        @optArgs,                                 # Optional args
 313 
                        @optArgs,                                 # Optional args
312 
                        );
 314 
                        );
313 
 
 315 
 
314 
    #
 316 
    #
315 
    #   The Packager has created a binary in the 'PROG' directory
 317 
    #   The Packager has created a binary in the 'PROG' directory