Subversion Repositories DevTools

Rev

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

Rev 6490 Rev 6531
Line 199... Line 199...
199 
        $PkgArch = 'noarch';
 199 
        $PkgArch = 'noarch';
200 
        $PkgType = '';
 200 
        $PkgType = '';
201 
        push @optArgs, "-NoArch";
 201 
        push @optArgs, "-NoArch";
202 
    }
 202 
    }
203 
    my $PkgName = "${build_name}-${::ScmBuildVersionFull}-${PkgRelease}.${PkgArch}.rpm";
 203 
    my $PkgName = "${build_name}-${::ScmBuildVersionFull}-${PkgRelease}.${PkgArch}.rpm";
204 
    push @outputFiles,  $PkgName;
 - 
 
205 
    push @optArgs, "-PkgArch=$PkgArch";
 204 
    push @optArgs, "-PkgArch=$PkgArch";
- 
 
 205 
    unless ($tarOnly) {
- 
 
 206 
        push (@outputFiles, $PkgName);
- 
 
 207 
        push @optArgs, "-Output=--GeneratedProg{$PkgName}";
- 
 
 208 
    }
206 
 
 209 
 
207 
    #
 210 
    #
208 
    #   Create name for the optional TGZ file
 211 
    #   Create name for the optional TGZ file
209 
    #       Allow user to specify parts of the name symbolically
 212 
    #       Allow user to specify parts of the name symbolically
210 
    #
 213 
    #
Line 223... Line 226...
223 
            $PkgArch = 'all';
 226 
            $PkgArch = 'all';
224 
        }
 227 
        }
225 
 
 228 
 
226 
        $tarFileName =~ s~PACKAGE~${build_name}~g;
 229 
        $tarFileName =~ s~PACKAGE~${build_name}~g;
227 
        $tarFileName =~ s~VERSION~${::ScmBuildVersionFull}~g;
 230 
        $tarFileName =~ s~VERSION~${::ScmBuildVersionFull}~g;
228 
        $tarFileName =~ s~PLATFORM~${Platform}~g;
 231 
        $tarFileName =~ s~PLATFORM~${::ScmPlatform}~g;
229 
        $tarFileName =~ s~ARCH~${PkgArch}~g;
 232 
        $tarFileName =~ s~ARCH~${PkgArch}~g;
230 
        $tarFileName =~ s~TYPE~\$(GBE_TYPE)~;
 233 
        $tarFileName =~ s~TYPE~\$(GBE_TYPE)~;
231 
        $tarFileName =~ s~RELEASE~${PkgRelease}~g;
 234 
        $tarFileName =~ s~RELEASE~${PkgRelease}~g;
232 
        $tarFileName .= '.tgz' unless $tarFileName =~ m~\.tgz$~;
 235 
        $tarFileName .= '.tgz' unless $tarFileName =~ m~\.tgz$~;
233 
        push @outputFiles,  $tarFileName;
 236 
        push @outputFiles,  $tarFileName;
234 
 
 237 
 
235 
        #push @optArgs, "-TarFile=--GeneratedProg{$tarFileName}";
 238 
        push @optArgs, "-TarFile=--GeneratedProg{$tarFileName}";
236 
        push @optArgs, "-TarFile=$tarFileName";
 239 
#        push @optArgs, "-TarFile=$tarFileName";
237 
        push (@optArgs, '-TarOnly' ) if $tarOnly;
 240 
        push (@optArgs, '-TarOnly' ) if $tarOnly;
238 
    }
 241 
    }
239 
 
 242 
 
240 
    #
 243 
    #
241 
    #   Simply use Generate Files
 244 
    #   Simply use Generate Files
Line 276... Line 279...
276 
 
 279 
 
277 
                        "-genRpm",                                # Type to generate
 280 
                        "-genRpm",                                # Type to generate
278 
                        "-Script=--Prerequisite($script)",        # Packager script
 281 
                        "-Script=--Prerequisite($script)",        # Packager script
279 
                        "-Name=$build_name",                      # Massaged Package Name
 282 
                        "-Name=$build_name",                      # Massaged Package Name
280 
                        "-Variant=$build_variant",                # Variant Name
 283 
                        "-Variant=$build_variant",                # Variant Name
281 
                        "-Output=--GeneratedProg{$PkgName}",      # Specify output file
 - 
 
282 
                        @optArgs,                                 # Optional args
 284 
                        @optArgs,                                 # Optional args
283 
                        );
 285 
                        );
284 
 
 286 
 
285 
    #
 287 
    #
286 
    #   The Packager has created a binary in the 'PROG' directory
 288 
    #   The Packager has created a binary in the 'PROG' directory