From 338224c5763dc864a8107a9ad3baaea1931fda64 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sun, 19 Apr 2015 22:11:41 +0200 Subject: [PATCH 1/9] freecad dependencies for ubuntu - scripted --- ubuntu/install_freecad_dependencies | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 ubuntu/install_freecad_dependencies diff --git a/ubuntu/install_freecad_dependencies b/ubuntu/install_freecad_dependencies new file mode 100755 index 00000000..8d77b0d0 --- /dev/null +++ b/ubuntu/install_freecad_dependencies @@ -0,0 +1,9 @@ +#!/bin/sh +sudo apt-get install build-essential python libcoin80-dev libsoqt4-dev \ +libxerces-c2-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev \ +libboost-graph-dev libboost-iostreams-dev libboost-program-options-dev \ +libboost-serialization-dev libboost-signals-dev \ +libboost-regex-dev libboost-thread-dev \ +libqt4-dev qt4-dev-tools python2.7-dev liboce-foundation-dev liboce-modeling-dev liboce-ocaf-dev liboce-visualization-dev oce-draw libsoqt4-dev \ +libode-dev subversion cmake libeigen2-dev libsimage-dev python-qt4 \ +libtool autotools-dev automake bison flex gfortran libeigen3-dev libqtwebkit-dev git libpyside-dev pyside-tools libshiboken-dev From ce3e6fdf670c034b002d4c06a7da977fc8ca2224 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sun, 19 Apr 2015 22:18:26 +0200 Subject: [PATCH 2/9] freecad installer for ubuntu --- .../{install_freecad_dependencies => install_freecad} | 11 +++++++++++ 1 file changed, 11 insertions(+) rename ubuntu/{install_freecad_dependencies => install_freecad} (82%) diff --git a/ubuntu/install_freecad_dependencies b/ubuntu/install_freecad similarity index 82% rename from ubuntu/install_freecad_dependencies rename to ubuntu/install_freecad index 8d77b0d0..c9a10324 100755 --- a/ubuntu/install_freecad_dependencies +++ b/ubuntu/install_freecad @@ -1,4 +1,7 @@ #!/bin/sh +set -e +set -v + sudo apt-get install build-essential python libcoin80-dev libsoqt4-dev \ libxerces-c2-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev \ libboost-graph-dev libboost-iostreams-dev libboost-program-options-dev \ @@ -7,3 +10,11 @@ libboost-regex-dev libboost-thread-dev \ libqt4-dev qt4-dev-tools python2.7-dev liboce-foundation-dev liboce-modeling-dev liboce-ocaf-dev liboce-visualization-dev oce-draw libsoqt4-dev \ libode-dev subversion cmake libeigen2-dev libsimage-dev python-qt4 \ libtool autotools-dev automake bison flex gfortran libeigen3-dev libqtwebkit-dev git libpyside-dev pyside-tools libshiboken-dev + +git clone git@github.com:FreeCAD/FreeCAD_sf_master.git $HOME/dev/freecad + +cd $HOME/dev/freecad +cmake-gui . +cmake . +make -j2 + From 920f04a1ac1c5c05749da2f03e92c375b17d068d Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sun, 19 Apr 2015 22:29:12 +0200 Subject: [PATCH 3/9] add custom dependencies' ppa for freecad build --- ubuntu/install_freecad | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ubuntu/install_freecad b/ubuntu/install_freecad index c9a10324..b345ed8c 100755 --- a/ubuntu/install_freecad +++ b/ubuntu/install_freecad @@ -1,7 +1,8 @@ #!/bin/sh set -e set -v - +sudo add-apt-repository ppa:freecad-maintainers/freecad-daily +sudo apt-get update sudo apt-get install build-essential python libcoin80-dev libsoqt4-dev \ libxerces-c2-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev \ libboost-graph-dev libboost-iostreams-dev libboost-program-options-dev \ From 7902760ab243448b98442c7f87aae8961f32609e Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Mon, 20 Apr 2015 07:36:39 +0200 Subject: [PATCH 4/9] added a cmake-gui program to dependencies for freecad installer --- ubuntu/install_freecad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/install_freecad b/ubuntu/install_freecad index b345ed8c..98171391 100755 --- a/ubuntu/install_freecad +++ b/ubuntu/install_freecad @@ -10,7 +10,7 @@ libboost-serialization-dev libboost-signals-dev \ libboost-regex-dev libboost-thread-dev \ libqt4-dev qt4-dev-tools python2.7-dev liboce-foundation-dev liboce-modeling-dev liboce-ocaf-dev liboce-visualization-dev oce-draw libsoqt4-dev \ libode-dev subversion cmake libeigen2-dev libsimage-dev python-qt4 \ -libtool autotools-dev automake bison flex gfortran libeigen3-dev libqtwebkit-dev git libpyside-dev pyside-tools libshiboken-dev +libtool autotools-dev automake bison flex gfortran libeigen3-dev libqtwebkit-dev git libpyside-dev pyside-tools libshiboken-dev cmake-gui git clone git@github.com:FreeCAD/FreeCAD_sf_master.git $HOME/dev/freecad From 21e14a7c76d89a62363896b53b221c71bfc335af Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Mon, 20 Apr 2015 07:51:59 +0200 Subject: [PATCH 5/9] ubuntu freecad installer changed to use daily PPA instead of building from git --- ubuntu/install_freecad | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/ubuntu/install_freecad b/ubuntu/install_freecad index 98171391..81153d7d 100755 --- a/ubuntu/install_freecad +++ b/ubuntu/install_freecad @@ -3,19 +3,4 @@ set -e set -v sudo add-apt-repository ppa:freecad-maintainers/freecad-daily sudo apt-get update -sudo apt-get install build-essential python libcoin80-dev libsoqt4-dev \ -libxerces-c2-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev \ -libboost-graph-dev libboost-iostreams-dev libboost-program-options-dev \ -libboost-serialization-dev libboost-signals-dev \ -libboost-regex-dev libboost-thread-dev \ -libqt4-dev qt4-dev-tools python2.7-dev liboce-foundation-dev liboce-modeling-dev liboce-ocaf-dev liboce-visualization-dev oce-draw libsoqt4-dev \ -libode-dev subversion cmake libeigen2-dev libsimage-dev python-qt4 \ -libtool autotools-dev automake bison flex gfortran libeigen3-dev libqtwebkit-dev git libpyside-dev pyside-tools libshiboken-dev cmake-gui - -git clone git@github.com:FreeCAD/FreeCAD_sf_master.git $HOME/dev/freecad - -cd $HOME/dev/freecad -cmake-gui . -cmake . -make -j2 - +sudo aptitude install freecad From 825be6d69a33f6b3cd69338e9a7f19f09c3385c3 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Wed, 22 Apr 2015 10:59:00 +0200 Subject: [PATCH 6/9] use p4merge under windows, for mergetool only --- .gitconfig_includes.cygwin | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitconfig_includes.cygwin b/.gitconfig_includes.cygwin index e69de29b..cb3e6e39 100644 --- a/.gitconfig_includes.cygwin +++ b/.gitconfig_includes.cygwin @@ -0,0 +1,5 @@ +[mergetool "p4merge"] + cmd = 'C:/Program Files/Perforce/p4merge.exe' "$(cygpath -wla $BASE)" "$(cygpath -wla $LOCAL)" "$(cygpath -wla $REMOTE)" "$(cygpath -wla $MERGED)" + trustExitCode = false +[merge] + tool = p4merge From 0b08bbbc416203976efcd12bce1a786da0a8343d Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Mon, 27 Apr 2015 16:30:43 +0200 Subject: [PATCH 7/9] blame script added, to be used for wide local repo searches --- tools/blame | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 tools/blame diff --git a/tools/blame b/tools/blame new file mode 100755 index 00000000..b5d7edd8 --- /dev/null +++ b/tools/blame @@ -0,0 +1,3 @@ +#!/bin/bash +find -iname "*$1*" -exec echo \; -exec echo {} \; -exec git blame {} \; + From 024638bc23e6db129dcd7350529b1142499070f3 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Mon, 27 Apr 2015 16:30:58 +0200 Subject: [PATCH 8/9] section comments in .zshrc --- .zshrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.zshrc b/.zshrc index 1dcf0ecf..3e2d7069 100644 --- a/.zshrc +++ b/.zshrc @@ -33,6 +33,7 @@ prompt_dir() { prompt_segment blue black '%1~' } +# aliases if [[ `uname` == 'Darwin' ]]; then alias vim=/usr/local/Cellar/vim/7.4/bin/vim fi @@ -43,6 +44,7 @@ else alias tssh="torsocks ssh" fi +# env vars PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting export PATH=$HOME/tools:$PATH export PATH=/usr/local/heroku/bin:$PATH From b6d63c4b9628909a3c9414839a50dc47608525bb Mon Sep 17 00:00:00 2001 From: cyplo Date: Thu, 30 Apr 2015 22:29:17 +0200 Subject: [PATCH 9/9] properly pass down the DIR variable for ubuntu scripts --- common/configure_fresh_system | 1 + ubuntu/configure_fresh_system | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 78228421..52baa2c7 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -1,5 +1,6 @@ #!/bin/bash +set -e echo echo "configuring settings common among OSes" sudo true diff --git a/ubuntu/configure_fresh_system b/ubuntu/configure_fresh_system index 9461ce76..94637fec 100755 --- a/ubuntu/configure_fresh_system +++ b/ubuntu/configure_fresh_system @@ -5,5 +5,5 @@ sudo apt-get install -y meld whois zsh tmux vim atop aria2 curl pv pixz gajim to DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$DIR/../" -$DIR/common/configure_fresh_system +DIR="$DIR" $DIR/common/configure_fresh_system