diff options
| author | Jürgen Schmidt <jsc@apache.org> | 2014-02-27 14:54:22 +0000 |
|---|---|---|
| committer | Jürgen Schmidt <jsc@apache.org> | 2014-02-27 14:54:22 +0000 |
| commit | 28c209b62358e8ecce8c4063a84db8e377aa57f8 (patch) | |
| tree | fcf2ef80709260a647bd95fd7382b269e233f041 /scp2 | |
| parent | 9581d8a5a9de55f5fe6736ab1c9cea481bfcf2bc (diff) | |
#124311# merge from AOO410 branch
Notes
Notes:
ignore: aoo
Diffstat (limited to 'scp2')
| -rw-r--r--[-rwxr-xr-x] | scp2/source/ooo/scpaction_ooo.scp | 4 | ||||
| -rw-r--r-- | scp2/source/sdkoo/sdkoo.scp | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp index bb62a8f412e1..f923c542a24d 100755..100644 --- a/scp2/source/ooo/scpaction_ooo.scp +++ b/scp2/source/ooo/scpaction_ooo.scp @@ -319,6 +319,8 @@ End ScpAction scp_Copy_Dmg_Background_Image Copy = "osxdndinstall.png"; LangPackCopy = "osxdndinstall_lang.png"; + BetaCopy = "osxdndinstall_beta.png"; + LangBetaCopy = "osxdndinstall_lang_beta.png"; Name = "background.png"; UnixRights = 444; Styles = (FORCELANGUAGEPACK); @@ -329,6 +331,8 @@ ScpAction scp_Copy_Ds_Store Copy = "DS_Store"; DevCopy = "DS_Store_Dev"; LangPackCopy = "DS_Store_Langpack"; + BetaCopy = "DS_Store_Beta"; + LangBetaCopy = "DS_Store_Langpack_Beta"; PatchCopy = "DS_Store_Patch"; Name = ".DS_Store"; UnixRights = 444; diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp index 0fa752e0fc14..98ae32dcd434 100644 --- a/scp2/source/sdkoo/sdkoo.scp +++ b/scp2/source/sdkoo/sdkoo.scp @@ -60,7 +60,8 @@ End Directory gid_Dir_Basis_Sdk #if defined MACOSX ParentID = PREDEFINED_PROGDIR; - DosName = "OpenOffice_SDK"; +# DosName = "OpenOffice_SDK"; + DosName = "${PRODUCTDIRNAME}"; #else ParentID = gid_Dir_OpenOffice_Sdk; DosName = "sdk"; @@ -217,6 +218,7 @@ End #ifdef MACOSX ScpAction scp_Copy_Dmg_Background_Image Copy = "osxdndinstall_sdk.png"; + BetaCopy = "osxdndinstall_sdk_beta.png"; Name = "background.png"; UnixRights = 444; Styles = (); @@ -225,7 +227,7 @@ End ScpAction scp_Copy_Ds_Store Copy = "DS_Store_SDK"; -# PatchCopy = "DS_Store_Patch"; + BetaCopy = "DS_Store_SDK_Beta"; Name = ".DS_Store"; UnixRights = 444; Styles = (); |