mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

On Mac OS X, directly name the executable "unopkg"

Browse Source 
Change-Id: I5f846d7f7c5ed54179504f551e19227f7283bda2
This commit is contained in:
Stephan Bergmann 2015-02-09 18:06:48 +01:00
parent d51502c654
commit 57e6d742a9
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RepositoryFixes.mk
View File

@ -25,7 +25,7 @@ gb_Executable_FILENAMES := $(foreach group,$(gb_Executable_VALIDGROUPS),\
ifneq (,$(filter-out MACOSX WNT,$(OS)))
gb_Executable_FILENAMES := $(patsubst uno:uno,uno:uno.bin,$(gb_Executable_FILENAMES))
endif
gb_Executable_FILENAMES := $(patsubst unopkg_bin:unopkg_bin%,unopkg_bin:unopkg.bin,$(gb_Executable_FILENAMES))
gb_Executable_FILENAMES := $(patsubst unopkg_bin:unopkg_bin%,unopkg_bin:unopkg$(if $(filter-out MACOSX,$(OS)),.bin),$(gb_Executable_FILENAMES))
gb_Executable_FILENAMES := $(patsubst unopkg_com:unopkg_com%,unopkg_com:unopkg.com,$(gb_Executable_FILENAMES))
gb_Executable_FILENAMES := $(patsubst gengal:gengal,gengal:gengal.bin,$(gb_Executable_FILENAMES))

2
desktop/Package_scripts.mk
View File

@ -12,13 +12,13 @@ $(eval $(call gb_Package_Package,desktop_scripts_install,$(SRCDIR)/desktop/scrip
ifeq (,$(filter MACOSX WNT,$(OS)))
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/gdbtrace,gdbtrace))
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unopkg,unopkg.sh))
endif
ifneq ($(OS),WNT)
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unoinfo,$(if $(filter MACOSX,$(OS)),unoinfo-mac.sh,unoinfo.sh)))
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unopkg,unopkg.sh))
endif

13
scp2/source/ooo/common_brand.scp
View File

@ -86,9 +86,6 @@ 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
@ -532,16 +529,6 @@ 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;