[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10929] branches/2-44-stable/blender/ SConstruct: branches/2-44-stable

[Diego Borghetti (Plumiferos)]

Revision: 10929
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10929
Author:   bdiego
Date:     2007-06-14 18:36:05 +0200 (Thu, 14 Jun 2007)

Log Message:
-----------
branches/2-44-stable

Merge from trunk:
	revision 10705:10706
	revision 10717:10718

Skip .svn administrative directories

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10705
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10717

Modified Paths:
--------------
    branches/2-44-stable/blender/SConstruct

Modified: branches/2-44-stable/blender/SConstruct
===================================================================
--- branches/2-44-stable/blender/SConstruct	2007-06-14 15:26:40 UTC (rev 10928)
+++ branches/2-44-stable/blender/SConstruct	2007-06-14 16:36:05 UTC (rev 10929)
@@ -515,6 +515,8 @@
         for dp, dn, df in os.walk(bundle):
             if 'CVS' in dn:
                 dn.remove('CVS')
+            if '.svn' in dn:
+                dn.remove('.svn')
             dir=env['BF_INSTALLDIR']+dp[len(bundledir):]
             source=[dp+os.sep+f for f in df]
             blenderinstall.append(env.Install(dir=dir,source=source))
@@ -527,6 +529,8 @@
 for dp, dn, df in os.walk('bin/.blender'):
     if 'CVS' in dn:
         dn.remove('CVS')
+    if '.svn' in dn:
+        dn.remove('.svn')
     for f in df:
         dotblendlist.append(dp+os.sep+f)
         dottargetlist.append(env['BF_INSTALLDIR']+dp[3:]+os.sep+f)
@@ -542,6 +546,8 @@
 for dp, dn, df in os.walk(scriptpath):
     if 'CVS' in dn:
         dn.remove('CVS')
+    if '.svn' in dn:
+        dn.remove('.svn')
     dir=env['BF_INSTALLDIR']+'/.blender/scripts'+dp[len(scriptpath):]
     source=[dp+os.sep+f for f in df]
     scriptinstall.append(env.Install(dir=dir,source=source))
@@ -552,6 +558,8 @@
 for tp, tn, tf in os.walk('release/plugins'):
     if 'CVS' in tn:
         tn.remove('CVS')
+    if '.svn' in tn:
+        tn.remove('.svn')
     for f in tf:
         pluglist.append(tp+os.sep+f)
         plugtargetlist.append(env['BF_INSTALLDIR']+tp[7:]+os.sep+f)
@@ -566,6 +574,8 @@
 for tp, tn, tf in os.walk('release/text'):
     if 'CVS' in tn:
         tn.remove('CVS')
+    if '.svn' in tn:
+        tn.remove('.svn')
     for f in tf:
         textlist.append(tp+os.sep+f)