* GtkSharpLibs/md-gtk-sharp-2.10:

* GtkSharpLibs/md-gtk-sharp-2.10/README:
* GtkSharpLibs/md-gtk-sharp-2.10/Makefile:
* GtkSharpLibs/md-gtk-sharp-2.10/md-gtk-sharp.addin.xml.xsl: New gtk#
2.10 compat lib.

* GtkSharpLibs/md-gtk-sharp-2.8/Makefile:
* GtkSharpLibs/md-gtk-sharp-2.6/Makefile:
* GtkSharpLibs/md-gtk-sharp-2.4/Makefile: Added more policies to make
sure future gtk# versions are mapped to this one.

svn path=/trunk/monodevelop/; revision=125480

6 files changed, 225 insertions, 12 deletions

diff --git a/extras/GtkSharpLibs/md-gtk-sharp-2.10/Makefile b/extras/GtkSharpLibs/md-gtk-sharp-2.10/Makefile
new file mode 100644
index 0000000000..98de42e8c8
--- /dev/null
+++ b/extras/GtkSharpLibs/md-gtk-sharp-2.10/Makefile
@@ -0,0 +1,107 @@
+ADDIN_VERSION=2.10.3.23
+CORE_ADDIN_VERSION=1.9.1
+TARGET_VERSION=2.10
+GTK_POLICY_VERSION=2.4 2.6 2.8 2.10 2.12 2.14 2.16 2.18
+GNOME_POLICY_VERSION=2.4 2.6 2.8 2.16 2.18 2.20 2.22 2.24 2.26 2.28 2.30
+GTK_VERSION=2.10.3
+GNOME_VERSION=2.16.1
+
+GTK_TARBALL=gtk-sharp-$(GTK_VERSION).tar.gz
+GNOME_TARBALL=gnome-sharp-$(GNOME_VERSION).tar.gz
+GTK_DIR=gtk-sharp-$(GTK_VERSION)
+GNOME_DIR=gnome-sharp-$(GNOME_VERSION)
+ADDIN_FILE=md-gtk-sharp.addin.xml
+ADDIN_MPACK=MonoDevelop.GtkCore.GtkSharp.$(TARGET_VERSION)_$(GTK_VERSION).mpack
+GTK_LIB=tmpinstall/lib/mono/gac/gtk-sharp2/$(GTK_VERSION)/gtk-sharp2.dll
+GNOME_LIB=tmpinstall/lib/mono/gac/gnome-sharp2/$(GTK_VERSION)/gnome-sharp2.dll
+
+GTK_LIBS = \
+	atk/atk-sharp \
+	gconf/GConf/gconf-sharp \
+	gdk/gdk-sharp \
+	glade/glade-sharp \
+	glib/glib-sharp \
+	gnome/gnome-sharp \
+	gtkdotnet/gtk-dotnet \
+	gtk/gtk-sharp \
+	pango/pango-sharp
+
+GNOME_LIBS = \
+	art/art-sharp \
+	gconf/GConf/gconf-sharp \
+	gnome/gnome-sharp \
+	gnomevfs/gnome-vfs-sharp \
+	gtkhtml/gtkhtml-sharp \
+	rsvg/rsvg-sharp \
+	vte/vte-sharp
+
+LIBS = $(foreach lib, $(GTK_LIBS), $(GTK_DIR)/$(lib)) $(foreach lib, $(GNOME_LIBS), $(GNOME_DIR)/$(lib))
+ASSEMBLIES = $(foreach lib, $(LIBS), $(lib).dll)
+GTK_POLICY_FILES = $(foreach pv, $(GTK_POLICY_VERSION), $(foreach lib, $(LIBS), $(dir $(lib))policy.$(pv).$(notdir $(lib)).dll))
+GTK_POLICY_CONFIGS = $(foreach pv, $(GTK_POLICY_VERSION), $(foreach lib, $(LIBS), $(dir $(lib))policy.$(pv).config))
+GNOME_POLICY_FILES = $(foreach pv, $(GNOME_POLICY_VERSION), $(foreach lib, $(LIBS), $(dir $(lib))policy.$(pv).$(notdir $(lib)).dll))
+GNOME_POLICY_CONFIGS = $(foreach pv, $(GNOME_POLICY_VERSION), $(foreach lib, $(LIBS), $(dir $(lib))policy.$(pv).config))
+LOCAL_CONFIG=PKG_CONFIG_PATH=`pwd`/../tmpinstall/lib/pkgconfig:$$PKG_CONFIG_PATH PATH=`pwd`/../tmpinstall/bin:$$PATH
+
+FILES = $(ASSEMBLIES) $(GTK_POLICY_FILES) $(GNOME_POLICY_FILES) $(GTK_POLICY_CONFIGS) $(GNOME_POLICY_CONFIGS)
+GAC_FILES = $(ASSEMBLIES) $(POLICY_FILES) $(GNOME_POLICY_FILES)
+
+all: build_gtk build_gnome $(ADDIN_FILE)
+
+kk:
+	echo $@
+
+clean:
+	rm -rf $(FILES) $(dir $(LIBS)) $(ADDIN_FILE) $(GTK_TARBALL) $(GNOME_TARBALL) $(GTK_DIR) $(GNOME_DIR) tmpinstall gconf files lib
+
+$(GTK_TARBALL):
+	wget http://go-mono.com/sources/gtk-sharp/$(GTK_TARBALL)
+
+$(GTK_DIR)/Makefile: $(GTK_TARBALL)
+	rm -rf $(GTK_DIR) && \
+	tar xvfz $(GTK_TARBALL) && \
+	cd $(GTK_DIR) && \
+	sed s/POLICY_VERSIONS="\(.*\)"/\POLICY_VERSIONS=\""$(GTK_POLICY_VERSION)"\"/ configure > configure.mod && \
+	chmod +x configure.mod && \
+	$(LOCAL_CONFIG) ./configure.mod --prefix=`pwd`/../tmpinstall
+
+$(GNOME_TARBALL):
+	wget http://go-mono.com/sources/gnome-sharp2/$(GNOME_TARBALL)
+
+$(GNOME_DIR)/Makefile: $(GNOME_TARBALL)
+	rm -rf $(GNOME_DIR) && \
+	tar xvfz $(GNOME_TARBALL) && \
+	cd $(GNOME_DIR) && \
+	sed s/POLICY_VERSIONS="\(.*\)"/\POLICY_VERSIONS=\""$(GNOME_POLICY_VERSION)"\"/ configure > configure.mod && \
+	chmod +x configure.mod && \
+	$(LOCAL_CONFIG) ./configure.mod --prefix=`pwd`/../tmpinstall \
+
+build_gtk: $(GTK_DIR)/Makefile
+	cd $(GTK_DIR) && \
+	$(LOCAL_CONFIG) make && \
+	$(LOCAL_CONFIG) make install
+
+build_gnome: $(GNOME_DIR)/Makefile
+	cd $(GNOME_DIR) && \
+	$(LOCAL_CONFIG) make && \
+	$(LOCAL_CONFIG) make install
+
+$(ADDIN_FILE): $(ADDIN_FILE).xsl
+	echo "<files>"  > files
+	echo "<targetversion>"$(TARGET_VERSION)"</targetversion>"  >> files
+	echo "<gtkversion>"$(GTK_VERSION)"</gtkversion>"  >> files
+	echo "<addinversion>"$(ADDIN_VERSION)"</addinversion>"  >> files
+	echo "<coreaddinversion>"$(CORE_ADDIN_VERSION)"</coreaddinversion>"  >> files
+	rm -rf lib
+	cp -r tmpinstall/lib lib
+	find lib -name *.dll -type f -printf "<dll>%p</dll>\n" >> files
+	find lib -name *.config -type f -printf "<config>%p</config>\n" >> files
+	echo "</files>" >> files
+	mono-xmltool --transform $(ADDIN_FILE).xsl files $(ADDIN_FILE)
+
+$(ADDIN_MPACK): $(ADDIN_FILE)
+	mdtool setup p $(ADDIN_FILE)
+
+pack: $(ADDIN_MPACK)
+
+	
diff --git a/extras/GtkSharpLibs/md-gtk-sharp-2.10/README b/extras/GtkSharpLibs/md-gtk-sharp-2.10/README
new file mode 100644
index 0000000000..6f55bcfd3c
--- /dev/null
+++ b/extras/GtkSharpLibs/md-gtk-sharp-2.10/README
@@ -0,0 +1,5 @@
+The Makefile in this directory generates a MonoDevelop add-in that adds
+support for GTK# 2.8.
+
+WARNING: the generation of the add-in will fail if you have any GTK# version
+installed in the GAC. To properly build it, uninstall GTK# and run make.
diff --git a/extras/GtkSharpLibs/md-gtk-sharp-2.10/md-gtk-sharp.addin.xml.xsl b/extras/GtkSharpLibs/md-gtk-sharp-2.10/md-gtk-sharp.addin.xml.xsl
new file mode 100644
index 0000000000..ca60be6e85
--- /dev/null
+++ b/extras/GtkSharpLibs/md-gtk-sharp-2.10/md-gtk-sharp.addin.xml.xsl
@@ -0,0 +1,101 @@
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes" />
+<xsl:template match="/">
+<Addin
+       namespace   = "MonoDevelop"
+       author      = "Lluis Sanchez"
+       copyright   = "GPL"
+       url         = "http://www.monodevelop.com"
+       category    = "GTK">
+       
+    <xsl:attribute name="id">GtkCore.GtkSharp.<xsl:value-of select="/files/targetversion"/></xsl:attribute>
+    <xsl:attribute name="name">GTK# <xsl:value-of select="/files/targetversion"/> Compilation Support</xsl:attribute>
+    <xsl:attribute name="version"><xsl:value-of select="/files/addinversion"/></xsl:attribute>
+    <xsl:attribute name="description">Allows building applications which target GTK# <xsl:value-of select="/files/targetversion"/></xsl:attribute>
+
+	<Runtime>
+		<xsl:for-each select="/files/config|/files/dll">
+			<xsl:element name="Import"><xsl:attribute name="file"><xsl:value-of select="." /></xsl:attribute></xsl:element>
+		</xsl:for-each>
+	</Runtime>
+	
+	<Dependencies>
+		<Addin id="Core">
+		    <xsl:attribute name="version"><xsl:value-of select="/files/coreaddinversion"/></xsl:attribute>
+		</Addin>
+		<Addin id="GtkCore">
+		    <xsl:attribute name="version"><xsl:value-of select="/files/coreaddinversion"/></xsl:attribute>
+		</Addin>
+	</Dependencies>
+	
+	<Extension path = "/MonoDevelop/Core/SupportPackages">
+		<Package name="art-sharp-2.0" gacRoot="true">
+		    <xsl:attribute name="version"><xsl:value-of select="/files/gtkversion"/></xsl:attribute>
+			<xsl:for-each select="/files/dll[contains(.,'/art-sharp')]">
+				<xsl:element name="Assembly"><xsl:attribute name="file"><xsl:value-of select="." /></xsl:attribute></xsl:element>
+			</xsl:for-each>
+		</Package>
+		<Package name="gtk-sharp-2.0" gacRoot="true">
+		    <xsl:attribute name="version"><xsl:value-of select="/files/gtkversion"/></xsl:attribute>
+			<xsl:for-each select="/files/dll[contains(.,'/atk-sharp') or contains(.,'/pango-sharp') or contains(.,'/gdk-sharp') or contains(.,'/gtk-sharp')]">
+				<xsl:element name="Assembly"><xsl:attribute name="file"><xsl:value-of select="." /></xsl:attribute></xsl:element>
+			</xsl:for-each>
+		</Package>
+		<Package name="vte-sharp-2.0" gacRoot="true">
+		    <xsl:attribute name="version"><xsl:value-of select="/files/gtkversion"/></xsl:attribute>
+			<xsl:for-each select="/files/dll[contains(.,'/vte-sharp')]">
+				<xsl:element name="Assembly"><xsl:attribute name="file"><xsl:value-of select="." /></xsl:attribute></xsl:element>
+			</xsl:for-each>
+		</Package>
+		<Package name="glib-sharp-2.0" gacRoot="true">
+		    <xsl:attribute name="version"><xsl:value-of select="/files/gtkversion"/></xsl:attribute>
+			<xsl:for-each select="/files/dll[contains(.,'/glib-sharp')]">
+				<xsl:element name="Assembly"><xsl:attribute name="file"><xsl:value-of select="." /></xsl:attribute></xsl:element>
+			</xsl:for-each>
+		</Package>
+		<Package name="rsvg-sharp-2.0" gacRoot="true">
+		    <xsl:attribute name="version"><xsl:value-of select="/files/gtkversion"/></xsl:attribute>
+			<xsl:for-each select="/files/dll[contains(.,'/rsvg-sharp')]">
+				<xsl:element name="Assembly"><xsl:attribute name="file"><xsl:value-of select="." /></xsl:attribute></xsl:element>
+			</xsl:for-each>
+		</Package>
+		<Package name="gtk-dotnet-2.0" gacRoot="true">
+		    <xsl:attribute name="version"><xsl:value-of select="/files/gtkversion"/></xsl:attribute>
+			<xsl:for-each select="/files/dll[contains(.,'/gtk-dotnet')]">
+				<xsl:element name="Assembly"><xsl:attribute name="file"><xsl:value-of select="." /></xsl:attribute></xsl:element>
+			</xsl:for-each>
+		</Package>
+		<Package name="gconf-sharp-2.0" gacRoot="true">
+		    <xsl:attribute name="version"><xsl:value-of select="/files/gtkversion"/></xsl:attribute>
+			<xsl:for-each select="/files/dll[contains(.,'/gconf-sharp')]">
+				<xsl:element name="Assembly"><xsl:attribute name="file"><xsl:value-of select="." /></xsl:attribute></xsl:element>
+			</xsl:for-each>
+		</Package>
+		<Package name="glade-sharp-2.0" gacRoot="true">
+		    <xsl:attribute name="version"><xsl:value-of select="/files/gtkversion"/></xsl:attribute>
+			<xsl:for-each select="/files/dll[contains(.,'/glade-sharp')]">
+				<xsl:element name="Assembly"><xsl:attribute name="file"><xsl:value-of select="." /></xsl:attribute></xsl:element>
+			</xsl:for-each>
+		</Package>
+		<Package name="gnome-sharp-2.0" gacRoot="true">
+		    <xsl:attribute name="version"><xsl:value-of select="/files/gtkversion"/></xsl:attribute>
+			<xsl:for-each select="/files/dll[contains(.,'/gnome-sharp')]">
+				<xsl:element name="Assembly"><xsl:attribute name="file"><xsl:value-of select="." /></xsl:attribute></xsl:element>
+			</xsl:for-each>
+		</Package>
+		<Package name="gnome-vfs-sharp-2.0" gacRoot="true">
+		    <xsl:attribute name="version"><xsl:value-of select="/files/gtkversion"/></xsl:attribute>
+			<xsl:for-each select="/files/dll[contains(.,'/gnome-vfs-sharp')]">
+				<xsl:element name="Assembly"><xsl:attribute name="file"><xsl:value-of select="." /></xsl:attribute></xsl:element>
+			</xsl:for-each>
+		</Package>
+		<Package name="gtkhtml-sharp-2.0" gacRoot="true">
+		    <xsl:attribute name="version"><xsl:value-of select="/files/gtkversion"/></xsl:attribute>
+			<xsl:for-each select="/files/dll[contains(.,'/gtkhtml-sharp')]">
+				<xsl:element name="Assembly"><xsl:attribute name="file"><xsl:value-of select="." /></xsl:attribute></xsl:element>
+			</xsl:for-each>
+		</Package>
+	</Extension>
+</Addin>
+</xsl:template>
+</xsl:stylesheet>
diff --git a/extras/GtkSharpLibs/md-gtk-sharp-2.4/Makefile b/extras/GtkSharpLibs/md-gtk-sharp-2.4/Makefile
index 1e24d74e88..bfebd58916 100644
--- a/extras/GtkSharpLibs/md-gtk-sharp-2.4/Makefile
+++ b/extras/GtkSharpLibs/md-gtk-sharp-2.4/Makefile
@@ -1,7 +1,7 @@
-ADDIN_VERSION=2.4.3.21
-CORE_ADDIN_VERSION=1.9.0
+ADDIN_VERSION=2.4.3.23
+CORE_ADDIN_VERSION=1.9.1
 TARGET_VERSION=2.4
