Merge pull request #4 from SEDS/issue2

Partial completion of issue2

.gitignore

@@ -54,3 +54,9 @@ default.features
 .DS_Store
 *xcodeproj/
 *xcworkspace/
+
+program
+
+# Eclipse files
+.cdtproject
+.project

.travis.yml

@@ -1,13 +1,20 @@
-sudo: true
+sudo: false
 language: cpp
 
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+
+    packages:
+      - gcc-4.9
+      - g++-4.9
+
 os:
   - linux
-  - osx
 
 compiler:
-  - gcc
-  - clang
+  - gcc-4.9
 
 env:
   global:
@@ -17,26 +24,16 @@ env:
 
   matrix:
     - PIN_VERSION=pin-2.14-71313-gcc.4.4.7-linux CPP11=0
-    #- PIN_VERSION=pin-2.14-71313-gcc.4.4.7-linux CPP11=1
+    - PIN_VERSION=pin-2.14-71313-gcc.4.4.7-linux CPP11=1
 
 before_install:
-  # setup C++11 compiler support
-  - if [ "$CXX" == "g++" ] && [ "$CPP11" == "1" ] ; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
-  - if [ "$CXX" == "clang++" ] && [ "$CPP" == "1" ]; then sudo add-apt-repository -y ppa:h-rayflood/llvm; fi
-  - sudo apt-get update
-
   # setup required software
-  - git clone git://github.com/hilljh82/MPC.git /tmp/MPC
+  - git clone https://github.com/DOCGroup/MPC.git /tmp/MPC
   - wget http://software.intel.com/sites/landingpage/pintool/downloads/$PIN_VERSION.tar.gz -O /tmp/$PIN_VERSION.tar.gz
   - tar -xvf /tmp/$PIN_VERSION.tar.gz -C /tmp
   - export PIN_ROOT=/tmp/$PIN_VERSION
 
-install:
-  # C++11 compiler support
-  - if [ "$CXX" = "g++" ] && [ "$CPP11" == "1" ]; then sudo apt-get install g++-4.9 && export CXX="g++-4.9" && export CC="gcc-4.9" ; fi
-  - if [ "$CXX" == "clang++" ] && [ "$CPP11" == "1" ]; then sudo apt-get install --allow-unauthenticated clang-3.4 && export CXX="clang++-3.4" ; fi
-
 script:
-  - $CXX --version
+  - g++ --version
   - perl $MPC_ROOT/mwc.pl -type make -features cpp11=$CPP11,ia32=0,intel64=1 "pin++.mwc"
-  - make
+  - make CC=gcc-4.9 CXX=g++-4.9