Skip to content

Commit b16aee0

Browse files
Fix build for CLR 2.0.
1 parent ac4408e commit b16aee0

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

Nemerle.Compiler.nproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,6 @@
135135
</Token>
136136
</ItemGroup>
137137
<TemplateFile Template="ncc\policy.1.2.$(AssemblyName).config.template" OutputFilename="$(OutputPath)\policy.1.2.$(AssemblyName).config" Tokens="@(Token)" />
138-
<AL LinkResources="$(OutputPath)\policy.1.2.$(AssemblyName).config" OutputAssembly="$(OutputPath)\policy.1.2.$(AssemblyName).dll" KeyFile="$(KeyOriginatorFile)" Platform="$(Platform)" />
138+
<AL ToolPath="$(SDKBin)" LinkResources="$(OutputPath)\policy.1.2.$(AssemblyName).config" OutputAssembly="$(OutputPath)\policy.1.2.$(AssemblyName).dll" KeyFile="$(KeyOriginatorFile)" Platform="$(Platform)" />
139139
</Target>
140140
</Project>

Nemerle.Macros.nproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,6 @@
7777
</Token>
7878
</ItemGroup>
7979
<TemplateFile Template="macros\policy.1.2.$(AssemblyName).config.template" OutputFilename="$(OutputPath)\policy.1.2.$(AssemblyName).config" Tokens="@(Token)" />
80-
<AL LinkResources="$(OutputPath)\policy.1.2.$(AssemblyName).config" OutputAssembly="$(OutputPath)\policy.1.2.$(AssemblyName).dll" KeyFile="$(KeyOriginatorFile)" Platform="$(Platform)" />
80+
<AL ToolPath="$(SDKBin)" LinkResources="$(OutputPath)\policy.1.2.$(AssemblyName).config" OutputAssembly="$(OutputPath)\policy.1.2.$(AssemblyName).dll" KeyFile="$(KeyOriginatorFile)" Platform="$(Platform)" />
8181
</Target>
8282
</Project>

Nemerle.nproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@
6161
</Token>
6262
</ItemGroup>
6363
<TemplateFile Template="lib\policy.1.2.$(AssemblyName).config.template" OutputFilename="$(OutputPath)\policy.1.2.$(AssemblyName).config" Tokens="@(Token)" />
64-
<AL LinkResources="$(OutputPath)\policy.1.2.$(AssemblyName).config" OutputAssembly="$(OutputPath)\policy.1.2.$(AssemblyName).dll" KeyFile="$(KeyOriginatorFile)" Platform="$(Platform)" />
64+
<AL ToolPath="$(SDKBin)" LinkResources="$(OutputPath)\policy.1.2.$(AssemblyName).config" OutputAssembly="$(OutputPath)\policy.1.2.$(AssemblyName).dll" KeyFile="$(KeyOriginatorFile)" Platform="$(Platform)" />
6565
</Target>
6666
</Project>

