Skip to content

Commit

Permalink
Add " to handle folders with spaces correctly
Browse files Browse the repository at this point in the history
  • Loading branch information
NN--- committed Nov 14, 2013
1 parent 213256e commit fc24122
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions NemerleAll.nproj
Original file line number Diff line number Diff line change
Expand Up @@ -282,16 +282,16 @@
<Asm3 Include="$(NCurBin)\*.dll" />
<Asm3 Include="$(NCurBin)\*.exe" />
</ItemGroup>
<Exec Command="$(Ildasm) %(Asm2.FullPath) /out=%(Asm2.FullPath).il /nobar" WorkingDirectory="$(NPrevBin)" />
<Exec Command="$(Ildasm) %(Asm3.FullPath) /out=%(Asm3.FullPath).il /nobar" WorkingDirectory="$(NCurBin)" />
<Exec Command="$(Ildasm) &quot;%(Asm2.FullPath)&quot; /out=&quot;%(Asm2.FullPath).il&quot; /nobar" WorkingDirectory="$(NPrevBin)" />
<Exec Command="$(Ildasm) &quot;%(Asm3.FullPath)&quot; /out=&quot;%(Asm3.FullPath).il&quot; /nobar" WorkingDirectory="$(NCurBin)" />
<ItemGroup>
<IL_PREV Include="$(NPrevBin)\*.il" />
<IL_LAST Include="$(NCurBin)\*.il" />
</ItemGroup>
<MSBuild.Community.Tasks.FileUpdate Files="@(IL_PREV)" Regex="^(//.*)(?=\r)" ReplacementText="// REPLACED" Multiline="True" />
<MSBuild.Community.Tasks.FileUpdate Files="@(IL_LAST)" Regex="^(//.*)(?=\r)" ReplacementText="// REPLACED" Multiline="True" />
<Exec Command="fc $(NPrevBin)\*.il $(NCurBin)\*.il" />
<Exec Command="$(PEVerify) %(Asm3.FullPath)" ContinueOnError="False" />
<Exec Command="fc &quot;$(NPrevBin)\*.il&quot; &quot;$(NCurBin)\*.il&quot;" />
<Exec Command="$(PEVerify) &quot;%(Asm3.FullPath)&quot;" ContinueOnError="False" />
<Delete Files="@(IL_PREV)" />
<Delete Files="@(IL_LAST)" />
</Target>
Expand All @@ -306,7 +306,7 @@
<Output ItemName="NTestFrameworkFiles" TaskParameter="Include" />
</CreateItem>
<!--Delete Files="@(CompilerTestsFiles)" / DONT WORK WITH READONLY FILES!-->
<Exec Command="IF EXIST $(NBin)\Tests\ DEL $(NBin)\Tests\ /F /S /Q" WorkingDirectory="$(NBin)\" />
<Exec Command="IF EXIST &quot;$(NBin)\Tests\&quot; DEL &quot;$(NBin)\Tests\&quot; /F /S /Q" WorkingDirectory="$(NBin)\" />
<Copy SourceFiles="$(NBin)\Linq\Nemerle.Linq.dll;$(NBin)\Unsafe\Nemerle.Unsafe.dll;$(NBin)\PowerPack\Nemerle.WPF.dll;@(CSharpCompilerFiles)" DestinationFolder="$(NBin)\Tests\positive" />
<Copy SourceFiles="$(NBin)\Linq\Nemerle.Linq.dll;$(NBin)\Unsafe\Nemerle.Unsafe.dll;$(NBin)\PowerPack\Nemerle.WPF.dll;@(CSharpCompilerFiles)" DestinationFolder="$(NBin)\Tests\negative" />
<!--Delete all temporary files in old testing directory-->
Expand Down
2 changes: 1 addition & 1 deletion misc/packages/wix/nemerle.wixproj
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
<PropertyGroup>
<Sed>"$(NRoot)\ExternalDependences\sed.exe"</Sed>
</PropertyGroup>
<Exec Condition = " '$(NVer)' == 'net-4.0' Or '$(NVer)' == 'net-4.5' Or '$(NVer)' == 'net-4.5.1'" Command="$(Sed) &quot;s/&lt;Version&gt;1.1.9999.0/&lt;Version&gt;$(ActualVersion)/g;s/&lt;InstalledByMsi&gt;false/&lt;InstalledByMsi&gt;true/g&quot; $(NBinPath)\VsIntegration\extension.vsixmanifest > $(DistPath)\vs-plugin\extension.vsixmanifest" WorkingDirectory="." />
<Exec Condition = " '$(NVer)' == 'net-4.0' Or '$(NVer)' == 'net-4.5' Or '$(NVer)' == 'net-4.5.1'" Command="$(Sed) &quot;s/&lt;Version&gt;1.1.9999.0/&lt;Version&gt;$(ActualVersion)/g;s/&lt;InstalledByMsi&gt;false/&lt;InstalledByMsi&gt;true/g&quot; &quot;$(NBinPath)\VsIntegration\extension.vsixmanifest&quot; > &quot;$(DistPath)\vs-plugin\extension.vsixmanifest&quot;" WorkingDirectory="." />
</Target>

<Target Name="AfterBuild">
Expand Down

0 comments on commit fc24122

Please sign in to comment.