Skip to content

Commit 48994a1

Browse files
Fix deployment of IDE extension during installer build.
1 parent c68e483 commit 48994a1

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

DevBuild2StageWithTests-4.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
22
set NoPause=true
3-
%MSBuild% NemerleAll.nproj /target:DevBuild2StageWithTests /p:Configuration=Debug /verbosity:n /tv:4.0 /p:TargetFrameworkVersion=v4.0
3+
%MSBuild% NemerleAll.nproj /target:DevBuild2StageWithTests /p:Configuration=Debug /p:NInstallIntegration=True /verbosity:n /tv:4.0 /p:TargetFrameworkVersion=v4.0
44
rem /p:NTargetName=Build
55
IF %errorlevel% == 0 call Reg-bins-2-4.0.cmd
66
pause

DevBuildForCommit-4.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
22
set NoPause=true
3-
%MSBuild% NemerleAll.nproj /target:DevBuildFull /p:Configuration=Debug /verbosity:n /tv:4.0 /p:TargetFrameworkVersion=v4.0
3+
%MSBuild% NemerleAll.nproj /target:DevBuildFull /p:Configuration=Debug /verbosity:n /p:NInstallIntegration=True /tv:4.0 /p:TargetFrameworkVersion=v4.0
44
rem /p:TargetName=ReBuild
55
pause

DevBuildQuick-VS2010.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
22
set NoPause=true
3-
%MSBuild% NemerleAll.nproj /target:DevBuildQuick /p:Configuration=Debug /verbosity:n /p:NTargetName=Build /tv:4.0 /p:TargetFrameworkVersion=v4.0
3+
%MSBuild% NemerleAll.nproj /target:DevBuildQuick /p:Configuration=Debug /verbosity:n /p:NTargetName=Build /p:NInstallIntegration=True /tv:4.0 /p:TargetFrameworkVersion=v4.0
44

55
rem /verbosity:n /p:TargetName=Build
66
IF %errorlevel% == 0 call Reg-bins-VS2010.cmd

DevBuildQuickWithTests-4.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
2-
%MSBuild% NemerleAll.nproj /target:DevBuildQuickWithTests /p:Configuration=Debug /verbosity:n /p:NTargetName=Build /tv:4.0 /p:TargetFrameworkVersion=v4.0
2+
%MSBuild% NemerleAll.nproj /target:DevBuildQuickWithTests /p:Configuration=Debug /verbosity:n /p:NTargetName=Build /p:NInstallIntegration=True /tv:4.0 /p:TargetFrameworkVersion=v4.0
33
rem /verbosity:n /p:TargetName=Build
44
pause

NemerleAll.nproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<!--Path to boot compiler.-->
3434
<NBoot>$(NBin)\boot\</NBoot>
3535
<!-- Project Constants -->
36+
<NInstallIntegration Condition=" '$(NInstallIntegration)' == '' ">False</NInstallIntegration>
3637
</PropertyGroup>
3738
<PropertyGroup Condition="'$(UseMSBuild)' != ''">
3839
<NProjectConstants Condition="'$(TargetFrameworkVersion)' == '' Or '$(TargetFrameworkVersion)' == 'v2.0' Or '$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.5'">RUNTIME_MS</NProjectConstants>
@@ -415,7 +416,7 @@
415416

416417
<!--Helper target to build integration-->
417418
<Target Name="_Integration" DependsOnTargets="Linq;Unsafe;TestFramework;Tools" Condition="'$(UseMSBuild)' != ''">
418-
<MSBuild Projects="@(NIntegrationProject)" Properties="OutputPath=$(NBin)\VsIntegration\; Nemerle=$(NCurBin); Configuration=$(Configuration); BaseIntermediateOutputPath=$(NObj)\VsIntegration\; IntermediateOutputPath=$(NObj)\VsIntegration\; NKeysDir=$(NBin)\keys" Targets="$(NTargetName)" />
419+
<MSBuild Projects="@(NIntegrationProject)" Properties="OutputPath=$(NBin)\VsIntegration\; Nemerle=$(NCurBin); Configuration=$(Configuration); BaseIntermediateOutputPath=$(NObj)\VsIntegration\; IntermediateOutputPath=$(NObj)\VsIntegration\; NKeysDir=$(NBin)\keys; DeployExtension=$(NInstallIntegration)" Targets="$(NTargetName)" />
419420
</Target>
420421

421422
<Target Name="TestFramework">

0 commit comments

Comments
 (0)