incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1308418 - in /incubator/ooo/trunk/main: configure.in readlicense_oo/makefile.mk readlicense_oo/prj/d.lst set_soenv.in
Date Mon, 02 Apr 2012 16:21:19 GMT
Author: hdu
Date: Mon Apr  2 16:21:19 2012
New Revision: 1308418

URL: http://svn.apache.org/viewvc?rev=1308418&view=rev
Log:
#i119168# create summary LICENSE and NOTICE files depending on build configuration

Modified:
    incubator/ooo/trunk/main/configure.in
    incubator/ooo/trunk/main/readlicense_oo/makefile.mk
    incubator/ooo/trunk/main/readlicense_oo/prj/d.lst
    incubator/ooo/trunk/main/set_soenv.in

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1308418&r1=1308417&r2=1308418&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Mon Apr  2 16:21:19 2012
@@ -1325,6 +1325,8 @@ dnl ====================================
 # Note that further below they may be enabled or disabled again by
 # more specific options.
 
+ENABLE_CATEGORY_B=
+
 AC_MSG_CHECKING([whether to enable category B components])
 # Category B modules (libraries):
 #   moz (seamonkey)
@@ -1336,8 +1338,7 @@ AC_MSG_CHECKING([whether to enable categ
 #   beanshell (beanshell)
 #   graphite (silgraphite)
 if test "$enable_category_b" = "yes"; then
-#   enable_mozilla="yes"
-#   enable_nss_module="yes"
+   ENABLE_CATEGORY_B=YES
    enable_hunspell="yes"
    enable_hyphen="yes"
    enable_saxon="yes"
@@ -1361,6 +1362,7 @@ else
 
    AC_MSG_RESULT([no: disabled modules moz, nss, hunspell, hyphen, saxon, rhino, beanshell,
graphite, coinmp])
 fi
+AC_SUBST(ENABLE_CATEGORY_B)
 
 # gstreamer is used only via pre-installed libraries: not a problem
 

Modified: incubator/ooo/trunk/main/readlicense_oo/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/readlicense_oo/makefile.mk?rev=1308418&r1=1308417&r2=1308418&view=diff
==============================================================================
--- incubator/ooo/trunk/main/readlicense_oo/makefile.mk (original)
+++ incubator/ooo/trunk/main/readlicense_oo/makefile.mk Mon Apr  2 16:21:19 2012
@@ -41,11 +41,34 @@ SOURCELICENCES=$(foreach,i,$(SYSLICBASE)
 
 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"
+    # extend the install set's LICENSE and NOTICE files
+    # for content distributed under category-B licenses
+    ALL_LICENSE+=..$/LICENSE_category_b
+    ALL_NOTICE+=..$/NOTICE_category_b
+.ENDIF
+.IF "${BUNDLED_EXTENSION_BLOBS}"!=""
+    # extend the install set's LICENSE and NOTICE files
+    # for content distributed as mere aggregations
+    ALL_LICENSE+=..$/LICENSE_aggregated
+    ALL_NOTICE+=..$/NOTICE_aggregated
+.ENDIF
+SUM_LICENSE=$(MISC)$/SUM_LICENSE
+SUM_NOTICE=$(MISC)$/SUM_NOTICE
+
 # ------------------------------------------------------------------
 .INCLUDE: target.mk
 # ------------------------------------------------------------------
 
-ALLTAR: $(SOURCELICENCES) $(fallbacklicenses) just_for_nice_optics
+ALLTAR: ${SUM_LICENSE} ${SUM_NOTICE} $(SOURCELICENCES) $(fallbacklicenses) just_for_nice_optics
+
+${SUM_LICENSE} : ${ALL_LICENSE}
+    cat $< > $@
+
+${SUM_NOTICE} : ${ALL_NOTICE}
+    cat $< > $@
 
 .IF "$(fallbacklicenses)"!=""
 $(fallbacklicenses) : $(SOURCELICENCES)
@@ -56,7 +79,7 @@ $(fallbacklicenses) : $(SOURCELICENCES)
 just_for_nice_optics: $(fallbacklicenses)
 	@$(ECHONL)
 
-# for windows, convert linends to DOS
+# 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/' < $< > $@

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=1308418&r1=1308417&r2=1308418&view=diff
==============================================================================
--- incubator/ooo/trunk/main/readlicense_oo/prj/d.lst (original)
+++ incubator/ooo/trunk/main/readlicense_oo/prj/d.lst Mon Apr  2 16:21:19 2012
@@ -44,6 +44,6 @@ 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
+# deliver the NOTICE and LICENSE file for later use in the packaging process
+..\%__SRC%\misc\SUM_NOTICE %_DEST%\bin%_EXT%\osl\NOTICE
+..\%__SRC%\misc\SUM_LICENSE %_DEST%\bin%_EXT%\osl\LICENSE

Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1308418&r1=1308417&r2=1308418&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Mon Apr  2 16:21:19 2012
@@ -1883,6 +1883,7 @@ ToFile( "SYSTEM_GRAPHITE",   "@SYSTEM_GR
 ToFile( "GRAPHITE_LIBS",     "@GRAPHITE_LIBS@",     "e");
 ToFile( "GRAPHITE_CFLAGS",   "@GRAPHITE_CFLAGS@",   "e");
 ToFile( "VC_STANDARD",       "@VC_STANDARD@",      "e" );
+ToFile( "ENABLE_CATEGORY_B", "@ENABLE_CATEGORY_B@", "e");
 ToFile( "BUNDLED_EXTENSION_BLOBS", "@BUNDLED_EXTENSION_BLOBS@", "e");
 ToFile( "BUNDLED_PREREG_EXTENSIONS", "@BUNDLED_PREREG_EXTENSIONS@", "e");
 ToFile( "ENABLE_BUNDLED_DICTIONARIES", "@ENABLE_BUNDLED_DICTIONARIES@", "e");



Mime
View raw message