Rework genproj to use gensources to build sources list for each profile and host platform (#8985)

* Update genproj makefile to include gensources
Update genproj argument parser to be more generous about displaying help

* Checkpoint

* Checkpoint

* Checkpoint

* Checkpoint

* Checkpoint

* Checkpoint

* Checkpoint

* Checkpoint

* Fix rebase issue

* Checkpoint

* Checkpoint

* Fix built sources only being added to one profile

* Fix typo

* Checkpoint

* Fix indentation

* Use csc instead of mcs

* Checkpoint

* Fix BUILT_SOURCES only being handled for the first profile processed

* Checkpoint

* Checkpoint

* Strip double slashes from paths to fix spurious csproj change

* Checkpoint

* Checkpoint

* Checkpoint

* Checkpoint: Fix genproj compilation

* Checkpoint

* Checkpoint

* Checkpoint

* Fix crash when no targets were loaded (due to an error)

* Checkpoint

* Checkpoint

* Checkpoint

* Fix TryParseTargetInto bug

* Checkpoint

* Shuffle exclude logic around so that it works correctly during genproj diffing

* Remove gensources tracing

* Checkpoint

* Fix handling of oddball sources paths from executable.make

* Fix jay not being set to build

* Fix wrong slashes being used for embedded resource paths

* [csproj] Update project files

1 files changed, 72 insertions, 71 deletions

diff --git a/mcs/class/Mono.CodeContracts/Mono.CodeContracts.csproj b/mcs/class/Mono.CodeContracts/Mono.CodeContracts.csproj
index 7f646a42818..458e885bae6 100644
--- a/mcs/class/Mono.CodeContracts/Mono.CodeContracts.csproj
+++ b/mcs/class/Mono.CodeContracts/Mono.CodeContracts.csproj
@@ -43,10 +43,14 @@
     <Optimize>true</Optimize>

   </PropertyGroup>

   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

-  <!-- @COMMON_SOURCES@ -->

-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">

+  <!-- @BUILT_SOURCES@ -->

+  <ItemGroup>

     <Compile Include="..\..\build\common\Consts.cs" />

     <Compile Include="Assembly\AssemblyInfo.cs" />

+    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\CompileVisitor.cs" />

+    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\ExprVisitor.cs" />

+    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\InstructionExtentVisitor.cs" />

+    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\SourcePositionVisitor.cs" />

     <Compile Include="Mono.CodeContracts.Rewrite.Ast\Expr.cs" />

     <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprAdd.cs" />

     <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprBinaryOp.cs" />

@@ -66,10 +70,6 @@
     <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprSub.cs" />

     <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprType.cs" />

     <Compile Include="Mono.CodeContracts.Rewrite.Ast\Sn.cs" />

-    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\CompileVisitor.cs" />

-    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\ExprVisitor.cs" />

-    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\InstructionExtentVisitor.cs" />

-    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\SourcePositionVisitor.cs" />

     <Compile Include="Mono.CodeContracts.Rewrite\AssemblyRef.cs" />

     <Compile Include="Mono.CodeContracts.Rewrite\ConditionTextExtractor.cs" />

     <Compile Include="Mono.CodeContracts.Rewrite\ContractRequiresInfo.cs" />

@@ -82,6 +82,63 @@
     <Compile Include="Mono.CodeContracts.Rewrite\RewriterOptions.cs" />

     <Compile Include="Mono.CodeContracts.Rewrite\RewriterResults.cs" />

     <Compile Include="Mono.CodeContracts.Rewrite\TransformContractsVisitor.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\CodeVisitor.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\DefaultNodeVisitor.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IAggregateVisitor.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ICodeConsumer.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IExpressionILVisitor.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IILVisitor.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ILVisitorBase.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IMethodCodeConsumer.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ISymbolicExpressionVisitor.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ISyntheticILVisitor.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\NodeInspector.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\NodeVisitor.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ValueCodeVisitor.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\ArrayTypeNode.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\AssemblyNode.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\AssignmentStatement.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\BinaryExpression.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\BinaryOperator.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\Block.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\BlockExpression.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\BodyParser.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\Branch.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\CatchFilter.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\Class.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\Construct.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\CoreSystemTypes.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\EndFinally.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\Ensures.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\ExceptionHandler.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\Expression.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\ExpressionStatement.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\FaultHandler.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\Field.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\Literal.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\Local.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\Member.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\MemberBinding.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\Method.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\MethodCall.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\MethodContract.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\MethodContractElement.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\Module.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\NaryExpression.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\Node.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\NodeType.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\OperatorExtensions.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\Parameter.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\Property.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\Reference.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\Requires.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\Return.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\Statement.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\This.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\TypeNode.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\UnaryExpression.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\UnaryOperator.cs" />

+    <Compile Include="Mono.CodeContracts.Static.AST\Variable.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\AnalysisDriver.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\BasicAnalysisDriver.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\BasicMethodDriver.cs" />

@@ -125,8 +182,8 @@
     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\MethodCallPathElement.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\ParameterPathElement.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\PathElement.cs" />

-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\PathElement`1.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\PathElementBase.cs" />

+    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\PathElement`1.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\PathExtensions.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\SpecialPathElement.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\SpecialPathElementKind.cs" />

@@ -154,9 +211,9 @@
     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\MethodWrapper.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\ParameterWrapper.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\StackToSymbolicAdapter.cs" />

-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\SymbolicValue.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\SymFunction.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\SymValue.cs" />

+    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\SymbolicValue.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\TypeCache.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\ValueContextProvider.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\ValueDecoder.cs" />

@@ -169,16 +226,16 @@
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\AbstractInterpretationException.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Analysers.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Analysis.ConstantEvaluator.cs" />

-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Analysis.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Analysis.GenericNumericalAnalysis.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Analysis.GenericValueAnalysis.cs" />

+    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Analysis.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\AssumeFalseVisitor.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\AssumeTrueVisitor.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\BoxedExpressionDecoder.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\BoxedExpressionEncoder.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\BoxedVariable.cs" />

-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\ConstantEvaluatorVisitor.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\ConstToIntervalEvaluator.cs" />

+    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\ConstantEvaluatorVisitor.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Counter.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\DisInterval.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\DisIntervalAssumer.cs" />

@@ -198,9 +255,9 @@
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IIntervalEnvironment.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Interval.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalAssumeFalseVisitor.cs" />

+    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalAssumeTrueVisitor.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalAssumer.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalAssumerBase.cs" />

-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalAssumeTrueVisitor.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalBase.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalContext.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalContextBase.cs" />

@@ -238,63 +295,6 @@
     <Compile Include="Mono.CodeContracts.Static.Analysis\IValueContext.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis\IValueContextProvider.cs" />

     <Compile Include="Mono.CodeContracts.Static.Analysis\PrinterFactory.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\CodeVisitor.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\DefaultNodeVisitor.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IAggregateVisitor.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ICodeConsumer.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IExpressionILVisitor.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IILVisitor.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ILVisitorBase.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IMethodCodeConsumer.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ISymbolicExpressionVisitor.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ISyntheticILVisitor.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\NodeInspector.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\NodeVisitor.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ValueCodeVisitor.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\ArrayTypeNode.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\AssemblyNode.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\AssignmentStatement.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\BinaryExpression.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\BinaryOperator.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\Block.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\BlockExpression.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\BodyParser.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\Branch.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\CatchFilter.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\Class.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\Construct.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\CoreSystemTypes.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\EndFinally.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\Ensures.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\ExceptionHandler.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\Expression.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\ExpressionStatement.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\FaultHandler.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\Field.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\Literal.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\Local.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\Member.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\MemberBinding.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\Method.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\MethodCall.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\MethodContract.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\MethodContractElement.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\Module.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\NaryExpression.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\Node.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\NodeType.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\OperatorExtensions.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\Parameter.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\Property.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\Reference.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\Requires.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\Return.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\Statement.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\This.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\TypeNode.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\UnaryExpression.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\UnaryOperator.cs" />

-    <Compile Include="Mono.CodeContracts.Static.AST\Variable.cs" />

     <Compile Include="Mono.CodeContracts.Static.ContractExtraction\ContractExtractor.cs" />

     <Compile Include="Mono.CodeContracts.Static.ContractExtraction\ContractNodes.cs" />

     <Compile Include="Mono.CodeContracts.Static.ContractExtraction\GatherLocals.cs" />

@@ -377,14 +377,14 @@
     <Compile Include="Mono.CodeContracts.Static.DataStructures\IImmutableMap.cs" />

     <Compile Include="Mono.CodeContracts.Static.DataStructures\IImmutableSet.cs" />

     <Compile Include="Mono.CodeContracts.Static.DataStructures\IIndexable.cs" />

+    <Compile Include="Mono.CodeContracts.Static.DataStructures\IPropertyCollection.cs" />

+    <Compile Include="Mono.CodeContracts.Static.DataStructures\IWorkList.cs" />

     <Compile Include="Mono.CodeContracts.Static.DataStructures\ImmutableIntKeyMap.cs" />

     <Compile Include="Mono.CodeContracts.Static.DataStructures\ImmutableIntMap.cs" />

     <Compile Include="Mono.CodeContracts.Static.DataStructures\ImmutableMap.cs" />

     <Compile Include="Mono.CodeContracts.Static.DataStructures\ImmutableSet.cs" />

     <Compile Include="Mono.CodeContracts.Static.DataStructures\ImmutableSetExtensions.cs" />

     <Compile Include="Mono.CodeContracts.Static.DataStructures\Indexable.cs" />

-    <Compile Include="Mono.CodeContracts.Static.DataStructures\IPropertyCollection.cs" />

-    <Compile Include="Mono.CodeContracts.Static.DataStructures\IWorkList.cs" />

     <Compile Include="Mono.CodeContracts.Static.DataStructures\Optional.cs" />

     <Compile Include="Mono.CodeContracts.Static.DataStructures\Pair.cs" />

     <Compile Include="Mono.CodeContracts.Static.DataStructures\PriorityQueue.cs" />

@@ -417,12 +417,13 @@
     <Compile Include="Mono.CodeContracts.Static.Proving\IFactBase.cs" />

     <Compile Include="Mono.CodeContracts.Static.Proving\IFactQuery.cs" />

     <Compile Include="Mono.CodeContracts.Static.Proving\SimpleLogicInference.cs" />

-    <Compile Include="Mono.CodeContracts.Static\Checker.cs" />

     <Compile Include="Mono.CodeContracts.Static\CheckOptions.cs" />

     <Compile Include="Mono.CodeContracts.Static\CheckResults.cs" />

+    <Compile Include="Mono.CodeContracts.Static\Checker.cs" />

     <Compile Include="Mono.CodeContracts.Static\DebugOptions.cs" />

     <Compile Include="Mono.CodeContracts.Static\ProofOutcome.cs" />

   </ItemGroup>

+  <ItemGroup></ItemGroup>

   <!-- @ALL_SOURCES@ -->

   <!-- @COMMON_PROJECT_REFERENCES@ -->

   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">