elastic · droberts195 · Feb 22, 2018 · Feb 22, 2018
diff --git a/build-setup/linux.md b/build-setup/linux.md
@@ -17,7 +17,7 @@ export JAVA_HOME=/usr/local/jdk1.8.0_121
 export LD_LIBRARY_PATH=/usr/local/gcc62/lib64:/usr/local/gcc62/lib:/usr/lib:/lib
 export PATH=$JAVA_HOME/bin:/usr/local/gcc62/bin:/usr/bin:/bin:/usr/sbin:/sbin:/home/vagrant/bin
 # Only required if building the C++ code directly using make - adjust depending on the location of your Git clone
-export CPP_SRC_HOME=$HOME/machine-learning-cpp
+export CPP_SRC_HOME=$HOME/ml-cpp
 ```
 
 ### OS Packages

diff --git a/build-setup/macos.md b/build-setup/macos.md
@@ -17,7 +17,7 @@ umask 0002
 export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home
 export PATH=$JAVA_HOME/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin
 # Only required if building the C++ code directly using make - adjust depending on the location of your Git clone
-export CPP_SRC_HOME=$HOME/machine-learning-cpp
+export CPP_SRC_HOME=$HOME/ml-cpp
 ```
 
 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:
 ./configure --with-charset=utf-8 --with-logchar=utf-8
 ```
 
-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:
+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:
 
 ```
 ./configure --with-charset=utf-8 --with-logchar=utf-8 --with-apr=$HOME/Downloads/apr-1-config --with-apr-util=$HOME/Downloads/apu-1-config

diff --git a/build-setup/macos_cross_compiled.md b/build-setup/macos_cross_compiled.md
@@ -13,7 +13,7 @@ umask 0002
 export JAVA_HOME=/usr/local/jdk1.8.0_121
 export PATH=$JAVA_HOME/bin:/usr/bin:/bin:/usr/sbin:/sbin
 # Only required if building the C++ code directly using make - adjust depending on the location of your Git clone
-export CPP_SRC_HOME=$HOME/machine-learning-cpp
+export CPP_SRC_HOME=$HOME/ml-cpp
 export CPP_CROSS_COMPILE=macosx
 ```
 

diff --git a/build-setup/windows.md b/build-setup/windows.md
@@ -29,7 +29,7 @@ Finally, you need to create an alias `make` for `gnumake`.
 For example, you might create a `.bashrc` file in your home directory containing this:
 
 ```
-export CPP_SRC_HOME=$HOME/machine-learning-cpp
+export CPP_SRC_HOME=$HOME/ml-cpp
 VCVER=`/bin/ls -1 /c/PROGRA~2/MICROS~2/2017/Professional/VC/Tools/MSVC | tail -1`
 VCBINDIR=/c/PROGRA~2/MICROS~2/2017/Professional/VC/Tools/MSVC/$VCVER/bin/HostX64/x64:/c/PROGRA~2/MICROS~2/2017/Professional/Common7/IDE:/c/PROGRA~2/WINDOW~4/8.0/bin/x64:/c/PROGRA~2/WINDOW~4/8.0/bin/x86:/c/PROGRA~2/MICROS~2/2017/Professional/TEAMTO~1/PERFOR~1/x64:/c/PROGRA~2/MICROS~2/2017/Professional/TEAMTO~1/PERFOR~1
 export JAVA_HOME=/c/PROGRA~1/Java/jdk1.8.0_121

diff --git a/build-setup/windows_simple.md b/build-setup/windows_simple.md
@@ -30,7 +30,7 @@ Create a `.bashrc` similar to that recommended in `windows.md`, but with a coupl
 export VCBASE=PROGRA~2/MICROS~2/2017/BUILDT~1
 export WINSDKBASE=PROGRA~2/WI3CF2~1
 
-export CPP_SRC_HOME=$HOME/machine-learning-cpp
+export CPP_SRC_HOME=$HOME/ml-cpp
 VCVER=`/bin/ls -1 /c/PROGRA~2/MICROS~2/2017/Professional/VC/Tools/MSVC | tail -1`
 VCBINDIR=/c/$VCBASE/VC/Tools/MSVC/$VCVER/bin/HostX64/x64:/c/$VCBASE/Common7/IDE:/c/$WINSDKBASE/8.0/bin/x64:/c/$WINSDKBASE/8.0/bin/x86:/c/$VCBASE/TEAMTO~1/PERFOR~1/x64:/c/$VCBASE/TEAMTO~1/PERFOR~1
 export JAVA_HOME=/c/PROGRA~1/Java/jdk1.8.0_121

diff --git a/dev-tools/docker/linux-musl_builder/Dockerfile b/dev-tools/docker/linux-musl_builder/Dockerfile
@@ -19,12 +19,12 @@ FROM droberts195/ml-linux-musl-build:2
 MAINTAINER David Roberts <[email protected]>
 
 # Copy the current Git repository into the container
-COPY . /machine-learning-cpp/
+COPY . /ml-cpp/
 
 # Pass through whether this is a snapshot build (default yes if not specified)
 ARG SNAPSHOT=yes
 
 # Run the build
 RUN \
-  /machine-learning-cpp/dev-tools/docker/docker_entrypoint.sh
+  /ml-cpp/dev-tools/docker/docker_entrypoint.sh
 
diff --git a/dev-tools/docker/linux-musl_image/Dockerfile b/dev-tools/docker/linux-musl_image/Dockerfile
@@ -15,8 +15,7 @@
 
 FROM alpine:3.4
 
