From c2da706a36ca355509d9dc2abcffc1edc6c49fff Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 28 Jan 2014 23:00:28 +1100 Subject: Code cleanup: remove references to svn and code style --- build_files/cmake/cmake_consistency_check.py | 2 +- .../cmake/example_scripts/cmake_linux_install.sh | 32 ++++++++++++---------- 2 files changed, 19 insertions(+), 15 deletions(-) (limited to 'build_files/cmake') diff --git a/build_files/cmake/cmake_consistency_check.py b/build_files/cmake/cmake_consistency_check.py index 665bc600efa..c2044fcc21d 100755 --- a/build_files/cmake/cmake_consistency_check.py +++ b/build_files/cmake/cmake_consistency_check.py @@ -58,7 +58,7 @@ def replace_line(f, i, text, keep_indent=True): def source_list(path, filename_check=None): for dirpath, dirnames, filenames in os.walk(path): - # skip '.svn' + # skip '.git' if dirpath.startswith("."): continue 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 "" - -- cgit v1.2.3