Merge pull request #60 from ImmortalPC/master

Add distcc cheatsheets and add git show
This commit is contained in:
Chris Lane 2013-09-01 10:44:20 -07:00
commit ddc99f339a
2 changed files with 30 additions and 1 deletions

29
cheatsheets/distcc Normal file
View file

@ -0,0 +1,29 @@
# INSTALL
# ==============================================================================
# Edit /etc/default/distcc and set theses vars
# STARTDISTCC="true"
# ALLOWEDNETS="127.0.0.1 192.168.1.0/24"# Your computer and local computers
# #LISTENER="127.0.0.1"# Comment it
# ZEROCONF="true"# Auto configuration
# REMEMBER 1:
# Start/Restart your distccd servers before using one of these commands.
# service distccd start
# REMEMBER 2:
# Do not forget to install on each machine DISTCC.
# No need to install libs ! Only main host need libs !
# USAGE
# ==============================================================================
# Run make with 4 thread (a cross network) in auto configuration.
# Note: for gcc, Replace CXX by CC and g++ by gcc
ZEROCONF='+zeroconf' make -j4 CXX='distcc g++'
# Run make with 4 thread (a cross network) in static configuration (2 ip)
# Note: for gcc, Replace CXX by CC and g++ by gcc
DISTCC_HOSTS='127.0.0.1 192.168.1.69' make -j4 CXX='distcc g++'
# Show hosts aviables
ZEROCONF='+zeroconf' distcc --show-hosts

View file

@ -24,4 +24,4 @@ git fetch upstream # Get branches
git branch -va # List local - remote branches
git checkout master # Checkout local master branch
git merge upstream/master # Merge remote into local repo
git show 83fb499 # Show what a commit did.