ooo-build r11550 - in trunk: . bin

[pmladek svn gnome org]

Author: pmladek
Date: Mon Feb 11 14:57:47 2008
New Revision: 11550
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11550&view=rev

Log:
2008-02-11  Petr Mladek  <pmladek suse cz>

	* bin/package-ooo, bin/install-mono: add the new .dll.config files to
	  the filelist even when the GAC is not preinstalled



Modified:
   trunk/ChangeLog
   trunk/bin/install-mono
   trunk/bin/package-ooo

Modified: trunk/bin/install-mono
==============================================================================
--- trunk/bin/install-mono	(original)
+++ trunk/bin/install-mono	Mon Feb 11 14:57:47 2008
@@ -34,8 +34,13 @@
 cp $SRCDIR/mono-ooo.pc ${OODESTDIR}${LIBDIRBASE}/pkgconfig/mono-$OOOINSTALLDIRNAME.pc
 
 # extra dlls config files
-cp $SRCDIR/cli_cppuhelper.dll.config $OOINSTDIR/program/
-cp $SRCDIR/cli_uno_bridge.dll.config $OOINSTDIR/program/
+for dll in cli_cppuhelper.dll cli_uno_bridge.dll ; do
+    cp $SRCDIR/$dll.config $OOINSTDIR/program/
+    if test -n "$OODESTDIR" ; then
+	file_list=`grep "^$OOINSTBASE/program/$dll$" $OODESTDIR/gid* | head -n 1 | cut -d: -f1`
+	echo "$OOINSTBASE/program/$dll.config" >>$file_list
+    fi
+done
 
 # install versioned assemblies into the system Global Assembly Cache  (GAC)
 # to  become  part  of  the assemblies that are available for all applications

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Mon Feb 11 14:57:47 2008
@@ -614,6 +614,7 @@
 	# mono subpackage
 	rm -f mono_list.txt
 	mv_file_between_flists mono_list.txt common_list.txt $OOINSTBASE/program/cli_.*.dll
+	mv_file_between_flists mono_list.txt common_list.txt $OOINSTBASE/program/cli_.*.dll.config
 	mv_file_between_flists mono_list.txt common_list.txt $OOINSTBASE/program/libcli_.*.so
 	add_used_directories mono_list.txt common_list.txt
 	# add the files from GAC if it was installed