-POLICY_VERSION=2.4 2.6 2.8 2.10
+POLICY_VERSION=2.4 2.6 2.8 2.10 2.12 2.14 2.16 2.18
 GTK_VERSION=2.4.3
 
 GTK_TARBALL=gtk-sharp-$(GTK_VERSION).tar.gz
diff --git a/extras/GtkSharpLibs/md-gtk-sharp-2.6/Makefile b/extras/GtkSharpLibs/md-gtk-sharp-2.6/Makefile
index 746e6375de..782d7546cb 100644
--- a/extras/GtkSharpLibs/md-gtk-sharp-2.6/Makefile
+++ b/extras/GtkSharpLibs/md-gtk-sharp-2.6/Makefile
@@ -1,7 +1,7 @@
-ADDIN_VERSION=2.6.0.21
-CORE_ADDIN_VERSION=1.9.0
+ADDIN_VERSION=2.6.0.23
+CORE_ADDIN_VERSION=1.9.1
 TARGET_VERSION=2.6
-POLICY_VERSION=2.4 2.6 2.8 2.10
+POLICY_VERSION=2.4 2.6 2.8 2.10 2.12 2.14 2.16 2.18
 GTK_VERSION=2.6.0
 
 GTK_TARBALL=gtk-sharp-$(GTK_VERSION).tar.gz
