Merge pull request #703 from Nihlus/remove-bindings-from.git

Remove bindings from Git

.gitignore

@@ -376,12 +376,9 @@ nuget/*.nupkg
 release.cmd
 release.sh
 localpackages/
-paket-files
 *.orig
-.paket/paket.exe
 docs/content/license.md
 docs/content/release-notes.md
-.fake
 docs/tools/FSharp.Formatting.svclog
 
 # ===========
@@ -441,11 +438,9 @@ fabric.properties
 # ============
 
 #User Specific
-*.userprefs
 *.usertasks
 
 #Mono Project Files
-*.pidb
 *.resources
 test-results/
 
@@ -453,8 +448,6 @@ test-results/
 # Linux-specific
 # ================
 
-*~
-
 # temporary files which can be created if a process still has a handle open of a deleted file
 .fuse_hidden*
 
@@ -482,7 +475,6 @@ test-results/
 # ============
 
 # -*- mode: gitignore; -*-
-*~
 \#*\#
 /.emacs.desktop
 /.emacs.desktop.lock
@@ -542,6 +534,16 @@ Session.vim
 
 # Temporary
 .netrwhist
-*~
 # Auto-generated tag files
 tags
+
+# OpenTK Binding files
+.bindingsGenerated
+src/OpenTK/Graphics/ES11/ES11.cs
+src/OpenTK/Graphics/ES11/ES11Enums.cs
+src/OpenTK/Graphics/ES20/ES20.cs
+src/OpenTK/Graphics/ES20/ES20Enums.cs
+src/OpenTK/Graphics/OpenGL/GL.cs
+src/OpenTK/Graphics/OpenGL/GLEnums.cs
+src/OpenTK/Graphics/OpenGL4/GL4.cs
+src/OpenTK/Graphics/OpenGL4/GL4Enums.cs

README.md

@@ -5,7 +5,7 @@ OpenTK
 ### MAINTAINERS WANTED
 
 OpenTK is a large project, with a huge number of components. We're looking to add a more maintainers to the team.
-Email [@varon](https://github.com/varon) or message him in Gitter if you'd like to help out. 
+Email [@varon](https://github.com/varon) or message him in Gitter if you'd like to help out.
 
 [![Join the chat at https://gitter.im/opentk/opentk](https://badges.gitter.im/opentk/opentk.svg)](https://gitter.im/opentk/opentk?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
@@ -46,13 +46,11 @@ Instructions
 The simplest way to use OpenTK in your project is to install the [NuGet package](http://www.nuget.org/packages/OpenTK/).
 If you want to try out the latest development build from the `develop` branch, we also have a [MyGet feed](https://www.myget.org/F/opentk-develop/api/v3/index.json).
 
-Note what installing NuGet package will add reference to OpenTK.dll, but OpenTK.dll.config 
+Note what installing NuGet package will add reference to OpenTK.dll, but OpenTK.dll.config
-will not be copied to the project output directory automatically, so you need to add it to your project 
+will not be copied to the project output directory automatically, so you need to add it to your project
 and then enable the "Copy to Output Directory" option (as in step 3 below).
 
-To build OpenTK from source, simply double-click OpenTK.sln and build through your IDE.
+To build OpenTK from source, do the following once:
-
-Alternatively, open a command prompt and type:
 ```
 git clone https://github.com/opentk/opentk   # Download source code from git
 cd opentk                                    # Enter the source directory
@@ -60,6 +58,8 @@ cd opentk                                    # Enter the source directory
 ./build.sh                                   # Build on Mono (Linux / Mac OS X)
 ```
 
+After this is done at least once, you can build OpenTK normally through
+your IDE.
 
 News
 ====
@@ -220,7 +220,7 @@ Change signature:
 - GL.MultiDrawArrays (`out` -> `ref`)
 - GL.Amd.DeletePerfMonitors (`out` -> `ref`)
 
-Change signature (may cause crash): 
+Change signature (may cause crash):
 - GL.Apple.ObjectPurgeable (returns `AppleObjectPurgeable` instead of `IntPtr`)
 - GL.Ext.SeparableFilter2D
 - GL.Ibm.EdgeFlagPointerList (`bool[]` -> `bool*[]`)

build.fsx

@@ -11,6 +11,7 @@ open Fake.UserInputHelper
 open Fake.Testing
 open System
 open System.IO
+open System.Diagnostics
 
 // --------------------------------------------------------------------------------------
 // START TODO: Provide project-specific details below
@@ -78,7 +79,10 @@ let (|Fsproj|Csproj|Vbproj|) (projFileName:string) =
     | _                           -> failwith (sprintf "Project file %s not supported. Unknown project type." projFileName)
 
 
-let activeProjects =
+let buildProjects =
+    !! "src/Generator.*/**.csproj"
+
+let runtimeProjects =
     let xamarinFilter f =
         if isXamarinPlatform then
             f
@@ -89,8 +93,24 @@ let activeProjects =
 
     !! "src/**/*.??proj"
     ++ "tests/**/OpenTK.Tests*.fsproj"
+    -- "src/Generator.*/**.csproj"
     |> xamarinFilter
 
+let activeProjects =
+    Seq.concat [buildProjects; runtimeProjects]
+
+let generateBindings =
+    if not (File.Exists(".bindingsGenerated")) then
+        buildProjects
+            |> MSBuildRelease "" "Build"
+            |> ignore
+        let bindingProcess = new Process()
+        bindingProcess.StartInfo.FileName <- Path.Combine("src", "Generator.Bind", "bin", "Release", "Bind.exe")
+        bindingProcess.Start() |> ignore
+        bindingProcess.WaitForExit() |> ignore
+        File.Create(".bindingsGenerated").Close() |> ignore
+
+
 // Generate assembly info files with the right version & up-to-date information
 Target "AssemblyInfo" (fun _ ->
     let getAssemblyInfoAttributes (projectName:string) =
@@ -142,10 +162,18 @@ Target "Clean" (fun _ ->
     CleanDirs ["bin"; "temp"]
 )
 
+// --------------------------------------------------------------------------------------
+// Build generator projects, and generate bindings if neccesary
+Target "GenerateBindings" (fun _ ->
+    generateBindings
+    |> ignore
+)
+
 // --------------------------------------------------------------------------------------
 // Build library & test project
 
 Target "Build" (fun _ ->
+    generateBindings
     activeProjects
     |> MSBuildRelease "" "Build"
     |> ignore