WebSVN – DevTools – Diff – /core_devl/branches/dpurdie_3.5.10000.cr/TOOLS/makelib.pl2

                                                 # 0: Don't write progdeps. Prog is Phony
 our $ScmToolsetSingleType   = 0;                # Toolset does not support Debug and Production
 our $ScmToolsetProgSource   = ();               # Toolset Program Source
 our $ScmToolsetSoName       = 0;                # 1: Shared library supports SoName
 our $ScmToolsetNillLibSrc   = 0;                # 1: Librarys created without source specified
-our $ScmToolsetProcessTests = 0;                # 1: Pre/Post process unit test runs
 our $ScmRoot                = "";
 our $ScmMakelib             = "";
 our $ScmPlatform            = "";
 our $ScmMachType            = "";
 our %ScmSourceTypes         = ();
 our $ScmDeploymentPatch     = "";
 our $ProjectBase            = "";               # Base of the user's project
 our $ScmNoToolsTest         = "";               # Supress compiler tests
 our $ScmDependTags          = 0;                # Create dependancy scanning tag
+our $ScmMakeUid;                                # Unique makefile id (number 1 .. )
 our @CFLAGS                 = ();
 our @CFLAGS_DEBUG           = ();
 our @CFLAGS_PROD            = ();
 our @CLINTFLAGS             = ();
 our @TOOLSETLIBS            = ();
 our @TOOLSETPROGS           = ();
 our %INSTALL_HDRS           = ();
 our %INSTALL_CLSS           = ();
+our @TOOLSET_UTF_PRE        = ();       # Toolsets can extend rules run before all unit tests
+our @TOOLSET_UTF_POST       = ();       # Toolsets can extend rules run after all unit tests
+our @TOOLSET_UTF_COLLATE    = ();       # Toolsets can extend rules run to collate unit tests results
 our @LIBS                   = ();
 our $LIBS                   = ();
 our %LIB_PKG                = ();
 our %LIB_INS                = ();
 our %INSTALL_LIBS           = ();
+#
 #   Arrays of hook functions
+#
 our %MF_RegisterSrcHooks;                       # Hook source file discovery
 ###############################################################################
+#
 #   Packaging and Installation Information
 #   Held in a structure as its used in a few places
 #   Items
     'Prog' => { 'PBase' => '$(BINDIR_PKG)'   ,'IBase' => '$(BINDIR_LOCAL)'   , 'Dir' => '/$(GBE_PLATFORM)$(GBE_TYPE)'},
     'Jar'  => { 'PBase' => '$(CLSDIR_PKG)'   ,'IBase' => '$(CLSDIR_LOCAL)'   , 'Dir' => ''},
     'Tool' => { 'PBase' => '$(PKGDIR)'       ,'IBase' => '$(LOCALDIR)'       , 'Dir' => '/tools/bin/$(GBE_HOSTMACH)'},
     );
+###############################################################################
+#
+#   An array of reserved names
+#   Used to attempt to prevent developers from naming toolset targets with names reserved
+#   within the build system
+our @reservedMakeTargets = qw (
+    preprocess_tests postprocess_tests collate_test_results
+);
 MakeLib2Init();                                 # Runtime initialisation
 sub MakeLib2Init
+{
 #.. Test environment
     $ScmSourceTypes{ ".awk" }   = "--Ignore";
 #.. Get the stuff from the build configuration file
+#
     ConfigLoad();
+    $ScmMakeUid = GetMakfilefileUid();
+    Debug("ScmMakeUid: $ScmMakeUid");
     if ( (%::ScmBuildPlatforms) )        # Interface/build.cfg
+    {
         AddPlatformArg( split( /$;/, $::ScmBuildPlatforms{ $ScmPlatform } ));
+    }
+    }
     push( @ScmDepends, "$script" );             # makefile dependencies
     close( $fh );
