diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 10:52:07 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 10:52:07 +0000 |
| commit | 797b315b407ec7099ee370d582ab113e3f5ca545 (patch) | |
| tree | 68827606fa464ac5e82a6e6c2085ecb4bdef1e39 | |
| parent | 375f9b5c0895898b96d8863ed4125cb60aeb7bd1 (diff) | |
INTEGRATION: CWS aquabundle (1.2.28); FILE MERGED
2007/05/24 20:53:41 obr 1.2.28.1: #i73693# moved office directory structure up in the Mac OS X bundle and renamed program to MacOS
| -rw-r--r-- | instsetoo_native/macosx/application/PostInstall.applescript | 9 | ||||
| -rw-r--r-- | instsetoo_native/macosx/makefile.mk | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/instsetoo_native/macosx/application/PostInstall.applescript b/instsetoo_native/macosx/application/PostInstall.applescript index 0bd6ef187ebe..ef6abdb10696 100644 --- a/instsetoo_native/macosx/application/PostInstall.applescript +++ b/instsetoo_native/macosx/application/PostInstall.applescript @@ -4,9 +4,9 @@ * * $RCSfile: PostInstall.applescript,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: vg $ $Date: 2007-02-26 14:57:02 $ + * last change: $Author: ihi $ $Date: 2007-06-05 11:52:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -42,8 +42,7 @@ (*==== (global variables as get-functions) ====*) on getOOInstallPath() - -- return (((path to applications folder from system domain) as string) & "OpenOffice %PRODUCTVERSION.app:" & "Contents:MacOS:") - return (((path to me) as string) & "Contents:MacOS:") + return (((path to me) as string) & "Contents:") end getOOInstallPath on getOOResourcesPath() @@ -51,7 +50,7 @@ on getOOResourcesPath() end getOOResourcesPath on getOOProgramPath() - return (getOOInstallPath() & "program:") + return (getOOInstallPath() & "MacOS:") end getOOProgramPath -- OSXSystemFontPathList : {"/System/Library/Fonts/", "/Library/Fonts/"} diff --git a/instsetoo_native/macosx/makefile.mk b/instsetoo_native/macosx/makefile.mk index 0042196fa737..d2d15c74650a 100644 --- a/instsetoo_native/macosx/makefile.mk +++ b/instsetoo_native/macosx/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: vg $ $Date: 2007-02-26 14:56:38 $ +# last change: $Author: ihi $ $Date: 2007-06-05 11:51:39 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -66,8 +66,10 @@ ZIP1LIST = * .IF "$(GUIBASE)"!="aqua" CREATOR_TYPE=OOo2 +BUNDLEEXECUTABLE=droplet .ELSE CREATOR_TYPE=OOO2 +BUNDLEEXECUTABLE=soffice.bin .ENDIF # --- Targets -------------------------------------------------- @@ -94,7 +96,8 @@ $(CONTENTS)$/Resources$/Scripts$/%.scpt : application/%.applescript # Info.plist is just versioned and copied into the bundle $(CONTENTS)$/%.plist : application/%.plist - make_versioned.sh "$<" "$@" + make_versioned.sh "$<" "$(VERSIONED)/$<" + sed "s|\%BUNDLEEXECUTABLE|${BUNDLEEXECUTABLE}|g" "$(VERSIONED)/$<" > "$@" # The InfoPlist.strings file has to be in UTF-16, thus a back-and-forth conversion # is needed for versioning |