[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30393] trunk/blender: - updated man page from --help output.

Campbell Barton ideasman42 at gmail.com
Thu Jul 15 21:58:23 CEST 2010


Revision: 30393
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30393
Author:   campbellbarton
Date:     2010-07-15 21:58:23 +0200 (Thu, 15 Jul 2010)

Log Message:
-----------
- updated man page from --help output.
- cmake now installs the man page.
- added cmake_linux_install.sh, shell script which downloads and builds blender.

Modified Paths:
--------------
    trunk/blender/doc/blender.1
    trunk/blender/doc/blender.1.py
    trunk/blender/source/creator/CMakeLists.txt

Added Paths:
-----------
    trunk/blender/build_files/cmake/example_scripts/
    trunk/blender/build_files/cmake/example_scripts/cmake_linux_install.sh

Property Changed:
----------------
    trunk/blender/doc/blender.1

Added: trunk/blender/build_files/cmake/example_scripts/cmake_linux_install.sh
===================================================================
--- trunk/blender/build_files/cmake/example_scripts/cmake_linux_install.sh	                        (rev 0)
+++ trunk/blender/build_files/cmake/example_scripts/cmake_linux_install.sh	2010-07-15 19:58:23 UTC (rev 30393)
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# This shell script checks out and compiles blender, tested on ubuntu 10.04
+# assumes you have dependancies installed alredy
+
+# See this page for more info:
+#  http://wiki.blender.org/index.php/Dev:2.5/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
+
+# create cmake dir
+mkdir ~/blender-svn/build-cmake
+cd ~/blender-svn/build-cmake
+
+# cmake without copying files for fast rebuilds
+# the files from svn will be used in place
+cmake ../blender -DWITH_INSTALL:BOOL=FALSE
+
+# 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
+
+# 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 ""
+
+

Modified: trunk/blender/doc/blender.1
===================================================================
(Binary files differ)


Property changes on: trunk/blender/doc/blender.1
___________________________________________________________________
Name: svn:mime-type
   - application/x-troff-man
   + text/htm

Modified: trunk/blender/doc/blender.1.py
===================================================================
--- trunk/blender/doc/blender.1.py	2010-07-15 19:49:03 UTC (rev 30392)
+++ trunk/blender/doc/blender.1.py	2010-07-15 19:58:23 UTC (rev 30393)
@@ -53,7 +53,7 @@
 
 date_string = datetime.date.fromtimestamp(time.time()).strftime("%B %d, %Y")
 
-filepath = os.path.splitext(__file__)[0] + ".1"
+filepath = os.path.splitext(__file__)[0]
 
 file = open(filepath, "w")
 
@@ -132,3 +132,5 @@
 <mester at uni-bremen.de> and updated by Cyril Brulebois
 <cyril.brulebois at enst-bretagne.fr> and Dan Eicher <dan at trollwerks.org>.
 ''')
+
+print("written:", filepath)

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2010-07-15 19:49:03 UTC (rev 30392)
+++ trunk/blender/source/creator/CMakeLists.txt	2010-07-15 19:58:23 UTC (rev 30393)
@@ -200,6 +200,10 @@
             DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps
         )
 		INSTALL(
+            FILES ${CMAKE_SOURCE_DIR}/doc/blender.1
+            DESTINATION ${CMAKE_INSTALL_PREFIX}/man
+        )
+		INSTALL(
             DIRECTORY ${CMAKE_SOURCE_DIR}/release/text/
             DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender
             PATTERN ".svn" EXCLUDE





More information about the Bf-blender-cvs mailing list