Skip to content

Commit f924b0f

Browse files
committed
try to fix travis
1 parent f0efa06 commit f924b0f

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

build.fsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,11 @@ Target "GenerateFSIStrings" (fun _ ->
8282
p.WorkingDirectory <- dir
8383
p.FileName <- !! "packages/FsSrGen/lib/net46/fssrgen.exe" |> Seq.head ) TimeSpan.MaxValue
8484
|> ignore
85+
// execProcess (fun p ->
86+
// p.Arguments <- "u+x packages/FsSrGen/lib/net46/fssrgen.exe"
87+
// p.WorkingDirectory <- __SOURCE_DIRECTORY__
88+
// p.FileName <- "chmod") TimeSpan.MaxValue
89+
// |> ignore
8590
)
8691

8792
Target "Build" (fun _ ->

src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@
4949
<DefineConstants>$(DefineConstants);NO_STRONG_NAMES</DefineConstants>
5050
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
5151
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
52-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
52+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\..\..\</SolutionDir>
5353
<TargetFrameworkProfile />
5454
</PropertyGroup>
5555
<PropertyGroup>
56-
<FsLexYaccPath>..\..\..\lib\bootstrap\4.0</FsLexYaccPath>
57-
<FsSrGenToolPath>..\..\..\packages\FsSrGen\lib\net46</FsSrGenToolPath>
56+
<FsLexYaccPath>$(SolutionDir)lib\bootstrap\4.0</FsLexYaccPath>
57+
<FsSrGenToolPath>$(SolutionDir)packages\FsSrGen\lib\net46</FsSrGenToolPath>
5858
<FsLexToolPath>$(FsLexYaccPath)</FsLexToolPath>
5959
<FsYaccToolPath>$(FsLexYaccPath)</FsYaccToolPath>
6060
<FsLexToolExe>fslex.exe</FsLexToolExe>
@@ -661,7 +661,7 @@
661661
<Target Name="AfterBuild" Condition="Exists('..\..\..\.paket\paket.exe')">
662662
<CopyRuntimeDependencies OutputPath="$(OutDir)" TargetFramework="$(TargetFrameworkIdentifier) - $(TargetFrameworkVersion)" ProjectsWithRuntimeLibs="System.Threading" />
663663
</Target>
664-
<Import Project="$(SolutionDir)\packages\FSharp.SRGen.Build.Tasks.$(FsSrGenBuildTasksVersion)\content\FSharp.SRGen.targets" />
664+
<Import Project="$(SolutionDir)\packages\FSharp.SRGen.Build.Tasks\content\FSharp.SRGen.targets" />
665665
<Import Project="$(FsLexYaccPath)\FsLexYacc.targets" />
666666
<Import Project="$(SolutionDir)\.paket\paket.targets" />
667667
<Choose>

0 commit comments

Comments
 (0)