Browse Source

../install/

Dave Schuyler 20 years ago
parent
commit
f92b90f80b
2 changed files with 20 additions and 11 deletions
  1. 6 11
      doc/SceneEditor/seForceGroup.py
  2. 14 0
      dtool/pptempl/Template.msvc.pp

+ 6 - 11
doc/SceneEditor/seForceGroup.py

@@ -34,16 +34,18 @@ class ForceGroup(DirectObject):
         del self.particleEffect
         del self.particleEffect
 
 
     def enable(self):
     def enable(self):
-        """enable(self)
-           Convenience function to enable all forces in force group"""
+        """
+        Convenience function to enable all forces in force group
+        """
         for i in range(self.node.getNumForces()):
         for i in range(self.node.getNumForces()):
             f = self.node.getForce(i)
             f = self.node.getForce(i)
             f.setActive(1)
             f.setActive(1)
         self.fEnabled = 1
         self.fEnabled = 1
 
 
     def disable(self):
     def disable(self):
-        """disable(self)
-           Convenience function to disable all forces in force group"""
+        """
+        Convenience function to disable all forces in force group
+        """
         for i in range(self.node.getNumForces()):
         for i in range(self.node.getNumForces()):
             f = self.node.getForce(i)
             f = self.node.getForce(i)
             f.setActive(0)
             f.setActive(0)
@@ -66,36 +68,29 @@ class ForceGroup(DirectObject):
 
 
     # Get/set
     # Get/set
     def getName(self):
     def getName(self):
-        """getName(self)"""
         return self.name
         return self.name
     def getNode(self):
     def getNode(self):
-        """getNode(self)"""
         return self.node
         return self.node
     def getNodePath(self):
     def getNodePath(self):
-        """getNodePath(self)"""
         return self.nodePath
         return self.nodePath
 
 
     # Utility functions 
     # Utility functions 
     def __getitem__(self, index):
     def __getitem__(self, index):
-        """__getItem__(self, index)"""
         numForces = self.node.getNumForces()
         numForces = self.node.getNumForces()
         if ((index < 0) or (index >= numForces)):
         if ((index < 0) or (index >= numForces)):
             raise IndexError
             raise IndexError
         return self.node.getForce(index)
         return self.node.getForce(index)
 
 
     def __len__(self):
     def __len__(self):
-        """__len__(self)"""
         return self.node.getNumForces()
         return self.node.getNumForces()
 
 
     def asList(self):
     def asList(self):
-        """asList(self)"""
         l = []
         l = []
         for i in range(self.node.getNumForces()):
         for i in range(self.node.getNumForces()):
             l.append(self.node.getForce(i))
             l.append(self.node.getForce(i))
         return l
         return l
 
 
     def printParams(self, file = sys.stdout, targ = 'self'):
     def printParams(self, file = sys.stdout, targ = 'self'):
-        """printParams(file, targ)"""
         i1="    "
         i1="    "
         i2=i1+i1
         i2=i1+i1
         file.write(i2+'# Force parameters\n')
         file.write(i2+'# Force parameters\n')

+ 14 - 0
dtool/pptempl/Template.msvc.pp

@@ -195,6 +195,20 @@
 // bison and flex (or copy from *.prebuilt if we don't have them).
 // bison and flex (or copy from *.prebuilt if we don't have them).
 #define bison_prebuilt $[patsubst %.yxx,%.h,$[yxx_so_sources] $[yxx_st_sources]] $[patsubst %.yxx,%.cxx,$[yxx_so_sources] $[yxx_st_sources]] $[patsubst %.lxx,%.cxx,$[lxx_so_sources] $[lxx_st_sources]]
 #define bison_prebuilt $[patsubst %.yxx,%.h,$[yxx_so_sources] $[yxx_st_sources]] $[patsubst %.yxx,%.cxx,$[yxx_so_sources] $[yxx_st_sources]] $[patsubst %.lxx,%.cxx,$[lxx_so_sources] $[lxx_st_sources]]
 
 
+// Rather than making a rule to generate each install directory later,
+// we create the directories now.  This reduces problems from
+// multiprocess builds.
+#mkdir $[sort \
+    $[if $[install_lib],$[install_lib_dir]] \
+    $[if $[install_bin] $[install_scripts],$[install_bin_dir]] \
+    $[if $[install_headers],$[install_headers_dir]] \
+    $[if $[install_parser_inc],$[install_parser_inc_dir]] \
+    $[if $[install_data],$[install_data_dir]] \
+    $[if $[install_config],$[install_config_dir]] \
+    $[if $[install_igatedb],$[install_igatedb_dir]] \
+    $[if $[install_py],$[install_py_dir] $[install_py_package_dir]] \
+    ]
+
 // Pre-compiled headers are one way to speed the compilation of many
 // Pre-compiled headers are one way to speed the compilation of many
 // C++ source files that include similar headers, but it turns out a
 // C++ source files that include similar headers, but it turns out a
 // more effective (and more portable) way is simply to compile all the
 // more effective (and more portable) way is simply to compile all the