Browse Source

2007-10-02 Miguel de Icaza <[email protected]>

	* scripts/mono-test-install: (temp_exe): Add tests for dynamic
	libraries that libgdiplus might be missing
;w


svn path=/trunk/mono/; revision=86784
Miguel de Icaza 18 years ago
parent
commit
403ada9782
2 changed files with 19 additions and 6 deletions
  1. 4 1
      ChangeLog
  2. 15 5
      scripts/mono-test-install

+ 4 - 1
ChangeLog

@@ -1,6 +1,9 @@
 2007-10-02  Miguel de Icaza  <[email protected]>
 
-	* scripts/mono-test-install: Add detection and diagnostics for
+	* scripts/mono-test-install: (temp_exe): Add tests for dynamic
+	libraries that libgdiplus might be missing
+
+	Add detection and diagnostics for
 	broken System.Drawing installations.
 
 2007-09-19  Jb Evain  <[email protected]>

+ 15 - 5
scripts/mono-test-install

@@ -86,8 +86,10 @@ search_libgdiplus_on_path()
 	fi
 	while test x$1 != x; do
 	    if test -e $1/$libgdiplus; then
-		   echo    Found a libgdiplus in directory $1
+		   echo "    The $libgdiplus is found on $libdir/$libgdiplus"
 		   libgdiplus_found=true
+		   libgdiplus_path=$1/$libgdiplus
+		   break
 	    fi
 	    shift
 	done
@@ -117,17 +119,25 @@ if mcs -pkg:dotnet $temp_cs >& /dev/null; then
 
 	   libdir=`dirname $monocmd`/../lib
 	   if test -f $libdir/$libgdiplus; then
-	       echo "    The $libgdiplus is found on $libdir"
+	       echo "    The $libgdiplus is found on $libdir/$libgdiplus"
 	       if test -e $libdir/$libgdiplus; then
-		   echo "    but it seems to be a broken link"
+		   libgdiplus_path=$libdir/$libgdiplus
+		   libgdiplus_found=true
 	       else
-		   search_libgdiplus_on_path
+		   echo "    but it seems to be a broken link"
 	       fi
 	   else
 	       search_libgdiplus_on_path
 	   fi
 	   if $libgdiplus_found; then
-	       echo "    libgdiplus found"
+	       echo ssss 
+	       if which ldd >/dev/null; then
+		   LANG=C dirs=`ldd $libgdiplus_path | grep 'not found'`
+		   if echo $dirs | grep 'not found' >& /dev/null; then
+		       echo "    libgdiplus is missing the following dependencies to run:"
+		       echo $dirs | sed 's/^/        /'
+		   fi
+	       fi 
 	   else
 	       echo "    No libgdiplus was found on your $LD_PATH"
 	   fi