Subversion Repositories DevTools

Rev

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

Rev 5532 Rev 5550
Line 93... Line 93...
93 
my $opt_md5 = 1;
 93 
my $opt_md5 = 1;
94 
my $opt_outfile;
 94 
my $opt_outfile;
95 
my $opt_info;
 95 
my $opt_info;
96 
my $opt_tarmode;
 96 
my $opt_tarmode;
97 
my $opt_testArchive;
 97 
my $opt_testArchive;
- 
 
 98 
my $opt_noBuild;
98 
 
 99 
 
99 
 
 100 
 
100 
#
 101 
#
101 
#   Structure to translate -archive=xxx option to archive variable
 102 
#   Structure to translate -archive=xxx option to archive variable
102 
#   These are the various dpkg_archives known to JATS
 103 
#   These are the various dpkg_archives known to JATS
Line 256... Line 257...
256 
                'test!'         => \$opt_test,              # [no]flag
 257 
                'test!'         => \$opt_test,              # [no]flag
257 
                'md5!'          => \$opt_md5,               # [no]flag
 258 
                'md5!'          => \$opt_md5,               # [no]flag
258 
                'info!'         => \$opt_info,              # [no]flag
 259 
                'info!'         => \$opt_info,              # [no]flag
259 
                'tarmode!'      => \$opt_tarmode,           # [no]flag
 260 
                'tarmode!'      => \$opt_tarmode,           # [no]flag
260 
                'testArchive'   => \$opt_testArchive,       # [no]flag
 261 
                'testArchive'   => \$opt_testArchive,       # [no]flag
- 
 
 262 
                'nobuild'       => \$opt_noBuild,           # flag
261 
                );
 263 
                );
262 
 
 264 
 
263 
 
 265 
 
264 
    #
 266 
    #
265 
    #   Process help and manual options
 267 
    #   Process help and manual options
Line 308... Line 310...
308 
 
 310 
 
309 
    #
 311 
    #
310 
    #   Detect NoBuild marker
 312 
    #   Detect NoBuild marker
311 
    #   This will bypass most of the operation of this package
 313 
    #   This will bypass most of the operation of this package
312 
    #
 314 
    #
- 
 
 315 
    $opt_noBuild = 2 if -f 'noBuild.gbe';
313 
    if ( -f 'noBuild.gbe' )
 316 
    if ( $opt_noBuild)
314 
    {
 317 
    {
315 
        Verbose ("No Build Marker file found");
 318 
        Verbose ("No Build Marker file found");
316 
        Error("Use of noBuild marker should only be done by a build daemon")
 319 
        Error("Use of noBuild marker should only be done by a build daemon")
317 
            unless ( $GBE_ABT );
 320 
            unless ( $GBE_ABT );
318 
 
 321 
 
319 
        $SRC_ROOT = '';
 322 
        $SRC_ROOT = '';
320 
        $DPKG_NAME = 'pkg';
 323 
        $DPKG_NAME = 'pkg';
321 
        $DESCPKG_FILE = 'descpkg';
 324 
        $DESCPKG_FILE = 'descpkg';
322 
        $PKG_BASE =$CWD_DIR;
 325 
        $PKG_BASE =$CWD_DIR;
- 
 
 326 
 
- 
 
 327 
        Error("NoBuild operation requires package name and version") unless ($opt_pname && $opt_pversion);
- 
 
 328 
        $DPKG_NAME = $opt_pname;
- 
 
 329 
        $DPKG_VERSION = $opt_pversion;
- 
 
 330 
 
323 
        return;
 331 
        return;
324 
    }
 332 
    }
325 
 
 333 
 
326 
    #
 334 
    #
327 
    #   Check for a "pkg" directory
 335 
    #   Check for a "pkg" directory
Line 388... Line 396...
388 
#
 396 
#
389 
# Returns         : Will not return on error
 397 
# Returns         : Will not return on error
390 
#
 398 
#
391 
sub CheckDescPkg
 399 
