Merge pull request #27 from codingteam/feature/travis

Travis automatic builds.

Author: ForNeVeR

.travis.yml

@@ -0,0 +1,9 @@
+language: csharp
+mono: latest
+solution: Naggum.sln
+install:
+    - nuget restore Naggum.sln
+    - nuget install xunit.runner.console -Version 2.1.0 -OutputDirectory testrunner
+script:
+    - xbuild /p:Configuration=Release /p:TargetFrameworkVersion="v4.5" Naggum.sln
+    - mono ./testrunner/xunit.runner.console.2.1.0/tools/xunit.console.exe ./Naggum.Test/bin/Release/Naggum.Test.dll

Naggum.Test/CompilerTest.fs

@@ -1,5 +1,6 @@
 namespace Naggum.Test
 
+open System
 open System.Diagnostics
 open System.IO
 
@@ -12,14 +13,15 @@ type CompilerTest() =
     static let resultExtension = "result"
     static let executableExtension = "exe"
 
-    static let directory = @"..\..\..\tests"
+    static let directory = Path.Combine ("..", "..", "..", "tests")
     static let filenames = [@"comment"; @"test"]
 
     static member private RunTest testName =
         let basePath = Path.Combine(directory, testName)
         let testPath = Path.ChangeExtension(basePath, testExtension)
         let resultPath = Path.ChangeExtension(basePath, resultExtension)
-        let executablePath = Path.ChangeExtension(testName, executableExtension)
+        let executableName = Path.ChangeExtension (testName, executableExtension)
+        let executablePath = Path.Combine (Environment.CurrentDirectory, executableName)
 
         use stream = File.Open(testPath, FileMode.Open)
         Generator.compile stream testName executablePath []

Naggum.sln

@@ -25,6 +25,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution items", "Solution items", "{F85A1ACB-4A60-46A9-856D-92A3C9B97402}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		.travis.yml = .travis.yml
 		appveyor.yml = appveyor.yml
 		License.md = License.md
 		Readme.md = Readme.md

ngc/Generator.fs

@@ -28,15 +28,20 @@ let compileMethod context (generatorFactory : IGeneratorFactory) body (methodBui
 
     epilogue context ilGenerator
 
-let compile (source : Stream) (assemblyName : string) (fileName : string) (asmRefs:string list): unit =
-    let assemblyName = new AssemblyName(assemblyName)
-    let assemblyBuilder = AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.Save)
+let compile (source : Stream) (assemblyName : string) (filePath : string) (asmRefs:string list): unit =
+    let assemblyName = AssemblyName assemblyName
+    let path = Path.GetDirectoryName filePath
+    let assemblyPath = if path = "" then null else path
+    let fileName = Path.GetFileName filePath
+    let appDomain = AppDomain.CurrentDomain
+
+    let assemblyBuilder = appDomain.DefineDynamicAssembly (assemblyName, AssemblyBuilderAccess.Save, assemblyPath)
     Globals.ModuleBuilder <- assemblyBuilder.DefineDynamicModule(assemblyBuilder.GetName().Name, fileName)
     let typeBuilder = Globals.ModuleBuilder.DefineType("Program", TypeAttributes.Public ||| TypeAttributes.Class ||| TypeAttributes.BeforeFieldInit)
     let methodBuilder = typeBuilder.DefineMethod ("Main",
                                                   MethodAttributes.Public ||| MethodAttributes.Static,
                                                   typeof<Void>,
-                                                  Array.Empty ())
+                                                  [| |])
 
     let gf = new GeneratorFactory(typeBuilder, methodBuilder) :> IGeneratorFactory
     assemblyBuilder.SetEntryPoint methodBuilder