Skip to content

Commit

Permalink
updated packages and build script
Browse files Browse the repository at this point in the history
  • Loading branch information
@krauthaufen
krauthaufen committed Aug 1, 2019
1 parent b7e0343 commit 4504888
Show file tree
Hide file tree
Showing 25 changed files with 1,018 additions and 1,429 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ src/GLVM/*.dylib
~$*
/paket-files
.fake
/.paket/paket.exe
/.paket
/src/Demo/Examples/polygons.dgml
/src/Demo/Examples/tictactoe.dgml
/perfTest.exe
Expand Down
Binary file removed .paket/paket.bootstrapper.exe
View file
Binary file not shown.
9 changes: 3 additions & 6 deletions build.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
SETLOCAL
PUSHD %~dp0


.paket\paket.bootstrapper.exe
if errorlevel 1 (
exit /b %errorlevel%
IF NOT exist .paket\paket.exe (
dotnet tool install Paket --tool-path .paket
)

if NOT exist paket.lock (
Expand All @@ -18,8 +16,7 @@ if errorlevel 1 (
exit /b %errorlevel%
)

SET FSI_PATH=packages\build\FAKE\tools\Fake.exe
"%FSI_PATH%" "build.fsx" Dummy --fsiargs build.fsx --shadowcopyreferences+ %*
dotnet packages\build\fake-cli\tools\netcoreapp2.1\any\fake-cli.dll build %*



151 changes: 77 additions & 74 deletions build.fsx
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@

#r "paket: groupref Build //"
#load ".fake/build.fsx/intellisense.fsx"
#load @"paket-files/build/aardvark-platform/aardvark.fake/DefaultSetup.fsx"

open Fake
open System
open System.IO
open System.Diagnostics
open Aardvark.Fake
open Fake.AssemblyInfoFile

open Fake.Core
open Fake.Tools
open Fake.IO.Globbing.Operators

//do MSBuildDefaults <- { MSBuildDefaults with Verbosity = Some Minimal }
do Environment.CurrentDirectory <- __SOURCE_DIRECTORY__
Expand All @@ -19,91 +22,91 @@ do System.Diagnostics.Debugger.Launch() |> ignore



Target "CreateAssemblyInfos" (fun () ->
let projects = !!"src/**/*.fsproj" ++ "src/**/*.csproj"
//Target.create "CreateAssemblyInfos" (fun _ ->
// let projects = !!"src/**/*.fsproj" ++ "src/**/*.csproj"

let version = getGitTag()
let currentHash = Git.Information.getCurrentHash()
// let version = getGitTag()
// let currentHash = Git.Information.getCurrentHash()

for p in projects do
let dir = Path.GetDirectoryName(p)
let template = Path.Combine(dir, "paket.template")
if File.Exists template then
let create, infoFile =
match Path.GetExtension(p) with
| ".csproj" -> CreateCSharpAssemblyInfo, "AssemblyInfo.cs"
| _ -> CreateFSharpAssemblyInfo, "AssemblyInfo.fs"
// for p in projects do
// let dir = Path.GetDirectoryName(p)
// let template = Path.Combine(dir, "paket.template")
// if File.Exists template then
// let create, infoFile =
// match Path.GetExtension(p) with
// | ".csproj" -> CreateCSharpAssemblyInfo, "AssemblyInfo.cs"
// | _ -> CreateFSharpAssemblyInfo, "AssemblyInfo.fs"

let assDir = Path.Combine(dir, "Properties")
// let assDir = Path.Combine(dir, "Properties")

if not (Directory.Exists assDir) then
Directory.CreateDirectory assDir |> ignore
// if not (Directory.Exists assDir) then
// Directory.CreateDirectory assDir |> ignore

let ass = Path.Combine(assDir, infoFile)
// let ass = Path.Combine(assDir, infoFile)


let name = Path.GetFileNameWithoutExtension(p)


create ass [
Attribute.Title name
Attribute.Description "Aardvark Rendering"
Attribute.Version version
Attribute.Product "Aardvark.Rendering"
Attribute.FileVersion version
Attribute.Configuration (if Aardvark.Fake.Startup.config.debug then "Debug" else "Release")
Attribute.Metadata("githash", currentHash)
Attribute.Copyright "Aardvark Platform Team"
]
()
)

Target "SourceLink.Test" (fun _ ->
!! "bin/*.nupkg"
|> Seq.iter (fun nupkg ->
DotNetCli.RunCommand
(fun p -> { p with WorkingDir = __SOURCE_DIRECTORY__ @@ "src" @@ "Demo" @@ "SlimJim" } )
(sprintf "sourcelink test %s" nupkg)
)
)


