CVS: boost/tools/build/v2/tools python.jam,1.31,1.32

Update of /cvsroot/boost/boost/tools/build/v2/tools
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18356/tools/build/v2/tools

Modified Files:
        python.jam 
Log Message:
Added missing cygwin support.


Index: python.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/python.jam,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- python.jam  30 Aug 2006 20:56:26 -0000      1.31
+++ python.jam  31 Aug 2006 02:48:23 -0000      1.32
@@ -45,6 +45,8 @@
 # not in whatever project we were called by.
 .project = [ project.current ] ;
 
+.alias-defined = ;
+
 # Dynamic linker lib. Necessary to specify it explicitly 
 # on some platforms.
 lib dl ;  
@@ -95,6 +97,13 @@
         init-unix $(version) : $(root) : $(includes) : $(libraries) : 
$(cygwin-condition) ;
     }
     
+    if [ os.on-windows ] && ! $(.alias-defined)
+    {
+        .alias-defined = true ;
+        alias python_for_extensions : python ;
+    }
+    
+    
     project.pop-current ;
 }
 
@@ -164,18 +173,22 @@
             extra-libs-conditional += <toolset>gcc:<source>rt ;
         }
     }
-             
-    # On *nix, we don't want to link either Boost.Python or Python
-    # extensions to libpython, because the Python interpreter itself
-    # provides all those symbols. If we linked to libpython, we'd get
-    # duplicate symbols. So declare two targets -- one for building
-    # extensions and another embedding
-    alias python_for_extensions
-                 :  
-                 : $(condition)
-                 :
-                 : <include>$(includes) 
-                 ;
+    
+    if ! [ os.on-windows ]
+    {
+        # On *nix, we don't want to link either Boost.Python or Python
+        # extensions to libpython, because the Python interpreter itself
+        # provides all those symbols. If we linked to libpython, we'd get
+        # duplicate symbols. So declare two targets -- one for building
+        # extensions and another embedding
+        alias python_for_extensions
+                     :  
+                     : $(condition)
+                     :
+                     : <include>$(includes) 
+                     ;
+    }
+    
     
     # This should really be called python_for_embedding
     alias python
@@ -187,6 +200,7 @@
                    <find-shared-library>python$(version)
                  ;
     
+             
     # NOTES:
     # - V1 had logic to force intel to use gcc's runtime.
     #   Note sure why that was needed, with icc 8.0 extensions
@@ -265,7 +279,6 @@
       ;  
 }
 
-.alias-defined = ;
 rule init-nt ( version : root ? : includes ? : libraries ? : cygwin-condition 
? )
 {
 #    PYTHON_PROPERTIES =
@@ -392,12 +405,6 @@
           : $(properties)
           ;        
     }    
-    
-    if ! $(.alias-defined)
-    {
-        .alias-defined = true ;
-        alias python_for_extensions : python ;
-    }    
 }
 
 
@@ -407,13 +414,14 @@
 }
         
 type.register PYTHON_EXTENSION : : SHARED_LIB ;
+
 # We can't give "dll" suffix to PYTHON_EXTENSION, because
 # we would not know what "a.dll" is: python extenstion or
 # ordinary library. Therefore, we specify only suffixes
 # used for generation of targets.
 type.set-generated-target-suffix PYTHON_EXTENSION : : so ;
-type.set-generated-target-suffix PYTHON_EXTENSION : <os>NT : dll ;
-type.set-generated-target-suffix PYTHON_EXTENSION : <os>CYGWIN : so ;
+type.set-generated-target-suffix PYTHON_EXTENSION : <os>NT : pyd ;
+type.set-generated-target-suffix PYTHON_EXTENSION : <os>CYGWIN : dll ;
 
 # Unset 'lib' prefix for PYTHON_EXTENSION
 type.set-generated-target-prefix PYTHON_EXTENSION : : "" ;


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642