sub CheckDescPkg
392 
{
 400 
{
- 
 
 401 
    #
- 
 
 402 
    #   Don't need a package description if performing a no-build
- 
 
 403 
    #   The package name and version will be provided on the command line
- 
 
 404 
    #   NoBuilds MUST NOT package up a descpkg file
- 
 
 405 
    #
- 
 
 406 
    return if ($opt_noBuild);
- 
 
 407 
 
393 
    # Get the dpkg_archive version number we are  going to create.
 408 
    # Get the dpkg_archive version number we are  going to create.
394 
    #
 409 
    #
395 
    Error("Descpkg file not found in package directory: $PKG_BASE")
 410 
    Error("Descpkg file not found in package directory: $PKG_BASE")
396 
        unless ( -f "$DESCPKG_FILE" );
 411 
        unless ( -f "$DESCPKG_FILE" );
397 
 
 412 
 
Line 496... Line 511...
496 
    Information1("DPKG_VERSION  = [$DPKG_VERSION]");
 511 
    Information1("DPKG_VERSION  = [$DPKG_VERSION]");
497 
    Information1("GBE_MACHTYPE  = [$GBE_MACHTYPE]");
 512 
    Information1("GBE_MACHTYPE  = [$GBE_MACHTYPE]");
498 
    Information1("GBE_HOSTNAME  = [$GBE_HOSTNAME]");
 513 
    Information1("GBE_HOSTNAME  = [$GBE_HOSTNAME]");
499 
    Information1("GBE_ABT       = [$GBE_ABT]");
 514 
    Information1("GBE_ABT       = [$GBE_ABT]");
500 
    Information1("USER          = [$USER]");
 515 
    Information1("USER          = [$USER]");
501 
    Information ("")                                if ( $opt_merge || $opt_delete || $opt_info || $opt_tarmode || $opt_testArchive);
 516 
    Information ("")                                if ( $opt_merge || $opt_delete || $opt_info || $opt_tarmode || $opt_testArchive || $opt_noBuild);
- 
 
 517 
    Information ("Opt:NoBuild       = Enabled")     if ( $opt_noBuild );
502 
    Information ("Opt:TarMode       = Enabled")     if ( $opt_tarmode );
 518 
    Information ("Opt:TarMode       = Enabled")     if ( $opt_tarmode );
503 
    Information ("Opt:Delete        = Enabled")     if ( $opt_delete );
 519 
    Information ("Opt:Delete        = Enabled")     if ( $opt_delete );
504 
    Information ("Opt:Merge         = Enabled")     if ( $opt_merge );
 520 
    Information ("Opt:Merge         = Enabled")     if ( $opt_merge );
505 
    Information ("Opt:testArchive   = Enabled")     if ( $opt_testArchive );
 521 
    Information ("Opt:testArchive   = Enabled")     if ( $opt_testArchive );
506 
    Information ("Opt:TestMode      = Enabled. No Package Transferred") if ( $opt_test );
 522 
    Information ("Opt:TestMode      = Enabled. No Package Transferred") if ( $opt_test );
Line 1254... Line 1270...
1254 
    -[no]merge         - merge with existing version of the package
 1270 
    -[no]merge         - merge with existing version of the package
1255 
    -archive=name      - Specify archive (cache, local, main, store, sandbox, deploy)
 1271 
    -archive=name      - Specify archive (cache, local, main, store, sandbox, deploy)
1256 
    -pname=name        - Ensure package is named correctly
 1272 
    -pname=name        - Ensure package is named correctly
1257 
    -pversion=version  - Ensure package version is correct
 1273 
    -pversion=version  - Ensure package version is correct
1258 
    -generic           - Create a built.generic file
 1274 
    -generic           - Create a built.generic file
- 
 
 1275 
    -noBuild           - Create dummy build files
1259 
    -[no]tarmode       - Transfer package as tarball
 1276 
    -[no]tarmode       - Transfer package as tarball
1260 
    -[no]md5           - Use MD5 comparison of merged files(enabled)
 1277 
    -[no]md5           - Use MD5 comparison of merged files(enabled)
1261 
 
 1278 
 
1262 
  Debug and Testing:
 1279 
  Debug and Testing:
1263 
    -[no]test          - Test package. Do not transfer.
 1280 
    -[no]test          - Test package. Do not transfer.
Line 1356... Line 1373...
1356 
=item B<-generic>
 1373 
=item B<-generic>
1357 
 
 1374 
 
1358 
This option will create a built.generic file, instead of one based on the machine
 1375 
This option will create a built.generic file, instead of one based on the machine
1359 
that actually built the package. This is used by the AutoBuilder toolchain.
 1376 
that actually built the package. This is used by the AutoBuilder toolchain.
1360 
 
 1377 
 
- 
 
 1378 
=item B<-noBuild>
- 
 
 1379 
 
- 
 
 1380 
This option is only used by the build daemons. It is used to create all required
- 
 
 1381 
files to indicate that the build has occured correctly. It will only be used by ANT
- 
 
 1382 
based builds as true JATS builds handle this situation internally.
- 
 
 1383 
 
1361 
=item B<-[no]tarmode>
 1384 
=item B<-[no]tarmode>
1362 
 
 1385 
 
1363 
This option will cause the package to be transferred into the package archive as
 1386 
This option will cause the package to be transferred into the package archive as
1364 
a tar ball. Used in the build system to address two issues:
 1387 
a tar ball. Used in the build system to address two issues:
1365 
 
 1388