From e694a32b03544eb1f50f49dc1eaf50f93c7c6abf Mon Sep 17 00:00:00 2001 From: Narendra Umate Date: Sat, 7 Sep 2013 15:19:02 -0700 Subject: [PATCH 1/5] Update .gitignore. Ignore vpc_crc and filters extensions. --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a5f72e0f..70cf512c 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,9 @@ ipch *.opensdf *.idb *.vcxproj -*.sln +*.sln +*.vpc_crc +*.filters # OSX/Linux build products *.mak From 28b6c2af5c76a8ae487b22352b9d5ecda98faabb Mon Sep 17 00:00:00 2001 From: Narendra Umate Date: Sat, 7 Sep 2013 16:50:43 -0700 Subject: [PATCH 2/5] Replacing CR/LFs with LFs in xcode_ccache_wrapper. Fixed error: can't exec '/Users/ardneran/Documents/Projects/GitHub/source-sdk-2013/*p/src/devtoo ls/bin/osx32/xcode_ccache_wrapper' (No such file or directory) Command /Users/ardneran/Documents/Projects/GitHub/source-sdk-2013/*p/src/devtool s/bin/osx32/xcode_ccache_wrapper failed with exit code 71 http://www.linuxquestions.org/questions/linux-general-1/bad-interpreter- no-such-file-or-directory-213617/#post1975207 perl -i -pe's/\r$//;' --- mp/src/devtools/bin/osx32/xcode_ccache_wrapper | 6 +++--- sp/src/devtools/bin/osx32/xcode_ccache_wrapper | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mp/src/devtools/bin/osx32/xcode_ccache_wrapper b/mp/src/devtools/bin/osx32/xcode_ccache_wrapper index 4f038475..475f508f 100755 --- a/mp/src/devtools/bin/osx32/xcode_ccache_wrapper +++ b/mp/src/devtools/bin/osx32/xcode_ccache_wrapper @@ -1,3 +1,3 @@ -#!/bin/bash - -exec $(dirname $0)/ccache "${DT_TOOLCHAIN_DIR}"/usr/bin/clang -Qunused-arguments "$@" +#!/bin/bash + +exec $(dirname $0)/ccache "${DT_TOOLCHAIN_DIR}"/usr/bin/clang -Qunused-arguments "$@" diff --git a/sp/src/devtools/bin/osx32/xcode_ccache_wrapper b/sp/src/devtools/bin/osx32/xcode_ccache_wrapper index 4f038475..475f508f 100755 --- a/sp/src/devtools/bin/osx32/xcode_ccache_wrapper +++ b/sp/src/devtools/bin/osx32/xcode_ccache_wrapper @@ -1,3 +1,3 @@ -#!/bin/bash - -exec $(dirname $0)/ccache "${DT_TOOLCHAIN_DIR}"/usr/bin/clang -Qunused-arguments "$@" +#!/bin/bash + +exec $(dirname $0)/ccache "${DT_TOOLCHAIN_DIR}"/usr/bin/clang -Qunused-arguments "$@" From 54fc005e7c01ececa5e1c49b787870c981d2364a Mon Sep 17 00:00:00 2001 From: Narendra Umate Date: Sun, 8 Sep 2013 10:49:13 -0700 Subject: [PATCH 3/5] Added xcode_ccache_wrapper as text to .gitattributes. This will hopefully prevent file turning into CRLF when someone next touches it. --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 8dcee243..15ab799b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,3 +9,4 @@ vpc_osx binary *.exe binary protoc binary ccache binary +xcode_ccache_wrapper text From 4459e7bb8b8519dac572d7892247d59c1a58006e Mon Sep 17 00:00:00 2001 From: Narendra Umate Date: Sun, 8 Sep 2013 13:31:18 -0700 Subject: [PATCH 4/5] Update .gitignore. Added a few extensions and ignore paths. --- .gitignore | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 70cf512c..c9b1a536 100644 --- a/.gitignore +++ b/.gitignore @@ -18,9 +18,10 @@ ipch *.opensdf *.idb *.vcxproj -*.sln -*.vpc_crc -*.filters +*.vcxproj.filters +*.sln +[Dd]ebug*/ +[Rr]elease*/ # OSX/Linux build products *.mak @@ -29,6 +30,7 @@ ipch obj*/ !devtools/*.mak !utils/smdlexp/smdlexp.mak +*_osx32* # Specific Source build products client.pdb @@ -50,6 +52,12 @@ client.dylib.dSYM/ server.dylib server.dylib.dSYM/ +*.vpc.sentinel +*.vpc_crc +**/generated_proto/** +**/src/utils/sapi51/** +**/game/**/bin/** + # files generated by running a mod config.cfg From cea71ff9ae22c48343b93ab49ea349ae44e62ca1 Mon Sep 17 00:00:00 2001 From: Narendra Umate Date: Mon, 2 Dec 2013 23:50:09 -0800 Subject: [PATCH 5/5] Added DS_Store to .gitignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c9b1a536..1f630780 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ ipch [Rr]elease*/ # OSX/Linux build products +*.DS_Store *.mak *.mak.vpc_crc *.xcodeproj/