diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-08-15 08:39:49 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-08-15 08:56:59 +0300 |
| commit | 26cfc797fa0b1809cd0c01d5546ba97856bc8143 (patch) | |
| tree | 5626e26648dbde44f58b724ae02f414781d169c8 /scp2/source | |
| parent | 41f2ebfbaa9fb06f56530b4a330fc029df87ecfd (diff) | |
When ENABLE_MACOSX_MACLIKE_APP_STRUCTURE put only binaries in the MacOS dir
The new code signing is more strict and enforces bundle structure
harder, it seems.
When ENABLE_MACOSX_MACLIKE_APP_STRUCTURE bypass the unoinfo and python
shell scripts. If they actually are needed, will have to put them
somewhere under Resources.
Change-Id: I14a34936b78195746d2b88d25603952ce5309380
Diffstat (limited to 'scp2/source')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 2 | ||||
| -rw-r--r-- | scp2/source/python/file_python.scp | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 365fb7b57e67..935238ec7df5 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -560,12 +560,14 @@ File gid_Brand_File_Desktophelper_Txt End #endif +#if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE File gid_Brand_File_Bin_Unoinfo BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; Name = EXENAME(unoinfo); Styles = (PACKED); End +#endif #ifdef WNT File gid_Brand_File_Bin_Unopkgcom diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index b2595ce400fd..32b0d3624feb 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -42,6 +42,8 @@ File gid_File_Pyuno_Rdb End #ifndef SYSTEM_PYTHON + +#if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE File gid_File_Py_Bin_Python BIN_FILE_BODY; #ifdef WNT @@ -54,6 +56,7 @@ File gid_File_Py_Bin_Python Styles = (FILELIST, PACKED); #endif End +#endif #ifndef MACOSX Directory gid_Dir_Py_PythonCore |