[Bf-blender-cvs] [e56de9d] master: Remove SVN references

Campbell Barton noreply at git.blender.org
Tue Aug 5 21:47:13 CEST 2014


Commit: e56de9d9d55bd409832a22f533823f1954e85012
Author: Campbell Barton
Date:   Wed Aug 6 05:44:51 2014 +1000
Branches: master
https://developer.blender.org/rBe56de9d9d55bd409832a22f533823f1954e85012

Remove SVN references

===================================================================

M	build_files/cmake/buildinfo.cmake
M	build_files/cmake/cmake_netbeans_project.py
M	build_files/cmake/cmake_qtcreator_project.py
M	source/blender/blenloader/intern/versioning_legacy.c

===================================================================

diff --git a/build_files/cmake/buildinfo.cmake b/build_files/cmake/buildinfo.cmake
index 16564b3..fecd19c 100644
--- a/build_files/cmake/buildinfo.cmake
+++ b/build_files/cmake/buildinfo.cmake
@@ -137,7 +137,7 @@ if(WIN32)
 	execute_process(COMMAND cmd /c time /t OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif()
 
-# Write a file with the SVNVERSION define
+# Write a file with the BUILD_HASH define
 file(WRITE buildinfo.h.txt
 	"#define BUILD_HASH \"${MY_WC_HASH}\"\n"
 	"#define BUILD_COMMIT_TIMESTAMP ${MY_WC_COMMIT_TIMESTAMP}\n"
diff --git a/build_files/cmake/cmake_netbeans_project.py b/build_files/cmake/cmake_netbeans_project.py
index b2b1f06..fc6c64d 100755
--- a/build_files/cmake/cmake_netbeans_project.py
+++ b/build_files/cmake/cmake_netbeans_project.py
@@ -24,7 +24,7 @@
 
 """
 Example linux usage
- python3 ~/blenderSVN/blender/build_files/cmake/cmake_netbeans_project.py ~/blenderSVN/cmake
+ python3 ~/blender-git/blender/build_files/cmake/cmake_netbeans_project.py ~/blender-git/cmake
 
 Windows not supported so far
 """
@@ -67,7 +67,7 @@ def create_nb_project_main():
         if 0:
             PROJECT_NAME = "Blender"
         else:
-            # be tricky, get the project name from SVN if we can!
+            # be tricky, get the project name from git if we can!
             PROJECT_NAME = project_name_get()
 
         # --------------- NB spesific
diff --git a/build_files/cmake/cmake_qtcreator_project.py b/build_files/cmake/cmake_qtcreator_project.py
index 76f1efa..346f5ea 100755
--- a/build_files/cmake/cmake_qtcreator_project.py
+++ b/build_files/cmake/cmake_qtcreator_project.py
@@ -27,7 +27,7 @@ Example Win32 usage:
  c:\Python32\python.exe c:\blender_dev\blender\build_files\cmake\cmake_qtcreator_project.py c:\blender_dev\cmake_build
 
 example linux usage
- python .~/blenderSVN/blender/build_files/cmake/cmake_qtcreator_project.py ~/blenderSVN/cmake
+ python .~/blender-git/blender/build_files/cmake/cmake_qtcreator_project.py ~/blender-git/cmake
 """
 
 from project_info import (SIMPLE_PROJECTFILE,
@@ -133,7 +133,7 @@ def create_qtc_project_python():
     if 0:
         PROJECT_NAME = "Blender_Python"
     else:
-        # be tricky, get the project name from SVN if we can!
+        # be tricky, get the project name from git if we can!
         PROJECT_NAME = project_name_get() + "_Python"
 
     FILE_NAME = PROJECT_NAME.lower()
diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c
index b73e1fe..557cc14 100644
--- a/source/blender/blenloader/intern/versioning_legacy.c
+++ b/source/blender/blenloader/intern/versioning_legacy.c
@@ -2232,7 +2232,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main)
 			}
 
 			if (sce->r.mode & R_PANORAMA) {
-				/* all these checks to ensure saved files with svn version keep working... */
+				/* all these checks to ensure saved files between released versions keep working... */
 				if (sce->r.xsch < sce->r.ysch) {
 					Object *obc = blo_do_versions_newlibadr(fd, lib, sce->camera);
 					if (obc && obc->type == OB_CAMERA) {




More information about the Bf-blender-cvs mailing list