+}
+#-------------------------------------------------------------------------------
+# Function        : ToolsetAddUnitTestPreProcess
+#                   ToolsetAddUnitTestPostProcess
+#                   ToolsetAddUnitTestCollateProcess
+#
+# Description     : Functions to allow toolsets to add recipes to be run before
+#                   and after Unit Tests are run.
+#
+# Inputs          : $target         - Name of the recipe to be run
+#
+# Returns         : Nothing
+#
+sub ToolsetAddUnitTestPreProcess
+{
+    _ToolsetAddUnitTest(\@TOOLSET_UTF_PRE, @_ );
+}
+sub ToolsetAddUnitTestPostProcess
+{
+    _ToolsetAddUnitTest(\@TOOLSET_UTF_POST, @_ );
+}
+sub ToolsetAddUnitTestCollateProcess
+{
+    _ToolsetAddUnitTest(\@TOOLSET_UTF_COLLATE, @_ );
+}
+#-------------------------------------------------------------------------------
+# Function        : _ToolsetAddUnitTest
+#
+# Description     : Internal helper function used by ToolsetAddUnitTest*
+#
+# Inputs          : $aref           - Ref to an array of names to extend
+#                   $target         - Name of recipe to run
+#
+# Returns         : Nothing
+#
+sub _ToolsetAddUnitTest
+{
+    my ($aref, $target ) = @_;
+    #   Determine name of parent function
+    my $fname = (caller(1))[3];
+    $fname =~ s~.*::~~;
+    Debug2( "$fname ($target)" );
+    #
+    #   Ensure user is not using a reserved target
+    #
+    if (grep {$_ eq $target} @reservedMakeTargets) {
+        Error("Internal: $fname uses reserved make taget: $target");
+    }
+    push @$aref, $target;
+}
 ###############################################################################
 # User interface:
+#
 #   AddFlags( 'platform [, ... ]', 'flags' [, 'flag' ... ] )
 #                                     This SHOULD return a non-zero exit status
 #                                     on error. The program may be a 'TestProg'
 #                                     or a 'Script'.
 #                   @elements       - Options and test arguments
 #                                     Options are:
-#                                       --Auto          - Non interactive unit test
+#                                       --Auto              - Non interactive unit test
-#                                       --Unit          - Same and --Auto
+#                                       --Unit              - Same and --Auto
+#                                       --UtfFormat=nnn     - Specifies Automated Unit Test,
+#                                                             results post processed with formatter
+#                                       --UtfArg=nnn        - Argument passed into the UTF formatter
+#                                       --Name=nnn          - Test Name.
-#                                       --CopyIn=file   - A file to be copied into
+#                                       --CopyIn=file       - A file to be copied into
-#                                                         The test directory.
+#                                                             The test directory.
+#
 #                                     Non Options are passed to the test program.
 #                                     --PackageBase(xxx)    - Base of package
 #                                     --PackageInfo(xxx)    - Package information
 #                                     --File(xxx)           - Resolved name of file
 #                                     --Var(xxx)            - Expanded variable
 #                                     --Local(xxx)          - File within the local directory
+#
+#                                     Toolset Framework support (ie NUNIT in csharp.pl)
+#                                       --FrameWork=name    - Name of framework
+#                                       --xxxx              - Args passed to framework constructor
+#
 # Returns         : Nothing
+#
+my %RunTestNames;                       # Unique Name Tests
 sub RunTest
