WebSVN – DevTools – Diff – /core_devl/trunk/CFG/TOOLSET/CSHARP.PL

 use MakeEntry;
+#
 #   Global data
+#
-our $ScmExpert;
 my %resource_files;
 my $pdb_none;
 my $toolset_info;
 my $toolset_version = '1.1';
     #.. Toolset configuration
+    #
     $::ScmToolsetVersion = "1.0.0";             # our version
     $::ScmToolsetGenerate = 0;                  # generate optional
-    $::ScmToolsetIFLAG3 = 1;                    # supports IFLAG3
     $::ScmToolsetProgDependancies = 0;          # handle Prog dependancies myself
     %::ScmToolsetProgSource = (                 # handle these files directly
             '.cs'       => '',                  # Will be flagged as "CSRCS"
             '.resx'     => '--Resource=',       # Will be passed with prefix
             '.dtd'      => '--Dtd=',            # Will be passed with prefix
+#
 sub NoWarns
+{
     my ($key, $value, $ukey) = @_;
     my @NoWarnList =  split (',', $::ScmCompilerOpts{$ukey});
-    UniquePush \@NoWarnList, split (',', $value);
+    UniquePush ( \@NoWarnList, split (',', $value) );
     return join ',', @NoWarnList;
+}
 ##############################################################################
 #   ToolsetPreprocess()
         my $src  = $resource_files{$resource}{src};
         my $root = $resource_files{$resource}{root};
         my $me = MakeEntry::New (*MAKEFILE, $resource );
         $me->AddComment ("Build Resource: $root" );
-#        $me->AddDependancy ( '$(GBE_PLATFORM).mk' ) if ( ! $ScmExpert );
+#        $me->AddDependancy ( '$(SCM_MAKEFILE)' );
         $me->AddDependancy ( $src );
         $me->AddRecipe ( '$(RESGEN)' );
         $me->Print();
+        #
     #   Create Rules and Recipes to create the SNK wrapper file
+    #
     my $me = MakeEntry::New (*MAKEFILE, $snk_file );
     $me->AddComment ("Build Strong Name Key File Wrapper: $snk" );
     $me->AddDependancy ( $snk );
-    $me->AddDependancy ( '$(GBE_PLATFORM).mk' ) if ( ! $ScmExpert );
+    $me->AddDependancy ( '$(SCM_MAKEFILE)' );
     $me->AddRecipe ( '$(call GenSnkWrapper,' . $tag .  ')' );
     $me->Print();
+    #
     #   Create the data t be placed into the wrapper file
     #   This will be a combination of source, libraries and resources
+    #
     my $me = MakeEntry::New (*MAKEFILE, $full );
     $me->AddComment ("Build Program: $name" );
     $me->AddName    ( $docFile ) if ( $docFile );
-    $me->AddDependancy ( '$(GBE_PLATFORM).mk' ) if ( ! $ScmExpert );
+    $me->AddDependancy ( '$(SCM_MAKEFILE)' );
     $me->AddDependancy ( @resources );
     $me->AddDependancy ( @csource );
     $me->AddDependancy ( @dtd );
     $me->AddDependancy ( $icon );
     $me->AddRecipe ( '$(CSC)' );
         #   This will be a combination of source, libraries and resources
+        #
         my $me = MakeEntry::New (*MAKEFILE, $full );
         $me->AddComment ("Build Shared Library: $name" );
         $me->AddName    ( $_docFile ) if ( $_docFile );
-        $me->AddDependancy ( '$(GBE_PLATFORM).mk' ) if ( ! $ScmExpert );
+        $me->AddDependancy ( '$(SCM_MAKEFILE)' );
         $me->AddDependancy ( @_resources );
         $me->AddDependancy ( @_csource );
         $me->AddDependancy ( @_dtd );
         $me->AddDependancy ( $_icon );
         $me->AddRecipe ( '$(CSC)' );
+{
     my ($pEntry) = @_;
     my $test_dll_name;
     my @copy_dlls;
     my %copy_dll_flags;
-    my @nunit_files = qw ( nunit.framework.dll );
+    #
     #   Extract base name of DLL under test
     #   Thsi will not have any extension.
+    #
+        }
+    }
+    #
     #   Locate the Nunit essentials
+    #       This list may change with each version of nunit
+    #       Look for a known file and use its contents
+    #       Format:
+    #           One file name per line
-    #       nunit-console.exe
+    #           Line comments only
+    #           Comment marker is a #
+    #           First one MUST be the executable
+    #
+    my @nunit_files;
+    my $mfile = 'nunit-jats-manifest.txt';
+    my $nunit_file = ToolExtensionProgram ( $mfile );
+    Error ("Cannot find Nunit Jats Manifest: $mfile") unless ( $nunit_file );
+    open (JM, $nunit_file ) || Error( "Cannot open file: $nunit_file", "Reason: $!" );
+    while ( <JM> )
+    {
+        s~\s+$~~;                   # Remove trailing white space
+        s~^\s+~~;                   # Remove Leading whitespace
+        next unless ( $_ );         # Skip block lines
+        next if ( m~^#~ );          # Skip comments
+        Verbose ("Nunit File: $_");
-    #       nunit.framework.dll
+        push @nunit_files, $_;
+    }
+    close JM;
+    #
+    #   Locate all the required files
-    #   These will be provided by a JATS plugin package
+    #   The first one will be the console executable
+    #
-    my $nunit_console = ToolExtensionProgram ('nunit-console','.exe' );
-    Error ("Cannot locate nunit-console") unless ( $nunit_console );
     my @nunit_framework;
     foreach my $file ( @nunit_files )
+    {
         my $path = ToolExtensionProgram ($file );
         Error ("Cannot locate nunit file: $file") unless ( $path );
         push @nunit_framework, $path;
+    }
+    my $nunit_console = $nunit_framework[0];
+    Error ("Nunit console executable not specified") unless ( $nunit_console );
+    #
     #   Locate the test DLL.
     #   This will be created locally within this makefile
     #   It will be a known shared library
     $pEntry->{'command'}  = $nunit_console . ' ' . $test_dll_name;
     unshift @{$pEntry->{args}}, "/xml=$pEntry->{test_name}.xml";
     $pEntry->{'prog'} = $test_dll_name;
     $pEntry->{'copyprog'} = 0;
     push @{$pEntry->{'copyin'}}, $test_dll;
-    push @{$pEntry->{'copyonce'}}, $nunit_console, @nunit_framework;
+    push @{$pEntry->{'copyonce'}}, @nunit_framework;
     $pEntry->{'testdir'}  = 'TESTDIR';
+    #
     #   Create the Test Directory
     #   Tests will be done in a .NUNIT subdir

Subversion Repositories DevTools

(root)/core_devl/trunk/CFG/TOOLSET/CSHARP.PL – Rev 255 → 261