WebSVN – DevTools – Diff – /core_devl/trunk/TOOLS/buildlib.pl

     EnvImport( "GBE_TOOLS" );
     EnvImport( "GBE_CONFIG" );
     EnvImport( "GBE_DPKG" );
     EnvImport( "GBE_MACHTYPE" );
     EnvImport( "USER" );
+    EnvImport( "GBE_HOSTNAME");
     EnvImport( "GBE_DRV" )
         if ( $ScmHost ne "Unix" );            # DOS or WIN special
     EnvImportOptional ( 'GBE_DPKG_STORE','' );
     EnvImportOptional ( 'GBE_DPKG_CACHE','' );
 #.. Common stuff
+#
     require "$::GBE_TOOLS/common.pl";
     CommonInit( "buildlib" );
     Debug( "Version:   $BuildVersion" );
+    Require( "$::GBE_CONFIG/PLATFORM", "PLATFORM_CFG.PM"  );
 #.. Parse command line
+#
     $ScmBuildSrc = $0;                          # Name of the build file
     ($Cwd, $Makelib) = @ARGV;
                 "package"       => \$NoPackageError,
                 "forcebuildpkg" => \$ForceBuildPkg,
                 );
     Usage() if ( $opt_help || !$result );
-    Debug( "Debug:          $::ScmDebug" );
+    Debug( "Debug:         $::ScmDebug" );
-    Debug( "Verbose:        $::ScmVerbose" );
+    Debug( "Verbose:       $::ScmVerbose" );
     Debug( "Expert:        $Expert" );
     Debug( "All:           $All" );
     Debug( "Nolog:         $Nolog" );
     Debug( "Cache:         $Cache" );
     Debug( "project:       $FullJats" );
     #   Locate the optional PLATFORM configuration file
     #   If it does exist then it can extend build-time information
+    #
     my $target = $pInfo->{TARGET};
-################################################################################
-#
+    #
-#   Temp remove: 08-Apr-08
+    #   Yukky Kludge
+    #   JATS has a mechanism whereby packages can create new platforms
-#   Does not play well with LMOS stuff, as LMOS platforms are defined within
+    #   Luckily this has only been done for LMOS - don't every do it again
+    #   One problem is that we can't validate the target name at this point
-#   the LMOS package. This is uggly, but its what we have.
+    #   in time: as the packages are loaded much later.
-#
+    #
+    #   Kludge. Assume that a leading LMOS_ can be removed when determing
+    #           validity of the target platform.
-#   Solutions:
+    #
+    my $base_target = $target;
-#       1) Move LMOS magic out of the LMOS package
+    $base_target =~ s~^LMOS_~~;
+    #
-#       2) Have a config file of known targets
+    #   Ensure target is known to JATS
-#          This will limit the auto-expandability of LMOS
+    #   Remove unknown targets from the build. Create a list of unknown
-#       3) Process later
+    #   targets and report them later.
+    #
-#          Change the way the build.pl parser works to do two phases
+    #   If there are signs that the target has been processed, then it may be
-#           a) Collect information from directives
+    #   an alias that has not been expanded.
+    #
-#           b) Process the information
+    #   One result will be that alias platforms, such as DEVLINUX, that don't
-#          This will solve a number of problems, not only here but elsewhere.
+    #   expand on WIN32 will be shown as DEVLINUX and not its components.
-#          It will:
+    #
-#               Simplify the handling of clobber
+    unless ($pInfo->{NOT_AVAILABLE} )
+    {
-#               Remove the need to order the directives
+        unless ( Exists( "$::GBE_CONFIG/PLATFORM", $base_target  ) )
+        {
-#               Simplify processing as all the information
+            UniquePush (\@BUILD_BADNAME, $target );
-#               will be present when the
+            $pInfo->{NOT_AVAILABLE} = 1;
+        }
+    }
-#
-#    #
+    #
-#    #   Ensure target is known to JATS
-#    #   Remove unknown targets from the build. Create a list of unknown
+    #   Mark as NOT_AVAILABLE platforms that are not available on the machine
-#    #   targets and report them later.
-#    #
+    #
-#    unless ( Exists( "$::GBE_CONFIG/PLATFORM", $target  ) )
+    unless ($pInfo->{NOT_AVAILABLE} )
-#    {
+    {
-#        $pInfo->{NOT_AVAILABLE} = 1;
+        $pInfo->{NOT_AVAILABLE} = 1
-#        UniquePush (\@BUILD_BADNAME, $target );
+            unless ( PlatformConfig::checkBuildAvailability( $base_target ) );
-#    }
+    }
-################################################################################
     unless ($pInfo->{NOT_AVAILABLE} )
