svn commit: r1292333 - in /incubator/ooo/trunk/main: readlicense_oo/prj/d.lst scp2/source/ooo/ooo_brand.scp scp2/source/sdkoo/sdkoo.scp

[jsc]

Author: jsc
Date: Wed Feb 22 15:02:45 2012
New Revision: 1292333

URL: http://svn.apache.org/viewvc?rev=1292333&view=rev
Log:
include NOTICE file in binary releases ans SDK

Modified:
    incubator/ooo/trunk/main/readlicense_oo/prj/d.lst
    incubator/ooo/trunk/main/scp2/source/ooo/ooo_brand.scp
    incubator/ooo/trunk/main/scp2/source/sdkoo/sdkoo.scp

Modified: incubator/ooo/trunk/main/readlicense_oo/prj/d.lst
URL: 
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/readlicense_oo/prj/d.lst?rev=1292333&r1=1292332&r2=1292333&view=diff
==============================================================================
--- incubator/ooo/trunk/main/readlicense_oo/prj/d.lst (original)
+++ incubator/ooo/trunk/main/readlicense_oo/prj/d.lst Wed Feb 22 15:02:45 2012
@@ -40,3 +40,10 @@ dos: echo ==============================
 ..\%__SRC%\misc\UNX\README_* %_DEST%\bin%_EXT%\osl
 ..\%__SRC%\misc\UNX\README_*.html %_DEST%\bin%_EXT%\osl
 
+dos: echo =====================================================================
+dos: echo Delivering NOTICE file
+dos: echo =====================================================================
+
+# deliver the NOTICE and LICENSE file in the main root from here for later use 
in the packaging process
+..\..\NOTICE %_DEST%\bin%_EXT%\osl
+..\..\LICENSE %_DEST%\bin%_EXT%\osl

Modified: incubator/ooo/trunk/main/scp2/source/ooo/ooo_brand.scp
URL: 
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/ooo_brand.scp?rev=1292333&r1=1292332&r2=1292333&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/ooo_brand.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/ooo_brand.scp Wed Feb 22 15:02:45 
2012
@@ -35,6 +35,24 @@ Directory gid_Dir_Brand_Root
 End
 #endif
 
+File gid_File_Txt_Notice
+    TXT_FILE_BODY;
+#ifndef MACOSX
+    Dir = gid_Brand_Dir_Program;
+#else
+    Dir = gid_Dir_Bundle_Contents;
+#endif
+    Name = "NOTICE";
+    Styles = (PACKED);
+End
+
+File gid_File_Txt_License_Root
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Name = "LICENSE";
+    Styles = (PACKED);
+End
+
 File gid_Brand_File_ServicesRdb
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program;

Modified: incubator/ooo/trunk/main/scp2/source/sdkoo/sdkoo.scp
URL: 
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/sdkoo/sdkoo.scp?rev=1292333&r1=1292332&r2=1292333&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/sdkoo/sdkoo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/sdkoo/sdkoo.scp Wed Feb 22 15:02:45 
2012
@@ -125,6 +125,20 @@ Module gid_Module_Root
     PackageInfo = "packinfo_sdkoo.txt";
 End
 
+File gid_File_Txt_Notice
+    TXT_FILE_BODY;
+    Dir = gid_Dir_Basis_Sdk;
+    Name = "NOTICE";
+    Styles = (PACKED, SCPZIP_REPLACE);
+End
+
+File gid_File_Txt_License_Root
+    TXT_FILE_BODY;
+    Dir = gid_Dir_Basis_Sdk;
+    Name = "LICENSE";
+    Styles = (PACKED, SCPZIP_REPLACE);
+End
+
 
 File gid_File_Txt_License
     TXT_FILE_BODY;