From 0fb0b40883a535577b52a6d1dafd3200405855ce Mon Sep 17 00:00:00 2001 From: Pierrick Koch Date: Thu, 7 Nov 2013 17:57:04 +0100 Subject: [PATCH 1/4] fix conflict morse -> morse-simulator https://github.com/mxcl/homebrew/blob/master/Library/Formula/morse.rb was conflicting with morse formula --- README.md | 8 ++++---- morse.rb => morse-simulator.rb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) rename morse.rb => morse-simulator.rb (98%) diff --git a/README.md b/README.md index 8ee0a67..566d4e5 100644 --- a/README.md +++ b/README.md @@ -9,16 +9,16 @@ Morse can be installed using the Homebrew package manager (http://mxcl.github.co brew install python3 brew tap davidhodo/homebrew-morse - brew install morse + brew install morse-simulator To upgrade to the latest version: brew update - brew install --upgrade morse + brew install --upgrade morse-simulator To uninstall Morse: - brew uninstall morse + brew uninstall morse-simulator # Formula Options @@ -33,7 +33,7 @@ Generating documentation can be enabled with '--with-doc'. HLA support can be e E.g. to install Morse with generated documentation and support for ROS: - brew install morse --with-doc --with-ros + brew install morse-simulator --with-doc --with-ros # ROS Installation Issues The 1.0 version of Morse has been tested on OSX with ROS Groovy, Python 3.3, and Blender 2.65. ROS was installed following the Homebrew based installation instructions given at: diff --git a/morse.rb b/morse-simulator.rb similarity index 98% rename from morse.rb rename to morse-simulator.rb index a2d53ca..571f398 100644 --- a/morse.rb +++ b/morse-simulator.rb @@ -1,6 +1,6 @@ require 'formula' -class Morse < Formula +class MorseSimulator < Formula homepage '' url 'https://github.com/laas/morse.git', :tag => '1.0.1' #head 'https://github.com/laas/morse.git', :branch => 'master' From 0b155f26851a725641b250faacdeea2cd977bf16 Mon Sep 17 00:00:00 2001 From: Pierrick Koch Date: Fri, 8 Nov 2013 12:07:45 +0100 Subject: [PATCH 2/4] bump to 1.1.1 For a complete changelog, see: http://www.openrobots.org/morse/doc/1.1/what_new.html --- morse-simulator.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/morse-simulator.rb b/morse-simulator.rb index 571f398..433b3ed 100644 --- a/morse-simulator.rb +++ b/morse-simulator.rb @@ -2,10 +2,10 @@ class MorseSimulator < Formula homepage '' - url 'https://github.com/laas/morse.git', :tag => '1.0.1' + url 'https://github.com/laas/morse.git', :tag => '1.1.1' #head 'https://github.com/laas/morse.git', :branch => 'master' homepage 'http://morse.openrobots.org' - version '1.0.1' + version '1.1.1' #sha1 '6b484890e2dc7801bcb135193cec3799f42e4208' option 'with-ros', 'Enable ROS middleware support' From 02989ff3a75b5ba4c0b9950aecd0a7aac036c98f Mon Sep 17 00:00:00 2001 From: Pierrick Koch Date: Fri, 8 Nov 2013 12:14:24 +0100 Subject: [PATCH 3/4] fix homebrew homepage in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 566d4e5..9051401 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Homebrew recipes to install Morse (https://morse.openrobots.org) and its depende # Installation -Morse can be installed using the Homebrew package manager (http://mxcl.github.com/homebrew/) by: +Morse can be installed using the Homebrew package manager (http://brew.sh) by: brew install python3 brew tap davidhodo/homebrew-morse From ca8efa1bc2d02e0e1dd57c24583ca7e6c027d175 Mon Sep 17 00:00:00 2001 From: Pierrick Koch Date: Fri, 31 Jan 2014 16:58:56 +0100 Subject: [PATCH 4/4] [readme] mention moving to main morse org --- README.md | 45 +++------------------------------------------ 1 file changed, 3 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 9051401..4f07d45 100644 --- a/README.md +++ b/README.md @@ -1,47 +1,8 @@ homebrew-morse ============== -Homebrew recipes to install Morse (https://morse.openrobots.org) and its dependencies. +This repository is now part of the main morse organization[1] -# Installation + brew tap morse-simulator/morse -Morse can be installed using the Homebrew package manager (http://brew.sh) by: - - brew install python3 - brew tap davidhodo/homebrew-morse - brew install morse-simulator - -To upgrade to the latest version: - - brew update - brew install --upgrade morse-simulator - -To uninstall Morse: - - brew uninstall morse-simulator - -# Formula Options - -The default formula configures and installs Morse for only the sockets middleware. To following formula options are available to enable middleware support: - -* --with-ros -* --with-moos -* --with-pocolibs -* --with-yarp2 - -Generating documentation can be enabled with '--with-doc'. HLA support can be enabled with '--with-hla'. - -E.g. to install Morse with generated documentation and support for ROS: - - brew install morse-simulator --with-doc --with-ros - -# ROS Installation Issues -The 1.0 version of Morse has been tested on OSX with ROS Groovy, Python 3.3, and Blender 2.65. ROS was installed following the Homebrew based installation instructions given at: - - http://www.ros.org/wiki/groovy/Installation/OSX/Homebrew/Source - -In addition to the instructions provided on the ROS website, a version of rospkg for Python 3 must be installed for Morse to operate properly: - - sudo pip3 install rospkg - - +[1] https://github.com/morse-simulator/homebrew-morse