[Pkg-cli-apps-commits] [SCM] monodevelop-java branch, master-experimental, updated. debian/2.4-3-9-g85dd83b
Jo Shields
directhex at apebox.org
Tue Jun 28 21:12:02 UTC 2011
The following commit has been merged in the master-experimental branch:
commit 64f056e0828c30b0b46fff676bf8e2f13650e418
Author: Jo Shields <directhex at apebox.org>
Date: Tue Jun 28 21:57:28 2011 +0100
Imported Upstream version 2.5.92
diff --git a/AssemblyInfo.cs b/AssemblyInfo.cs
index 67fbcc9..cf34872 100644
--- a/AssemblyInfo.cs
+++ b/AssemblyInfo.cs
@@ -5,5 +5,5 @@ using System.Reflection;
[assembly: AssemblyProduct ("MonoDevelop")]
[assembly: AssemblyTitle ("Java Language Binding")]
[assembly: AssemblyDescription ("Java Language Binding")]
-[assembly: AssemblyVersion ("2.4")]
+[assembly: AssemblyVersion ("2.6")]
[assembly: AssemblyCopyright ("GPL")]
diff --git a/IKVMCompilerManager.cs b/IKVMCompilerManager.cs
index 6c561dc..e88725a 100644
--- a/IKVMCompilerManager.cs
+++ b/IKVMCompilerManager.cs
@@ -185,7 +185,7 @@ namespace JavaBinding
string outclass = Path.Combine (outdir, configuration.OutputAssembly + ".class");
string asm = Path.GetFileNameWithoutExtension (outclass);
- StringBuilder args = new StringBuilder ("*.class ");
+ StringBuilder args = new StringBuilder ("-recurse:*.class ");
args.Append ("-assembly:"); args.Append (asm);
args.Append (" -target:"); args.Append (TargetToString (configuration.CompileTarget));
diff --git a/JavaBinding.addin.xml b/JavaBinding.addin.xml
index 9f0ef6b..2dd65ab 100644
--- a/JavaBinding.addin.xml
+++ b/JavaBinding.addin.xml
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Java Language Binding"
category = "Language bindings"
- version = "2.4">
+ version = "2.6">
<Runtime>
<Import assembly = "JavaBinding.dll"/>
@@ -15,8 +15,8 @@
<Localizer type="Gettext" catalog="monodevelop-java"/>
<Dependencies>
- <Addin id="Core" version="2.4"/>
- <Addin id="Ide" version="2.4"/>
+ <Addin id="Core" version="2.6"/>
+ <Addin id="Ide" version="2.6"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/FileFilters">
diff --git a/JavaBinding.make b/JavaBinding.make
index f4d0fd1..ab5dec4 100644
--- a/JavaBinding.make
+++ b/JavaBinding.make
@@ -9,7 +9,7 @@ include $(top_srcdir)/Makefile.include
include $(top_srcdir)/config.make
ifeq ($(CONFIG),DEBUG)
-ASSEMBLY_COMPILER_COMMAND = gmcs
+ASSEMBLY_COMPILER_COMMAND = dmcs
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug -define:DEBUG
ASSEMBLY = build/JavaBinding.dll
ASSEMBLY_MDB = $(ASSEMBLY).mdb
@@ -21,7 +21,7 @@ BUILD_DIR = build
endif
ifeq ($(CONFIG),RELEASE)
-ASSEMBLY_COMPILER_COMMAND = gmcs
+ASSEMBLY_COMPILER_COMMAND = dmcs
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+
ASSEMBLY = build/JavaBinding.dll
ASSEMBLY_MDB =
diff --git a/configure b/configure
index f7a3475..e027e7a 100755
--- a/configure
+++ b/configure
@@ -1,10 +1,10 @@
#!/bin/bash
-VERSION=2.4
+VERSION=2.5.92
PACKAGE=monodevelop-java
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-required_packages="mono-addins;0.3 gtk-sharp-2.0;2.12.8 glade-sharp-2.0;2.12.8 monodevelop;2.4"
+required_packages="mono-addins;0.3 gtk-sharp-2.0;2.12.8 glade-sharp-2.0;2.12.8 monodevelop;2.5.92"
usage ()
{
diff --git a/po/Makefile b/po/Makefile
index 5b1b727..ca133be 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -7,7 +7,7 @@ top_srcdir=../
include $(top_srcdir)/Makefile.include
include $(top_srcdir)/config.make
-MDTOOL = $(LOCAL_PKGCONFIG) mono `$(LOCAL_PKGCONFIG) pkg-config --variable=libdir monodevelop`/bin/mdrun.exe
+MDTOOL = $(LOCAL_PKGCONFIG) mono `$(LOCAL_PKGCONFIG) pkg-config --variable=libdir monodevelop`/bin/mdtool.exe
BUILD_DIR = ../build/locale
INSTALL_DIR = $(DESTDIR)$(prefix)/lib/monodevelop/AddIns/JavaBinding/locale
--
monodevelop-java
More information about the Pkg-cli-apps-commits
mailing list