2005-06-06 Ben Maurer <bmaurer@ximian.com>

	* scripts/Makefile.am: Add mono-find-*

	* scripts/mono-find-*.in: provides/requires stuff for rpm is now
	done with monodis. This makes packaging easier as it doesn't
	depend on the gac ind DESTDIR.

	* configure.in: changes for the above


svn path=/trunk/mono/; revision=45522

3 files changed, 135 insertions, 5 deletions

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 0d0a5c78e79..03a61c160d6 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,8 +1,16 @@
-EXTRA_DIST = script.in script2.in mono-service.in mono-nunit.pc.in
-DISTCLEANFILES = mono-nunit.pc
+EXTRA_DIST =                   \
+	script.in              \
+	script2.in             \
+	mono-service.in        \
+	mono-nunit.pc.in       \
+	mono-find-provides.in  \
+	mono-find-requires.in
+
+DISTCLEANFILES = $(pkgconfig_DATA) $(rpmscripts_SCRIPTS)
 
 bin2dir = $(bindir)
 servicedir = $(bindir)
+rpmscriptsdir = $(bindir)
 
 bin_SCRIPTS = \
 	al			\
@@ -22,8 +30,6 @@ bin_SCRIPTS = \
 	mcs			\
 	mjs			\
 	mkbundle		\
-	mono-find-provides	\
-	mono-find-requires	\
 	monop			\
 	permview		\
 	prj2make		\
@@ -41,7 +47,9 @@ bin2_SCRIPTS = gmcs wsdl2
 
 service_SCRIPTS = mono-service
 
-CLEANFILES = $(bin_SCRIPTS) $(bin2_SCRIPTS) mono-service
+rpmscripts_SCRIPTS = mono-find-provides mono-find-requires
+
+CLEANFILES = $(bin_SCRIPTS) $(bin2_SCRIPTS) $(service_SCRIPTS)
 
 if USE_JIT
 MONO_INTERP = mono
diff --git a/scripts/mono-find-provides.in b/scripts/mono-find-provides.in
new file mode 100644
index 00000000000..c3f59fdd763
--- /dev/null
+++ b/scripts/mono-find-provides.in
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# mono-find-provides
+#
+# Authors:
+#       Ben Maurer (bmaurer@ximian.com)
+#
+# (C) 2005 Novell (http://www.novell.com)
+#
+
+IFS=$'\n'
+filelist=($(grep -Ev '/usr/doc/|/usr/share/doc/'))
+monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$"))
+
+# Set the prefix, unless it is overriden (used when building mono rpms)
+: ${prefix=@prefix@}
+
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+bindir=@bindir@
+
+[ -x $bindir/monodis ] || exit 0;
+[ -f $libdir/libmono.so ] || exit 0;
+
+
+# set LD_LIBRARY_PATH to ensure that libmono.so is found
+export LD_LIBRARY_PATH=$libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+
+for i in "${monolist[@]}"; do
+        ($bindir/monodis --assembly $i | awk '
+                BEGIN { LIBNAME=""; VERSION=""; }
+                /^Version:/ { VERSION=$2 }
+                /^Name:/    { LIBNAME=$2 }
+                END {
+                        if (VERSION && LIBNAME)
+                                print "mono(" LIBNAME ") = " VERSION
+                }
+            ') 2>/dev/null
+done
diff --git a/scripts/mono-find-requires.in b/scripts/mono-find-requires.in
new file mode 100644
index 00000000000..b602afd6339
--- /dev/null
+++ b/scripts/mono-find-requires.in
@@ -0,0 +1,83 @@
+#!/bin/sh
+#
+# mono-find-requires
+#
+# Authors:
+#       Ben Maurer (bmaurer@ximian.com)
+#
+# (C) 2005 Novell (http://www.novell.com)
+#
+
+IFS=$'\n'
+filelist=($(grep -Ev '/usr/doc/|/usr/share/doc/'))
+monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$"))
+
+# Set the prefix, unless it is overriden (used when building mono rpms)
+: ${prefix=@prefix@}
+
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+bindir=@bindir@
+
+[ -x $bindir/monodis ] || exit 0;
+[ -f $libdir/libmono.so ] || exit 0;
+
+
+# set LD_LIBRARY_PATH to ensure that libmono.so is found
+export LD_LIBRARY_PATH=$libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+
+REQUIRES=$(
+	for i in "${monolist[@]}"; do
+		($bindir/monodis --assemblyref $i | awk '
+			BEGIN { START=0; LIBNAME=""; VERSION=""; }
+			(START==0) && /^[0-9]+: Version=/ {
+				START=1;
+				sub(/Version=/, "", $2);
+				VERSION=$2
+			}
+	
+			(START==1) && /^\tName=/ {
+				sub(/Name=/, "", $1);
+				LIBNAME=$1
+	
+				print "mono(" LIBNAME ") = " VERSION
+				START=0
+			}
+		    ') 2> /dev/null
+	done
+)
+
+PROVIDES=$(
+	for i in "${monolist[@]}"; do
+		($bindir/monodis --assembly $i | awk '
+			BEGIN { LIBNAME=""; VERSION=""; }
+			/^Version:/ { VERSION=$2 }
+			/^Name:/    { LIBNAME=$2 }
+			END {
+				if (VERSION && LIBNAME)
+					print "mono(" LIBNAME ") = " VERSION
+			}
+		    ') 2>/dev/null
+	done
+)
+#
+# This is a little magic trick to get all REQUIRES that are not
+# in PROVIDES. While RPM functions correctly when such deps exist,
+# they make the metadata a bit bloated.
+#
+
+# Filter out dups from both lists
+REQUIRES=$(echo "$REQUIRES" | sort | uniq)
+PROVIDES=$(echo "$PROVIDES" | sort | uniq)
+
+#
+# Get a list of elements that exist in exactly one of PROVIDES or REQUIRES
+#
+UNIQ=$(echo "$PROVIDES
+$REQUIRES" | sort | uniq -u)
+
+#
+# Of those, only chose the ones that are in REQUIRES
+#
+echo "$UNIQ
+$REQUIRES" | sort | uniq -d