Re: [GERRIT] gbuild migration: pyuno module

On 06/12/2012 03:07 PM, Stephan Bergmann wrote:
> On 06/11/2012 12:17 AM, David Ostrovsky wrote:
> > Still have to test it on Windows and ask somebody to test it in MacosX.
>
> Quick update: Attached windows.patch allowed me to at least build
> <https://gerrit.libreoffice.org/#/c/179/11> on Windows (on top of recent
> master). "Tools - Macros - Organize Macros - Python... - LOdev Macros -
> HelloWord - HelloWOrdPython - Run" within Writer works, but executing
> ...\program\python.exe does nothing.

...and with the attached additional windows2.patch, now also 
.../program/python -c 'import uno' works.

Stephan

diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
old mode 100644
new mode 100755
index 892941c..47ab5fe
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -84,12 +84,12 @@ End
 Directory gid_Dir_Py_PythonCore
     ParentID = gid_Brand_Dir_Program;
     HostName = STRING(CONCAT2(python-core-,PYVERSION));
-END
+End
 
 Directory gid_Dir_Py_PythonCore_Lib
     ParentID = gid_Dir_Py_PythonCore;
     HostName = "lib";
-END
+End
 #endif
 
 File gid_File_Py_Python_Core
@@ -105,17 +105,27 @@ File gid_File_Py_Python_Core
   #endif
 End
 
-#ifdef UNX
+#ifdef WNT
+Directory gid_Dir_Py_PythonCore_Bin
+    ParentID = gid_Dir_Py_PythonCore;
+    HostName = "bin";
+End
+#endif
+
 #ifndef MACOSX
 File gid_File_Py_Python_Bin
     BIN_FILE_BODY;
+#ifdef UNX
     Dir = gid_Brand_Dir_Program;
     Name = "python.bin";
+#else
+    Dir = gid_Dir_Py_PythonCore_Bin;
+    Name = EXENAME(python);
+#endif
     Styles = (PACKED);
 End
 #endif
 #endif
-#endif
 
 //Scripting Framework Python example scripts
 
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
old mode 100644
new mode 100755
index a1872dc..0f15826
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -41,7 +41,8 @@ Module gid_Module_Optional_Pyuno
             gid_Dir_PythonFramework_Versions_ver_lib,
             gid_Dir_PythonFramework_Versions_ver_lib_pythonver,
             gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config,
-            gid_Dir_Py_PythonCore, gid_Dir_Py_PythonCore_Lib);
+            gid_Dir_Py_PythonCore, gid_Dir_Py_PythonCore_Bin,
+            gid_Dir_Py_PythonCore_Lib);
     Files = (gid_File_Pyuno,
              gid_File_Lib_Pyuno,
              gid_File_Lib_Pythonloader,