CWS-TOOLING: integrate CWS python26

2009-04-22 11:57:41 +0200 obo  r271091 : #i101079# mingw port (by tono)
2009-04-22 11:56:37 +0200 obo  r271090 : #i101079# mingw port (by tono)
2009-04-22 11:55:55 +0200 obo  r271089 : #i101079# mingw port (by tono)
2009-04-22 11:26:00 +0200 obo  r271084 : #i100492# Patch for FreeBSD (by maho)
2009-04-21 10:19:01 +0200 obo  r271020 : #i92413# make python buildable in Hamburg RE environment
2009-04-17 15:52:57 +0200 obo  r270952 : #i10000# fix for 4NT shell support
2009-04-17 15:16:39 +0200 hjs  r270951 : #i92413# - remove gcc warnings about new struct member. fetched fomr DEV300
2009-04-17 10:30:28 +0200 sb  r270927 : #i92413# adaptions for Solaris and/or bash
2009-04-16 00:36:32 +0200 jbu  r270861 : #i101080# patch for bash environment provided by tono
2009-04-15 13:50:01 +0200 rene  r270842 : #i100997# allow also python < 2.6 again
2009-03-12 14:23:32 +0100 rene  r269410 : cleanup: remove Python 2.3.4 - not referenced anymore
2009-03-11 21:48:58 +0100 jbu  r269356 : native python modules pyuno.dll -> pyuno.pyd (required by 2.6 python runtime)
2009-03-11 11:11:43 +0100 rene  r269307 : fix typo; regen configure
2009-03-10 11:44:54 +0100 rene  r269262 : update _AM_PYTHON_INTERPRETER_LIST
2009-03-10 00:30:09 +0100 jbu  r269233 : python26 now builds on windows (installation set not built yet)
2009-03-06 21:45:20 +0100 jbu  r269050 : python 2.6.1-linuxx86: PYTHONHOME variable removed from set_soenv.in (is now unecessary), added new and removed old python blob, linux x86 builds without patches, windows build still needs to be done and is now broken
2009-03-06 14:08:33 +0100 rene  r269004 : #i92413#

4 files changed, 5 insertions, 8 deletions

diff --git a/aclocal.m4 b/aclocal.m4
index 2a954fbba32e..680f52ac3929 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -118,7 +118,7 @@ AC_DEFUN([AM_PATH_PYTHON],
   dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
   dnl in 1.5.
   m4_define([_AM_PYTHON_INTERPRETER_LIST],
-            [python python2 python2.4 python2.3 python2.2 dnl
+            [python python2 python2.6 python2.5 python2.4 python2.3 python2.2 dnl
 python2.1 python2.0 python1.6 python1.5])
 
   m4_if([$1],[],[
diff --git a/configure b/configure
index fe88d7f8b789..f0ac63c6c9eb 100755
--- a/configure
+++ b/configure
@@ -15080,7 +15080,7 @@ if test "${am_cv_pathless_PYTHON+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
-	for am_cv_pathless_PYTHON in python python2 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
+	for am_cv_pathless_PYTHON in python python2 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
 	  test "$am_cv_pathless_PYTHON" = none && break
 	  prog="import sys, string
 # split strings by '.' and convert to numeric.  Append some zeros
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index 892a1dd76bb6..403e6385dcfd 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -35,7 +35,7 @@ File gid_File_Lib_Pyuno
   #ifdef UNX
     Name = STRING(CONCAT2(libpyuno,UNXSUFFIX));
   #else
-    Name = "pyuno.dll";
+    Name = "pyuno.pyd";
   #endif
     Dir = gid_Dir_Program;
     Styles = (PACKED);
diff --git a/set_soenv.in b/set_soenv.in
index 70dab1f20307..48c4bca13705 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -90,7 +90,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $SHELL,
      $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
      $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB,
 	 $PROEXT,
-     $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA, $EPM_FLAGS);
+     $SYSTEM_PYTHON, $PYTHONPATH, $SYSTEM_MOZILLA, $EPM_FLAGS);
 #
 #-------------------------------------------
 # IId. Declaring the aliases.
@@ -1516,11 +1516,9 @@ else
 
 if ($SYSTEM_PYTHON eq "NO") {
     $PYTHONPATH           = '.'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$ds.'lib-dynload'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'pyuno'.$wps.$SOLARVER.$ds.$INPATH.$ds.'bin'.$ds.'pyuno';
-    $PYTHONHOME           = $SOLARVER.$ds.$INPATH;
     if ($GUIBASE eq "WIN") {
-        # PYTHONPATH and PYTHONHOME need to use '\' directory seperators;
+        # PYTHONPATH need to use '\' directory seperators;
         $PYTHONPATH = WinPath( $PYTHONPATH, ";" );
-        $PYTHONHOME = WinPath( $PYTHONHOME, ";" );
     }
 }
 
@@ -1990,7 +1988,6 @@ ToFile( "ZIPDEP",        $perlpre."zipdep.pl",      "e" );
 ToFile( "USE_SHELL",             '@USE_SHELL@',     "e" );
 if ($SYSTEM_PYTHON eq "NO") {
     ToFile( "PYTHONPATH",        $PYTHONPATH,        "e" );
-    ToFile( "PYTHONHOME",        $PYTHONHOME,        "e" );
 }
 
 #