@@ -37,7 +37,7 @@ clean:
 	rm -rf $(FILES) $(dir $(LIBS)) $(ADDIN_FILE) $(GTK_TARBALL) $(GTK_DIR) gconf files lib
 
 $(GTK_TARBALL):
-	wget http://go-mono.com/sources/gtk-sharp-2.0/$(GTK_TARBALL)
+	wget http://go-mono.com/sources/gtk-sharp/$(GTK_TARBALL)
 	rm -rf $(GTK_DIR)
 	tar xvfz $(GTK_TARBALL)
 
diff --git a/extras/GtkSharpLibs/md-gtk-sharp-2.8/Makefile b/extras/GtkSharpLibs/md-gtk-sharp-2.8/Makefile
index ffd2c359fd..f7559eab41 100644
--- a/extras/GtkSharpLibs/md-gtk-sharp-2.8/Makefile
+++ b/extras/GtkSharpLibs/md-gtk-sharp-2.8/Makefile
@@ -1,8 +1,8 @@
-ADDIN_VERSION=2.8.3.21
-CORE_ADDIN_VERSION=1.9.0
+ADDIN_VERSION=2.8.3.23
+CORE_ADDIN_VERSION=1.9.1
 TARGET_VERSION=2.8
-POLICY_VERSION=2.4 2.6 2.8 2.10
-GTK_VERSION=2.8.3
+POLICY_VERSION=2.4 2.6 2.8 2.10 2.12 2.14 2.16 2.18
+GTK_VERSION=2.8.5
 
 GTK_TARBALL=gtk-sharp-$(GTK_VERSION).tar.gz
 GTK_DIR=gtk-sharp-$(GTK_VERSION)
@@ -37,7 +37,7 @@ clean:
 	rm -rf $(FILES) $(dir $(LIBS)) $(ADDIN_FILE) $(GTK_TARBALL) $(GTK_DIR) gconf files lib
 
 $(GTK_TARBALL):
-	wget http://go-mono.com/sources/gtk-sharp-2.0/$(GTK_TARBALL)
+	wget http://go-mono.com/sources/gtk-sharp-2.8/$(GTK_TARBALL)
 	rm -rf $(GTK_DIR)
 	tar xvfz $(GTK_TARBALL)