Commitc7d8a46

committed

make "xbuild fsharp-build.proj /t:Clean work

1 parent97c1308 commitc7d8a46Copy full SHA for c7d8a46

File tree

+12

-4

lines changed

+12

-4

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ aclocal.m4`
`10`	`10`	`src/*.userprefs`
`11`	`11`	`src/fsharp/FSStrings.resources`
`12`	`12`	`lkg`
	`13`	`+pack`
`13`	`14`	`src/fsharp/FSharp.Build/*.resx`
`14`	`15`	`src/fsharp/FSharp.Build-proto/*.resx`
`15`	`16`	`src/fsharp/FSharp.Build-proto/*.resources`
`@@ -48,4 +49,7 @@ src/fsharp/FSharp.Compiler-proto/ilpars.fsi`
`48`	`49`	`src/fsharp/FSharp.Compiler-proto/lex.fs`
`49`	`50`	`src/fsharp/FSharp.Compiler-proto/pars.fs`
`50`	`51`	`src/fsharp/FSharp.Compiler-proto/pars.fsi`
`51`		`-*~`
	`52`	`+*~`
	`53`	`+tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource/Sample_VS2012_FSharp_ConsoleApp_net45/Sample_VS2012_FSharp_ConsoleApp_net45.sln`
	`54`	`+`
	`55`	`+tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource/Sample_VS2012_FSharp_ConsoleApp_net45/Sample_VS2012_FSharp_ConsoleApp_net45.userprefs`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,8 @@ You can also build using xbuild:`
`41`	`41`	`cd src`
`42`	`42`	`xbuild fsharp-build.proj`
`43`	`43`	```
`44`		`-though we haven't verified the binaries produced this way are 100% usable.`
	`44`	`+However the binaries produced are NOT yet usable because they are not correcy strong-name signed. Further, building using`
	`45`	`+xbuild does not create a Mono-ready distribution (see src/fsharp/targets.make).`
`45`	`46`
`46`	`47`	`##Notes`
`47`	`48`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -453,10 +453,13 @@`
`453`	`453`
`454`	`454`
`455`	`455`
	`456`	`+<!-- Include the proto targets file when building the final compiler suing the proto-->`
`456`	`457`	`<ImportProject="..\Proto\$(protoCLIDir)\bin\Microsoft.FSharp-proto.targets"`
`457`		`-Condition="'$(BuildWith)' == '' AND '$(ProjectLanguage)' == 'FSharp'"/>`
	`458`	`+Condition="Exists('..\Proto\$(protoCLIDir)\bin\Microsoft.FSharp-proto.targets') AND '$(BuildWith)' == '' AND '$(ProjectLanguage)' == 'FSharp'"/>`
	`459`	`+<!-- Include the bootstrap targets file when building the proto compiler using the bootstrap-->`
	`460`	`+<!-- Also include it if Proto targets file doesn't exist, e.g. when cleaning the build with /t:Clean-->`
`458`	`461`	`<ImportProject="$(LkgPath)\Microsoft.FSharp.targets"`
`459`		`-Condition="'$(BuildWith)' == 'LKG' AND '$(ProjectLanguage)' == 'FSharp'" />`
	`462`	`+Condition="(!Exists('..\Proto\$(protoCLIDir)\bin\Microsoft.FSharp-proto.targets') OR '$(BuildWith)' == 'LKG') AND '$(ProjectLanguage)' == 'FSharp')" />`
`460`	`463`	`<ImportProject="Silverlight\$(SilverlightVersion)\FSharpSource.Silverlight.Common.targets"`
`461`	`464`	`Condition="'$(TargetFramework)'=='sl3' or '$(TargetFramework)'=='sl4' or '$(TargetFramework)'=='sl5' or '$(TargetFramework)'=='sl5-compiler'"/>`
`462`	`465`

Comments

(0)