diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-01 11:14:16 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-01 11:17:07 +0100 |
| commit | 055995086474821207313bacabe50bd9b9d7774c (patch) | |
| tree | 3a215e56acd75414a86c77b1321566219e1bd9d1 | |
| parent | f1f6f30bac305115fdf58fc4f2ecabaf236a519c (diff) | |
Made ooinstall more deterministic, fixed Mac OS X Python module dependencies.
| -rw-r--r-- | scp2/source/python/module_python.scp | 21 | ||||
| -rw-r--r-- | solenv/bin/make_installer.pl | 3 |
2 files changed, 23 insertions, 1 deletions
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp index d80bc1663a76..32f0dc8def4b 100644 --- a/scp2/source/python/module_python.scp +++ b/scp2/source/python/module_python.scp @@ -34,7 +34,28 @@ Module gid_Module_Optional_Pyuno MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON ); ParentID = gid_Module_Optional; Sortkey = "750"; + Dirs = (gid_Dir_PythonFramework, + gid_Dir_PythonFramework_Versions, + gid_Dir_PythonFramework_Versions_ver, + 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_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); + Unixlinks = (gid_Unixlink_Python_Headers, + gid_Unixlink_Python_Resources, + gid_Unixlink_Python_Versions_Current, + gid_Unixlink_Python_Versions_ver_Headers, + gid_Unixlink_Python_OOoPython, + gid_Unixlink_Python_bin_idle, + gid_Unixlink_Python_bin_pydoc, + gid_Unixlink_Python_bin_python_real, + gid_Unixlink_Python_bin_python, + gid_Unixlink_Python_bin_pythonconfig, + gid_Unixlink_Python_bin_pythonw_real, + gid_Unixlink_Python_bin_pythonw, + gid_Unixlink_Python_bin_smtpdpy, + gid_Unixlink_Python_libpython); Minimal = NO; Default = YES; Styles = ( ); diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index fd1df27ee834..10dac770fd63 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -1309,7 +1309,8 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) my $found_epm = 0; # shuffle array to reduce parallel packaging process in pool - installer::worker::shuffle_array($packages); + installer::worker::shuffle_array($packages) + unless $installer::globals::simple; # iterating over all packages for ( my $k = 0; $k <= $#{$packages}; $k++ ) |