Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan McGovern <alan@xamarin.com>2015-03-04 19:44:22 +0300
committerAlan McGovern <alan@xamarin.com>2015-03-04 19:44:45 +0300
commit42a3be1954c5b3562c4f2f1f56929d295d314d02 (patch)
tree1c706fa927796d61b632f1c033137d49cc59c414
parent153ffb3320b7ee95d45d843f39ecbee48ec373f7 (diff)
Revert "[build] Add a dependency checker to configure"
This reverts commit 96bb9c7b1910b3a1feb248e56ed5227268f0df2c. This needs to be properly protected so it only runs on Mac systems.
-rwxr-xr-xconfigure9
-rw-r--r--dependency_checker.rb30
2 files changed, 0 insertions, 39 deletions
diff --git a/configure b/configure
index 04a83e43d8..42d2ae1231 100755
--- a/configure
+++ b/configure
@@ -6,13 +6,6 @@ prefix=NONE
test -e "$CONFIG_SITE" && . "$CONFIG_SITE"
test "$prefix" = NONE && prefix=/usr/local
-bail ()
-{
- echo "$2"
- echo "Run 'configure --help' for usage."
- exit "$1"
-}
-
usage ()
{
profiles=`ls profiles | sed -e "s/$/,/g" | fmt | sed -e 's/,$//' -e "s/ChangeLog, //"`
@@ -263,8 +256,6 @@ while test x$1 != x; do
shift
done
-ruby dependency_checker.rb || bail 7 "A dependency is not fulfilled"
-
# make the build & run use libraries already installed in $PREFIX
if [ -d "$prefix" ]; then
export MONO_GAC_PREFIX=$prefix:$MONO_GAC_PREFIX
diff --git a/dependency_checker.rb b/dependency_checker.rb
deleted file mode 100644
index 99c64269be..0000000000
--- a/dependency_checker.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'pp'
-
-REQUIRED_XAMARIN_MAC_VERSION="1.12.0.4"
-XAMARIN_MAC_VERSION_FILE="/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/Version"
-
-def compare_version(first, second)
- val1 = first.split('.').map { |x| x.to_i }
- val2 = second.split('.').map { |x| x.to_i }
-
- return val1 <=> val2
-end
-
-def check_product(required_version, version_file, product_name)
- actual_version = File.read(version_file).strip
- retval = compare_version(actual_version, required_version)
- if (retval < 0)
- puts "Your installed #{product_name} (#{actual_version}) is too old, please use #{required_version} or newer"
- end
- return retval
-end
-
-def run()
- xammac_ret = check_product(REQUIRED_XAMARIN_MAC_VERSION, XAMARIN_MAC_VERSION_FILE, "Xamarin.Mac")
- if (xammac_ret < 0)
- raise RuntimeError
- end
-end
-
-$stdout.sync = true
-run()