[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - scp2/source

[Sebastian Spaeth]

 scp2/source/ooo/common_brand.scp        |    8 -------
 scp2/source/ooo/common_brand_readme.scp |   24 -----------------------
 scp2/source/ooo/scpaction_ooo.scp       |   32 -------------------------------
 scp2/source/sdkoo/sdkoo.scp             |   33 --------------------------------
 4 files changed, 1 insertion(+), 96 deletions(-)

New commits:
commit 3330f12ca7f7bc9faff62fd8860f66fa7c35e582
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Tue Nov 23 13:12:21 2010 +0100

    Don't install html versions of LICENSE and README

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 5734a4b..701f9a7 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -134,18 +134,12 @@ Module gid_Module_Langpack_Brand_Template
              gid_Brand_File_Help_C05_Swriter_Zip,
              gid_Brand_File_License_License,
              gid_Brand_File_License_License_Small,
-             gid_Brand_File_License_License_Html,
-             gid_Brand_File_License_License_Html_Small,
              gid_Brand_File_Readme_Readme,
-             gid_Brand_File_Readme_Readme_Html,
              gid_Brand_File_Share_Registry_Cjk_Xcd,
              gid_Brand_File_Share_Registry_Korea_Xcd,
              gid_Brand_File_Txt_License,
              gid_Brand_File_Txt_License_Small,
-             gid_Brand_File_Txt_License_Html,
-             gid_Brand_File_Txt_License_Html_Small,
-             gid_Brand_File_Txt_Readme,
-             gid_Brand_File_Txt_Readme_Html);
+             gid_Brand_File_Txt_Readme);
 End
 
 // Directories
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index d6f294f..de546e8 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -27,22 +27,6 @@
 
 #include "macros.inc"
 
-ScpAction scp_Copy_License_Html
-  #ifdef UNX
-    README_TXT_ALL_LANG(Copy, LICENSE, html);
-    README_TXT_ALL_LANG(Name, LICENSE, html);
-  #else
-    README_TXT_ALL_LANG(Copy, license, html);
-    README_TXT_ALL_LANG(Name, license, html);
-  #endif
-    Styles = (SCPZIP_REPLACE);
-  #ifndef MACOSX
-    Subdir = "licenses";
-  #else
-    Subdir = "LICENSEs";
-  #endif
-End
-
 ScpAction scp_Copy_License_Txt
   #ifdef UNX
     README_ALL_LANG(Copy, LICENSE);
@@ -67,22 +51,6 @@ ScpAction scp_Copy_Thirdpartylicense_Readme_Html
 End
 #endif
 
-ScpAction scp_Copy_Readme_Html
-  #ifdef UNX
-    README_TXT_ALL_LANG(Copy, README, html);
-    README_TXT_ALL_LANG(Name, README, html);
-  #else
-    README_TXT_ALL_LANG(Copy, readme, html);
-    README_TXT_ALL_LANG(Name, readme, html);
-  #endif
-    Styles = (SCPZIP_REPLACE);
-  #ifndef MACOSX
-    Subdir = "readmes";
-  #else
-    Subdir = "READMEs";
-  #endif
-End
-
 ScpAction scp_Copy_Readme_Txt
   #ifdef UNX
     README_ALL_LANG(Copy, README);
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index 0f79720..2c7aa6e 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -95,13 +95,6 @@ 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);
@@ -110,7 +103,6 @@ ScpAction scp_Copy_License_Txt_Sdk
 End
 #endif
 
-
 Directory gid_Dir_Share_Sdk
     ParentID = gid_Dir_Basis_Sdk;
     DosName = "share";
@@ -141,18 +133,6 @@ File gid_File_Txt_License
     Styles = (PACKED, SCPZIP_REPLACE);
 End
 
-File gid_File_Txt_License_Html
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Readme_Sdk;
-  #ifdef UNX
-    Name = "LICENSE_en-US.html";
-  #endif
-  #ifdef WNT
-    Name = "license_en-US.html";
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
 File gid_File_Txt_Readme
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Readme_Sdk;
@@ -165,19 +145,6 @@ File gid_File_Txt_Readme
     Styles = (PACKED, SCPZIP_REPLACE);
 End
 
-File gid_File_Txt_Readme_Html
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Readme_Sdk;
-  #ifdef UNX
-    Name = "README_en-US.html";
-  #endif
-  #ifdef WNT
-    Name = "readme_en-US.html";
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-
 File gid_File_Zip_Odkexamples
     TXT_FILE_BODY;
     Dir = gid_Dir_Basis_Sdk;
commit 5efb5fa46e08f2fbd2f840f172bf5b7f6955e8ff
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Wed Nov 17 16:44:14 2010 +0100

    Don't install the readme.html files
    
    Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>

diff --git a/scp2/source/ooo/common_brand_readme.scp b/scp2/source/ooo/common_brand_readme.scp
index dea9145..6655f80 100644
--- a/scp2/source/ooo/common_brand_readme.scp
+++ b/scp2/source/ooo/common_brand_readme.scp
@@ -89,18 +89,6 @@ File gid_Brand_File_Txt_Readme
     Styles = (PACKED, SCPZIP_REPLACE);
 End
 
-File gid_Brand_File_Txt_Readme_Html
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Readme;
-  #ifdef UNX
-    README_TXT_ALL_LANG(Name, README, html);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, readme, html);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
 File gid_Brand_File_Readme_Readme
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Readme;
@@ -112,15 +100,3 @@ File gid_Brand_File_Readme_Readme
   #endif
     Styles = (PACKED, SCPZIP_REPLACE);
 End
-
-File gid_Brand_File_Readme_Readme_Html
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Readme;
-  #ifdef UNX
-    README_TXT_ALL_LANG(Name, README, html);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, readme, html);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End