+    {
         if ( my $build_cfg = Require( "$::GBE_CONFIG/PLATFORM", "${target}.cfg"  ) )
+        {
     HashJoin( \%BUILDPLATFORMARGS, $;, $platform, @arguments )
         if ( $platform );
+}
+#-------------------------------------------------------------------------------
+# Function        : BuildName
+#
+# Description     : Defines the package name and version
+#
+# Inputs          : build arguments
+#                   Various formats are allowed for backward compatability
+#                   Must support a number of different formats
+#                       "name nn.nn.nn prj"
+#                       "name nn.nn.nn.prj"
+#
+#                       "name nn.nn.nn prj", "nn.nn.nn"
+#                       "name nn.nn.nn.prj", "nn.nn.nn"
+#
+#                       "name", "nn.nn.nn.prj"
+#
+#                       "name", "nn.nn.nn", "prj", --RelaxedVersion
+#
+# Returns         : Nothing
+#
 sub BuildName
+{
     my( @arguments ) = @_;
     my $relaxed_version_name = 0;
     my @args;
     my @opts;
     my $supports_opts;
     StartBuildPhase();                          # Starting the build phase. No more data collection
-    if ( defined($Prefix) && $Prefix =~ /^--/ )
+    if ( defined($Prefix) && $Prefix =~ /^-/ )
+    {
         $Prefix = undef;
         $Type = undef;
         $Mode = undef;
         foreach  ( @_ )
                 $Mode = 'defs';
                 $ModePrefix = "";
             } elsif ( /^--Style=(.*)/ ) {
                 $Style = $1;
+                $VersionFiles = 1;
                 $supports_opts = 1 if ( $Style =~ /^WinRC/i );
             } elsif ( /^--File=(.*)/ ) {
                 $FileName = $1;
+    #
     my $pkgfile = BuildAddKnownFile ( $Srcdir, 'descpkg' );
     return if ( $Clobber );                 # clobber mode ?
     my @desc;
-    push @desc, "Package Name: $BUILDNAME_PACKAGE";
+    push @desc, "Package Name:  $BUILDNAME_PACKAGE";
-    push @desc, "Version:      $BUILDVERSION";
+    push @desc, "Version:       $BUILDVERSION";
-    push @desc, "Released By:  $::USER";
+    push @desc, "Released By:   $::USER";
-    push @desc, "Released On:  $::CurrentTime";
+    push @desc, "Released On:   $::CurrentTime";
+    push @desc, "Build Machine: $::GBE_HOSTNAME";
-    push @desc, "Path:         $Cwd";
+    push @desc, "Path:          $Cwd";
-    push @desc, "Jats Version: $::GBE_VERSION";
+    push @desc, "Jats Version:  $::GBE_VERSION";
-    push @desc, "Jats Path:    $::GBE_CORE";
+    push @desc, "Jats Path:     $::GBE_CORE";
     push @desc, "";
     push @desc, "Build Dependencies:";
     push @desc, "";
     foreach my $tag ( PackageEntry::GetPackageList )
         foreach ( reverse @dos_paths )
+        {
             tr~\\/~/~s;
             $fh->Write ( "PATH=$_\\;\$PATH\n" );
+        }
-        $fh->Write ( "\n\"\$\@\"\n" );
+        $fh->Write ( "\n" . '[ -n "$@" ] && "$@"'  ."\n" );
         $fh->Close();
+    }
+}
 #-------------------------------------------------------------------------------

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/buildlib.pl – Rev 277 → 279