Target "PerfTest" (fun () ->
let exeFile = "bin/Release/perfTest.exe"
let exeModified =
if File.Exists exeFile then FileInfo(exeFile).LastWriteTime
else DateTime.MinValue

let sourceModified = FileInfo("perfTest.fsx").LastWriteTime

if sourceModified > exeModified then
// let name = Path.GetFileNameWithoutExtension(p)


// create ass [
// Attribute.Title name
// Attribute.Description "Aardvark Rendering"
// Attribute.Version version
// Attribute.Product "Aardvark.Rendering"
// Attribute.FileVersion version
// Attribute.Configuration (if Aardvark.Fake.Startup.config.debug then "Debug" else "Release")
// Attribute.Metadata("githash", currentHash)
// Attribute.Copyright "Aardvark Platform Team"
// ]
// ()
//)

//Target.create "SourceLink.Test" (fun _ ->
// !! "bin/*.nupkg"
// |> Seq.iter (fun nupkg ->
// Fake.Core.
// (fun p -> { p with WorkingDir = __SOURCE_DIRECTORY__ @@ "src" @@ "Demo" @@ "SlimJim" } )
// (sprintf "sourcelink test %s" nupkg)
// )
//)


//Target.create "PerfTest" (fun _ ->
// let exeFile = "bin/Release/perfTest.exe"
// let exeModified =
// if File.Exists exeFile then FileInfo(exeFile).LastWriteTime
// else DateTime.MinValue

// let sourceModified = FileInfo("perfTest.fsx").LastWriteTime

// if sourceModified > exeModified then

let refs =
List.map (fun p -> Path.Combine(Environment.CurrentDirectory, p))
[@"packages\FSharp.Charting\lib\net40\FSharp.Charting.dll"; @"packages\build\FAKE\tools\FakeLib.dll"]
// let refs =
// List.map (fun p -> Path.Combine(Environment.CurrentDirectory, p))
// [@"packages\FSharp.Charting\lib\net40\FSharp.Charting.dll"; @"packages\build\FAKE\tools\FakeLib.dll"]

FscHelper.Compile
(
(refs |> List.map FscHelper.FscParam.Reference) @
[
FscHelper.FscParam.Out exeFile
FscHelper.FscParam.Target FscHelper.TargetType.Exe
]
)
["perfTest.fsx"]
// Fsc.Compile
// (
// (refs |> List.map FscHelper.FscParam.Reference) @
// [
// FscHelper.FscParam.Out exeFile
// FscHelper.FscParam.Target FscHelper.TargetType.Exe
// ]
// )
// ["perfTest.fsx"]

for r in refs do
let file = Path.GetFileName r
File.Copy(r, Path.Combine("bin", "Release", file), true)
// for r in refs do
// let file = Path.GetFileName r
// File.Copy(r, Path.Combine("bin", "Release", file), true)

else
tracefn "executable up-to-date"
)
// else
// tracefn "executable up-to-date"
//)

"CreatePackage" ==> "SourceLink.Test"
//"CreatePackage" ==> "SourceLink.Test"


"Restore" ==> "PerfTest"
//"Restore" ==> "PerfTest"


entry()
9 changes: 6 additions & 3 deletions build.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#!/bin/bash

mono .paket/paket.bootstrapper.exe
mono .paket/paket.exe restore --group Build
if [ ! -f .paket/paket ]; then
dotnet tool install Paket --tool-path .paket
fi

mono packages/build/FAKE/tools/FAKE.exe "build.fsx" Dummy --fsiargs build.fsx $@
./.paket/paket restore

dotnet packages/build/fake-cli/tools/netcoreapp2.1/any/fake-cli.dll build $@
26 changes: 12 additions & 14 deletions paket.dependencies
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
framework: netstandard2.0, net471, netcoreapp2.0
source https://api.nuget.org/v3/index.json

nuget FSharp.Core ~> 4.6.2
nuget FSharp.Core ~> 4.6.2

nuget Aardvark.Base.FSharp ~> 4.5.8
nuget Aardvark.Base.IO ~> 4.5.8
nuget Aardvark.Base.Incremental ~> 4.5.8
nuget Aardvark.Base.Runtime ~> 4.5.8
nuget Aardvark.Base.Essentials ~> 4.5.8
nuget Aardvark.Base.FSharp ~> 4.5.11
nuget Aardvark.Base.IO ~> 4.5.11
nuget Aardvark.Base.Incremental ~> 4.5.11
nuget Aardvark.Base.Runtime ~> 4.5.11
nuget Aardvark.Base.Essentials ~> 4.5.11

nuget FShade.Core ~> 4.3.8
nuget FShade ~> 4.3.8
nuget FShade.Debug ~> 4.3.8
nuget FShade.Core ~> 4.3.9
nuget FShade ~> 4.3.9
nuget FShade.Debug ~> 4.3.9

nuget Unofficial.OpenVR ~> 1.1.0
nuget Unofficial.Typography ~> 0.0.3
nuget Unofficial.Typography ~> 0.0.3
nuget CommonMark.NET ~> 0.15.1
nuget GLSLangSharp ~> 0.4.4
nuget GLSLangSharp ~> 0.4.4

nuget BruTile ~> 2.0.0-alpha1
nuget Unofficial.LibTessDotNet ~> 2.0.2
Expand Down Expand Up @@ -45,8 +45,6 @@ nuget SourceLink.Create.CommandLine copy_local: true ~> 2.8.2
clitool dotnet-sourcelink

group Build
framework: net45
content: none
source https://api.nuget.org/v3/index.json
github aardvark-platform/aardvark.fake:v4-temp
github aardvark-platform/aardvark.fake:v5
nuget FSharp.Data ~> 3.0.0

0 comments on commit 4504888

Please sign in to comment.