Skip to content

Commit dd8e9ad

Browse files
author
David Roberts
committed
Changing references to the repo name following migration (#1)
machine-learning-cpp -> ml-cpp
1 parent 3d8f72b commit dd8e9ad

File tree

12 files changed

+17
-20
lines changed

12 files changed

+17
-20
lines changed

build-setup/linux.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export JAVA_HOME=/usr/local/jdk1.8.0_121
1717
export LD_LIBRARY_PATH=/usr/local/gcc62/lib64:/usr/local/gcc62/lib:/usr/lib:/lib
1818
export PATH=$JAVA_HOME/bin:/usr/local/gcc62/bin:/usr/bin:/bin:/usr/sbin:/sbin:/home/vagrant/bin
1919
# Only required if building the C++ code directly using make - adjust depending on the location of your Git clone
20-
export CPP_SRC_HOME=$HOME/machine-learning-cpp
20+
export CPP_SRC_HOME=$HOME/ml-cpp
2121
```
2222

2323
### OS Packages

build-setup/macos.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ umask 0002
1717
export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home
1818
export PATH=$JAVA_HOME/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin
1919
# Only required if building the C++ code directly using make - adjust depending on the location of your Git clone
20-
export CPP_SRC_HOME=$HOME/machine-learning-cpp
20+
export CPP_SRC_HOME=$HOME/ml-cpp
2121
```
2222

2323
Note, that bash doesn't read `~/.bashrc` for login shells (which is what you get when you open a new Terminal window) - it reads `~/.bash_profile` or `~/.profile` so you should probably also create a `.bash_profile` file in your home directory which sources `.bashrc`.
@@ -69,7 +69,7 @@ Extract it to a temporary directory, then configure the unzipped source using:
6969
./configure --with-charset=utf-8 --with-logchar=utf-8
7070
```
7171

72-
If you are running macOS Sierra or above this might fail due to not being able to find APR. To resolve this download the [`apr-1-config`](https://github.com/elastic/machine-learning-cpp/files/1526791/apr-1-config.txt) and [`apu-1-config`](https://github.com/elastic/machine-learning-cpp/files/1526793/apu-1-config.txt) files to a temporary directory. Remove any `.txt` extension that the download process might add, and add execute permissions to the `apr-1-config` and `apu-1-config` files. Then run:
72+
If you are running macOS Sierra or above this might fail due to not being able to find APR. To resolve this download the [`apr-1-config`](https://github.com/elastic/ml-cpp/files/1747602/apr-1-config.txt) and [`apu-1-config`](https://github.com/elastic/ml-cpp/files/1747599/apu-1-config.txt) files to a temporary directory. Remove any `.txt` extension that the download process might add, and add execute permissions to the `apr-1-config` and `apu-1-config` files. Then run:
7373

7474
```
7575
./configure --with-charset=utf-8 --with-logchar=utf-8 --with-apr=$HOME/Downloads/apr-1-config --with-apr-util=$HOME/Downloads/apu-1-config

build-setup/macos_cross_compiled.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ umask 0002
1313
export JAVA_HOME=/usr/local/jdk1.8.0_121
1414
export PATH=$JAVA_HOME/bin:/usr/bin:/bin:/usr/sbin:/sbin
1515
# Only required if building the C++ code directly using make - adjust depending on the location of your Git clone
16-
export CPP_SRC_HOME=$HOME/machine-learning-cpp
16+
export CPP_SRC_HOME=$HOME/ml-cpp
1717
export CPP_CROSS_COMPILE=macosx
1818
```
1919

build-setup/windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Finally, you need to create an alias `make` for `gnumake`.
2828
For example, you might create a `.bashrc` file in your home directory containing this:
2929

3030
```
31-
export CPP_SRC_HOME=$HOME/machine-learning-cpp
31+
export CPP_SRC_HOME=$HOME/ml-cpp
3232
VCBINDIR=/c/PROGRA~2/MICROS~1.0/VC/bin/x86_amd64:/c/PROGRA~2/MICROS~1.0/Common7/IDE:/c/PROGRA~2/MICROS~1/WINDOW~4/8.1/bin/x64:/c/PROGRA~2/WINDOW~4/8.1/bin/x86:/c/PROGRA~2/MICROS~1.0/TEAMTO~1/PERFOR~1/x64:/c/PROGRA~2/MICROS~1.0/TEAMTO~1/PERFOR~1
3333
export JAVA_HOME=/c/PROGRA~1/Java/jdk1.8.0_121
3434
export PATH="$CPP_SRC_HOME/build/distribution/platform/windows-x86_64/bin:$VCBINDIR:/mingw64/bin:$JAVA_HOME/bin:/c/usr/local/bin:/c/usr/local/lib:/bin:/c/Windows/System32:/c/Windows"

dev-tools/docker/linux-musl_builder/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ FROM droberts195/ml-linux-musl-build:2
1919
MAINTAINER David Roberts <[email protected]>
2020

2121
# Copy the current Git repository into the container
22-
COPY . /machine-learning-cpp/
22+
COPY . /ml-cpp/
2323

2424
# Pass through whether this is a snapshot build (default yes if not specified)
2525
ARG SNAPSHOT=yes
2626

2727
# Run the build
2828
RUN \
29-
/machine-learning-cpp/dev-tools/docker/docker_entrypoint.sh
29+
/ml-cpp/dev-tools/docker/docker_entrypoint.sh
3030

dev-tools/docker/linux-musl_image/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515

1616
FROM alpine:3.4
1717

18-
# This is basically automating the non-Java portion of the setup instructions at
19-
# https://github.com/elastic/machine-learning-cpp/wiki/Machine-Learning-Development-Setup-for-Linux
18+
# This is basically automating the setup instructions in build-setup/linux.md
2019

2120
MAINTAINER David Roberts <[email protected]>
2221

dev-tools/docker/linux_builder/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ FROM droberts195/ml-linux-build:2
1919
MAINTAINER David Roberts <[email protected]>
2020

2121
# Copy the current Git repository into the container
22-
COPY . /machine-learning-cpp/
22+
COPY . /ml-cpp/
2323

2424
# Pass through whether this is a snapshot build (default yes if not specified)
2525
ARG SNAPSHOT=yes
2626

2727
# Run the build
2828
RUN \
29-
/machine-learning-cpp/dev-tools/docker/docker_entrypoint.sh
29+
/ml-cpp/dev-tools/docker/docker_entrypoint.sh
3030

dev-tools/docker/linux_image/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515

1616
FROM droberts195/fedora:10
1717

18-
# This is basically automating the non-Java portion of the setup instructions at
19-
# https://github.com/elastic/machine-learning-cpp/wiki/Machine-Learning-Development-Setup-for-Linux
18+
# This is basically automating the setup instructions in build-setup/linux.md
2019

2120
MAINTAINER David Roberts <[email protected]>
2221

dev-tools/docker/macosx_builder/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ FROM droberts195/ml-macosx-build:2
1919
MAINTAINER David Roberts <[email protected]>
2020

2121
# Copy the current Git repository into the container
22-
COPY . /machine-learning-cpp/
22+
COPY . /ml-cpp/
2323

2424
# Tell the build we want to cross compile
2525
ENV CPP_CROSS_COMPILE macosx
@@ -29,5 +29,5 @@ ARG SNAPSHOT=yes
2929

3030
# Run the build
3131
RUN \
32-
/machine-learning-cpp/dev-tools/docker/docker_entrypoint.sh
32+
/ml-cpp/dev-tools/docker/docker_entrypoint.sh
3333

dev-tools/docker/macosx_image/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515

1616
FROM ubuntu:16.04
1717

18-
# This is basically automating the non-Java portion of the setup instructions at
19-
# https://github.com/elastic/machine-learning-cpp/wiki/Machine-Learning-Development-Setup-for-Mac-OS-X-cross-compiled-on-Linux
18+
# This is basically automating the setup instructions in build-setup/macos_cross_compiled.md
2019

2120
MAINTAINER David Roberts <[email protected]>
2221

0 commit comments

Comments
 (0)