ooo-build r13066 - in trunk: . bin

[michael svn gnome org]

Author: michael
Date: Fri Jul  4 11:14:55 2008
New Revision: 13066
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13066&view=rev

Log:
2008-07-04  Michael Meeks  <michael meeks novell com>

        * bin/src-pack2: pack inside different sub-dirs,
        and rename sub-dirs for consistency to use an '_'



Modified:
   trunk/ChangeLog
   trunk/bin/src-pack2

Modified: trunk/bin/src-pack2
==============================================================================
--- trunk/bin/src-pack2	(original)
+++ trunk/bin/src-pack2	Fri Jul  4 11:14:55 2008
@@ -23,18 +23,18 @@
     'testing' => [ 'qadevOOo', 'smoketestoo_native', 'testshl2', 'testtools' ],
     'bootstrap' => [ 'config_office', 'dmake', 'instsetoo_native', 'scp2',
 		     'solenv', 'soltools', 'stlport' ],
-    'libs-gui' => [ 'basebmp', 'basegfx', 'canvas', 'comphelper', 'cppcanvas',
+    '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',
+    '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', 'epm', 'external',
+    'libs_extern' => [ 'afms', 'agg', 'beanshell', 'epm', 'external',
 		       'fondu', 'freetype', 'hsqldb', 'jfreereport',
 		       'libegg', 'libtextcat', 'libxmlsec', 'msfontextract',
 		       'np_sdk', 'rhino', 'sane', 'twain', 'lpsolve', 'icc',
@@ -46,7 +46,7 @@
 		      'package', 'setup_native', 'UnoControls', 'wizards',
 		      'xmlsecurity' ],
     'postprocess' => [ 'postprocess', 'packimages' ],
-    'libs-extern-sys' => [ 'berkeleydb', 'bitstream_vera_fonts', 'expat', 'icu', 
+    'libs_extern_sys' => [ 'berkeleydb', 'bitstream_vera_fonts', 'expat', 'icu', 
 			   'jpeg', 'libxml2', 'libxslt', 'moz', 'neon',
 			   'python', 'zlib', 'xalan', 'boost', 'curl',
 			   'dictionaries', 'cairo', 'hunspell' ]
@@ -132,9 +132,12 @@
 for my $a (keys %module_map) {
     print STDERR "\tpack $a ...";
     my $dest_tar = "$dest/$src-$a.tar.bz2";
-    my $cmd = "tar $tar_opts -f $dest_tar ";
+    my $cmd = "tar $tar_opts --dereference -f $dest_tar ";
+    my $newsrc = "$src-$a";
+    symlink ($src, $newsrc ) if (! -l $newsrc);
+
     for my $b (@{$module_map{$a}}) {
-	$cmd .= "$src/$b ";
+	$cmd .= "$newsrc/$b ";
     }
     if (-f $dest_tar) {
 	print "\twarning: $dest_tar exists, skipping\n";