Add support for g++ to version selection script
Version selection script now compiles versions which are not currently installed
Don't capitalise bash prompt in version selection script
Remove --disable-python and --disable-java flags from configure script
N/A
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
Hm, I just tried the script and found
system in marathon/ on arcpatch-D826 › ./scripts/mvm.sh --help Mesos sources not found. Cloning sources. Cloning into '/Users/kjeschkies/.mesos/mesos_src'... remote: Counting objects: 120986, done. remote: Compressing objects: 100% (27701/27701), done.
I think the clone should be done during the first install.
| scripts/mvm.sh | ||
|---|---|---|
| 101 | I think it would be useful to have it built with SSL support by default. At the very least, MESOS_CONFIGURE_OPTIONS should be here and be set to SSL options by default, and it should be possible to overwrite it. | |
| Path | Packages | |||
|---|---|---|---|---|
| M | README.md (36 lines) | |||
| A | M | scripts/mvm.sh (233 lines) |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| 72fab02cc504 | 5ba021a2f0ec | ce0d800ac5ad | Keno Schwalb | Add version selection script (Show More…) | Jun 2 2017, 4:26 PM |
| ce0d800ac5ad | 58b71e06ce66 | f2c27cc00f7e | Keno Schwalb | Don't capitalise bash prompt in version selection script | Jun 2 2017, 3:31 PM |
| f2c27cc00f7e | fd45d0b48c2a | 0dd567bd06c4 | Keno Schwalb | Version selection script now compiles versions which are not currently installed | Jun 2 2017, 3:09 PM |
| 0dd567bd06c4 | 9bbed53f25df | 4691cda33a5a | Keno Schwalb | Add support for g++ to version selection script | Jun 2 2017, 11:38 AM |
| 4691cda33a5a | 533fa70e67b6 | 957b61b577e4 | Keno Schwalb | Add version selection script | Jun 1 2017, 6:02 PM |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | Caerostris | ||
| Closed | Caerostris |
| Show First 20 Lines • Show All 58 Lines • ▼ Show 20 Line(s) | |||
| 59 | 59 | * Apache Zookeeper - You can have a separate Zookeeper installation specifically for Marathon, or you can use the same Zookeeper used by Mesos. | |
|---|---|---|---|
| 60 | 60 | ||
| 61 | 61 | ### Installation | |
| 62 | 62 | ||
| 63 | 63 | #### Getting started with [DC/OS](https://dcos.io/get-started/#marathon) | |
| 64 | 64 | The by far easiest way to get Marathon running is to use [DC/OS](https://dcos.io/get-started/#marathon). Marathon is pre-bundled into [DC/OS](https://dcos.io/get-started/#marathon). | |
| 65 | 65 | ||
| 66 | 66 | #### Install Mesos | |
| 67 | Marathon requires libmesos, a shared object library, that contains JNI bindings for Marathon to talk to the Mesos master. *libmesos* comes as part of the Apache Mesos installation. There are two options for installing Apache Mesos. | ||
| 67 | Marathon requires libmesos, a shared object library, that contains JNI bindings for Marathon to talk to the Mesos master. *libmesos* comes as part of the Apache Mesos installation. There are three options for installing Apache Mesos. | ||
| 68 | 68 | ||
| 69 | 69 | ##### Installing Mesos from prepackaged releases | |
| 70 | 70 | Instructions on how to install prepackaged releases of Mesos are available [in the Marathon docs](https://mesosphere.github.io/marathon/docs/). | |
| 71 | 71 | ||
| 72 | 72 | ##### Building Mesos from source | |
| 73 | 73 | **NOTE:** *Choose this option only if building Marathon from source, else there might be version incompatibility between pre-packaged releases of Marathon and Mesos built from source.* | |
| 74 | 74 | ||
| 75 | 75 | You can find the instructions for compiling Mesos from source in the [Apache Mesos getting started docs](http://mesos.apache.org/gettingstarted/). If you want Mesos to install libraries and executables in a non-default location use the --prefix option during configuration as follows: | |
| 76 | 76 | ||
| 77 | 77 | ```console | |
| 78 | 78 | ./configure --prefix=<path to Mesos installation> | |
| 79 | 79 | ``` | |
| 80 | 80 | ||
| 81 | 81 | The `make install` will install libmesos (libmesos.so on Linux and libmesos.dylib on Mac OS X) in the install directory. | |
| 82 | |||
| 83 | ##### Using the Mesos Version Manager | ||
| 84 | **NOTE:** *Choose this option only if building Marathon from source, else there might be version incompatibility between pre-packaged releases of Marathon and Mesos built from source.* | ||
| 85 | **NOTE:** *This option is currently only supported on macOS* | ||
| 86 | |||
| 87 | The Mesos Version Manager (mvm) compiles, configures, and manages multiple versions of Apache Mesos. | ||
| 88 | It allows switching between versions quickly, making it easy to test Marathon against different versions of Mesos. | ||
| 89 | |||
| 90 | ###### Prerequisites | ||
| 91 | |||
| 92 | The Mesos Version Manager assumes that all dependencies of Apache Mesos are readily installed. | ||
| 93 | Please refer to the [Apache Mesos getting started docs](http://mesos.apache.org/gettingstarted/) for instructions on how to set up the build environment. | ||
| 94 | |||
| 95 | ###### Usage | ||
| 96 | |||
| 97 | The script can be run as follows: | ||
| 98 | |||
| 99 | cd marathon | ||
| 100 | cd scripts | ||
| 101 | ./mvm.sh <VERSION> | ||
| 102 | |||
| 103 | You should consider placing the script into a folder in your shell's `PATH` if you are using it regularly. | ||
| 104 | |||
| 105 | The mvm script accepts three different formats as version name: | ||
| 106 | |||
| 107 | 1. Version tags from the Mesos repository. Use `./mvm.sh --tags` in order to obtain a list of available tags. | ||
| 108 | 2. Commit hashes from the Mesos repository. | ||
| 109 | 3. The `--latest` flag, which automatically chooses the latest development version: `./mvm.sh --latest`. | ||
| 110 | |||
| 111 | MVM Will automatically download & compile Apache Mesos if necessary. | ||
| 112 | It will then spawn a new bash shell with the chosen version of Mesos activated. | ||
| 113 | For more information see `./mvm.sh --help`. | ||
| 114 | |||
| 115 | **Note**: You will have to re-run the script if you wish to use Mesos after closing the shell. | ||
| 82 | 116 | ||
| 83 | 117 | #### Install Marathon | |
| 84 | 118 | ||
| 85 | 119 | Instructions on how to install prepackaged releases are available [in the Marathon docs](https://mesosphere.github.io/marathon/docs/). Alternatively, you can build Marathon from source. | |
| 86 | 120 | ||
| 87 | 121 | ##### Building from Source | |
| 88 | 122 | ||
| 89 | 123 | 1. To build Marathon from source, check out this repo and use sbt to build a universal: | |
| ▲ Show 20 Lines • Show All 212 Lines • Show Last 20 Lines | |||
| Property | Old Value | New Value |
|---|---|---|
| File Mode | null | 100755 |
| 1 | #!/bin/bash -i | |||
|---|---|---|---|---|
| 2 | # | |||
| 3 | # ***Mesos Version Manager*** | |||
| 4 | # | |||
| 5 | # * Introduction * | |||
| 6 | # This script allows to easily and quickly install and switch between different | |||
| 7 | # versions of Apache Mesos. | |||
| 8 | # It was built to simplify testing of Marathon against multiple versions of Mesos. | |||
| 9 | # | |||
| 10 | # * Prerequisites * | |||
| 11 | # MVM assumes that all dependencies required to compile Mesos are readily installed. | |||
| 12 | # Follow the instructions on this page in order to install the dependencies: | |||
| 13 | # http://mesos.apache.org/gettingstarted/ | |||
| 14 | # | |||
| 15 | # * Compatibility * | |||
| 16 | # MVM has currently only been tested on macOS 10.12.5 "Sierra". | |||
| 17 | # It should run on older versions of macOS, but support for Linux will require minor alterations. | |||
| 18 | # | |||
| 19 | # * Functional Overview * | |||
| 20 | # The script clones the Apache Mesos sources files into ~/.mesos/mesos_src. | |||
| 21 | # Versions activated by the user are compiled and installed to ~/.mesos/mesos_versions/<VERSION>. | |||
| 22 | # E.g. ~/.mesos/mesos_version/1.3.0-rc3 | |||
| 23 | # The script then spawns a bash shell with paths set to point to the chosen version of Mesos. | |||
| 24 | # | |||
| 25 | ||||
| 26 | set -e | |||
| 27 | ||||
| 28 | function print_help { | |||
| 29 | echo "MVM, The Mesos Version Manager." | |||
| 30 | echo "Usage: $0 [OPTION|VERSION]" | |||
| 31 | echo "" | |||
| 32 | echo "VERSION: Any tag or revision hash from the Mesos git repository may be chosen." | |||
| 33 | echo "" | |||
| 34 | echo "OPTIONS:" | |||
| 35 | echo " --delete [VERSION] Delete an installed version of Mesos" | |||
| 36 | echo " --fetch See --update" | |||
| 37 | echo " --help Display this help screen" | |||
| 38 | echo " --latest Switch to the latest avaiable version (HEAD)" | |||
| 39 | echo " --tags List all available version tags" | |||
| 40 | echo " --installed List all installed versions" | |||
| 41 | echo " --update Update the Mesos sources" | |||
| 42 | } | |||
| 43 | ||||
| 44 | function error { | |||
| 45 | echo "Error: $1" | |||
| 46 | exit 1 | |||
| 47 | } | |||
| 48 | ||||
| 49 | function confirm { | |||
| 50 | read -r -p "$1 [y/n] " response | |||
| 51 | if [[ ! "$response" =~ [yY](es)* ]]; then | |||
| 52 | echo "Abort." | |||
| 53 | exit 0 | |||
| 54 | fi | |||
| 55 | } | |||
| 56 | ||||
| 57 | function warn { | |||
| 58 | echo "Warning: $1" | |||
| 59 | } | |||
| 60 | ||||
| 61 | function print_tags { | |||
| 62 | cd "$MESOS_SOURCES" | |||
| 63 | ||||
| 64 | for tag in $(git tag); do | |||
| 65 | echo -ne "$tag" | |||
| 66 | ||||
| 67 | # check if version is built yet | |||
| 68 | if [ -d "$MESOS_INSTALL_BASE/$tag" ]; then | |||
| 69 | echo -ne "*" | |||
| 70 | fi | |||
| 71 | ||||
| 72 | echo "" | |||
| 73 | done | |||
| 74 | } | |||
| 75 | ||||
| 76 | function print_installed { | |||
| 77 | for version in $MESOS_INSTALL_BASE/*; do | |||
| 78 | basename "$version" | |||
| 79 | done | |||
| 80 | } | |||
| 81 | ||||
| 82 | function compile_mesos_version { | |||
| 83 | cd "$MESOS_SOURCES" | |||
| 84 | local requested_version="$1" | |||
| 85 | local target_dir="$MESOS_INSTALL_BASE/$requested_version" | |||
| 86 | ||||
| 87 | # checkout requested revision | |||
| 88 | if ! git checkout "$requested_version" > /dev/null 2>&1; then | |||
| 89 | error "Version '$requested_version' does not match a git tag or revision" | |||
| 90 | fi | |||
| 91 | ||||
| 92 | # generate configure script if it does not exist | |||
| 93 | if [ ! -f "$MESOS_SOURCES/configure" ]; then | |||
| 94 | ./bootstrap | |||
| 95 | fi | |||
| 96 | ||||
| 97 | mkdir -p build | |||
| 98 | cd build | |||
| 99 | ||||
| 100 | ../configure CXXFLAGS=-Wno-deprecated-declarations --prefix="$target_dir" | |||
| 101 | ||||
| 102 | local num_parallel=${MVM_MAKE_NUM_PARALLEL:-$(getconf _NPROCESSORS_ONLN)} | |||
| 103 | make clean | |||
| 104 | make "-j$num_parallel" | |||
| 105 | ||||
| 106 | # prepare installation directory and install Mesos | |||
| 107 | mkdir "$target_dir" | |||
| 108 | make install | |||
| 109 | } | |||
| 110 | ||||
| 111 | function version_exists { | |||
| 112 | local requested_version="$1" | |||
| 113 | test -d "$MESOS_INSTALL_BASE/$requested_version" | |||
| 114 | } | |||
| 115 | ||||
| 116 | function update_sources { | |||
| 117 | cd "$MESOS_SOURCES" | |||
| 118 | git fetch | |||
| 119 | } | |||
| 120 | ||||
| 121 | function get_head_revision { | |||
| 122 | cd "$MESOS_SOURCES" | |||
| 123 | git checkout master > /dev/null 2>&1 | |||
| 124 | git rev-parse --short=9 HEAD | |||
| 125 | } | |||
| 126 | ||||
| 127 | function delete_version { | |||
| 128 | local requested_version="$1" | |||
| 129 | ||||
| 130 | if ! version_exists "$requested_version"; then | |||
| 131 | error "Mesos version '$requested_version' is not currently installed" | |||
| 132 | fi | |||
| 133 | ||||
| 134 | confirm "rm -rf \"$MESOS_INSTALL_BASE/$1\". Proceed?" | |||
| 135 | rm -rf "${MESOS_INSTALL_BASE:?}/$requested_version" | |||
| 136 | } | |||
| 137 | ||||
| 138 | function spawn_shell { | |||
| 139 | local requested_version="$1" | |||
| 140 | local mesos_base="$MESOS_INSTALL_BASE/$requested_version" | |||
| 141 | local mesos_bin="$mesos_base/bin" | |||
| 142 | local mesos_sbin="$mesos_base/sbin" | |||
| 143 | local mesos_lib="$mesos_base/lib" | |||
| 144 | local mesos_include="$mesos_base/include" | |||
| 145 | ||||
| 146 | # spawn new bash shell | |||
| 147 | PATH="$mesos_bin:$mesos_sbin:$PATH" \ | |||
| 148 | MESOS_NATIVE_JAVA_LIBRARY="$mesos_lib/libmesos.dylib" \ | |||
| 149 | CPATH="$mesos_include:$CPATH" \ | |||
| 150 | LIBRARY_PATH="$mesos_lib:$LIBRARY_PATH" \ | |||
| 151 | PS1="(mesos $requested_version) $PS1" \ | |||
| 152 | bash | |||
| 153 | } | |||
| 154 | ||||
| 155 | function activate_version { | |||
| 156 | local requested_version="$1" | |||
| 157 | ||||
| 158 | if [ "$requested_version" == "master" ]; then | |||
| 159 | echo "Please specify either a tag name or commit hash." | |||
| 160 | echo "Use the --latest flag in order to select the latest commit." | |||
| 161 | exit 1 | |||
| 162 | fi | |||
| 163 | ||||
| 164 | # verify that the specified Mesos version actually exists | |||
| 165 | if ! version_exists "$requested_version"; then | |||
| 166 | echo "Version '$requested_version' is not currently installed." | |||
| 167 | confirm "Compilation may take 30+ mins. Continue?" | |||
| 168 | compile_mesos_version "$requested_version" | |||
| 169 | fi | |||
| 170 | ||||
| 171 | spawn_shell "$requested_version" | |||
| 172 | } | |||
| 173 | ||||
| 174 | MVM_BASE="$HOME/.mesos" | |||
| 175 | MESOS_INSTALL_BASE="$MVM_BASE/mesos_versions" | |||
| 176 | MESOS_SOURCES="$HOME/.mesos/mesos_src" | |||
| 177 | ||||
| 178 | # ensure that the MVM_BASE directory exists | |||
| 179 | if [ ! -d "$MVM_BASE" ]; then | |||
| 180 | mkdir "$MVM_BASE" | |||
| 181 | fi | |||
| 182 | ||||
| 183 | # ensure that the MESOS_INSTALL_BASE directory exists | |||
| 184 | if [ ! -d "$MESOS_INSTALL_BASE" ]; then | |||
| 185 | mkdir "$MESOS_INSTALL_BASE" | |||
| 186 | fi | |||
| 187 | ||||
| 188 | # check if mesos source directory exists | |||
| 189 | if [ ! -d "$MESOS_SOURCES" ]; then | |||
| 190 | echo "Mesos sources not found. Cloning sources." | |||
| 191 | git clone https://git-wip-us.apache.org/repos/asf/mesos.git "$MESOS_SOURCES" | |||
| 192 | fi | |||
| 193 | ||||
| 194 | # check OS compatibility | |||
| 195 | if [ "$(uname)" != "Darwin" ]; then | |||
| 196 | error "MVM currently only supports macOS." | |||
| 197 | elif [ "$(sw_vers -productVersion)" != "10.12.5" ]; then | |||
| 198 | warn "MVM has only been tested on macOS 10.12.5." | |||
| 199 | echo "You are running macOS $(sw_vers -productVersion). Proceed at your own risk." | |||
| 200 | fi | |||
| 201 | ||||
| 202 | # check command line arguments | |||
| 203 | if [ -z "${1+x}" ] || [ "$1" == "--help" ]; then | |||
| 204 | print_help | |||
| 205 | exit 0 | |||
| 206 | elif [ "$1" == "--tags" ]; then | |||
| 207 | print_tags | |||
| 208 | exit 0 | |||
| 209 | elif [ "$1" == "--installed" ]; then | |||
| 210 | print_installed | |||
| 211 | exit 0 | |||
| 212 | elif [ "$1" == "--update" ] || [ "$1" == "--fetch" ]; then | |||
| 213 | echo "Fetching updates..." | |||
| 214 | update_sources | |||
| 215 | echo "Done." | |||
| 216 | exit 0 | |||
| 217 | elif [ "$1" == "--delete" ]; then | |||
| 218 | if [ -z "${2+x}" ]; then | |||
| 219 | error "VERSION parameter required for --delete option" | |||
| 220 | fi | |||
| 221 | ||||
| 222 | delete_version "$2" | |||
| 223 | exit 0 | |||
| 224 | elif [ "$1" == "--latest" ]; then | |||
| 225 | # set requested_version to the latest commit | |||
| 226 | REQUESTED_VERSION=$(get_head_revision) | |||
| 227 | echo "Latest commit is '$REQUESTED_VERSION'." | |||
| 228 | activate_version "$REQUESTED_VERSION" | |||
| 229 | elif [[ $1 == --* ]]; then | |||
| 230 | error "Unknown flag: '$1'." | |||
| 231 | else | |||
| 232 | activate_version "$1" | |||
| 233 | fi | |||
I think it would be useful to have it built with SSL support by default. At the very least, MESOS_CONFIGURE_OPTIONS should be here and be set to SSL options by default, and it should be possible to overwrite it.