Attempt using iojs first and then try ndoe

tbranyen · tbranyen · commit c179e2b133b4 · 2015-03-21T21:38:24.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -15,16 +15,22 @@ before_install:
   - nvm use $NODE_VERSION
   - if [ $TRAVIS_OS_NAME == "linux" ]; then
       sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;
-      sudo apt-get -qq update;
-      sudo apt-get -qq install gcc-4.8 g++-4.8 lcov;
-      sudo rm /usr/bin/gcov /usr/bin/g++;
-      sudo ln -s /usr/bin/gcov-4.8 /usr/bin/gcov;
-      sudo ln -s /usr/bin/g++-4.8 /usr/bin/g++;
-      export CC="gcc-4.8";
-      export CXX="g++-4.8";
+      sudo apt-get update;
+      sudo apt-get install gcc-4.9 g++-4.9 lcov;
+      sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 20;
+      sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.9 20;
+      sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-4.9 20;
+      sudo update-alternatives --config gcc;
+      sudo update-alternatives --config g++;
+      sudo update-alternatives --config gcov;
+      wget http://downloads.sourceforge.net/ltp/lcov-1.10.tar.gz;
+      tar xvfz lcov-1.10.tar.gz;
+      sudo cp -v lcov-1.10/bin/{lcov,genpng,gendesc,genhtml,geninfo} /usr/bin/;
+      sudo chmod 777 /usr/bin/lcov /usr/bin/genhtml /usr/bin/geninfo /usr/bin/genpng /usg/bin/gendesc;
+      rm -rf lcov-1.10.tar.gz lcov-1.10;
+      sudo mv -v `which gcov-4.8` `which gcov`;
       export GYP_DEFINES="coverage=1";
       export JOBS=4;
-      sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90;
     fi
   - BUILD_ONLY=true npm install
 # This is a random private key used purely for testing.
diff --git a/README.md b/README.md
@@ -31,8 +31,6 @@ NodeGit
   </tbody>
 </table>
 
-***NOTE: NodeGit currently does not work with [iojs on windows](https://github.com/rvagg/pangyp/issues/4)***
-
 **Stable: 0.3.3**
 
 ## Have a problem? Come chat with us! ##
@@ -63,6 +61,8 @@ dependencies.
 npm install nodegit
 ```
 
+**Note: NodeGit will only work on io.js Windows with [the iojs binary instead of node](https://github.com/rvagg/pangyp/issues/4).**
+
 If you encounter problems while installing, you should try the Building from
 source instructions below.
 
diff --git a/package.json b/package.json
@@ -84,12 +84,12 @@
   "scripts": {
     "lint": "jshint lib test/tests examples lifecycleScripts",
     "coveralls": "cat ./test/coverage/merged.lcov | coveralls",
-    "cppcov": "mkdir -p test/coverage/cpp && lcov --capture --directory build/Release/obj.target/nodegit/src --output-file test/coverage/cpp/lcov.info",
+    "cppcov": "mkdir -p test/coverage/cpp && lcov --gcov-tool $(which gcov) --capture --directory build/Release/obj.target/nodegit/src --output-file test/coverage/cpp/lcov.info",
     "mergecov": "lcov-result-merger 'test/**/*.info' 'test/coverage/merged.lcov' && genhtml test/coverage/merged.lcov --output-directory test/coverage/report",
     "cov": "npm run cppcov && npm run mergecov",
     "mocha": "mocha test/runner test/tests",
     "mochaDebug": "mocha --debug-brk test/runner test/tests",
-    "test": "npm run lint && node --expose-gc test",
+    "test": "npm run lint && iojs --expose-gc test || node --expose-gc test",
     "generateJson": "node generate/scripts/generateJson",
     "generateNativeCode": "node generate/scripts/generateNativeCode",
     "generateMissingTests": "node generate/scripts/generateMissingTests",