NemerleAll.nproj

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -175,14 +175,15 @@
175175
<MSBuild>$(MSBuildBinPath)\msbuild.exe</MSBuild>
176176
<Junction>$(NRoot)\ExternalDependences\junction.exe</Junction>
177177
</PropertyGroup>
178-
<Message Text="Framework tools found at:" Importance="high" />
178+
<Message Text="Framework tools found at:" Importance="high" />
179179
<Message Text=" MSBuild - $(MSBuild)" Importance="high" />
180-
<Message Text=" NGen - $(NGen)" Importance="high" />
181-
<Message Text=" SDK tools found at:" Importance="high" />
180+
<Message Text=" NGen - $(NGen)" Importance="high" />
181+
<Message Text=" SDK tools found at:" Importance="high" />
182182
<Message Text=" GacUtil - $(GacUtil)" Importance="high" />
183183
<Message Text=" Ildasm - $(Ildasm)" Importance="high" />
184184
<Message Text=" PEVerify - $(PEVerify)" Importance="high" />
185-
<Message Text=" ExternalDependences:" Importance="high" />
185+
<Message Text=" ALPath - $(ALPath)" Importance="high" />
186+
<Message Text=" ExternalDependences:" Importance="high" />
186187
<Message Text=" Junction - $(Junction)" Importance="high" />
187188
</Target>
188189
<!--Builds and deploy tasks dll into boot directory-->
@@ -219,7 +220,7 @@
219220
<NCurBin>$(NBin)\Stage1\</NCurBin>
220221
<NCurObj>$(NObj)\Stage1\</NCurObj>
221222
</PropertyGroup>
222-
<MSBuild Projects="@(NCompilerProject)" Properties="OutputPath=$(NCurBin); IntermediateOutputPath=$(NCurObj)\; $(NDefineProjectConstants); Nemerle=$(NPrevBin); NKeysDir=$(NBin)\keys" Targets="$(NTargetName)" />
223+
<MSBuild Projects="@(NCompilerProject)" Properties="OutputPath=$(NCurBin); IntermediateOutputPath=$(NCurObj)\; $(NDefineProjectConstants); Nemerle=$(NPrevBin); NKeysDir=$(NBin)\keys; SDKBin=$(SDKBin)" Targets="$(NTargetName)" />
223224
<Copy SourceFiles="@(NTasksFiles)" DestinationFolder="$(NCurBin)" />
224225
</Target>
225226
<!--Builds compiler using Stage1-->
@@ -229,7 +230,7 @@
229230
<NCurBin>$(NBin)\Stage2\</NCurBin>
230231
<NCurObj>$(NObj)\Stage2\</NCurObj>
231232
</PropertyGroup>
232-
<MSBuild Projects="@(NCompilerProject)" Properties="OutputPath=$(NCurBin); IntermediateOutputPath=$(NCurObj)\; $(NDefineProjectConstants); Nemerle=$(NPrevBin); NKeysDir=$(NBin)\keys" Targets="$(NTargetName)" />
233+
<MSBuild Projects="@(NCompilerProject)" Properties="OutputPath=$(NCurBin); IntermediateOutputPath=$(NCurObj)\; $(NDefineProjectConstants); Nemerle=$(NPrevBin); NKeysDir=$(NBin)\keys; SDKBin=$(SDKBin)" Targets="$(NTargetName)" />
233234
<Copy SourceFiles="@(NTasksFiles)" DestinationFolder="$(NCurBin)" />
234235
</Target>
235236
<!--Builds compiler using Stage2-->
@@ -239,7 +240,7 @@
239240
<NCurBin>$(NBin)\Stage3\</NCurBin>
240241
<NCurObj>$(NObj)\Stage3\</NCurObj>
241242
</PropertyGroup>
242-
<MSBuild Projects="@(NCompilerProject)" Properties="OutputPath=$(NCurBin); IntermediateOutputPath=$(NCurObj)\; $(NDefineProjectConstants); Nemerle=$(NPrevBin); NKeysDir=$(NBin)\keys" Targets="$(NTargetName)" />
243+
<MSBuild Projects="@(NCompilerProject)" Properties="OutputPath=$(NCurBin); IntermediateOutputPath=$(NCurObj)\; $(NDefineProjectConstants); Nemerle=$(NPrevBin); NKeysDir=$(NBin)\keys; SDKBin=$(SDKBin)" Targets="$(NTargetName)" />
243244
<Copy SourceFiles="@(NTasksFiles)" DestinationFolder="$(NCurBin)" />
244245
</Target>
245246
<!--Builds compiler using Stage3-->
@@ -249,7 +250,7 @@
249250
<NCurBin>$(NBin)\Stage4\</NCurBin>
250251
<NCurObj>$(NObj)\Stage4\</NCurObj>
251252
</PropertyGroup>
252-
<MSBuild Projects="@(NCompilerProject)" Properties="OutputPath=$(NCurBin); IntermediateOutputPath=$(NCurObj)\; $(NDefineProjectConstants); Nemerle=$(NPrevBin); NKeysDir=$(NBin)\keys" Targets="$(NTargetName)" />
253+
<MSBuild Projects="@(NCompilerProject)" Properties="OutputPath=$(NCurBin); IntermediateOutputPath=$(NCurObj)\; $(NDefineProjectConstants); Nemerle=$(NPrevBin); NKeysDir=$(NBin)\keys; SDKBin=$(SDKBin)" Targets="$(NTargetName)" />
253254
<Copy SourceFiles="@(NTasksFiles)" DestinationFolder="$(NCurBin)" />
254255
</Target>
255256

0 commit comments

Comments
 (0)