This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new d058a7d Added graphics for macOS-Dev (LangPack and SDK)- part 2
d058a7d is described below
commit d058a7dd53c24cfc00fbe190ba9026fbfc4560d5
Author: mseidel <msei...@apache.org>
AuthorDate: Sat Jun 27 22:26:08 2020 +0200
Added graphics for macOS-Dev (LangPack and SDK)- part 2
(cherry picked from commit 27ce0da5ae362b54e560738dcc566636758b1650)
---
main/scp2/source/ooo/scpaction_ooo.scp | 12 +++++++-----
main/scp2/source/sdkoo/sdkoo.scp | 12 +++++++-----
main/setup_native/prj/d.lst | 6 +++++-
3 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/main/scp2/source/ooo/scpaction_ooo.scp
b/main/scp2/source/ooo/scpaction_ooo.scp
index 22e4b1e..6c1519b 100644
--- a/main/scp2/source/ooo/scpaction_ooo.scp
+++ b/main/scp2/source/ooo/scpaction_ooo.scp
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -320,6 +320,7 @@ ScpAction scp_Copy_Dmg_Background_Image
Copy = "osxdndinstall.png";
LangPackCopy = "osxdndinstall_lang.png";
DevCopy = "osxdndinstall_dev.png";
+ LangDevCopy = "osxdndinstall_lang_dev.png";
BetaCopy = "osxdndinstall_beta.png";
LangBetaCopy = "osxdndinstall_lang_beta.png";
Name = "background.png";
@@ -330,8 +331,9 @@ End
ScpAction scp_Copy_Ds_Store
Copy = "DS_Store";
- DevCopy = "DS_Store_Dev";
LangPackCopy = "DS_Store_Langpack";
+ DevCopy = "DS_Store_Dev";
+ LangDevCopy = "DS_Store_Langpack_Dev";
BetaCopy = "DS_Store_Beta";
LangBetaCopy = "DS_Store_Langpack_Beta";
PatchCopy = "DS_Store_Patch";
diff --git a/main/scp2/source/sdkoo/sdkoo.scp b/main/scp2/source/sdkoo/sdkoo.scp
index 98ae32d..88f4651 100644
--- a/main/scp2/source/sdkoo/sdkoo.scp
+++ b/main/scp2/source/sdkoo/sdkoo.scp
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -157,7 +157,7 @@ File gid_File_Zip_Odkcommon
End
#if (!defined(WNT) && !defined( MACOSX) )
-Directory gid_Dir_Lib_Sdk
+Directory gid_Dir_Lib_Sdk
Styles = (CREATE);
ParentID = gid_Dir_Basis_Sdk;
DosName = "lib";
@@ -218,6 +218,7 @@ End
#ifdef MACOSX
ScpAction scp_Copy_Dmg_Background_Image
Copy = "osxdndinstall_sdk.png";
+ DevCopy = "osxdndinstall_sdk_dev.png";
BetaCopy = "osxdndinstall_sdk_beta.png";
Name = "background.png";
UnixRights = 444;
@@ -227,6 +228,7 @@ End
ScpAction scp_Copy_Ds_Store
Copy = "DS_Store_SDK";
+ DevCopy = "DS_Store_SDK_Dev";
BetaCopy = "DS_Store_SDK_Beta";
Name = ".DS_Store";
UnixRights = 444;
diff --git a/main/setup_native/prj/d.lst b/main/setup_native/prj/d.lst
index 836aaa1..db39ac5 100644
--- a/main/setup_native/prj/d.lst
+++ b/main/setup_native/prj/d.lst
@@ -34,17 +34,21 @@ mkdir: %_DEST%\bin%_EXT%\osolsmf
..\source\mac\ooo\osxdndinstall.png %_DEST%\bin%_EXT%\osl\osxdndinstall.png
..\source\mac\ooo\osxdndinstall_lang.png
%_DEST%\bin%_EXT%\osl\osxdndinstall_lang.png
..\source\mac\ooo\osxdndinstall_dev.png
%_DEST%\bin%_EXT%\osl\osxdndinstall_dev.png
+..\source\mac\ooo\osxdndinstall_lang_dev.png
%_DEST%\bin%_EXT%\osl\osxdndinstall_lang_dev.png
..\source\mac\ooo\osxdndinstall_beta.png
%_DEST%\bin%_EXT%\osl\osxdndinstall_beta.png
..\source\mac\ooo\osxdndinstall_lang_beta.png
%_DEST%\bin%_EXT%\osl\osxdndinstall_lang_beta.png
..\source\mac\ooo\osxdndinstall_nologo.png
%_DEST%\bin%_EXT%\osl\osxdndinstall_nologo.png
..\source\mac\ooo\DS_Store %_DEST%\bin%_EXT%\osl\DS_Store
-..\source\mac\ooo\DS_Store_Beta %_DEST%\bin%_EXT%\osl\DS_Store_Beta
..\source\mac\ooo\DS_Store_Dev %_DEST%\bin%_EXT%\osl\DS_Store_Dev
+..\source\mac\ooo\DS_Store_Beta %_DEST%\bin%_EXT%\osl\DS_Store_Beta
..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin%_EXT%\osl\DS_Store_Langpack
+..\source\mac\ooo\DS_Store_Langpack_Dev
%_DEST%\bin%_EXT%\osl\DS_Store_Langpack_Dev
..\source\mac\ooo\DS_Store_Langpack_Beta
%_DEST%\bin%_EXT%\osl\DS_Store_Langpack_Beta
..\source\mac\sdk\DS_Store_SDK %_DEST%\bin%_EXT%\osl\DS_Store_SDK
+..\source\mac\sdk\DS_Store_SDK_Dev %_DEST%\bin%_EXT%\osl\DS_Store_SDK_Dev
..\source\mac\sdk\DS_Store_SDK_Beta %_DEST%\bin%_EXT%\osl\DS_Store_SDK_Beta
..\source\mac\sdk\osxdndinstall_sdk.png
%_DEST%\bin%_EXT%\osl\osxdndinstall_sdk.png
+..\source\mac\sdk\osxdndinstall_sdk_dev.png
%_DEST%\bin%_EXT%\osl\osxdndinstall_sdk_dev.png
..\source\mac\sdk\osxdndinstall_sdk_beta.png
%_DEST%\bin%_EXT%\osl\osxdndinstall_sdk_beta.png
..\source\java\openofficeorg_setup.gif %_DEST%\bin%_EXT%\osl\Setup.gif
..\source\java\javaversion.dat %_DEST%\bin%_EXT%\javaversion.dat
