From da85fba0156ab66aa8b6bbdb6d82ac69c4417dca Mon Sep 17 00:00:00 2001
From: luxsie <luxsie@163.com>
Date: Thu, 9 Apr 2015 02:02:54 +0800
Subject: [PATCH] Modify .travis.yml to enable Travis. Fix the master git repo
 name in Github, also the one in git-version-gen.cmd. Display Shell Export
 List to help debugging our Travis Build.

---
 .travis.yml                   | 11 ++++++++++-
 README.md                     |  2 +-
 Utilities/git-version-gen.cmd |  4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8fef9bddc8..2d8150cbd0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,8 @@ before_install:
     aria2c -x 16 http://www.cmake.org/files/v3.0/cmake-3.0.0-Linux-i386.sh &&
     chmod a+x cmake-3.0.0-Linux-i386.sh &&
     sudo ./cmake-3.0.0-Linux-i386.sh --skip-license --prefix=/usr;
+# Add coverall for C++ so coverity could be triggered. Even it should be --coverage and gcov.
+  - sudo pip install cpp-coveralls
 
 before_script:
  - git submodule update --init asmjit ffmpeg llvm
@@ -51,5 +53,12 @@ addons:
     build_command:   "make -j 4"
     branch_pattern: coverity_scan
 
+# These modifys are from https://github.com/devernay/cminpack/blob/master/.travis.yml
+# It passed but when coverall it failed.
 script:
- - if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then make -j 4; fi
+# Add a command to show all the variables now. maybe only useful for debugging travis.
+ - echo "--Shell Export Lists START--" ; export -p; echo "--Shell Export Lists STOP--"
+ - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then make -j 4; fi
+after_success:
+ - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then coveralls --extension .c --extension .cpp --extension .h; fi
+
diff --git a/README.md b/README.md
index 7d5516bbac..cbcc27e346 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 RPCS3
 =====
 
-[![Build Status](https://travis-ci.org/DHrpcs3/rpcs3.svg?branch=master)](https://travis-ci.org/DHrpcs3/rpcs3)
+[![Build Status](https://travis-ci.org/RPCS3/rpcs3.svg?branch=master)](https://travis-ci.org/RPCS3/rpcs3)
 
 <a href="https://scan.coverity.com/projects/3960">
   <img alt="Coverity Scan Build Status"
diff --git a/Utilities/git-version-gen.cmd b/Utilities/git-version-gen.cmd
index e55b6befc9..2852592086 100644
--- a/Utilities/git-version-gen.cmd
+++ b/Utilities/git-version-gen.cmd
@@ -13,7 +13,7 @@ rem // A copy of the GPL 2.0 should have been included with the program.
 rem // If not, see http://www.gnu.org/licenses/
 
 rem // Official git repository and contact information can be found at
-rem // https://github.com/DHrpcs3/rpcs3 and http://rpcs3.net/.
+rem // https://github.com/RPCS3/rpcs3 and http://rpcs3.net/.
 
 setlocal ENABLEDELAYEDEXPANSION
 
@@ -25,7 +25,7 @@ call %GIT% describe > NUL 2> NUL
 if errorlevel 1 (
 	echo Git not on path, trying default Msysgit paths
 	set GIT="%ProgramFiles(x86)%\Git\bin\git.exe"
-	call !GIT! describe > NUL 2> NUL
+	call %GIT% describe > NUL 2> NUL
 	if errorlevel 1 (
 		set GIT="%ProgramFiles%\Git\bin\git.exe"
 	)