Undo basis/brand split: moved Python from basis to brand.

The Windows-only code in pyuno/zipcore/python.cxx may still need fixing.

4 files changed, 16 insertions, 25 deletions

diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index cfef220e2703..be8cbe239f11 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -36,13 +36,13 @@ File gid_File_Lib_Pyuno
   #else
     Name = "pyuno.pyd";
   #endif
-    Dir = gid_Dir_Program;
+    Dir = gid_Brand_Dir_Program;
     Styles = (PACKED);
 End
 
 File gid_File_Lib_Pythonloader
     TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
+    Dir = gid_Brand_Dir_Program;
   #ifdef UNX
     Name = STRING(CONCAT2(pythonloader.uno,UNXSUFFIX));
   #else
@@ -53,28 +53,28 @@ End
 
 File gid_File_Py_Unohelper
     TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
+    Dir = gid_Brand_Dir_Program;
     Name = "unohelper.py";
     Styles = (PACKED);
 End
 
 File gid_File_Py_Officehelper
     TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
+    Dir = gid_Brand_Dir_Program;
     Name = "officehelper.py";
     Styles = (PACKED);
 End
 
 File gid_File_Py_Uno
     TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
+    Dir = gid_Brand_Dir_Program;
     Name = "uno.py";
     Styles = (PACKED);
 End
 
 File gid_File_Py_Pythonloader
     TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
+    Dir = gid_Brand_Dir_Program;
     Name = "pythonloader.py";
     Styles = (PACKED);
 End
@@ -82,7 +82,7 @@ End
 #ifndef SYSTEM_PYTHON
 File gid_File_Py_Python_Core
     TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
+    Dir = gid_Brand_Dir_Program;
   #ifdef MACOSX
     Name = "OOoPython.framework.zip";
     Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
@@ -96,7 +96,7 @@ End
 #ifndef MACOSX
 File gid_File_Py_Python_Bin
     BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
+    Dir = gid_Brand_Dir_Program;
     Name = "python.bin";
     Styles = (PACKED);
 End
@@ -126,14 +126,14 @@ End
 #ifndef MACOSX
 File gid_File_Lib_Python_So
     TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
+    Dir = gid_Brand_Dir_Program;
     Name = STRING(PY_FULL_DLL_NAME);
     Styles = (PACKED);
 End
 #ifdef UNX
 Shortcut gid_Shortcut_Lib_Python_So
     FileID = gid_File_Lib_Python_So;
-    Dir = gid_Dir_Program;
+    Dir = gid_Brand_Dir_Program;
     Name = STRING(CONCAT3(libpython,PYMAJMIN,UNXSUFFIX));
     Styles = (NETWORK,RELATIVE);
 End
@@ -141,7 +141,7 @@ End
 #else //MACOSX
 //directory entries solely to be able to create the symlinks
 Directory gid_Dir_PythonFramework
-    ParentID = gid_Dir_Program;
+    ParentID = gid_Brand_Dir_Program;
     HostName = "OOoPython.framework";
 End
 
@@ -287,15 +287,6 @@ Unixlink gid_Unixlink_Python_libpython
     Styles = ();
 End
 #endif //MACOSX
-
-#ifdef WNT
-File gid_File_Lib_Python_So_Brand // Fix for system-python-problem on windows
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = STRING(PY_FULL_DLL_NAME);
-    Styles = (PACKED);
-End
-#endif
 #endif
 
 #ifdef UNX
@@ -308,7 +299,7 @@ File gid_File_Pyuno
 #else
     Name = "pyuno.so";
 #endif
-    Dir = gid_Dir_Program;
+    Dir = gid_Brand_Dir_Program;
     Styles = (PACKED);
 End
 
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
index eef393917432..d80bc1663a76 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -34,7 +34,7 @@ Module gid_Module_Optional_Pyuno
     MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON );
     ParentID = gid_Module_Optional;
     Sortkey = "750";
-    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,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_Lib_Python_So_Brand,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
+    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,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);
     Minimal = NO;
     Default = YES;
     Styles = ( );
diff --git a/scp2/source/python/module_python_mailmerge.scp b/scp2/source/python/module_python_mailmerge.scp
index 53ed507acd08..222e33f83812 100644
--- a/scp2/source/python/module_python_mailmerge.scp
+++ b/scp2/source/python/module_python_mailmerge.scp
@@ -31,13 +31,13 @@
 #ifndef DISABLE_PYUNO
 File gid_File_Pymailmerge
     TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
+    Dir = gid_Brand_Dir_Program;
     Name = "mailmerge.py";
     Styles = (PACKED);
 End
 File gid_File_Pymailmerge_msgbox
     TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
+    Dir = gid_Brand_Dir_Program;
     Name = "msgbox.py";
     Styles = (PACKED);
 End
diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp
index e0ceceead612..46d515cd85a5 100644
--- a/scp2/source/python/profileitem_python.scp
+++ b/scp2/source/python/profileitem_python.scp
@@ -36,7 +36,7 @@ Profile gid_Profile_Pythonloader_Uno_Ini
   #else
     Name = "pythonloader.uno.ini";
   #endif
-    Dir = gid_Dir_Program;
+    Dir = gid_Brand_Dir_Program;
     Styles = (NETWORK);
 End