ooo-build r12973 - trunk/bin

[michael svn gnome org]

Author: michael
Date: Thu Jun 26 15:34:01 2008
New Revision: 12973
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12973&view=rev

Log:
more work.


Modified:
   trunk/bin/src-pack2

Modified: trunk/bin/src-pack2
==============================================================================
--- trunk/bin/src-pack2	(original)
+++ trunk/bin/src-pack2	Thu Jun 26 15:34:01 2008
@@ -5,6 +5,50 @@
 # Towards a more modular build ...
 
 my $tar_opts='cj';
+my %module_map = (
+    'ure' => [ 'bridges', 'cli_ure', 'codemaker', 'cppu', 'cppuhelper',
+	       'cpputools', 'idlc', 'io', 'javaunohelper', 'jurt', 'jut',
+	       'jvmaccess', 'jvmfwk', 'offapi', 'offuh', 'pyuno', 'rdbmaker',
+	       'registry', 'remotebridges', 'ridljar', 'sal', 'salhelper',
+	       'stoc', 'store', 'udkapi', 'unoil', 'ure', 'xml2cmp' ],
+    'sdk' => [ 'autodoc', 'cosv', 'odk', 'sdk_oo', 'udm', 'unodevtools' ],
+    'base' => [ 'dbaccess', 'reportdesign' ],
+    'calc' => [ 'sc', 'scaddins', 'sccomp', 'chart2' ],
+    'l10n' => [ 'extras', 'helpcontent2', 'readlicense_oo' ],
+    'writer' => [ 'sw', 'starmath' ],
+    'impress' => [ 'sd', 'animations', 'slideshow', 'sdext' ],
+    'artwork' => [ 'default_images', 'external_images', 'ooo_custom_images' ],
+    'filters' => [ 'binfilter', 'filter', 'hwpfilter', 'unoxml',
+		   'writerfilter', 'writerperfect', 'xmerge', 'oox' ],
+    'testing' => [ 'qadevOOo', 'smoketestoo_native', 'testshl2', 'testtools' ],
+    'bootstrap' => [ 'config_office', 'dmake', 'instsetoo_native', 'scp2',
+		     'solenv', 'soltools', 'stlport' ],
+    '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', 'embeddedobj', 'eventattacher', 'fileaccess',
+		     'fpicker', 'framework', 'idl', 'linguistic',
+		     'officecfg', 'oovbaapi', 'sandbox', 'scripting',
+		     'sfx2', 'shell', 'sj2', 'svx', 'sysui',
+		     'ucb', 'uui', 'xmlhelp', 'xmloff', 'xmlscript' ],
+    'libs-extern' => [ 'afms', 'agg', 'beanshell', 'berkeleydb', 'bitstream_vera_fonts',
+		       'boost', 'curl', 'dictionaries', 'epm', 'expat', 'external',
+		       'fondu', 'freetype', 'hsqldb', 'icu', 'jfreereport', 'jpeg',
+		       'libegg', 'libtextcat', 'libwpd', 'libxml2', 'libxmlsec',
+		       'libxslt', 'moz', 'msfontextract', 'neon', 'np_sdk',
+		       'python', 'rhino', 'sane', 'twain', 'lpsolve', 'icc',
+		       'openssl', 'unixODBC', 'vigra', 'xalan', 'x11_extensions',
+		       'zlib', 'xpdf', 'hyphen' ],
+    'extensions' => [ 'accessibility', 'automation', 'basctl', 'bean',
+		      'crashrep', 'embedserv', 'extensions', 'forms',
+		      'javainstaller2', 'lingucomponent', 'MathMLDTD',
+		      'package', 'setup_native', 'UnoControls', 'wizards',
+		      'xmlsecurity' ],
+    'postprocess' => [ 'postprocess', 'packimages' ]
+);
 
 my $src;
 my $dest;
