Reenabled building of GLWidget project.

This commit is contained in:
Jarl Gullberg 2017-06-13 19:59:04 +02:00
parent 4c059644bf
commit 1dab0a23cf
No known key found for this signature in database
GPG key ID: 750FF6F6BDA72D23

View file

@ -42,7 +42,7 @@ let tags = "OpenTK OpenGL OpenGLES GLES OpenAL C# F# VB .NET Mono Vector Math Ga
let copyright = "Copyright (c) 2006 - 2016 Stefanos Apostolopoulos <stapostol@gmail.com> for the Open Toolkit library." let copyright = "Copyright (c) 2006 - 2016 Stefanos Apostolopoulos <stapostol@gmail.com> for the Open Toolkit library."
// File system information // File system information
let solutionFile = "OpenTK.sln" let solutionFile = "OpenTK.sln"
// Pattern specifying assemblies to be tested using NUnit // Pattern specifying assemblies to be tested using NUnit
@ -50,7 +50,7 @@ let testAssemblies = "tests/**/bin/Release/*Tests*.dll"
// Git configuration (used for publishing documentation in gh-pages branch) // Git configuration (used for publishing documentation in gh-pages branch)
// The profile where the project is posted // The profile where the project is posted
let gitOwner = "opentk" let gitOwner = "opentk"
let gitHome = "https://github.com/" + gitOwner let gitHome = "https://github.com/" + gitOwner
// The name of the project on GitHub // The name of the project on GitHub
@ -70,7 +70,7 @@ let isXamarinPlatform = false //EnvironmentHelper.isMacOS || Environment.OSVersi
// Helper active pattern for project types // Helper active pattern for project types
let (|Fsproj|Csproj|Vbproj|) (projFileName:string) = let (|Fsproj|Csproj|Vbproj|) (projFileName:string) =
match projFileName with match projFileName with
| f when f.EndsWith "fsproj" -> Fsproj | f when f.EndsWith "fsproj" -> Fsproj
| f when f.EndsWith "csproj" -> Csproj | f when f.EndsWith "csproj" -> Csproj
@ -78,24 +78,23 @@ let (|Fsproj|Csproj|Vbproj|) (projFileName:string) =
| _ -> failwith (sprintf "Project file %s not supported. Unknown project type." projFileName) | _ -> failwith (sprintf "Project file %s not supported. Unknown project type." projFileName)
let activeProjects = let activeProjects =
let xamarinFilter f = let xamarinFilter f =
if isXamarinPlatform then if isXamarinPlatform then
f f
else else
f f
-- "**/OpenTK.Android.csproj" -- "**/OpenTK.Android.csproj"
-- "**/OpenTK.iOS.csproj" -- "**/OpenTK.iOS.csproj"
!! "src/**/*.??proj" !! "src/**/*.??proj"
++ "tests/**/OpenTK.Tests.fsproj" ++ "tests/**/OpenTK.Tests.fsproj"
-- "**/OpenTK.GLWidget.csproj"
|> xamarinFilter |> xamarinFilter
// Generate assembly info files with the right version & up-to-date information // Generate assembly info files with the right version & up-to-date information
Target "AssemblyInfo" (fun _ -> Target "AssemblyInfo" (fun _ ->
let getAssemblyInfoAttributes (projectName:string) = let getAssemblyInfoAttributes (projectName:string) =
let projectName = let projectName =
if projectName.Contains(".iOS") || projectName.Contains(".Android") then if projectName.Contains(".iOS") || projectName.Contains(".Android") then
projectName.Split('.').[0] projectName.Split('.').[0]
else else
@ -110,7 +109,7 @@ Target "AssemblyInfo" (fun _ ->
let getProjectDetails projectPath = let getProjectDetails projectPath =
let projectName = System.IO.Path.GetFileNameWithoutExtension(projectPath) let projectName = System.IO.Path.GetFileNameWithoutExtension(projectPath)
( projectPath, ( projectPath,
projectName, projectName,
System.IO.Path.GetDirectoryName(projectPath), System.IO.Path.GetDirectoryName(projectPath),
(getAssemblyInfoAttributes projectName) (getAssemblyInfoAttributes projectName)
@ -127,7 +126,7 @@ Target "AssemblyInfo" (fun _ ->
) )
// Copies binaries from default VS location to expected bin folder // Copies binaries from default VS location to expected bin folder
// But keeps a subdirectory structure for each project in the // But keeps a subdirectory structure for each project in the
// src folder to support multiple project outputs // src folder to support multiple project outputs
Target "CopyBinaries" (fun _ -> Target "CopyBinaries" (fun _ ->
activeProjects activeProjects
@ -175,7 +174,7 @@ Target "NuGet" (fun _ ->
"OpenTK.iOS" ] "OpenTK.iOS" ]
Paket.Pack(fun p -> Paket.Pack(fun p ->
{ p with { p with
OutputPath = "bin" OutputPath = "bin"
ExcludedTemplates = "OpenTK.GLWidget" :: xamExcludes ExcludedTemplates = "OpenTK.GLWidget" :: xamExcludes
@ -198,7 +197,7 @@ Target "All" DoNothing
==> "RunTests" ==> "RunTests"
==> "All" ==> "All"
"All" "All"
==> "NuGet" ==> "NuGet"