attempt to fix cross-platform with windows support

lamdu · Oct 5, 2018 · 3635e2f · 3635e2f
1 parent 07fe4e0
commit 3635e2f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/Setup.hs b/Setup.hs
@@ -11,11 +11,7 @@ import System.Directory
 import System.FilePath ((</>))
 
 nodeRelPath :: FilePath
-#ifdef mingw32_HOST_OS
 nodeRelPath = "bin/node.exe"
-#else
-nodeRelPath = "bin/node"
-#endif
 
 buildNode :: Verbosity -> IO ()
 buildNode verbosity =

diff --git a/build_node.sh b/build_node.sh
@@ -11,7 +11,7 @@ VER=$(version "$NODE_VERSION")
 if [[ $(version "v6.2.1") -le $VER && $VER -lt $(version "v8.0.0") ]]; then
     # According to http://node.green/ support of tail calls exists in these versions
     echo "Using existing system node $NODE_VERSION"
-    cp "$(which node)" bin/node
+    cp "$(which node)" bin/node.exe
 else
     echo "Building nodejs from source"
     # node not available or too old. Build from source.
@@ -20,5 +20,5 @@ else
     ./configure --prefix=/tmp
     make -j4
     cd ..
-    cp node/node bin/node
+    cp node/node bin/node.exe
 fi
diff --git a/nodejs-exec.cabal b/nodejs-exec.cabal
@@ -16,7 +16,6 @@ cabal-version:       >=1.10
 -- list all options and get a few harmless warnings :-(
 data-files:
   bin/node.exe
-  bin/node
 custom-setup
   setup-depends:
     base, Cabal, directory, filepath

diff --git a/src/System/NodeJS/Path.hs b/src/System/NodeJS/Path.hs
@@ -5,4 +5,4 @@ module System.NodeJS.Path
 import Paths_nodejs_exec (getDataFileName)
 
 path :: IO FilePath
-path = getDataFileName "bin/node"
+path = getDataFileName "bin/node.exe"