Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | More updates to the Eagle script library in externals. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | netStandard20 |
Files: | files | file ages | folders |
SHA1: |
e394825ba47c2718f516abfe634669b7 |
User & Date: | mistachkin 2018-04-06 10:34:54.312 |
Context
2018-04-06
| ||
11:03 | Fix a leaked variable in a test. check-in: 77ca0367c7 user: mistachkin tags: netStandard20 | |
10:34 | More updates to the Eagle script library in externals. check-in: e394825ba4 user: mistachkin tags: netStandard20 | |
10:34 | Adjust test constraints to work around .NET Core issues. check-in: c11f98fd5b user: mistachkin tags: netStandard20 | |
Changes
Changes to Externals/Eagle/lib/Eagle1.0/csharp.eagle.
︙ | ︙ | |||
17 18 19 20 21 22 23 | # # NOTE: Use our own namespace here because even though we do not directly # support namespaces ourselves, we do not want to pollute the global # namespace if this script actually ends up being evaluated in Tcl. # namespace eval ::Eagle { # | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > | | | | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 | # # NOTE: Use our own namespace here because even though we do not directly # support namespaces ourselves, we do not want to pollute the global # namespace if this script actually ends up being evaluated in Tcl. # namespace eval ::Eagle { # # NOTE: This procedure is used to determine the fully qualified path to the # .NET Core SDK. An empty string will be returned to indicate an # error. This procedure should not raise script errors. # proc getDotNetCoreSdkPath {} { if {[catch {exec -- dotnet --info} info] == 0} then { set info [string map [list \r\n \n] $info] if {[regexp -line -- \ {^\s*Base Path:\s+([^\n]+)$} $info dummy path]} then { return [file normalize $path] } } return "" } # # NOTE: This procedure is used to determine the fully qualified path to the # directory containing the reference assemblies for the .NET Standard # 2.0. An empty string will be returned to indicate an error. This # procedure should not raise script errors. # proc getDotNetStandardReferencePath { {packageVersion 2.0.1} {standardVersion netstandard2.0} } { set path [getDotNetCoreSdkPath] if {[string length $path] > 0} then { return [file normalize [file join \ [file dirname $path] NuGetFallbackFolder netstandard.library \ $packageVersion build $standardVersion ref]] } return "" } # # NOTE: This procedure is used to determine the command line arguments that # are required to invoke the .NET Core SDK compiler for CSharp. An # empty list will be returned if the arguments cannot be determined # for some reason. This procedure should not raise script errors. # proc getDotNetCoreCSharpCommandArgs {} { set path [getDotNetCoreSdkPath] if {[string length $path] > 0} then { return [list dotnet exec [appendArgs \" \ [file nativename [file normalize [file join $path Roslyn bincore \ csc.dll]]] \"]] } return [list] } # # NOTE: This procedure is used to format an option to the C# compiler. It # may have a name and/or a value. This procedure should not raise # script errors. # proc formatCompilerArgument { name value } { set wrap "" if {[regexp -- {\s} $name] || [regexp -- {\s} $value]} then { set wrap \" } if {[string length $name] > 0} then { if {[string length $value] > 0} then { return [appendArgs $wrap $name : $value $wrap] } else { return [appendArgs $wrap $name $wrap] } } else { if {[string length $value] > 0} then { return [appendArgs $wrap $value $wrap] } else { return "" } } } # # NOTE: This procedure is used to translate a name/value pair into zero or # more options to the C# compiler. This procedure should not raise # script errors. # proc compilerParameterToArguments { name {value ""} } { switch -exact -- $name { WarningLevel { set name -warn } ReferencedAssemblies.Add { set name -reference if {[file pathtype $value] ne "absolute"} then { set value [file nativename [file normalize \ [file join [getDotNetStandardReferencePath] \ $value]]] } } } set formatted [formatCompilerArgument $name $value] if {[string length $formatted] > 0} then { return [list $formatted] } else { return [list] } } # # NOTE: This procedure is used to obtain the base command line options for # the C# compiler, including those that may be enabled by default. # An empty string may be returned. This procedure should not raise # script errors. # proc getCSharpCompilerOptions { parameters library csharp prefix } { # # NOTE: Start out with no compiler options. # set result "" # # NOTE: Make sure that the "standard" preprocessor defines match those # for the platform (i.e. the ones used to compile the Eagle core # library assembly). This caller may disable this handling. # if {$library} then { set libraryOptions [expr { \ [info exists ::eagle_platform(compileOptions)] ? \ $::eagle_platform(compileOptions) : [list] \ }] } else { set libraryOptions "" } # # NOTE: Permit extra C# compiler options to be passed via the global # array element "csharpOptions", if it exists. This caller may # disable this handling. # if {$csharp} then { set csharpOptions [expr { \ [info exists ::eagle_platform(csharpOptions)] ? \ $::eagle_platform(csharpOptions) : [list] \ }] } else { set csharpOptions "" } # # NOTE: Grab the existing compiler options, if any. This caller may # disable this handling (e.g. by specifying an invalid opaque # object handle for the "parameters" argument). # if {[isNonNullObjectHandle $parameters]} then { append result [$parameters CompilerOptions] } # # NOTE: Are there any Eagle core library options to check? # if {[llength $libraryOptions] > 0} then { # # NOTE: Was the Eagle core library built in the Debug configuration? # if {"DEBUG" in $libraryOptions} then { if {[string length $result] > 0} then { append result " " } append result $prefix define:DEBUG } # # NOTE: Was the Eagle core library built with tracing enabled (i.e. # this allows for use of System.Diagnostics.Trace, etc)? # if {"TRACE" in $libraryOptions} then { if {[string length $result] > 0} then { append result " " } append result $prefix define:TRACE } } # # NOTE: Are there any extra C# compiler options to add? # if {[llength $csharpOptions] > 0} then { # # NOTE: Append the configured extra C# compiler options configured # via the global array element "csharpOptions", if any. # foreach csharpOption $csharpOptions { if {[string length $result] > 0} then { append result " " } append result $csharpOption } } return $result } # # NOTE: This procedure is used to escape all characters in the specified # string for use inside of a regular expression. An empty string # may be returned. This procedure should not raise script errors. # proc regexpEscapeAll { value } { set result "" foreach char [split $value ""] { append result \\u [format %04X [string ordinal $char 0]] } return $result } # # NOTE: This procedure is used to extract the C# compiler error messages # from its results. An empty list will be returned if the errors # cannot be determined for some reason. This procedure should not # raise script errors. # proc extractCSharpErrors { fileName results } { set list [list] foreach {dummy match} [regexp -all -line -inline -- \ [appendArgs (^(?: [regexpEscapeAll $fileName] \ {\(\d+,\d+\): )?error CS\d{4}: [^\n]+$)}] $results] { lappend list $match } return $list } # # NOTE: This procedure is used to extract the C# compiler warning messages # from its results. An empty list will be returned if the warnings # cannot be determined for some reason. This procedure should not # raise script errors. # proc extractCSharpWarnings { fileName results } { set list [list] foreach {dummy match} [regexp -all -line -inline -- \ [appendArgs (^(?: [regexpEscapeAll $fileName] \ {\(\d+,\d+\): )?warning CS\d{4}: [^\n]+$)}] $results] { lappend list $match } return $list } # # NOTE: This procedure is used to dynamically compile arbitrary C# code # from within a script using the CSharpCodeProvider class present # in the desktop .NET Framework. It may work on some versions of # Mono as well. This procedure was originally designed to be used # by the test suite; however, it can be quite useful in non-test # scripts as well. # proc compileViaCSharpCodeProvider { string memory symbols strict resultsVarName errorsVarName args } { # # NOTE: The [object] command is required by this procedure. If it # is not available, bail out now. # if {[llength [info commands object]] == 0} then { # |
︙ | ︙ | |||
67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | # set parameters [object create -alias \ System.CodeDom.Compiler.CompilerParameters] # # NOTE: Do we not want to persist the generated assembly to disk? # if {$memory} then { $parameters GenerateInMemory true } # # NOTE: Do we want symbols to be generated for the generated assembly? # if {$symbols} then { $parameters IncludeDebugInformation true } # | > > > > > < < < < < < < | < < < < < < < | < < | < < | < < < | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < | | | 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 | # set parameters [object create -alias \ System.CodeDom.Compiler.CompilerParameters] # # NOTE: Do we not want to persist the generated assembly to disk? # set outputFileName "" if {$memory} then { $parameters GenerateInMemory true } else { $parameters OutputAssembly \ [set outputFileName [appendArgs [file tempname] .dll]] } # # NOTE: Do we want symbols to be generated for the generated assembly? # if {$symbols} then { $parameters IncludeDebugInformation true } # # NOTE: Start out the compiler options with the pre-existing defaults # for the compiler followed by those necessary for the platform. # $parameters CompilerOptions \ [getCSharpCompilerOptions $parameters true true /] # # NOTE: Process extra compiler settings the caller may have provided. # foreach {name value} $args { $parameters -nocase $name $value } # # NOTE: Prepare to transfer the object reference to the caller. We # must use [upvar] here because otherwise the object is lost # when the procedure call frame is cleaned up. # if {[string length $resultsVarName] > 0} then { upvar 1 $resultsVarName results } # # NOTE: Attempt to compile the specified string as C# and capture the |
︙ | ︙ | |||
190 191 192 193 194 195 196 | # # NOTE: Prepare to transfer error messages to the caller. # if {[string length $errorsVarName] > 0} then { upvar 1 $errorsVarName local_errors } | < < < < < | | 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 | # # NOTE: Prepare to transfer error messages to the caller. # if {[string length $errorsVarName] > 0} then { upvar 1 $errorsVarName local_errors } # # NOTE: Grab each error object and append the string itself to # the overall list of errors. # for {set index 0} {$index < [$errors Count]} {incr index} { # # NOTE: Get the compiler error object at this index. # set error [$errors -alias Item $index] # # NOTE: Convert it to a string and append it to the list of |
︙ | ︙ | |||
225 226 227 228 229 230 231 | # # NOTE: Compilation of the assembly succeeded. # set code Ok } # | | | > > > > > > > > > > > | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 | # # NOTE: Compilation of the assembly succeeded. # set code Ok } # # NOTE: We no longer need the compiler errors collection; therefore, # dispose it now. # unset errors; # dispose # # HACK: *BREAKING CHANGE* If there is an output file name, return it # as well; otherwise, just return success. # if {[string length $outputFileName] > 0} then { # # NOTE: Return a two element list: the first element is the overall # result and the second element is the output file name. # return [list $code $outputFileName] } else { # # NOTE: Return the overall result to the caller. # return $code } } # # NOTE: This procedure is used to dynamically compile arbitrary C# code # from within a script using the command line C# compiler provided # by the .NET Core SDK. This procedure was originally designed to # be used by the test suite; however, it can be quite useful in # non-test scripts as well. # proc compileViaDotNetCoreCSharp { string memory symbols strict resultsVarName errorsVarName args } { # # NOTE: Get the initial command line arguments needed to invoke the C# # compiler on .NET Core. If this ends up being invalid, nothing # else can be done. # set command [getDotNetCoreCSharpCommandArgs] if {[llength $command] == 0} then { # # NOTE: We cannot even attempt to compile anything, fail. # set code Error # # NOTE: Prepare to transfer error messages to the caller. # if {[string length $errorsVarName] > 0} then { upvar 1 $errorsVarName local_errors } # # NOTE: Append to the list of errors. # lappend local_errors "cannot compile, CSharp compiler not found" # # NOTE: Return the overall result to the caller. # return $code } # # NOTE: Insert the [exec] command before the command line arguments. # The -success option is not used here because we want to handle # errors (only) by processing the compiler output. # set command [linsert $command 0 exec --] # # NOTE: Start out the compiler options with the pre-existing defaults # for the compiler followed by those necessary for the platform. # append command " " [getCSharpCompilerOptions "" true true -] # # NOTE: Process extra compiler settings the caller may have provided. # foreach {name value} $args { eval lappend command [compilerParameterToArguments $name $value] } # # NOTE: Allocate a couple temporary file names, one to hold the source # code to compile and one to hold the generated assembly. # set sourceFileName [appendArgs [file tempname] .cs] set outputFileName [appendArgs [file tempname] .dll] try { # # NOTE: Make the compiler output a little quieter. This is needed # to maintain compatibility with the results generated by the # [compileViaCSharpCodeProvider] procedure. # lappend command -nologo # # NOTE: If symbols are enabled, add the necessary command line # argument. # if {$symbols} then {lappend command -debug} # # NOTE: As of this writing (2018-04-06), the current version of the # .NET Core SDK (2.1.101) uses the "netstandard.dll" assembly # to enable use of the .NET Standard 2.0 library. # lappend command [appendArgs \"-reference: [file join \ [getDotNetStandardReferencePath] netstandard.dll] \"] # # NOTE: Set the output assembly file name to the temporary output # file name we obtained from [file tempname] above. # lappend command [appendArgs \"-out: $outputFileName \"] # # NOTE: Set the source code file name to the temporary source code # file name we obtained from [file tempname] above. # lappend command [appendArgs \" $sourceFileName \"] # # NOTE: First, write the specified string (containing C# code) to # the temporary source code file. # writeFile $sourceFileName $string # # NOTE: Attempt to compile the temporary file as C# and capture the # results into the variable provided by the caller. Since the # results are text, normalize line endings before extracting # the compiler errors and/or warnings. # set local_results [string map [list \r\n \n] [eval $command]] # # NOTE: Extract the compiler errors (which may be empty). # set errors [extractCSharpErrors $sourceFileName $local_results] # # NOTE: Extract the compiler warnings (which may be empty). # set warnings [extractCSharpWarnings $sourceFileName $local_results] # # NOTE: Prepare to transfer the "results" to the caller. # if {[string length $resultsVarName] > 0} then { upvar 1 $resultsVarName results } # # NOTE: It is assumed that no assembly was generated if there were # any compiler errors. Ignore all compiler warnings unless # we are in strict mode. # if {[llength $errors] > 0 || \ ($strict && [llength $warnings] > 0)} then { # # NOTE: Set the results to an empty string because we failed and # this will not look like a valid opaque object handle. # set results "" # # NOTE: Compilation of the assembly failed. # set code Error # # NOTE: Prepare to transfer error messages to the caller. # if {[string length $errorsVarName] > 0} then { upvar 1 $errorsVarName local_errors } # # NOTE: If there are compiler errors, add them to the list now. # if {[llength $errors] > 0} then { eval lappend local_errors $errors } # # NOTE: If there are compiler warnings, add them to the list now. # if {[llength $warnings] > 0} then { eval lappend local_errors $warnings } } else { # # HACK: For backward compatibility with the results generated by # the [compileViaCSharpCodeProvider] procedure, we must now # set the results to an obviously fake opaque object handle # that still matches the normal pattern. # set results System#CodeDom#Compiler#CompilerResults#0 # # NOTE: If the generated assembly was supposed to be loaded into # memory, try to do that now. # if {$memory} then { object load -loadtype File $outputFileName } # # NOTE: Compilation of the assembly succeeded. # set code Ok } } finally { # # NOTE: Delete the temporary file name used to hold the source code. # if {[string length $sourceFileName] > 0 && \ [file exists $sourceFileName]} then { catch {file delete $sourceFileName} } } # # HACK: *BREAKING CHANGE* If there is an output file name, return it # as well; otherwise, just return success. # if {!$memory && [string length $outputFileName] > 0} then { # # NOTE: Return a two element list: the first element is the overall # result and the second element is the output file name. # return [list $code $outputFileName] } else { # # NOTE: Return the overall result to the caller. # return $code } } # # NOTE: This procedure is used to dynamically compile arbitrary C# code # from within a script. This procedure was originally designed to # be used by the test suite; however, it can be quite useful in # non-test scripts as well. # proc compileCSharp { string memory symbols strict resultsVarName errorsVarName args } { if {[isDotNetCore]} then { return [uplevel 1 [list \ compileViaDotNetCoreCSharp $string $memory $symbols $strict \ $resultsVarName $errorsVarName] $args] } else { return [uplevel 1 [list \ compileViaCSharpCodeProvider $string $memory $symbols $strict \ $resultsVarName $errorsVarName] $args] } } # # NOTE: Provide the Eagle "C#" package to the interpreter. # package provide Eagle.CSharp \ [expr {[isEagle] ? [info engine PatchLevel] : "1.0"}] } |
Changes to Externals/Eagle/lib/Test1.0/constraints.eagle.
︙ | ︙ | |||
2936 2937 2938 2939 2940 2941 2942 | tputs $channel no\n } } proc checkForCompileCSharp { channel } { tputs $channel "---- checking for test use of C# compiler... " | | | 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 | tputs $channel no\n } } proc checkForCompileCSharp { channel } { tputs $channel "---- checking for test use of C# compiler... " if {![info exists ::no(compileCSharp)]} then { addConstraint compileCSharp tputs $channel yes\n } else { tputs $channel no\n } } |
︙ | ︙ | |||
3199 3200 3201 3202 3203 3204 3205 | if {$dotVersion(1) eq $dotVersion(2)} then { # # NOTE: Yes, the image runtime version matches the framework. # addConstraint matchFramework addConstraint [appendArgs matchFramework $version(1)] | | | | | | | | | | | | | | 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 | if {$dotVersion(1) eq $dotVersion(2)} then { # # NOTE: Yes, the image runtime version matches the framework. # addConstraint matchFramework addConstraint [appendArgs matchFramework $version(1)] addConstraint dotNetMatchFramework addConstraint [appendArgs dotNetMatchFramework $version(1)] addConstraint monoMatchFramework addConstraint [appendArgs monoMatchFramework $version(1)] addConstraint dotNetCoreMatchFramework addConstraint [appendArgs dotNetCoreMatchFramework $version(1)] tputs $channel yes\n } else { if {[isTestDotNetCore]} then { addConstraint dotNetMatchFramework addConstraint [appendArgs dotNetMatchFramework $version(1)] addConstraint monoMatchFramework addConstraint [appendArgs monoMatchFramework $version(1)] } elseif {[isTestMono]} then { addConstraint dotNetMatchFramework addConstraint [appendArgs dotNetMatchFramework $version(1)] addConstraint dotNetCoreMatchFramework addConstraint [appendArgs dotNetCoreMatchFramework $version(1)] } else { addConstraint monoMatchFramework addConstraint [appendArgs monoMatchFramework $version(1)] addConstraint dotNetCoreMatchFramework addConstraint [appendArgs dotNetCoreMatchFramework $version(1)] } tputs $channel no\n } } else { tputs $channel "no, missing image runtime version\n" } |
︙ | ︙ |