INTEGRATION: CWS jsc21 (1.6.20); FILE MERGED

2008/07/04 06:46:23 jsc 1.6.20.2: #i88797# rework optional SDK
2008/04/28 09:29:08 jsc 1.6.20.1: #88797# integrate sdk as optional office module

1 files changed, 74 insertions, 24 deletions

diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index cbd264722a4d..49f9734fa726 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: sdkoo.scp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,7 +30,7 @@
 
 #include "macros.inc"
 
-Installation gid_Installation
+Installation gid_Installation_Sdk
     ProductName = "${PRODUCTNAME}";
     ProductVersion = "${PRODUCTVERSION}";
     ProductExtension = "${PRODUCTEXTENSION}";
@@ -47,25 +47,86 @@ DataCarrier gid_Datacarrier
     DiskNo = 1;
 End
 
-Directory gid_Dir_Share
-    ParentID = PD_PROGDIR;
+#ifndef MACOSX
+
+#ifndef WNT
+Directory gid_Dir_Ooo_Openofficeorg_Sdk
+    ParentID = PREDEFINED_PROGDIR;
+  #ifdef WNT
+    HostName = "${BASISROOTNAME}";
+  #else
+    HostName = "${UNIXBASISROOTNAME}";
+  #endif
+End
+#endif
+
+#ifndef WNT
+Directory gid_Dir_Ooo_Basis_Sdk
+    ParentID = gid_Dir_Ooo_Openofficeorg_Sdk;
+  #ifdef WNT
+    HostName = "Basis ${OOOBASEVERSION}";
+  #else
+    HostName = "basis${OOOBASEVERSION}";
+  #endif
+    Styles = (BASISDIRECTORY);
+End
+#endif
+
+#endif
+
+Directory gid_Dir_Basis_Sdk
+#if defined MACOSX
+    ParentID = PREDEFINED_PROGDIR;
+    DosName = "OpenOffice.org${OOOBASEVERSION}_SDK";
+#else
+  #if defined WNT
+    ParentID = PREDEFINED_PROGDIR;
+  #else
+    ParentID = gid_Dir_Ooo_Basis_Sdk;
+  #endif
+    DosName = "sdk";
+#endif
+End
+
+
+#if defined MACOSX
+ScpAction scp_Copy_License_Html_Sdk
+    README_TXT_ALL_LANG(Copy, LICENSE, html);
+    README_TXT_ALL_LANG(Name, LICENSE, html);
+    Styles = (SCPZIP_REPLACE);
+    Subdir = "LICENSEs";
+End
+
+ScpAction scp_Copy_License_Txt_Sdk
+    README_ALL_LANG(Copy, LICENSE);
+    README_ALL_LANG(Name, LICENSE);
+    Styles = (SCPZIP_REPLACE);
+    Subdir = "LICENSEs";
+End
+#endif
+
+
+Directory gid_Dir_Share_Sdk
+    ParentID = gid_Dir_Basis_Sdk;
     DosName = "share";
 End
 
-Directory gid_Dir_Share_Readme
-    ParentID = gid_Dir_Share;
+Directory gid_Dir_Share_Readme_Sdk
+    ParentID = gid_Dir_Share_Sdk;
     DosName = "readme";
 End
 
+
 Module gid_Module_Root
     Name = "sdkoo";
     Description = "sdkoo";
     PackageInfo = "packinfo_sdkoo.txt";
 End
 
+
 File gid_File_Txt_License
     TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Readme;
+    Dir = gid_Dir_Share_Readme_Sdk;
   #ifdef UNX
     Name = "LICENSE_en-US";
   #endif
@@ -77,7 +138,7 @@ End
 
 File gid_File_Txt_License_Html
     TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Readme;
+    Dir = gid_Dir_Share_Readme_Sdk;
   #ifdef UNX
     Name = "LICENSE_en-US.html";
   #endif
@@ -89,7 +150,7 @@ End
 
 File gid_File_Txt_Readme
     TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Readme;
+    Dir = gid_Dir_Share_Readme_Sdk;
   #ifdef UNX
     Name = "README_en-US";
   #endif
@@ -101,7 +162,7 @@ End
 
 File gid_File_Txt_Readme_Html
     TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Readme;
+    Dir = gid_Dir_Share_Readme_Sdk;
   #ifdef UNX
     Name = "README_en-US.html";
   #endif
@@ -111,30 +172,19 @@ File gid_File_Txt_Readme_Html
     Styles = (PACKED, SCPZIP_REPLACE);
 End
 
-File gid_File_Zip_Sdk_Oo
-    TXT_FILE_BODY;
-    Dir = PREDEFINED_PROGDIR;
-    Name = "sdk_oo.zip";
-    Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
-End
 
 File gid_File_Zip_Odkexamples
     TXT_FILE_BODY;
-    Dir = PREDEFINED_PROGDIR;
+    Dir = gid_Dir_Basis_Sdk;
     Name = "odkexamples.zip";
     Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
 End
 
-File gid_File_Zip_Odkidl
-    TXT_FILE_BODY;
-    Dir = PREDEFINED_PROGDIR;
-    Name = "odkidl.zip";
-    Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
-End
 
 File gid_File_Zip_Odkcommon
     TXT_FILE_BODY;
-    Dir = PREDEFINED_PROGDIR;
+    Dir = gid_Dir_Basis_Sdk;
     Name = "odkcommon.zip";
     Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
 End
+