Merge branch 'fix-build-2' of http://github.com/dsyme/FSharp.Compiler.Service into fix-build-2

Author: dsyme

build.fsx

@@ -82,6 +82,11 @@ Target "GenerateFSIStrings" (fun _ ->
       p.WorkingDirectory <- dir
       p.FileName <- !! "packages/FsSrGen/lib/net46/fssrgen.exe" |> Seq.head ) TimeSpan.MaxValue
     |> ignore
+//    execProcess (fun p -> 
+ //     p.Arguments <- "u+x packages/FsSrGen/lib/net46/fssrgen.exe"
+ //     p.WorkingDirectory <- __SOURCE_DIRECTORY__ 
+ //     p.FileName <- "chmod") TimeSpan.MaxValue
+ //   |> ignore
 )
 
 Target "Build" (fun _ ->

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

@@ -49,12 +49,12 @@
     <DefineConstants>$(DefineConstants);NO_STRONG_NAMES</DefineConstants>
     <DefineConstants>$(DefineConstants);TRACE</DefineConstants>
     <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\..\..\</SolutionDir>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup>
-    <FsLexYaccPath>..\..\..\lib\bootstrap\4.0</FsLexYaccPath>
-    <FsSrGenToolPath>..\..\..\packages\FsSrGen\lib\net46</FsSrGenToolPath>
+    <FsLexYaccPath>$(SolutionDir)lib\bootstrap\4.0</FsLexYaccPath>
+    <FsSrGenToolPath>$(SolutionDir)packages\FsSrGen\lib\net46</FsSrGenToolPath>
     <FsLexToolPath>$(FsLexYaccPath)</FsLexToolPath>
     <FsYaccToolPath>$(FsLexYaccPath)</FsYaccToolPath>
     <FsLexToolExe>fslex.exe</FsLexToolExe>