Skip to content

C
core
Kaydet (Commit) b0c5680e authored tarafından Herbert Dürr's avatar Herbert Dürr
Dosyalara gözat
Seçenekler

#i119168# consolidate packaging of LICENSE and NOTICE files

üst 34f86524
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 205 deletions
README
Dosyayı görüntüle @ b0c5680e
......@@ -2,7 +2,7 @@ Apache OpenOffice (AOO)
=======================
The Apache OpenOffice project provides a full featured office productivity suite
based on open standards and is the continuation of the OpenOffice.org project.
based on open standards. It is the continuation of the OpenOffice.org project.
For detailed information about Apache OpenOffice please visit
http://incubator.apache.org/openofficeorg/
......
readlicense_oo/makefile.mk
Dosyayı görüntüle @ b0c5680e
......@@ -26,21 +26,6 @@ TARGET=source
.INCLUDE: settings.mk
# ------------------------------------------------------------------
.IF "$(GUI)"=="WNT"
SYSLICBASE=license.txt license.html license.rtf
SYSLICDEST=$(MISC)$/license$/wnt
.ELIF "$(GUI)"=="OS2"
SYSLICBASE=license.txt license.html license.rtf
SYSLICDEST=$(MISC)$/license$/os2
.ELSE # "$(GUI)"=="WNT"
SYSLICBASE=LICENSE LICENSE.html
SYSLICDEST=$(MISC)$/license$/unx
.ENDIF # "$(GUI)"=="WNT"
SOURCELICENCES=$(foreach,i,$(SYSLICBASE) $(SYSLICDEST)$/$(i:b)_en-US$(i:e))
fallbacklicenses=$(foreach,i,{$(subst,$(defaultlangiso), $(alllangiso))} $(foreach,j,$(SYSLICBASE) $(SYSLICDEST)$/$(j:b)_$i$(j:e)))
ALL_LICENSE=..$/LICENSE
ALL_NOTICE=..$/NOTICE
.IF "${ENABLE_CATEGORY_B}"=="YES"
......@@ -62,7 +47,7 @@ SUM_NOTICE=$(MISC)$/SUM_NOTICE
.INCLUDE: target.mk
# ------------------------------------------------------------------
ALLTAR: ${SUM_LICENSE} ${SUM_NOTICE} $(SOURCELICENCES) $(fallbacklicenses) just_for_nice_optics
ALLTAR: ${SUM_LICENSE} ${SUM_NOTICE}
${SUM_LICENSE} : ${ALL_LICENSE}
cat $< > $@
......@@ -70,25 +55,3 @@ ${SUM_LICENSE} : ${ALL_LICENSE}
${SUM_NOTICE} : ${ALL_NOTICE}
cat $< > $@
.IF "$(fallbacklicenses)"!=""
$(fallbacklicenses) : $(SOURCELICENCES)
@$(ECHON) .
@$(COPY) $(@:d)$(@:b:s/_/./:b)_$(defaultlangiso)$(@:e) $@
.ENDIF # "$(fallbacklicenses)"!=""
just_for_nice_optics: $(fallbacklicenses)
@$(ECHONL)
# for windows, convert line ends to CR/LF
$(SYSLICDEST)$/license_en-US.% : source$/license$/license_en-US.%
@-$(MKDIRHIER) $(SYSLICDEST)
$(PERL) -p -e 's/\r?\n$$/\r\n/' < $< > $@
# for others just copy
$(SYSLICDEST)$/LICENSE_en-US : source$/license$/license_en-US.txt
@-$(MKDIRHIER) $(SYSLICDEST)
$(COPY) $< $@
$(SYSLICDEST)$/LICENSE_en-US.html : source$/license$/license_en-US.html
@-$(MKDIRHIER) $(SYSLICDEST)
$(COPY) $< $@
readlicense_oo/prj/build.lst
Dosyayı görüntüle @ b0c5680e
ro readlicense_oo : L10N:l10n solenv LIBXSLT:libxslt NULL
ro readlicense_oo usr1 - all ro_root NULL
ro readlicense_oo\docs\readme nmake - all ro_readme NULL
ro readlicense_oo\html nmake - all ro_html NULL
ro readlicense_oo nmake - all ro_conv NULL
readlicense_oo/prj/d.lst
Dosyayı görüntüle @ b0c5680e
mkdir: %_DEST%\bin%_EXT%\osl
mkdir: %_DEST%\pck%_EXT%
dos: echo =====================================================================
dos: echo Delivering LICENSE files
dos: echo =====================================================================
# Can we finally unify Windows and unx file names to upper case
# LICENSE/LICENSE.html?
# FIXME: is - can you solve this?
..\%__SRC%\misc\license\unx\LICENSE* %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\license\unx\LICENSE*.html %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\license\wnt\license*.txt %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\license\wnt\license*.html %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\license\wnt\license*.rtf %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\license\os2\license*.txt %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\license\os2\license*.html %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\license\os2\license*.rtf %_DEST%\bin%_EXT%\osl
# URE:
mkdir: %_DEST%\bin%_EXT%\ure
..\%__SRC%\misc\license\unx\LICENSE_en-US %_DEST%\bin%_EXT%\ure\LICENSE
..\%__SRC%\misc\license\wnt\license_en-US.txt %_DEST%\bin%_EXT%\ure\LICENSE
..\%__SRC%\misc\license\wnt\license_en-US.rtf %_DEST%\bin%_EXT%\ure\license_en-US.rtf
..\%__SRC%\misc\license\os2\license_en-US.txt %_DEST%\bin%_EXT%\ure\LICENSE
..\%__SRC%\misc\license\os2\license_en-US.rtf %_DEST%\bin%_EXT%\ure\license_en-US.rtf
# RTF only for Windows?
# Why? It comes from cws_src680_langsupporter.
..\%__SRC%\misc\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\THIRDPARTYLICENSEREADME.html
dos: echo =====================================================================
dos: echo Delivering README files
dos: echo =====================================================================
......@@ -41,7 +13,7 @@ dos: echo =====================================================================
..\%__SRC%\misc\UNX\README_*.html %_DEST%\bin%_EXT%\osl
dos: echo =====================================================================
dos: echo Delivering NOTICE file
dos: echo Delivering the LICENSE and NOTICE files
dos: echo =====================================================================
# deliver the NOTICE and LICENSE file for later use in the packaging process
......
scp2/source/ooo/common_brand.scp
Dosyayı görüntüle @ b0c5680e
......@@ -34,9 +34,6 @@ Module gid_Module_Root_Brand
PackageInfo = "packinfo_brand.txt";
Dirs = (gid_Brand_Dir_Program,
gid_Brand_Dir_Share,
gid_Brand_Dir_Share_C05,
gid_Brand_Dir_Share_C05_Rgt,
gid_Brand_Dir_Share_C05_Faq,
gid_Brand_Dir_Share_Config,
gid_Brand_Dir_Share_Extension,
gid_Brand_Dir_Share_Extensions,
......@@ -62,14 +59,7 @@ Module gid_Module_Root_Brand
gid_Brand_File_Bin_Msvcr71,
gid_Brand_File_Bin_Libxml2,
gid_Brand_File_Bmp_IntroAbout,
gid_Brand_File_C05_Zip_Faq,
gid_Brand_File_C05_Zip_Register,
gid_Brand_File_C05_Htm_Faq,
gid_Brand_File_C05_Htm_Rgt,
gid_Brand_File_C05_Pdf_Gettingstartedguide,
gid_Brand_File_C05_Exe_Suptool,
gid_Brand_File_Desktophelper_Txt,
gid_Brand_File_Html_Thirdpartylicensereadme,
gid_Brand_File_Images_Brand_Zip,
gid_Brand_File_Lib_Dbghelp,
gid_Brand_File_Lib_Mingw_GccS,
......@@ -82,7 +72,6 @@ Module gid_Module_Root_Brand
gid_Brand_File_Lib_Oirm2,
gid_Brand_File_Msvcm80crt_Manifest,
gid_Brand_File_Lib_Npsoplugin,
gid_Brand_File_Lib_Subscrib_C05,
gid_Brand_File_ServicesRdb,
gid_Brand_File_Share_Registry_Brand_Xcd,
gid_Brand_File_Share_Registry_O5oo_Xcd,
......@@ -123,22 +112,10 @@ Module gid_Module_Langpack_Brand_Template
gid_Brand_Dir_Share_Readme);
Files = (gid_Brand_File_Res_About,
gid_Brand_File_Res_Oirm,
gid_Brand_File_Help_C05_Sdatabase_Zip,
gid_Brand_File_Help_C05_Scalc_Zip,
gid_Brand_File_Help_C05_Sdraw_Zip,
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);
End
......@@ -314,17 +291,6 @@ End
// Files
File gid_Brand_File_Html_Thirdpartylicensereadme
Name = "THIRDPARTYLICENSEREADME.html";
#ifdef MACOSX
Dir = gid_Brand_Dir_BasisLink;
#else
Dir = gid_Dir_Brand_Root;
#endif
Styles = (WORKSTATION);
TXT_FILE_BODY;
End
File gid_Brand_File_Bin_Soffice
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
......
scp2/source/ooo/common_brand_readme.scp
Dosyayı görüntüle @ b0c5680e
......@@ -29,46 +29,22 @@ File gid_Brand_File_Txt_License
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Share_Readme;
#ifdef UNX
README_ALL_LANG(Name, LICENSE);
Name=LICENSE;
#endif
#if defined(WNT) || defined(OS2)
README_TXT_ALL_LANG(Name, license, txt);
Name=LICENSE.txt;
#endif
Styles = (PACKED, SCPZIP_REPLACE);
End
File gid_Brand_File_Txt_License_Html
File gid_Brand_File_Txt_Notice
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Share_Readme;
#ifdef UNX
README_TXT_ALL_LANG(Name, LICENSE, html);
Name=NOTICE;
#endif
#if defined(WNT) || defined(OS2)
README_TXT_ALL_LANG(Name, license, html);
#endif
Styles = (PACKED, SCPZIP_REPLACE);
End
File gid_Brand_File_License_License
TXT_FILE_BODY;
Dir = gid_Brand_Dir_License;
#ifdef UNX
README_ALL_LANG(Name, LICENSE);
#endif
#if defined(WNT) || defined(OS2)
README_TXT_ALL_LANG(Name, license, txt);
#endif
Styles = (PACKED, SCPZIP_REPLACE);
End
File gid_Brand_File_License_License_Html
TXT_FILE_BODY;
Dir = gid_Brand_Dir_License;
#ifdef UNX
README_TXT_ALL_LANG(Name, LICENSE, html);
#endif
#if defined(WNT) || defined(OS2)
README_TXT_ALL_LANG(Name, license, html);
Name=NOTICE.txt;
#endif
Styles = (PACKED, SCPZIP_REPLACE);
End
......
scp2/source/ooo/scpaction_ooo.scp
Dosyayı görüntüle @ b0c5680e
......@@ -23,15 +23,9 @@
#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);
ScpAction scp_Copy_LICENSE_Txt
Copy = "LICENSE";
Name = "LICENSE";
#ifndef MACOSX
Subdir = "licenses";
#else
......@@ -39,15 +33,9 @@ ScpAction scp_Copy_License_Html
#endif
End
ScpAction scp_Copy_License_Txt
#ifdef UNX
README_ALL_LANG(Copy, LICENSE);
README_ALL_LANG(Name, LICENSE);
#else
README_TXT_ALL_LANG(Copy, license, txt);
README_TXT_ALL_LANG(Name, license, txt);
#endif
Styles = (SCPZIP_REPLACE);
ScpAction scp_Copy_NOTICE_Txt
Copy = "NOTICE";
Name = "NOTICE";
#ifndef MACOSX
Subdir = "licenses";
#else
......@@ -55,14 +43,6 @@ ScpAction scp_Copy_License_Txt
#endif
End
#ifdef MACOSX
ScpAction scp_Copy_Thirdpartylicense_Readme_Html
Copy = "THIRDPARTYLICENSEREADME.html";
Name= "THIRDPARTYLICENSEREADME.html";
Subdir = "LICENSEs";
End
#endif
ScpAction scp_Copy_Readme_Html
#ifdef UNX
README_TXT_ALL_LANG(Copy, README, html);
......@@ -144,14 +124,6 @@ ScpAction scp_Copy_Xpd_Gif_Setup
Subdir = "installdata/images";
End
// Setup license file
ScpAction scp_Copy_Xpd_Html_License
README_TXT_ALL_LANG(Copy, LICENSE, html);
README_TXT_ALL_LANG(Name, LICENSE, html);
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
ScpAction scp_Copy_Xpd_Html_License_En_Us
Copy = "LICENSE_en-US.html";
Name = "LICENSE.html";
......
scp2/source/ooo/ure.scp
Dosyayı görüntüle @ b0c5680e
......@@ -1162,9 +1162,9 @@ Module gid_Module_Root_Ure_Hidden
gid_Dir_Ure_Share,
gid_Dir_Ure_Java,
gid_Dir_Ure_Misc);
Files = (gid_File_ThirdpartylicensereadmeHtml_Ure,
gid_File_Readme_Ure,
gid_File_License_Ure,
Files = (gid_File_Readme_Ure,
gid_File_LICENSE_Ure,
gid_File_NOTICE_Ure,
gid_File_Exe_Uno,
gid_File_Exe_Regcomp,
gid_File_Exe_Regmerge,
......
scp2/source/ooo/ure_standalone.scp
Dosyayı görüntüle @ b0c5680e
......@@ -55,17 +55,17 @@ Directory gid_Dir_Common_Ure
Styles = (UREDIRECTORY);
End
File gid_File_License_Ure
File gid_File_LICENSE_Ure
TXT_FILE_BODY;
Dir = gid_Dir_Common_Ure;
Name = "LICENSE";
Styles = (PACKED);
End
File gid_File_ThirdpartylicensereadmeHtml_Ure
File gid_File_NOTICE_Ure
TXT_FILE_BODY;
Dir = gid_Dir_Common_Ure;
Name = "THIRDPARTYLICENSEREADME.html";
Name = "NOTICE";
Styles = (PACKED);
End
......
scp2/source/sdkoo/sdkoo.scp
Dosyayı görüntüle @ b0c5680e
......@@ -92,19 +92,18 @@ 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
ScpAction scp_Copy_Notice_Txt_Sdk
README_ALL_LANG(Copy, NOTICE);
README_ALL_LANG(Name, NOTICE);
Styles = (SCPZIP_REPLACE);
Subdir = "LICENSEs";
End
#endif
......@@ -139,31 +138,6 @@ File gid_File_Txt_License_Root
Styles = (PACKED, SCPZIP_REPLACE);
End
File gid_File_Txt_License
TXT_FILE_BODY;
Dir = gid_Dir_Share_Readme_Sdk;
#ifdef UNX
Name = "LICENSE_en-US";
#endif
#ifdef WNT
Name = "license_en-US.txt";
#endif
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;
......
ure/prj/d.lst
Dosyayı görüntüle @ b0c5680e
......@@ -3,7 +3,6 @@ mkdir: %_DEST%\xml%_EXT%\ure
..\%__SRC%\bin\uretest.zip %COMMON_DEST%\bin%_EXT%\uretest.zip
..\%__SRC%\misc\services.rdb %_DEST%\xml%_EXT%\ure\services.rdb
..\source\README %_DEST%\bin%_EXT%\ure\README
..\source\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\ure\THIRDPARTYLICENSEREADME.html
..\source\jvmfwk3.ini %_DEST%\bin%_EXT%\ure\jvmfwk3.ini
..\source\jvmfwk3rc %_DEST%\bin%_EXT%\ure\jvmfwk3rc
..\source\startup.sh %_DEST%\bin%_EXT%\ure\startup.sh
......
ure/source/THIRDPARTYLICENSEREADME.html deleted 100644 → 0
Dosyayı görüntüle @ 34f86524
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment