ooo-build r15434 - in trunk: . bin doc src

[pmladek svn gnome org]

Author: pmladek
Date: Mon Mar  2 20:10:55 2009
New Revision: 15434
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15434&view=rev

Log:
2009-03-02  Petr Mladek  <pmladek suse cz>

	* src/Makefile.am: add main_transform.xsl and the prebuilt sg3* to
	  the released tarball (hacks for split build and Novell build)

	* bin/modules2.txt: renamed pieces:
	    libs_core       -> libs-core
	    libs_gui        -> libs-gui
	    libs-extern     -> libs-extern
	    libs_extern_sys -> libs-extern-sys

	 Motivation: the dash "-" is typycally used to delimit words in the
	    subpackage names (RPMS, DEB), so the sources should use the dash
	    as well

	* bin/modules2.txt: split and renamed "l10n" piece:
	    l10n --> extras
		 `-> help
	  also moved "readlicense_oo" from "l10n" to "libs-core"

	  Motivation: help could/should be built separately; license files
	     should be in a core package and not with potentialy optional extras;
	     the name "l10n" should be reserved for the real packages with the
	     localizations (menus, dialogs)

	* doc/split.txt: udpated notes about build dependencies



Modified:
   trunk/ChangeLog
   trunk/bin/modules2.txt
   trunk/doc/split.txt
   trunk/src/Makefile.am

Modified: trunk/bin/modules2.txt
==============================================================================
--- trunk/bin/modules2.txt	(original)
+++ trunk/bin/modules2.txt	Mon Mar  2 20:10:55 2009
@@ -2,17 +2,18 @@
 sdk=autodoc,cosv,odk,udm,unodevtools
 base=dbaccess,reportdesign
 calc=sc,scaddins,sccomp,chart2
-l10n=extras,helpcontent2,readlicense_oo
+extras=extras
+help=helpcontent2
 writer=sw,starmath
 impress=sd,animations,slideshow
 artwork=default_images,external_images,ooo_custom_images
 filters=binfilter,filter,hwpfilter,unoxml,writerfilter,writerperfect,xmerge,oox,writer2latex
 testing=qadevOOo,smoketestoo_native,testshl2,testtools,testautomation
 bootstrap=guw,dmake,instsetoo_native,scp2,solenv,soltools,stlport,soldep,aclocal.m4,oowintool,configure.in,configure.cmd,Makefile.in,install-sh,set_soenv.in,config.guess,configure,acinclude.m4,config.sub,makefile.rc,bootstrap.1
-libs_gui=basebmp,basegfx,canvas,comphelper,cppcanvas,dtrans,goodies,i18npool,i18nutil,o3tl,padmin,psprint,psprint_config,regexp,rsc,sax,sot,svtools,toolkit,tools,transex3,ucbhelper,unotools,vcl,vos
-libs_core=avmedia,basic,configmgr,connectivity,desktop,drawinglayer,embeddedobj,eventattacher,fileaccess,formula,fpicker,framework,idl,linguistic,officecfg,oovbaapi,sandbox,scripting,sfx2,shell,sj2,svx,sysui,ucb,uui,xmlhelp,xmloff,xmlscript
-libs_extern=afms,agg,beanshell,epm,external,fondu,hsqldb,libegg,libtextcat,libxmlsec,msfontextract,np_sdk,rhino,sane,twain,lpsolve,icc,openssl,unixODBC,vigra,x11_extensions,hyphen,libwpd,lucene,redland,cppunit,apple_remote
+libs-gui=basebmp,basegfx,canvas,comphelper,cppcanvas,dtrans,goodies,i18npool,i18nutil,o3tl,padmin,psprint,psprint_config,regexp,rsc,sax,sot,svtools,toolkit,tools,transex3,ucbhelper,unotools,vcl,vos
+libs-core=avmedia,basic,configmgr,connectivity,desktop,drawinglayer,embeddedobj,eventattacher,fileaccess,formula,fpicker,framework,idl,linguistic,officecfg,oovbaapi,sandbox,scripting,sfx2,shell,sj2,svx,sysui,ucb,uui,xmlhelp,xmloff,xmlscript,readlicense_oo
+libs-extern=afms,agg,beanshell,epm,external,fondu,hsqldb,libegg,libtextcat,libxmlsec,msfontextract,np_sdk,rhino,sane,twain,lpsolve,icc,openssl,unixODBC,vigra,x11_extensions,hyphen,libwpd,lucene,redland,cppunit,apple_remote
 components=accessibility,automation,basctl,bean,crashrep,embedserv,extensions,forms,javainstaller2,lingucomponent,MathMLDTD,package,setup_native,UnoControls,wizards,xmlsecurity
 postprocess=postprocess,packimages
-libs_extern_sys=berkeleydb,bitstream_vera_fonts,expat,icu,jpeg,libxml2,libxslt,moz,neon,python,zlib,saxon,stax,boost,curl,dictionaries,cairo,hunspell
+libs-extern-sys=berkeleydb,bitstream_vera_fonts,expat,icu,jpeg,libxml2,libxslt,moz,neon,python,zlib,saxon,stax,boost,curl,dictionaries,cairo,hunspell
 extensions=sdext,swext,tomcat,apache-commons,jfreereport,reportbuilder,xpdf

Modified: trunk/doc/split.txt
==============================================================================
--- trunk/doc/split.txt	(original)
+++ trunk/doc/split.txt	Mon Mar  2 20:10:55 2009
@@ -58,10 +58,13 @@
 	+ To build you need to build things in this order:
 
 		+ bootstrap, ( ure | libs_extern | artwork ),
-		  libs_gui, libs_core, components, l10n,
-		  ( impress | filters | base | writer | calc )
+		  libs_gui, libs_core, components, l10n-extras, filters
+		  ( impress | base | writer | calc | help )
 
 		+ [ test building components / l10n in parallel ]
+		
+		+ [ try move licenses somewhere else => might build l10n-extras
+		    in parallel with the rest??? ]
 
 	+ sample .spec files are in scratch/split/ooo3_*.spec
 

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Mon Mar  2 20:10:55 2009
@@ -7,6 +7,7 @@
 	Ubuntu.dic \
 	banner_nld.bmp \
 	cli_uno_bridge.dll.config.in \
+	main_transform.xsl \
 	mono-ooo.pc.in \
 	nologoinstall_nld.bmp \
 	ooobanner_nld.bmp \
@@ -22,6 +23,7 @@
 	openabout_translateorgza.png \
 	openintro_pld.bmp \
 	openabout_pld.bmp \
+	sg3.sdg sg3.sdv sg3.thm \
 	tango_mainapp_16.png \
 	glib-1.2.10-ooo.patch \
 	libIDL-0.6.8-ooo.patch \