+{
     my( $platforms, $prog, @elements ) = @_;
     my $command = './';                 # program prefix / command
     my $winprog = 1;                    # 1: Convert / -> \ (WIN32 only)
     my $framework;
     my @framework_opts;
     my @copy = ();
     my $auto;
+    my $utfFormat;
+    my @utfArgs;
+    my $utfName;
     return if ( ! ActivePlatform($platforms) );
+    #
     #   Scan @elements and extract useful information
             $framework = $1;
         } elsif ( m/^--Auto/ || m/^--Unit/) {
             $auto = 1;
+        } elsif ( m/^--Name=(.*)/) {
+            $utfName = $1;
+            Error("Duplicate Test Name: $utfName")
+                if (exists $RunTestNames{$utfName} );
+            $RunTestNames{$utfName} = 1;
+        } elsif ( m/^--UtfFormat=(.*)/) {
+            $utfFormat = $1;
+        } elsif ( m/^--UtfArg=(.*)/) {
+            push @utfArgs, $1;
         } elsif ( m/^--CopyIn=(.*)/ ) {
             push @copy, MakeSrcResolve ( $1 );
         } elsif ( $framework && m/^--\w+=(.+)/ ) {
     $test_entry{'prog'}     = $prog;
     $test_entry{'copyprog'} = 1;
     $test_entry{'args'}     = \@uargs;
     $test_entry{'auto'}     = $auto if ( $auto );
+    $test_entry{'utfformat'}= $utfFormat if ( $utfFormat );
+    $test_entry{'utfargs'}  = \@utfArgs;
+    $test_entry{'utfname'}  = $utfName;
     $test_entry{'copyin'}   = \@copy;
     $test_entry{'copyonce'} = ();
     $test_entry{'preq'}     = \@preq_files;
     $test_entry{'testdir'}  = 'BINDIR';
     ::ToolsetFile ($Makefile);
     open( MAKEFILE, '>', $Makefile ) || Error( "Cannot create $Makefile" );
     ::MakefileHeader( *MAKEFILE,
                       'Auto-generated Platform Dependent Makefile',
                       "$ScmMakelib (version $ScmVersion)",
-                      "# Copyright (C) 1995-$::CurrentYear Vix-ERG, All rights reserved",
+                      "# Copyright (c) VIX TECHNOLOGY (AUST) LTD",
                       '#',
                       "# Located in $::Cwd",
                       "# Platform $::ScmPlatform",
                       '#' . ('-' x 79),
                       );
     if ( $ScmProduct ne "" );
 MakePrint( "GBE_OS_COMMON := $::BUILDINFO{$ScmPlatform}{OS_COMMON}\n" )
     if ( exists($::BUILDINFO{$ScmPlatform}{OS_COMMON}) );
     print MAKEFILE <<EOF;
 SHELL           := \$(GBE_BIN)/sh
 SHELLARGS       :=
 EXTENDED_LINE   := \$(GBE_BIN)/extend.lst
 BUILDVER         := $::ScmBuildVersionFull
 BUILDVERNUM      := $::ScmBuildVersion
 BUILDPREVIOUSVER := $::ScmBuildPreviousVersion
 DEPLOYPATCH      := $ScmDeploymentPatch
 GBE_NOTOOLSTEST  := $ScmNoToolsTest
+MAKEFILEUID      := $ScmMakeUid
+export MAKEFILEUID
+#
 #   Ensure PWD is correctly set
+#
 PWD             := \$(CURDIR)
     MakeHeader ("Automated tests");
     my $idx = 0;
     my @copy_set = ();
-    #
-    #   Insert the three rules that surround test execution:
-    #    - preprocess_tests runs before any test has run
-    #    - postprocess_tests runs after all tests have run
-    #    - collate_test_results runs after all postprocess_tests have run
-    #
-    $if->PreprocessTests();
-    $if->PostprocessTests();
-    $if->CollateTestResults();
     foreach my $pEntry ( @TESTS_TO_RUN )
     {                                           # Foreach test
         $idx++;
         $pEntry->{'index'} = $idx;
         $pEntry->{'test_name'} = "run_test_$idx";
+        $pEntry->{'utfname'} = $pEntry->{'test_name'} unless defined $pEntry->{'utfname'};
+        #
         #   If the test is being run within a 'FrameWork' then the underlying
         #   toolset must instantiate the frame work.
+        #
         push @TESTPROJECT_TO_ARUN, $test_name if     ($pEntry->{'auto'} );
         my $tprog = $tdir . '/' . StripDir( $pEntry->{'prog'} );
         my $me = MakeEntry::New( *MAKEFILE, $test_name, '--Phony' );
+        #
+        #   Export GBE_UTFNAME for the duration of the test
+        #
+        $me->AddDefn('export GBE_UTFNAME', $pEntry->{'utfname'});
+        $me->AddDefn('export GBE_UTFUID', '$(MAKEFILEUID)' . '_' . $pEntry->{'index'});
         $me->AddDependancy( "\$(GBE_$tdir_alias)" );
         $me->AddDependancy( "\$(INTERFACEDIR)/set_$::ScmPlatform.sh" );
         $me->AddDependancy( $tprog ) if $pEntry->{'copyprog'};
         $me->AddDependancy( @{ $pEntry->{'copyin' } } );
         $me->AddDependancy( map { $tdir . '/' . StripDir($_) } @{ $pEntry->{'copyonce' } } );
             $me->AddShellRecipe ( "\$(cp) -f $file $dst" );
             $me->AddShellRecipe ( "\$(chmod) -f +wx $dst" );
+        }
+        #
-        #   Insert and FrameWork Recipe bits
+        #   Insert any FrameWork Recipe bits
+        #
         $me->AddShellRecipe ( @{$pEntry->{'ShellRecipe'}} );
+        #
+        #   Insert command
+        #       If we could run a UTF filter, then ignore the commands return code
+        #
         $me->AddShellRecipe ( "cd $tdir" );
         $me->AddShellRecipe ( ["GBE_TYPE=\$(GBE_TYPE)",
                                "GBE_HOST=\$(GBE_HOST)",
                                "GBE_ROOT=\$(GBE_ROOT_ABS)",
                                "PATH=.\\$::ScmPathSep\$(BINDIR_LOCAL_PATH)\\$::ScmPathSep\$\$PATH",
                                $pEntry->{'command'},
                                @{$pEntry->{'args'}},
+                               $pEntry->{'utfformat' } ? '|| true' : ''
                                ] );
+        if ($pEntry->{'utfformat' })
+        {
+            #
+            #   Create the basic command line for 'jats_runutf'
+            #
+            my @cmdline;
+            push @cmdline, '--';
+            push @cmdline, '$(VERBOSE_OPT)';
+            push @cmdline, "-filter=$pEntry->{utfformat}";
+            push @cmdline, '-root=$(GBE_ROOT_ABS)' ;
+            push @cmdline, "-dir=$tdir";
+            push @cmdline, '-target=$(GBE_PLATFORM)';
+            push @cmdline, '-pkgdir=$(PKGDIR)';
+            push @cmdline, '-local=$(LOCALDIR)';
+            push @cmdline, '-interface=$(INTERFACEDIR)';
+            foreach my $entry (@{$pEntry->{'utfargs' }})
+            {
+                push @cmdline, '-arg=' . $entry;
+            }
+            #
+            #   Insert commands to post process the test results according to the specified formatter
+            #
+            $me->NewSection     ();
+            $me->SectionDef     ('UTF_POSTPROCESS');
+            $me->RecipePrefix   ('$(XX_PRE)');
+            $me->AddRecipe      ( "\$(GBE_PERL) -Mjats_runutf -e processUtf " . join(" \\\n\t\t\t", @cmdline)  );
+        }
         $me->Print();
+        #
         #   Create entries to handle the copy-once files
 MakeDefEntry( "PROJECTSCLEAN",   "=", CreateNameList( 'ProjectClean_', '', \%PROJECTS ));
 MakeDefEntry( "UNITTESTS",       "=", \@TESTPROJECT_TO_URUN );
 MakeDefEntry( "AUTOUNITTESTS",   "=", \@TESTPROJECT_TO_ARUN );
+MakeDefEntry( "AUTOUNITTESTS_PRE",    "=", \@TOOLSET_UTF_PRE );
+MakeDefEntry( "AUTOUNITTESTS_POST",   "=", \@TOOLSET_UTF_POST );
+MakeDefEntry( "AUTOUNITTESTS_COLLATE","=", \@TOOLSET_UTF_COLLATE );
 MakeHeader ("Toolset components");
 MakeDefEntry( "USERGENERATED",        "=", \@USERGENERATED )    if ( @USERGENERATED );
 MakeDefEntry( "TOOLSETGENERATED",     "=", \@TOOLSETGENERATED ) if ( @TOOLSETGENERATED );
 MakeDefEntry( "TOOLSETOBJS",          "=", \@TOOLSETOBJS )      if ( @TOOLSETOBJS );
 MakeDefEntry( "TOOLSETLIBS",          "=", \@TOOLSETLIBS )      if ( @TOOLSETLIBS );
 #   make_init - Test toolset presence and sanity
 #   Will only be called ONCE for each platform in a recursive build
 #   Should be used to ensure that the required toolset is present
+#
-PrintPhonyRule ('make_init',       "@initdep" );
+PrintPhonyRule ('make_init',            "@initdep" );
 #   make_dir    - Create required subdirectories
 #   Will be invoked as a part of most targets that create files
 #   Will be invoked by the calling wrappers
 #   Should not be invoked when cleaning
+#
-PrintPhonyRule ('make_dir',       "@mkdirdep" );
+PrintPhonyRule ('make_dir',             "@mkdirdep" );
-PrintPhonyRule ('generate',       "@generatedep @projectgendep" );
+PrintPhonyRule ('generate',             "@generatedep @projectgendep" );
-PrintPhonyRule ('ungenerate',     "@ungeneratedep",  \@ungenact);
+PrintPhonyRule ('ungenerate',           "@ungeneratedep",  \@ungenact);
-PrintPhonyRule ('unobj',          "",  \@unobjact);
+PrintPhonyRule ('unobj',                "",  \@unobjact);
-PrintPhonyRule ('make_lib',       "@libdep" );
+PrintPhonyRule ('make_lib',             "@libdep" );
-PrintPhonyRule ('lint_lib',       "@liblintdep" );
+PrintPhonyRule ('lint_lib',             "@liblintdep" );
-PrintPhonyRule ('make_mlib',      "@mlibdep" );
+PrintPhonyRule ('make_mlib',            "@mlibdep" );
-PrintPhonyRule ('lint_shlib',     "@shliblintdep" );
+PrintPhonyRule ('lint_shlib',           "@shliblintdep" );
-PrintPhonyRule ('unmake_lib',     "", \@unlibact );
+PrintPhonyRule ('unmake_lib',           "", \@unlibact );
-PrintPhonyRule ('unmake_mlib',    "", \@unmlibact );
+PrintPhonyRule ('unmake_mlib',          "", \@unmlibact );
-PrintPhonyRule ('make_script',    "@scriptdep" );
+PrintPhonyRule ('make_script',          "@scriptdep" );
-PrintPhonyRule ('unmake_script',  "", \@unscriptact );
+PrintPhonyRule ('unmake_script',        "", \@unscriptact );
-PrintPhonyRule ('make_prog',      "make_script @progdep @projectdep" );
+PrintPhonyRule ('make_prog',            "make_script @progdep @projectdep" );
-PrintPhonyRule ('unmake_prog',    "unmake_script @projectcleandep", \@unprogact );
+PrintPhonyRule ('unmake_prog',          "unmake_script @projectcleandep", \@unprogact );
-PrintPhonyRule ('lint_prog',      "@proglintdep" );
+PrintPhonyRule ('lint_prog',            "@proglintdep" );
-PrintPhonyRule ('exec_tests',     "make_script @testprogdep @runtestdep" );
+PrintPhonyRule ('exec_tests',           "make_script @testprogdep @runtestdep" );
-PrintPhonyRule ('exec_unit_tests',"make_script @testprogdep @autoruntestdep" );
+PrintPhonyRule ('exec_unit_tests',      "make_script @testprogdep @autoruntestdep" );
-PrintPhonyRule ('make_test',      "make_script @testprogdep" );
+PrintPhonyRule ('make_test',            "make_script @testprogdep" );
-PrintPhonyRule ('unmake_test',    "unmake_script", \@untestprogact );
+PrintPhonyRule ('unmake_test',          "unmake_script", \@untestprogact );
+PrintPhonyRule ('preprocess_tests',     '$(AUTOUNITTESTS_PRE)' );
+PrintPhonyRule ('postprocess_tests',    '$(AUTOUNITTESTS_POST)' );
+PrintPhonyRule ('collate_test_results', '$(AUTOUNITTESTS_COLLATE)' );
 #-------------------------------------------------------------------------------
 #   Package and Installation Summary
+#
     MakeHeader ("Package and Installation Summary");
     Maketag( "make_script",         @scriptdep );
     Maketag( "make_prog",           @progdep || @projectdep );
     Maketag( "make_test",           @testprogdep );
     Maketag( "exec_tests",          $TESTS_TO_RUN     || @TESTPROJECT_TO_URUN || $TESTS_TO_AUTORUN || @TESTPROJECT_TO_ARUN );
     Maketag( "exec_unit_tests",     $TESTS_TO_AUTORUN || @TESTPROJECT_TO_ARUN );
-    Maketag( "process_tests",       $ScmToolsetProcessTests );
+    Maketag( "process_tests",       @TOOLSET_UTF_PRE || @TOOLSET_UTF_POST || @TOOLSET_UTF_COLLATE);
     Maketag( "install_hdr",         %INSTALL_HDRS );
     Maketag( "install_class",       %INSTALL_CLSS );
     Maketag( "install_lib",         %INSTALL_LIBS );
     Maketag( "install_prog",        %INSTALL_PROGS );
     Maketag( "deploy",              %DEPLOYPACKAGE );
     Maketag( "package",             %PACKAGE_FILES || %PACKAGE_HDRS || %PACKAGE_CLSS ||
                                     %PACKAGE_LIBS || %PACKAGE_SHLIBS || %PACKAGE_PROGS );
+    #
     #   Display tags in the MAKEFILE
-    #   Not used here - just for show
+    #       Not used here - just for show
+    #
     MakeHeader ("Maketags");
     foreach my $tag ( sort keys %MakeTags )
+    {
-        MakePadded( 2, "#   $tag:", defined ($MakeTags{$tag}) ? 1 : 0, "\n");
+        MakePadded( 3, "#   $tag:", '1', "\n");
+    }
 #-------------------------------------------------------------------------------
 #   End of Makefile
+#

Subversion Repositories DevTools

(root)/core_devl/branches/dpurdie_3.5.10000.cr/TOOLS/makelib.pl2 – Rev 4836 → 4837