diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-05 13:07:28 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-05 13:07:28 +0100 |
| commit | 167ff1e7318fca51409b8b486e5b011e2c9cd72f (patch) | |
| tree | 766534142b502a8c3c4c61137db97c7301e5116d /scp2 | |
| parent | 4404b718bdb547cb9b7b17c73a53574724cdeeb7 (diff) | |
Mac OS X: Add back into installset LibreOffice.app/Contents/MacOS/ files
...that were erroneously removed with 6492c8576e0393f7ee548cd938e84c80e8d37127
"Make the 'Mac-like' or 'canonical' app bundle structure always used on OS X":
* gengal script (ultimately calling gengal.bin); this script still needs
adaption to the new LibreOffice.app layout, though!
* python script (ultimately calling Python.app)
* unoinfo script
* unopkg symlink to unopkg.bin (which could be dropped for Mac by renaming
unopkg.bin to just unopkg, similarly to soffice/soffice.bin)
Change-Id: Ic3eb340a183388939b1c812faf7fb509c9f53a8a
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 15 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 2 | ||||
| -rw-r--r-- | scp2/source/python/file_python.scp | 2 |
3 files changed, 16 insertions, 3 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 01c072d65f08..a8669295b2f9 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -89,6 +89,9 @@ Module gid_Module_Root_Brand git_License_Odt, gid_Credits_Odt, gid_Apache_Notice); +#if defined MACOSX + Unixlinks = (gid_Brand_Unixlink_Unopkg); +#endif End // Language specific brand module @@ -514,7 +517,7 @@ File gid_Brand_File_Desktophelper_Txt End #endif -#if !defined MACOSX && !defined WNT +#if !defined WNT File gid_Brand_File_Bin_Unoinfo BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; @@ -532,6 +535,16 @@ File gid_Brand_File_Script_Unopkg End #endif +#if defined MACOSX +Unixlink gid_Brand_Unixlink_Unopkg + BIN_FILE_BODY; + Dir = gid_Brand_Dir_Program; + Name = "unopkg"; + Target = "unopkg.bin"; + Styles = (); +End +#endif + File gid_Brand_File_Bmp_IntroAboutShell TXT_FILE_BODY; Dir = FILELIST_DIR; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index ce9d533b00c8..86128d090956 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -122,7 +122,7 @@ File gid_File_Basic_Tutorials Name = "wizards_basicsrvtutorials.filelist"; End -#if defined UNX && !defined MACOSX +#if defined UNX File gid_File_Script_Gengal BIN_FILE_BODY; diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index e5bebefc5279..4ffee8f729fa 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -43,7 +43,7 @@ End #ifndef SYSTEM_PYTHON -#if !defined MACOSX && !defined WNT +#if !defined WNT File gid_File_Py_Bin_Python BIN_FILE_BODY; Name = "python_shell.filelist"; |