From 1dab0a23cfebb1f7ea4d4dd285db2d14cbb4c844 Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Tue, 13 Jun 2017 19:59:04 +0200 Subject: [PATCH] Reenabled building of GLWidget project. --- build.fsx | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/build.fsx b/build.fsx index d6bec54..639b13a 100644 --- a/build.fsx +++ b/build.fsx @@ -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 for the Open Toolkit library." -// File system information +// File system information let solutionFile = "OpenTK.sln" // 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) // The profile where the project is posted -let gitOwner = "opentk" +let gitOwner = "opentk" let gitHome = "https://github.com/" + gitOwner // The name of the project on GitHub @@ -70,7 +70,7 @@ let isXamarinPlatform = false //EnvironmentHelper.isMacOS || Environment.OSVersi // Helper active pattern for project types -let (|Fsproj|Csproj|Vbproj|) (projFileName:string) = +let (|Fsproj|Csproj|Vbproj|) (projFileName:string) = match projFileName with | f when f.EndsWith "fsproj" -> Fsproj | 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) -let activeProjects = - let xamarinFilter f = +let activeProjects = + let xamarinFilter f = if isXamarinPlatform then f else f -- "**/OpenTK.Android.csproj" -- "**/OpenTK.iOS.csproj" - + !! "src/**/*.??proj" ++ "tests/**/OpenTK.Tests.fsproj" - -- "**/OpenTK.GLWidget.csproj" |> xamarinFilter // Generate assembly info files with the right version & up-to-date information Target "AssemblyInfo" (fun _ -> let getAssemblyInfoAttributes (projectName:string) = - let projectName = + let projectName = if projectName.Contains(".iOS") || projectName.Contains(".Android") then projectName.Split('.').[0] else @@ -110,7 +109,7 @@ Target "AssemblyInfo" (fun _ -> let getProjectDetails projectPath = let projectName = System.IO.Path.GetFileNameWithoutExtension(projectPath) - ( projectPath, + ( projectPath, projectName, System.IO.Path.GetDirectoryName(projectPath), (getAssemblyInfoAttributes projectName) @@ -127,7 +126,7 @@ Target "AssemblyInfo" (fun _ -> ) // 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 Target "CopyBinaries" (fun _ -> activeProjects @@ -175,7 +174,7 @@ Target "NuGet" (fun _ -> "OpenTK.iOS" ] - Paket.Pack(fun p -> + Paket.Pack(fun p -> { p with OutputPath = "bin" ExcludedTemplates = "OpenTK.GLWidget" :: xamExcludes @@ -198,7 +197,7 @@ Target "All" DoNothing ==> "RunTests" ==> "All" -"All" +"All" ==> "NuGet" -- 2.7.4