diff options
| author | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2011-06-02 06:45:38 +0400 |
|---|---|---|
| committer | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2011-06-02 06:45:38 +0400 |
| commit | 41af9bd766762332a065e21c63052501c7bc4427 (patch) | |
| tree | db0ba12e77febfe652b25401e73d5177f6676f1c /extras/ValaBinding | |
| parent | 929a32dbc544c006ca5042f7e80af78de50c264b (diff) | |
| parent | 72f566bf1db26bb837b40b79b7c716282cc478c5 (diff) | |
Merge pull request #73 from Tak/master-valabinding-vala010
Explicitly support Vala 0.10 (only)
Diffstat (limited to 'extras/ValaBinding')
| -rw-r--r-- | extras/ValaBinding/Makefile.am | 4 | ||||
| -rw-r--r-- | extras/ValaBinding/MonoDevelop.ValaBinding.dll.config | 3 | ||||
| -rw-r--r-- | extras/ValaBinding/Parser/Afrodite.cs | 2 | ||||
| -rw-r--r-- | extras/ValaBinding/configure.in | 3 |
4 files changed, 10 insertions, 2 deletions
diff --git a/extras/ValaBinding/Makefile.am b/extras/ValaBinding/Makefile.am index 1203dad655..03500e5c0b 100644 --- a/extras/ValaBinding/Makefile.am +++ b/extras/ValaBinding/Makefile.am @@ -1,5 +1,6 @@ ADDIN_BUILD = $(top_builddir)/build ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.ValaBinding.dll +ASSEMBLY_CONFIG = MonoDevelop.ValaBinding.dll.config REFS = \ $(GLIB_SHARP_LIBS) \ @@ -88,9 +89,10 @@ $(ASSEMBLY): $(build_sources) $(build_resources) mkdir -p $(ADDIN_BUILD) $(LOCAL_PKGCONFIG) $(CSC) $(CSC_FLAGS) -debug -out:$@ -target:library $(REFS) \ $(build_resources:%=/resource:%) $(build_sources) + cp $(ASSEMBLY_CONFIG) $(ADDIN_BUILD) valabindinglibdir = $(prefix)/lib/monodevelop/AddIns/BackendBindings -valabindinglib_DATA = $(ASSEMBLY) +valabindinglib_DATA = $(ASSEMBLY) $(ASSEMBLY_CONFIG) CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb diff --git a/extras/ValaBinding/MonoDevelop.ValaBinding.dll.config b/extras/ValaBinding/MonoDevelop.ValaBinding.dll.config new file mode 100644 index 0000000000..184cdd0306 --- /dev/null +++ b/extras/ValaBinding/MonoDevelop.ValaBinding.dll.config @@ -0,0 +1,3 @@ +<configuration> + <dllmap dll="vala" target="vala-0.10" /> +</configuration>
\ No newline at end of file diff --git a/extras/ValaBinding/Parser/Afrodite.cs b/extras/ValaBinding/Parser/Afrodite.cs index 5979d8eaf9..e1dabf9d09 100644 --- a/extras/ValaBinding/Parser/Afrodite.cs +++ b/extras/ValaBinding/Parser/Afrodite.cs @@ -793,7 +793,7 @@ namespace MonoDevelop.ValaBinding.Parser.Afrodite internal List<T> ToTypedList<T> (Func<IntPtr,T> factory) { - List<T> list = new List<T> (Count); + List<T> list = new List<T> (Math.Max (0, Count)); foreach (IntPtr item in this) { list.Add (factory (item)); } diff --git a/extras/ValaBinding/configure.in b/extras/ValaBinding/configure.in index b48c307bb7..14cbf1a4f8 100644 --- a/extras/ValaBinding/configure.in +++ b/extras/ValaBinding/configure.in @@ -53,6 +53,7 @@ dnl hard dependencies MONOADDINS_REQUIRED_VERSION=0.3 GTKSHARP_REQUIRED_VERSION=2.12.8 MONODEVELOP_REQUIRED_VERSION=2.5.91 +LIBVALA_REQUIRED_VERSION=0.10.0 PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= $MONOADDINS_REQUIRED_VERSION) AC_SUBST(MONO_ADDINS_LIBS) @@ -81,6 +82,8 @@ AM_CONDITIONAL(HAVE_GNOME_VFS_SHARP, test x$gnome_vfs_sharp = xyes) PKG_CHECK_MODULES(GCONF_SHARP, gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION, [gconf_sharp=yes], [gconf_sharp=no]) AC_SUBST(GCONF_SHARP_LIBS) AM_CONDITIONAL(HAVE_GCONF_SHARP, test x$gconf_sharp = xyes) +PKG_CHECK_MODULES(LIBVALA, vala-0.10 >= $LIBVALA_REQUIRED_VERSION) +AC_SUBST(LIBVALA_LIBS) AC_SEARCH_LIBS(afrodite_utils_get_package_paths, afrodite, [], [ echo "" |