gbuild migration: pyuno module

Change-Id: I7f923a5622214f7540a789bcdd93bf6fd1d166db

3 files changed, 49 insertions, 16 deletions

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 359f9c6b7144..1de1e4b4e8bc 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -51,7 +51,6 @@ Module gid_Module_Root_Brand
     Files = (gid_Brand_File_Bin_Crashreport,
              gid_Brand_File_Bin_Crashreport_Script,
              gid_Brand_File_Bin_Crashreport_Com,
-             gid_Brand_File_Bin_Python,
              gid_Brand_File_Gdb_Trace,
              gid_Brand_File_Bin_Soffice,
              gid_Brand_File_Bin_Soffice_Bin,
@@ -1431,16 +1430,6 @@ ProfileItem gid_Brand_Profileitem_Setup_Install
 End
 #endif
 
-//TODO: This actually belongs into a module of its own:
-#if !defined DISABLE_PYUNO && !defined SYSTEM_PYTHON
-File gid_Brand_File_Bin_Python
-    BIN_FILE_BODY;
-    Name = EXENAME(pyuno/python);
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-End
-#endif
-
 File gid_License_Txt
   TXT_FILE_BODY;
 #if defined MACOSX
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index 194394dbc4f1..47ab5fecb93b 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -73,29 +73,59 @@ File gid_File_Py_Pythonloader
 End
 
 #ifndef SYSTEM_PYTHON
+File gid_File_Py_Bin_Python
+    BIN_FILE_BODY;
+    Name = EXENAME(pyuno/python);
+    Dir = gid_Brand_Dir_Program;
+    Styles = (PACKED);
+End
+
+#ifndef MACOSX
+Directory gid_Dir_Py_PythonCore
+    ParentID = gid_Brand_Dir_Program;
+    HostName = STRING(CONCAT2(python-core-,PYVERSION));
+End
+
+Directory gid_Dir_Py_PythonCore_Lib
+    ParentID = gid_Dir_Py_PythonCore;
+    HostName = "lib";
+End
+#endif
+
 File gid_File_Py_Python_Core
     TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
   #ifdef MACOSX
+    Dir = gid_Brand_Dir_Program;
     Name = "OOoPython.framework.zip";
     Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
   #else
+    Dir = gid_Dir_Py_PythonCore_Lib;
     Name = STRING(CONCAT3(python-core-,PYVERSION,.zip));
     Styles = (ARCHIVE);
   #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
index 6ee83450fe1f..0f15826b90ad 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -40,8 +40,22 @@ Module gid_Module_Optional_Pyuno
             gid_Dir_PythonFramework_Versions_ver_bin,
             gid_Dir_PythonFramework_Versions_ver_lib,
             gid_Dir_PythonFramework_Versions_ver_lib_pythonver,
-            gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config);
-    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So,gid_Shortcut_Lib_Python_So,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
+            gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config,
+            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,
+             gid_File_Py_Bin_Python,
+             gid_File_Py_Unohelper,
+             gid_File_Py_Uno,
+             gid_File_Py_Pythonloader,
+             gid_File_Py_Python_Core,
+             gid_File_Py_Python_Bin,
+             gid_File_Lib_Python_So,
+             gid_Shortcut_Lib_Python_So,
+             gid_File_Scripts_Python,
+             gid_File_Share_Registry_Pyuno_Xcd);
     Unixlinks = (gid_Unixlink_Python_Headers,
                  gid_Unixlink_Python_Resources,
                  gid_Unixlink_Python_Versions_Current,