moving build stuff to the scripts folder, npm install on Fabled proje…

…ct is part of the prebuild script which appveyor should run from the scripts folder

Pricer.nuspec

@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <id>@project@</id>
-    <version>@build.number@</version>
-    <authors>@authors@</authors>
-    <owners>@authors@</owners>
-    <summary>@summary@</summary>
-    <licenseUrl>https://github.com/hoonzis/Pricer/blob/master/LICENSE</licenseUrl>
-    <projectUrl>https://github.com/hoonzis/Pricer</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>@description@</description>
-    <releaseNotes>@releaseNotes@</releaseNotes>
-    <tags>Options Pricing</tags>
-    <dependencies>
-      <group>
-        <dependency id="MathNet.Numerics" version="3.8.0"/>
-      </group>
-    </dependencies>
-  </metadata>
-</package>
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>@project@</id>
+    <version>@build.number@</version>
+    <authors>@authors@</authors>
+    <owners>@authors@</owners>
+    <summary>@summary@</summary>
+    <licenseUrl>https://github.com/hoonzis/Pricer/blob/master/LICENSE</licenseUrl>
+    <projectUrl>https://github.com/hoonzis/Pricer</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>@description@</description>
+    <releaseNotes>@releaseNotes@</releaseNotes>
+    <tags>Options Pricing</tags>
+    <dependencies>
+      <group>
+        <dependency id="MathNet.Numerics" version="3.8.0"/>
+      </group>
+    </dependencies>
+  </metadata>
+</package>

Pricer.sln

@@ -16,7 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{310F10
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C0D7B58E-05A7-439C-8835-21E019CE7B16}"
 	ProjectSection(SolutionItems) = preProject
-		build.fsx = build.fsx
 		Pricer.nuspec = Pricer.nuspec
 	EndProjectSection
 EndProject
@@ -26,6 +25,12 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Pricer.Fabled", "Pricer.Fab
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Pricer", "Pricer\Pricer.fsproj", "{27CF805C-AA6B-4789-8AB7-0614E746CB14}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{CD4C8327-792A-4D32-999D-3F9D7A383BBE}"
+	ProjectSection(SolutionItems) = preProject
+		scripts\build.fsx = scripts\build.fsx
+		scripts\prebuild.cmd = scripts\prebuild.cmd
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

appveyor.yml

@@ -7,8 +7,6 @@ environment:
 install:
   # Get the latest stable version of Node.js or io.js
   - ps: Install-Product node $env:nodejs_version
-  # install modules
-  - npm install
 
 assembly_info:
   patch: true
@@ -18,7 +16,7 @@ assembly_info:
   assembly_informational_version: "{version}"
 
 before_build:
-  cmd: prebuild.cmd
+  cmd: scripts\prebuild.cmd
 
 build_script:
   cmd: fake.cmd CompilePricer

fake.cmd

@@ -1,4 +1,4 @@
 @echo off
 cls
 "tools\NuGet.exe" "Install" "FAKE" "-OutputDirectory" "tools" "-ExcludeVersion"
-"tools\FAKE\tools\Fake.exe" build.fsx %*
+"tools\FAKE\tools\Fake.exe" scripts\build.fsx %*

build.fsx → scripts/build.fsx

@@ -1,5 +1,5 @@
 // include Fake lib
-#r @"tools\FAKE\tools\FakeLib.dll"
+#r @"..\tools\FAKE\tools\FakeLib.dll"
 
 open Fake
 open Fake.AssemblyInfoFile

prebuild.cmd → scripts/prebuild.cmd

@@ -3,3 +3,6 @@
 cls
 ".paket\paket.bootstrapper.exe"
 ".paket\paket.exe" restore
+cd Pricer.Fabled
+npm install
+cd..