@@ -34,6 +78,7 @@
 {
     my $src = shift;
     my $module_map = shift;
+    my $failed = 0;
 
     my $modules = slurp_dir_to_hash ($src);
 
@@ -42,15 +87,19 @@
     for my $section (keys %{$module_map}) {
 	for my $module (@{$module_map->{$section}}) {
 	    if (!defined $modules->{$module}) {
-		die "Error: section '$section' contains non-existent module '$module'\n";
+		print "\n\nError: section '$section' contains non-existent module '$module'\n\n";
+		$failed = 1;
 	    }
 	    delete $modules->{$module};
 	}
     }
     my @left_over = keys %{$modules};
     if (@left_over) {
-	die "Modules not included in any section: @left_over";
+	print "\n\nError: modules not included in any section: @left_over\n\n";
+	$failed = 1;
     }
+    
+    die "Failed." if ($failed);
     print " done\n";
 }
 
@@ -71,50 +120,7 @@
 }
 $dest = '.' if (!defined $dest);
 
-my %module_map = (
-    'ure' => [ 'bridges', 'cli_ure', 'codemaker', 'cppu', 'cppuhelper',
-	       'cpputools', 'idlc', 'io', 'javaunohelper', 'jurt', 'jut',
-	       'jvmaccess', 'jvmfwk', 'offapi', 'offuh', 'pyuno', 'rdbmaker',
-	       'registry', 'remotebridges', 'ridljar', 'sal', 'salhelper',
-	       'stoc', 'store', 'udkapi', 'unoil', 'ure', 'xml2cmp' ],
-    'sdk' => [ 'autodoc', 'cosv', 'odk', 'sdk_oo', 'udm', 'unodevtools' ],
-    'base' => [ 'dbaccess', 'reportdesign' ],
-    'calc' => [ 'sc', 'scaddins', 'chart2' ],
-    'l10n' => [ 'extras', 'helpcontent2', 'readlicense_oo' ],
-    'writer' => [ 'sw', 'starmath' ],
-    'impress' => [ 'sd', 'animations', 'slideshow' ],
-    'artwork' => [ 'default_images', 'external_images', 'ooo_custom_images' ],
-    'filters' => [ 'binfilter', 'filter', 'hwpfilter', 'unoxml',
-		   'writerfilter', 'writerperfect', 'xmerge' ],
-    'testing' => [ 'qadevOOo', 'smoketestoo_native', 'testshl2', 'testtools' ],
-    'bootstrap' => [ 'config_office', 'dmake', 'instsetoo_native', 'scp2',
-		     'solenv', 'soltools', 'stlport' ],
-    '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', 'embeddedobj', 'eventattacher', 'fileaccess',
-		     'fpicker', 'framework', 'idl', 'linguistic',
-		     'officecfg', 'oovbaapi', 'sandbox', 'scripting',
-		     'sfx2', 'shell', 'sj2', 'so3', 'svx', 'sysui',
-		     'ucb', 'uui', 'xmlhelp', 'xmloff', 'xmlscript',
-		     'XmlSearch' ],
-    'libs-contrib' => [ 'afms', 'agg', 'beanshell', 'berkeleydb', 'bitstream_vera_fonts',
-			'boost', 'curl', 'dictionaries', 'epm', 'expat', 'external',
-			'fondu', 'freetype', 'hsqldb', 'icu', 'jfreereport', 'jpeg',
-			'libegg', 'libtextcat', 'libwpd', 'libxml2', 'libxmlsec',
-			'libxslt', 'moz', 'msfontextract', 'nas', 'neon', 'np_sdk',
-			'portaudio', 'python', 'rhino', 'sane', 'sndfile', 'twain',
-			'unixODBC', 'vigra', 'xalan', 'xt', 'x11_extensions', 'zlib' ],
-    'extensions' => [ 'accessibility', 'automation', 'basctl', 'bean',
-		      'crashrep', 'embedserv', 'extensions', 'forms',
-		      'javainstaller2', 'lingucomponent', 'MathMLDTD',
-		      'package', 'setup_native', 'UnoControls', 'wizards',
-		      'xmlsecurity' ],
-    'postprocess' => [ 'postprocess' ]
-);
+-f "$src/vcl/source/gdi/outdev.cxx" || die "$src doesn't look like an OO.o source tree";
 
 verify_module_map ($src, \%module_map);