diff --git a/Makefile.am b/Makefile.am index aaffb9842b..e06b5dfca4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ all: update_submodules SUBMODULE_ERROR='Could not recursively update all git submodules. You may experience compilation problems if some submodules are out of date' update_submodules: - @$(srcdir)/scripts/update_submodules + @$(srcdir)/scripts/update_submodules.sh .PHONY: update_submodules diff --git a/Makefile.in b/Makefile.in index 152dedfc88..f7fd0dac55 100644 --- a/Makefile.in +++ b/Makefile.in @@ -939,7 +939,7 @@ uninstall-am: all: update_submodules update_submodules: - @$(srcdir)/scripts/update_submodules + @$(srcdir)/scripts/update_submodules.sh .PHONY: update_submodules diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index b905186086..b5331a88d1 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -5ee52c595af4a754ddf1cc4e287415421e543537 \ No newline at end of file +1f5b54d986e9a0bb2907e076fbde52c66bc7e50d \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 1a8082c714..c21274a1d3 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -c6c1d89ecade1efd48abd44c9cb42126f11dacff \ No newline at end of file +a04424aabfe6acc33f8fe8cc3671eea3e0b4330b \ No newline at end of file diff --git a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/AssemblyMirror.cs b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/AssemblyMirror.cs index 9b0af4c77d..a83daab43c 100644 --- a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/AssemblyMirror.cs +++ b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/AssemblyMirror.cs @@ -14,6 +14,7 @@ namespace Mono.Debugger.Soft ModuleMirror main_module; AssemblyName aname; AssemblyDefinition meta; + AppDomainMirror domain; Dictionary typeCacheIgnoreCase = new Dictionary (StringComparer.InvariantCultureIgnoreCase); Dictionary typeCache = new Dictionary (); @@ -50,6 +51,17 @@ namespace Mono.Debugger.Soft } } + // Since Protocol version 2.45 + public AppDomainMirror Domain { + get { + if (domain == null) { + vm.CheckProtocolVersion (2, 45); + domain = vm.GetDomain (vm.conn.Assembly_GetIdDomain (id)); + } + return domain; + } + } + public virtual AssemblyName GetName () { if (aname == null) { string name = vm.conn.Assembly_GetName (id); diff --git a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/Connection.cs b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/Connection.cs index 93e9a959ee..7e47063d6a 100644 --- a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/Connection.cs +++ b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/Connection.cs @@ -420,7 +420,7 @@ namespace Mono.Debugger.Soft * with newer runtimes, and vice versa. */ internal const int MAJOR_VERSION = 2; - internal const int MINOR_VERSION = 43; + internal const int MINOR_VERSION = 45; enum WPSuspendPolicy { NONE = 0, @@ -532,7 +532,8 @@ namespace Mono.Debugger.Soft GET_MANIFEST_MODULE = 3, GET_OBJECT = 4, GET_TYPE = 5, - GET_NAME = 6 + GET_NAME = 6, + GET_DOMAIN = 7 } enum CmdModule { @@ -590,6 +591,7 @@ namespace Mono.Debugger.Soft GET_THIS = 2, SET_VALUES = 3, GET_DOMAIN = 4, + SET_THIS = 5, } enum CmdArrayRef { @@ -2113,6 +2115,10 @@ namespace Mono.Debugger.Soft return SendReceive (CommandSet.ASSEMBLY, (int)CmdAssembly.GET_NAME, new PacketWriter ().WriteId (id)).ReadString (); } + internal long Assembly_GetIdDomain (long id) { + return SendReceive (CommandSet.ASSEMBLY, (int)CmdAssembly.GET_DOMAIN, new PacketWriter ().WriteId (id)).ReadId (); + } + /* * TYPE */ @@ -2410,6 +2416,10 @@ namespace Mono.Debugger.Soft return SendReceive (CommandSet.STACK_FRAME, (int)CmdStackFrame.GET_DOMAIN, new PacketWriter ().WriteId (thread_id).WriteId (id)).ReadId (); } + internal void StackFrame_SetThis (long thread_id, long id, ValueImpl value) { + SendReceive (CommandSet.STACK_FRAME, (int)CmdStackFrame.SET_THIS, new PacketWriter ().WriteId (thread_id).WriteId (id).WriteValue (value)); + } + /* * ARRAYS */ diff --git a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/StackFrame.cs b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/StackFrame.cs index f160c4a37a..c92f2240ef 100644 --- a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/StackFrame.cs +++ b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/StackFrame.cs @@ -166,6 +166,15 @@ namespace Mono.Debugger.Soft return vm.DecodeValue (vm.conn.StackFrame_GetThis (thread.Id, Id)); } + // Since protocol version 2.44 + public void SetThis (Value value) { + if (value == null) + throw new ArgumentNullException ("value"); + if (Method.IsStatic || !Method.DeclaringType.IsValueType) + throw new InvalidOperationException ("The frame's method needs to be a valuetype instance method."); + vm.conn.StackFrame_SetThis (thread.Id, Id, vm.EncodeValue (value)); + } + public void SetValue (LocalVariable var, Value value) { if (var == null) throw new ArgumentNullException ("var"); diff --git a/mcs/class/Mono.Debugger.Soft/Test/dtest.cs.REMOVED.git-id b/mcs/class/Mono.Debugger.Soft/Test/dtest.cs.REMOVED.git-id index c4d525cfc6..96c71aa207 100644 --- a/mcs/class/Mono.Debugger.Soft/Test/dtest.cs.REMOVED.git-id +++ b/mcs/class/Mono.Debugger.Soft/Test/dtest.cs.REMOVED.git-id @@ -1 +1 @@ -10f28bcfc8faf083f7bacd0efadc598a4bbba506 \ No newline at end of file +1d8f429b58b595754ddcbc30238a86f4f64a5050 \ No newline at end of file diff --git a/mcs/class/Mono.Security/Mono.Security.X509/X509Store.cs b/mcs/class/Mono.Security/Mono.Security.X509/X509Store.cs index 536782fd0c..1821075635 100644 --- a/mcs/class/Mono.Security/Mono.Security.X509/X509Store.cs +++ b/mcs/class/Mono.Security/Mono.Security.X509/X509Store.cs @@ -163,7 +163,7 @@ namespace Mono.Security.X509 { cspParams.KeyContainerName = CryptoConvert.ToHex (certificate.Hash); // Right now this seems to be the best way to know if we should use LM store.. ;) - if (_storePath.StartsWith (X509StoreManager.LocalMachinePath)) + if (_storePath.StartsWith (X509StoreManager.LocalMachinePath) || _storePath.StartsWith(X509StoreManager.NewLocalMachinePath)) cspParams.Flags = CspProviderFlags.UseMachineKeyStore; ImportPrivateKey (certificate, cspParams); @@ -338,7 +338,7 @@ namespace Mono.Security.X509 { // If privateKey it's available, load it too.. CspParameters cspParams = new CspParameters (); cspParams.KeyContainerName = CryptoConvert.ToHex (cert.Hash); - if (_storePath.StartsWith (X509StoreManager.LocalMachinePath)) + if (_storePath.StartsWith (X509StoreManager.LocalMachinePath) || _storePath.StartsWith(X509StoreManager.NewLocalMachinePath)) cspParams.Flags = CspProviderFlags.UseMachineKeyStore; KeyPairPersistence kpp = new KeyPairPersistence (cspParams); diff --git a/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id index 8f38674309..d8953927db 100644 --- a/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -87cdef5c41826c8ad40a46a9f662234769f1a596 \ No newline at end of file +3d79e44fa692cf973f2663a7bf559af29f22c161 \ No newline at end of file diff --git a/mcs/class/lib/monolite/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.Configuration.dll.REMOVED.git-id index 8855a044a1..e743249e61 100644 --- a/mcs/class/lib/monolite/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -a1437f73aa93b512e6b12d6a52339d1d4d2abd5d \ No newline at end of file +1d5679f4c41950c1ebc6de1e704081e655202973 \ No newline at end of file diff --git a/mcs/class/lib/monolite/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.Core.dll.REMOVED.git-id index 7b1d4cedb6..4559a22cef 100644 --- a/mcs/class/lib/monolite/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -14b978577f098a3656996d0d47ba8f4f5ad2282b \ No newline at end of file +27644619f0798b509db93fcc2c9c9daca7e87fd0 \ No newline at end of file diff --git a/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id index 26bec16875..751d1f6fc8 100644 --- a/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -4290723c3f54f5143abed47828651d8f424b95f3 \ No newline at end of file +149fd98eeb1f80cda33f523a71586c3c56cce23d \ No newline at end of file diff --git a/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id index 7ac3365ede..628abba1d9 100644 --- a/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -9ae3f67f2d49337f9132b2676053d84cf34ff5d3 \ No newline at end of file +d82e9d9ead46347c5641a66f76035811190e0e5e \ No newline at end of file diff --git a/mcs/class/lib/monolite/System.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.dll.REMOVED.git-id index 7884d8f2ff..748f6bbe40 100644 --- a/mcs/class/lib/monolite/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.dll.REMOVED.git-id @@ -1 +1 @@ -ab52f34a16be899445ac46f7fa080754b4035145 \ No newline at end of file +5e769f86c6e601eeed6a547e159a1e065ec48f06 \ No newline at end of file diff --git a/mcs/class/lib/monolite/basic.exe.REMOVED.git-id b/mcs/class/lib/monolite/basic.exe.REMOVED.git-id index 46120cf8b4..eeaa2aa757 100644 --- a/mcs/class/lib/monolite/basic.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite/basic.exe.REMOVED.git-id @@ -1 +1 @@ -e2132b7cb721bf4a4f23e20d5e295687d21b1ddf \ No newline at end of file +01a4b08d98f10122f957785f3e414ead7d64ad42 \ No newline at end of file diff --git a/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id index aec906edee..66bc749a33 100644 --- a/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -1f23dd85def924073ad388e7604387b143d0f06b \ No newline at end of file +7941c31777bd9ab2dc0aa8f7c4e6bcc0f5de68fb \ No newline at end of file diff --git a/mono/metadata/class-internals.h b/mono/metadata/class-internals.h index ef861aa899..8bb0b610a6 100644 --- a/mono/metadata/class-internals.h +++ b/mono/metadata/class-internals.h @@ -458,8 +458,9 @@ struct MonoVTable { guint8 *interface_bitmap; guint16 max_interface_id; guint8 rank; + /* Keep this a guint8, the jit depends on it */ + guint8 initialized; /* cctor has been run */ guint remote : 1; /* class is remotely activated */ - guint initialized : 1; /* cctor has been run */ guint init_failed : 1; /* cctor execution failed */ guint has_static_fields : 1; /* pointer to the data stored at the end of the vtable array */ guint gc_bits : MONO_VTABLE_AVAILABLE_GC_BITS; /* Those bits are reserved for the usaged of the GC */ diff --git a/mono/metadata/object-offsets.h b/mono/metadata/object-offsets.h index 5c78288ec8..fdddc7f578 100644 --- a/mono/metadata/object-offsets.h +++ b/mono/metadata/object-offsets.h @@ -76,6 +76,7 @@ DECL_OFFSET(MonoVTable, max_interface_id) DECL_OFFSET(MonoVTable, interface_bitmap) DECL_OFFSET(MonoVTable, vtable) DECL_OFFSET(MonoVTable, rank) +DECL_OFFSET(MonoVTable, initialized) DECL_OFFSET(MonoVTable, type) DECL_OFFSET(MonoVTable, runtime_generic_context) diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am index c3cc64f041..76d27664e5 100644 --- a/mono/mini/Makefile.am +++ b/mono/mini/Makefile.am @@ -861,7 +861,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 4.8.0.483/ba7f169\"" > version.h + echo "#define FULL_VERSION \"Stable 4.8.0.489/9ac5bf2\"" > version.h # Utility target for patching libtool to speed up linking patch-libtool: diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in index c3cc64f041..76d27664e5 100755 --- a/mono/mini/Makefile.am.in +++ b/mono/mini/Makefile.am.in @@ -861,7 +861,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 4.8.0.483/ba7f169\"" > version.h + echo "#define FULL_VERSION \"Stable 4.8.0.489/9ac5bf2\"" > version.h # Utility target for patching libtool to speed up linking patch-libtool: diff --git a/mono/mini/Makefile.in.REMOVED.git-id b/mono/mini/Makefile.in.REMOVED.git-id index ba1bdfbee6..e207d3d3d7 100644 --- a/mono/mini/Makefile.in.REMOVED.git-id +++ b/mono/mini/Makefile.in.REMOVED.git-id @@ -1 +1 @@ -9e66f81dfb8f381a6cdc81e9852487bb391c9616 \ No newline at end of file +d78d3160cb95346fa22eb7f257a9e51030af6b97 \ No newline at end of file diff --git a/mono/mini/debugger-agent.c.REMOVED.git-id b/mono/mini/debugger-agent.c.REMOVED.git-id index 12b9e36839..0851ceb9d2 100644 --- a/mono/mini/debugger-agent.c.REMOVED.git-id +++ b/mono/mini/debugger-agent.c.REMOVED.git-id @@ -1 +1 @@ -f778f59ada713a7c2556d4dbea1ef6473d3650a2 \ No newline at end of file +0ec7f5958e3856cfe956471328e27fb9dc3e5de6 \ No newline at end of file diff --git a/mono/mini/method-to-ir.c.REMOVED.git-id b/mono/mini/method-to-ir.c.REMOVED.git-id index b7c968e16e..332d6517d3 100644 --- a/mono/mini/method-to-ir.c.REMOVED.git-id +++ b/mono/mini/method-to-ir.c.REMOVED.git-id @@ -1 +1 @@ -989d1ceee9a69e6fa24b8a468e3ee04693b4a338 \ No newline at end of file +c78dd666bf120a7b972ce43e3aa949f6e124d7e5 \ No newline at end of file diff --git a/mono/mini/mini-amd64.c.REMOVED.git-id b/mono/mini/mini-amd64.c.REMOVED.git-id index aa59cf0caa..0e7fbbdcdb 100644 --- a/mono/mini/mini-amd64.c.REMOVED.git-id +++ b/mono/mini/mini-amd64.c.REMOVED.git-id @@ -1 +1 @@ -3db3f59ac8a8d3be96d86874d46e4ac43a7e450a \ No newline at end of file +9252453243a187d9d4e4d8af4894553d7f3c8c52 \ No newline at end of file diff --git a/mono/mini/mini-arm.c.REMOVED.git-id b/mono/mini/mini-arm.c.REMOVED.git-id index 70746d1f9e..31322c30b5 100644 --- a/mono/mini/mini-arm.c.REMOVED.git-id +++ b/mono/mini/mini-arm.c.REMOVED.git-id @@ -1 +1 @@ -8b0b61e62ad3a349c2c1721e0d36365f3697eccf \ No newline at end of file +0784d290c0c1991dbc02f5b7cf69a367983f3d7e \ No newline at end of file diff --git a/mono/mini/mini-arm64.c.REMOVED.git-id b/mono/mini/mini-arm64.c.REMOVED.git-id index dc87bb7c47..e517f76031 100644 --- a/mono/mini/mini-arm64.c.REMOVED.git-id +++ b/mono/mini/mini-arm64.c.REMOVED.git-id @@ -1 +1 @@ -b4871f36b910f3efc6be8a41a65c6d80a1e7d70b \ No newline at end of file +6cf2ec475565f30874bec535d48ea4435ea66ca4 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index c4b37d6354..43ae24d8ae 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "Stable 4.8.0.483/ba7f169" +#define FULL_VERSION "Stable 4.8.0.489/9ac5bf2" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index feb8ed33f8..c0b168cce4 100644 Binary files a/po/mcs/de.gmo and b/po/mcs/de.gmo differ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 15a14b3d9b..286f652a5b 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -b9667b3e71239bc55572c5164c1d3e5a4b05b099 \ No newline at end of file +da2fd49923155b32b5bca18fb07cf7c7e320a8dc \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index f6b4f620ce..49089190b7 100644 Binary files a/po/mcs/es.gmo and b/po/mcs/es.gmo differ diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index da00e1139d..c307df86b1 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -fae2eeed149ee7057ac6271c6600bcf980d267ab \ No newline at end of file +e4a9bbec1f2d716b4b646529ce5394539d5aaf92 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 246346a352..d7a1064ac0 100644 Binary files a/po/mcs/ja.gmo and b/po/mcs/ja.gmo differ diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 3c012fad95..1f4feb8184 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -06520507928f8b699b9062e095592e8976d85903 \ No newline at end of file +6b60ac7183d65ee9d7f074c8a23f3799d762e2b6 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index da259362a9..fa474c2c8c 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: mono 4.8.0\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2017-02-07 10:58+0000\n" +"POT-Creation-Date: 2017-02-15 09:35+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index e505ef24b3..13329957a1 100644 Binary files a/po/mcs/pt_BR.gmo and b/po/mcs/pt_BR.gmo differ diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 691cef4f39..ac6c3daccb 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -4e4126ca221c7efebe3ca9f837dcbfb791824362 \ No newline at end of file +593851f8ddc8ae23de4aecfe19261ca7f69713f9 \ No newline at end of file diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 51a160c36c..012cf813c6 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -154,14 +154,13 @@ EXTRA_DIST = \ mono-find-requires.in \ peverify.in \ xbuild.in \ - update_submodules \ + update_submodules.sh \ mcs.in \ dmcs.in \ mono-package-runtime \ mono-test-install \ mono-heapviz \ $(MDOC_COMPAT) \ - get-cygwin-deps.sh \ mono-configuration-crypto.in \ submodules/versions.mk \ submodules/versions.py diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 92b1108c1d..32b0042afa 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -496,14 +496,13 @@ EXTRA_DIST = \ mono-find-requires.in \ peverify.in \ xbuild.in \ - update_submodules \ + update_submodules.sh \ mcs.in \ dmcs.in \ mono-package-runtime \ mono-test-install \ mono-heapviz \ $(MDOC_COMPAT) \ - get-cygwin-deps.sh \ mono-configuration-crypto.in \ submodules/versions.mk \ submodules/versions.py diff --git a/scripts/get-cygwin-deps.sh b/scripts/get-cygwin-deps.sh deleted file mode 100755 index 6fc456e309..0000000000 --- a/scripts/get-cygwin-deps.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash - -# -# This script will download and install the dependencies needed for compiling -# mono on cygwin -# - -# Check for required packages - -commands="wget unzip automake autoconf libtool make bison" - -failed=0 -for i in $commands; do - if ! which $i > /dev/null 2>&1; then - echo "You must have the '$i' package installed." - failed=1 - fi -done - -if [ $failed = 1 ]; then - exit 1 -fi - -dir=cygwin-deps -mkdir -p $dir - -echo -n "Downloading deps... " -if [ ! -f $dir/gettext-runtime-0.17-1.zip ]; then - wget -P $dir http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gettext-runtime-0.17-1.zip -fi -if [ ! -f $dir/libiconv-1.13-mingw32-dev.tar.gz ]; then - wget -P $dir http://sourceforge.net/projects/mingw/files/MinGW/libiconv/libiconv-1.13/libiconv-1.13-mingw32-dev.tar.gz/download -fi -echo "done." - -echo -n "Extracting to cygwin-deps/ ..." -(cd $dir && for i in *.zip; do unzip -oq $i || exit 1; done) || exit 1 -# This is needed because windows can't use dll's without an x flag. -chmod a+x $dir/bin/*.dll -echo "done." - -echo -n "Patching PC files... " -prefix=$PWD/$dir -find $dir -name "*.pc" > $dir/pc-files -for i in `cat $dir/pc-files`; do - (sed -e "s,^prefix=.*,prefix=$prefix,g" < $i > $i.tmp && mv $i.tmp $i) || exit 1 -done -rm -f $dir/pc-files -echo "done." - -# Create an environment shell file -rm -f $dir/env.sh -echo "export PKG_CONFIG_PATH=\"$PWD/$dir/lib/pkgconfig:\$PKG_CONFIG\"" >> $dir/env.sh -echo "export PATH=\"$PWD/$dir/bin:\$PATH\"" >> $dir/env.sh - -echo "Source $dir/env.sh into your environment using:" -echo ". $dir/env.sh" -echo "Then run mono's configure." diff --git a/scripts/update_submodules b/scripts/update_submodules.sh similarity index 98% rename from scripts/update_submodules rename to scripts/update_submodules.sh index 22109b920c..83ec6d392a 100755 --- a/scripts/update_submodules +++ b/scripts/update_submodules.sh @@ -1,3 +1,4 @@ +#!/bin/sh SUBMODULE_ERROR='Could not recursively update all git submodules. You may experience compilation problems if some submodules are out of date' SUBMODULE_OK='Git submodules updated successfully' if test -d .git; then \