Match build.fsx to Makefile #7

.gitignore

@@ -1,3 +1,5 @@
 *.swp
 *.pyc
+paket.exe
 ftplugin/bin/
+packages/

README.mkd

@@ -60,9 +60,9 @@ build_commands = ['curl', 'make', 'mozroots', 'touch', 'unzip']
 
 1. Install [pathogen][pathogen] and [syntastic][syntastic]
 
-2. Run _install.cmd_ 
+2. Run _install.cmd_
 
-3. Currently you will most likely need to set g:fsharp_xbuild_path and g:fsharp_interactive_bin to approapriate values. 
+3. Currently you will most likely need to set g:fsharp_xbuild_path and g:fsharp_interactive_bin to appropriate values. 
 
 ####Syntastic
 

install.cmd

@@ -1,18 +1,18 @@
 @echo off
 
-pushd %~dp0
-
 IF EXIST packages\FAKE\tools\Fake.exe GOTO FAKEINSTALLED
 
-"..\lib\nuget\NuGet.exe" "install" "FAKE" "-OutputDirectory" "packages" "-ExcludeVersion" "-Prerelease"
-
-:FAKEINSTALLED
+paket.bootstrapper.exe
+if errorlevel 1 (
+  exit /b %errorlevel%
+)
 
-SET TARGET="All"
+paket.exe restore
+if errorlevel 1 (
+  exit /b %errorlevel%
+)
 
-IF NOT [%1]==[] (set TARGET="%1")
-
-"packages\FAKE\tools\Fake.exe" "build.fsx" "target=%TARGET%"
+:FAKEINSTALLED
 
-popd
+packages\FAKE\tools\FAKE.exe install.fsx %*
 

install.fsx

@@ -0,0 +1,53 @@
+// include Fake lib
+#r "packages/FAKE/tools/FakeLib.dll"
+open Fake
+open System
+open System.IO
+open System.Net
+open System.Text.RegularExpressions
+
+let homeVimPath =
+    if Environment.OSVersion.Platform = PlatformID.Unix || Environment.OSVersion.Platform = PlatformID.MacOSX then
+        Environment.GetEnvironmentVariable("HOME") @@ ".vim"
+    else Environment.ExpandEnvironmentVariables("%HOMEDRIVE%%HOMEPATH%") @@ "vimfiles"
+
+let vimInstallDir = homeVimPath @@ "bundle/fsharpbinding-vim"
+
+let vimBinDir = __SOURCE_DIRECTORY__ @@ "ftplugin/bin"
+let ftpluginDir = __SOURCE_DIRECTORY__ @@ "ftplugin"
+let autoloadDir = __SOURCE_DIRECTORY__ @@ "autoload"
+let syntaxDir = __SOURCE_DIRECTORY__ @@ "syntax"
+let ftdetectDir = __SOURCE_DIRECTORY__ @@ "ftdetect"
+let syntaxCheckersDir = __SOURCE_DIRECTORY__ @@ "syntax_checkers"
+
+let acArchive = "fsautocomplete.zip"
+let acVersion = "0.15.0"
+
+Target "FSharp.AutoComplete" (fun _ ->
+  CreateDir vimBinDir
+  use client = new WebClient()
+  tracefn "Downloading version %s of FSharp.AutoComplete" acVersion
+  client.DownloadFile(sprintf "https://github.com/fsharp/FSharp.AutoComplete/releases/download/%s/%s" acVersion acArchive, vimBinDir @@ acArchive)
+  tracefn "Download complete"
+  tracefn "Unzipping"
+  Unzip vimBinDir (vimBinDir @@ acArchive))
+
+Target "Install" (fun _ ->
+    DeleteDir vimInstallDir
+    CreateDir vimInstallDir
+    CopyDir (vimInstallDir @@ "ftplugin") ftpluginDir (fun _ -> true)
+    CopyDir (vimInstallDir @@ "autoload") autoloadDir (fun _ -> true)
+    CopyDir (vimInstallDir @@ "syntax") syntaxDir (fun _ -> true)
+    CopyDir (vimInstallDir @@ "syntax_checkers") syntaxCheckersDir (fun _ -> true)
+    CopyDir (vimInstallDir @@ "ftdetect") ftdetectDir (fun _ -> true))
+
+Target "Clean" (fun _ ->
+    CleanDirs [ vimBinDir; vimInstallDir ])
+
+Target "All" id
+
+"FSharp.AutoComplete"
+    ==> "Install"
+    ==> "All"
+
+RunTargetOrDefault "All"

install.sh

@@ -0,0 +1,16 @@
+if ! [ -e ./packages/FAKE/tools/Fake.exe ]
+then
+    mono paket.bootstrapper.exe
+    exit_code=$?
+    if [ $exit_code -ne 0 ]; then
+        exit $exit_code
+    fi
+
+    mono paket.exe restore
+    exit_code=$?
+    if [ $exit_code -ne 0 ]; then
+        exit $exit_code
+    fi
+fi
+
+mono packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO install.fsx 

paket.dependencies

@@ -0,0 +1,3 @@
+source https://nuget.org/api/v2
+
+nuget FAKE

paket.lock

@@ -0,0 +1,4 @@
+NUGET
+  remote: https://nuget.org/api/v2
+  specs:
+    FAKE (3.33.0)