Corrected project exclusions

diff --git a/build.fsx b/build.fsx
index cce7692..24b563d 100644 (file)
--- a/build.fsx
+++ b/build.fsx
@@ -77,6 +77,24 @@ let (|Fsproj|Csproj|Vbproj|) (projFileName:string) =
     | f when f.EndsWith "vbproj" -> Vbproj
     | _                           -> failwith (sprintf "Project file %s not supported. Unknown project type." projFileName)
 
+
+let activeProjects = 
+    let xamarinFilter f = 
+        if isXamarinPlatform then
+            f
+        else
+            f
+            -- "**/OpenTK.Android.csproj"
+            -- "**/OpenTK.iOS.csproj"
+
+    !! "src/**/*.??proj"
+    -- "**/OpenTK.GLWidget.csproj"
+    |> xamarinFilter
+
+do 
+    activeProjects
+    |> Seq.iter (tracefn "item: %s")
+
 // Generate assembly info files with the right version & up-to-date information
 Target "AssemblyInfo" (fun _ ->
     let getAssemblyInfoAttributes projectName =
@@ -110,7 +128,7 @@ Target "AssemblyInfo" (fun _ ->
 // But keeps a subdirectory structure for each project in the 
 // src folder to support multiple project outputs
 Target "CopyBinaries" (fun _ ->
-    !! "src/**/*.??proj"
+    activeProjects
     |>  Seq.map (fun f -> ((System.IO.Path.GetDirectoryName f) @@ "bin/Release", "bin" @@ (System.IO.Path.GetFileNameWithoutExtension f)))
     |>  Seq.iter (fun (fromDir, toDir) -> CopyDir toDir fromDir (fun _ -> true))
 )
@@ -126,17 +144,7 @@ Target "Clean" (fun _ ->
 // Build library & test project
 
 Target "Build" (fun _ ->
-    let xamarinFilter f = 
-        if isXamarinPlatform then
-            f
-        else
-            f
-            -- "**/OpenTK.Android.csproj"
-            -- "**/OpenTK.iOS.csproj"
-
-    !! "src/**/*.??proj"
-    -- "**/OpenTK.GLWidget.csproj"
-    |> xamarinFilter
+    activeProjects
     |> MSBuildRelease "" "Rebuild"
     |> ignore
 )

diff --git a/src/OpenTK.GLControl/paket.template b/src/OpenTK.GLControl/paket.template
index 0f5bc5f..4ca96d5 100644 (file)
--- a/src/OpenTK.GLControl/paket.template
+++ b/src/OpenTK.GLControl/paket.template
@@ -1,4 +1,4 @@
-type project
+type file
 id OpenTK.GLControl
 owners
     opentk thefiddler
@@ -20,4 +20,4 @@ summary
     A set of fast, low-level C# bindings for OpenGL, OpenGL ES and OpenAL.
 description
     The Open Toolkit is set of fast, low-level C# bindings for OpenGL, OpenGL ES and OpenAL. It runs on all major platforms and powers hundreds of apps, games and scientific research. 
-    OpenTK provides several utility libraries, including a math/linear algebra package, a windowing system, and input handling.
\ No newline at end of file
+    OpenTK provides several utility libraries, including a math/linear algebra package, a windowing system, and input handling.

diff --git a/src/OpenTK.GLWidget/paket.template b/src/OpenTK.GLWidget/paket.template
index 40cfaf7..fcfdfc2 100644 (file)
--- a/src/OpenTK.GLWidget/paket.template
+++ b/src/OpenTK.GLWidget/paket.template
@@ -1,4 +1,4 @@
-type project
+type file
 id OpenTK.GLWidget
 owners
     opentk thefiddler
@@ -20,4 +20,4 @@ summary
     A set of fast, low-level C# bindings for OpenGL, OpenGL ES and OpenAL.
 description
     The Open Toolkit is set of fast, low-level C# bindings for OpenGL, OpenGL ES and OpenAL. It runs on all major platforms and powers hundreds of apps, games and scientific research. 
-    OpenTK provides several utility libraries, including a math/linear algebra package, a windowing system, and input handling.
\ No newline at end of file
+    OpenTK provides several utility libraries, including a math/linear algebra package, a windowing system, and input handling.

diff --git a/src/OpenTK/OpenTK.Android.csproj.paket.template b/src/OpenTK/OpenTK.Android.csproj.paket.template
index f13e685..56e17be 100644 (file)
--- a/src/OpenTK/OpenTK.Android.csproj.paket.template
+++ b/src/OpenTK/OpenTK.Android.csproj.paket.template
@@ -1,4 +1,4 @@
-type project
+type file
 id OpenTK.Android
 owners
     opentk thefiddler

diff --git a/src/OpenTK/OpenTK.csproj.paket.template b/src/OpenTK/OpenTK.csproj.paket.template
index 1c31bf0..b60ca84 100644 (file)
--- a/src/OpenTK/OpenTK.csproj.paket.template
+++ b/src/OpenTK/OpenTK.csproj.paket.template
@@ -1,4 +1,4 @@
-type project
+type file
 id OpenTK
 owners
     opentk thefiddler
@@ -22,4 +22,4 @@ description
     The Open Toolkit is set of fast, low-level C# bindings for OpenGL, OpenGL ES and OpenAL. It runs on all major platforms and powers hundreds of apps, games and scientific research. 
     OpenTK provides several utility libraries, including a math/linear algebra package, a windowing system, and input handling.
 files
-    OpenTK.dll.config => content/
\ No newline at end of file
+    OpenTK.dll.config => content/

diff --git a/src/OpenTK/OpenTK.iOS.csproj.paket.template b/src/OpenTK/OpenTK.iOS.csproj.paket.template
index 13cbf14..1ae7613 100644 (file)
--- a/src/OpenTK/OpenTK.iOS.csproj.paket.template
+++ b/src/OpenTK/OpenTK.iOS.csproj.paket.template
@@ -1,4 +1,4 @@
-type project
+type file
 id OpenTK.iOS
 owners
     opentk thefiddler