-# This is basically automating the non-Java portion of the setup instructions at
-# https://github.com/elastic/machine-learning-cpp/wiki/Machine-Learning-Development-Setup-for-Linux
+# This is basically automating the setup instructions in build-setup/linux.md
 
 MAINTAINER David Roberts <[email protected]>
 

diff --git a/dev-tools/docker/linux_builder/Dockerfile b/dev-tools/docker/linux_builder/Dockerfile
@@ -19,12 +19,12 @@ FROM droberts195/ml-linux-build:2
 MAINTAINER David Roberts <[email protected]>
 
 # Copy the current Git repository into the container
-COPY . /machine-learning-cpp/
+COPY . /ml-cpp/
 
 # Pass through whether this is a snapshot build (default yes if not specified)
 ARG SNAPSHOT=yes
 
 # Run the build
 RUN \
-  /machine-learning-cpp/dev-tools/docker/docker_entrypoint.sh
+  /ml-cpp/dev-tools/docker/docker_entrypoint.sh
 
diff --git a/dev-tools/docker/linux_image/Dockerfile b/dev-tools/docker/linux_image/Dockerfile
@@ -15,8 +15,7 @@
 
 FROM droberts195/fedora:10
 
-# This is basically automating the non-Java portion of the setup instructions at
-# https://github.com/elastic/machine-learning-cpp/wiki/Machine-Learning-Development-Setup-for-Linux
+# This is basically automating the setup instructions in build-setup/linux.md
 
 MAINTAINER David Roberts <[email protected]>
 

diff --git a/dev-tools/docker/macosx_builder/Dockerfile b/dev-tools/docker/macosx_builder/Dockerfile
@@ -19,7 +19,7 @@ FROM droberts195/ml-macosx-build:3
 MAINTAINER David Roberts <[email protected]>
 
 # Copy the current Git repository into the container
-COPY . /machine-learning-cpp/
+COPY . /ml-cpp/
 
 # Tell the build we want to cross compile
 ENV CPP_CROSS_COMPILE macosx
@@ -29,5 +29,5 @@ ARG SNAPSHOT=yes
 
 # Run the build
 RUN \
-  /machine-learning-cpp/dev-tools/docker/docker_entrypoint.sh
+  /ml-cpp/dev-tools/docker/docker_entrypoint.sh
 
diff --git a/dev-tools/docker/macosx_image/Dockerfile b/dev-tools/docker/macosx_image/Dockerfile
@@ -15,8 +15,7 @@
 
 FROM ubuntu:16.04
 
-# This is basically automating the non-Java portion of the setup instructions at
-# https://github.com/elastic/machine-learning-cpp/wiki/Machine-Learning-Development-Setup-for-Mac-OS-X-cross-compiled-on-Linux
+# This is basically automating the setup instructions in build-setup/macos_cross_compiled.md
 
 MAINTAINER David Roberts <[email protected]>
 

diff --git a/dev-tools/docker_build.sh b/dev-tools/docker_build.sh
@@ -75,7 +75,7 @@ do
     docker build -t $TEMP_TAG --build-arg SNAPSHOT=$SNAPSHOT -f "$DOCKERFILE" .
     # Using tar to copy the build artifacts out of the container seems more reliable
     # than docker cp, and also means the files end up with the correct uid/gid
-    docker run --workdir=/machine-learning-cpp $TEMP_TAG tar cf - build/distributions | tar xvf -
+    docker run --workdir=/ml-cpp $TEMP_TAG tar cf - build/distributions | tar xvf -
     docker rmi --force $TEMP_TAG
 
 done

diff --git a/dev-tools/github_relabel.pl b/dev-tools/github_relabel.pl
@@ -9,7 +9,7 @@
 use Getopt::Long;
 
 my $Base_URL  = "https://api.github.com/repos/";
-my $User_Repo = 'elastic/machine-learning-cpp/';
+my $User_Repo = 'elastic/ml-cpp/';
 my $Issue_URL = "https://github.com/${User_Repo}issues";
 use JSON();
 use URI();

diff --git a/dev-tools/mlcpp-release-notes.pl b/dev-tools/mlcpp-release-notes.pl
@@ -24,7 +24,7 @@
 
 my $Github_Key = load_github_key();
 my $Base_URL   = "https://${Github_Key}api.github.com/repos/";
-my $User_Repo  = 'elastic/machine-learning-cpp/';
+my $User_Repo  = 'elastic/ml-cpp/';
 my $Issue_URL  = "http://github.com/${User_Repo}issues/";
 
 my @Groups = (

diff --git a/mk/defines.mk b/mk/defines.mk
@@ -29,10 +29,10 @@ SNAPSHOT?=yes
 # If building in one of these directories we're building within a dedicated
 # container (Docker or Vagrant), and can skip certain checks like we would under
 # Jenkins
-ifeq ($(CPP_SRC_HOME),/machine-learning-cpp)
+ifeq ($(CPP_SRC_HOME),/ml-cpp)
 JOB_NAME?=container-build
 else
-ifeq ($(CPP_SRC_HOME),C:/Users/vagrant/projects/elasticsearch-extra/machine-learning-cpp)
+ifeq ($(CPP_SRC_HOME),C:/Users/vagrant/projects/elasticsearch-extra/ml-cpp)
 JOB_NAME?=container-build
 endif
 endif