diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-01-28 16:00:28 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-01-28 16:01:22 +0400 |
commit | c2da706a36ca355509d9dc2abcffc1edc6c49fff (patch) | |
tree | 079e1fee7010538b22b61402b9e24a1e032c5cbf /build_files/cmake/example_scripts | |
parent | 59d1387c4154b4a285e8c53eca2128fbe59aeb54 (diff) |
Code cleanup: remove references to svn and code style
Diffstat (limited to 'build_files/cmake/example_scripts')
-rwxr-xr-x | build_files/cmake/example_scripts/cmake_linux_install.sh | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/build_files/cmake/example_scripts/cmake_linux_install.sh b/build_files/cmake/example_scripts/cmake_linux_install.sh index 504218f91a6..6ef50742c42 100755 --- a/build_files/cmake/example_scripts/cmake_linux_install.sh +++ b/build_files/cmake/example_scripts/cmake_linux_install.sh @@ -1,37 +1,41 @@ #!/bin/sh # This shell script checks out and compiles blender, tested on ubuntu 10.04 -# assumes you have dependancies installed alredy +# assumes you have dependencies installed already # See this page for more info: -# http://wiki.blender.org/index.php/Dev:2.5/Doc/Building_Blender/Linux/Generic_Distro/CMake +# http://wiki.blender.org/index.php/Dev:Doc/Building_Blender/Linux/Generic_Distro/CMake # grab blender -mkdir ~/blender-svn -cd ~/blender-svn -svn co https://svn.blender.org/svnroot/bf-blender/trunk/blender +mkdir ~/blender-git +cd ~/blender-git + +git clone http://git.blender.org/blender.git +cd blender +git submodule update --init --recursive +git submodule foreach git checkout master +git submodule foreach git pull --rebase origin master # create cmake dir -mkdir ~/blender-svn/build-cmake -cd ~/blender-svn/build-cmake +mkdir ~/blender-git/build-cmake +cd ~/blender-git/build-cmake # cmake without copying files for fast rebuilds -# the files from svn will be used in place +# the files from git will be used in place cmake ../blender # make blender, will take some time make # link the binary to blenders source directory to run quickly -ln -s ~/blender-svn/build-cmake/bin/blender ~/blender-svn/blender/blender.bin +ln -s ~/blender-git/build-cmake/bin/blender ~/blender-git/blender/blender.bin # useful info echo "" echo "* Useful Commands *" -echo " Run Blender: ~/blender-svn/blender/blender.bin" -echo " Update Blender: svn up ~/blender-svn/blender" -echo " Reconfigure Blender: cd ~/blender-svn/build-cmake ; cmake ." -echo " Build Blender: cd ~/blender-svn/build-cmake ; make" +echo " Run Blender: ~/blender-git/blender/blender.bin" +echo " Update Blender: git pull --rebase; git submodule foreach git pull --rebase origin master" +echo " Reconfigure Blender: cd ~/blender-git/build-cmake ; cmake ." +echo " Build Blender: cd ~/blender-git/build-cmake ; make" echo "" - |