Adds a fuckload of tool updates

also updates tgui

tools/travis/before_build_byond.sh

@@ -4,27 +4,28 @@ set -e
 #If this is the build tools step, we do not bother to install/build byond
 if [ "$BUILD_TOOLS" = true ]; then
   exit 0
-fi;
+fi
+
 echo "Combining maps for building"
 if [ $BUILD_TESTING = true ]; then
     python tools/travis/template_dm_generator.py
-fi;
-
-if [ -d "$HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin" ];
-then
-  echo "Using cached directory."
-  exit 0
-else
-  echo "Setting up BYOND."
-  mkdir -p "$HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}"
-  cd "$HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}"
-  curl "http://www.byond.com/download/build/${BYOND_MAJOR}/${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip" -o byond.zip
-  unzip byond.zip
-  cd byond
-  make here
-  cd ~/
-  exit 0
 fi
 
-#some variable not set correctly, panic
-exit 1
+source dependencies.sh
+
+if [ -d "$HOME/BYOND/byond/bin" ] && grep -Fxq "${BYOND_MAJOR}.${BYOND_MINOR}" $HOME/BYOND/version.txt;
+then
+  echo "Using cached directory."
+else
+  echo "Setting up BYOND."
+  rm -rf "$HOME/BYOND"
+  mkdir -p "$HOME/BYOND"
+  cd "$HOME/BYOND"
+  curl "http://www.byond.com/download/build/${BYOND_MAJOR}/${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip" -o byond.zip
+  unzip byond.zip
+  rm byond.zip
+  cd byond
+  make here
+  echo "$BYOND_MAJOR.$BYOND_MINOR" > "$HOME/BYOND/version.txt"
+  cd ~/
+fi

tools/travis/build_byond.sh

@@ -41,33 +41,36 @@ if [ "$BUILD_TOOLS" = false ]; then
 		exit 1
 	fi;
 
-    source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup
+    source $HOME/BYOND/byond/bin/byondsetup
 	if [ "$BUILD_TESTING" = true ]; then
 		tools/travis/dm.sh -DTRAVISBUILDING -DTRAVISTESTING -DALL_MAPS tgstation.dme
 	else
 		tools/travis/dm.sh -DTRAVISBUILDING tgstation.dme
 		
-		#config folder should not be mandatory
-		rm -rf config/*
+		tools/deploy.sh travis_test
+		mkdir travis_test/config
 
 		#test config
-		cp tools/travis/travis_config.txt config/config.txt
+		cp tools/travis/travis_config.txt travis_test/config/config.txt
 
 		# get libmariadb, cache it so limmex doesn't get angery
 		if [ -f $HOME/libmariadb ]; then
 			#travis likes to interpret the cache command as it being a file for some reason
 			rm $HOME/libmariadb
-			mkdir $HOME/libmariadb
 		fi
+		mkdir -p $HOME/libmariadb
 		if [ ! -f $HOME/libmariadb/libmariadb.so ]; then
 			wget http://www.byond.com/download/db/mariadb_client-2.0.0-linux.tgz
 			tar -xvf mariadb_client-2.0.0-linux.tgz
 			mv mariadb_client-2.0.0-linux/libmariadb.so $HOME/libmariadb/libmariadb.so
 			rm -rf mariadb_client-2.0.0-linux.tgz mariadb_client-2.0.0-linux
 		fi
-    	ln -s $HOME/libmariadb/libmariadb.so libmariadb.so
 	
+		cd travis_test
+    	ln -s $HOME/libmariadb/libmariadb.so libmariadb.so
 		DreamDaemon tgstation.dmb -close -trusted -verbose -params "test-run&log-directory=travis"
-		cat data/logs/travis/clean_run.lk
+		cd ..
+		cat travis_test/data/logs/travis/clean_run.lk
+
 	fi;
 fi;

tools/travis/build_dependencies.sh

@@ -2,6 +2,15 @@
 
 set -e
 
+source dependencies.sh
+
+#ensure the Dockerfile version matches the dependencies.sh version
+line=$(head -n 1 Dockerfile)
+if [[ $line != *"$BYOND_MAJOR.$BYOND_MINOR"* ]]; then
+  echo "Dockerfile BYOND version in FROM command does not match dependencies.sh (Or it's not on line 1)!"
+  exit 1
+fi
+
 if [ $BUILD_TOOLS = false ] && [ $BUILD_TESTING = false ]; then
     curl https://sh.rustup.rs -sSf | sh -s -- -y --default-host i686-unknown-linux-gnu
     source ~/.profile
@@ -13,7 +22,43 @@ if [ $BUILD_TOOLS = false ] && [ $BUILD_TESTING = false ]; then
     git fetch --depth 1 origin $RUST_G_VERSION
     git checkout FETCH_HEAD
     cargo build --release
+    cmp target/rust_g.dm ../code/__DEFINES/rust_g.dm
 
     mkdir -p ~/.byond/bin
     ln -s $PWD/target/release/librust_g.so ~/.byond/bin/rust_g
+
+    mkdir -p ../BSQL/artifacts
+    cd ../BSQL
+    git init
+    git remote add origin https://github.com/tgstation/BSQL
+    git fetch --depth 1 origin $BSQL_VERSION
+    git checkout FETCH_HEAD
+
+    if [ -f "$HOME/MariaDB/libmariadb.so.2" ] && [ -f "$HOME/MariaDB/libmariadb.so" ] && [ -d "$HOME/MariaDB/include" ];
+    then
+        echo "Using cached MariaDB library."
+    else
+        echo "Setting up MariaDB."
+        rm -rf "$HOME/MariaDB"
+        mkdir -p "$HOME/MariaDB"
+        wget http://mirrors.kernel.org/ubuntu/pool/universe/m/mariadb-client-lgpl/libmariadb2_2.0.0-1_i386.deb
+        dpkg -x libmariadb2_2.0.0-1_i386.deb /tmp/extract
+        rm libmariadb2_2.0.0-1_i386.deb
+        mv /tmp/extract/usr/lib/i386-linux-gnu/libmariadb.so.2 $HOME/MariaDB/
+        ln -s $HOME/MariaDB/libmariadb.so.2 $HOME/MariaDB/libmariadb.so
+        rm -rf /tmp/extract
+
+        wget http://mirrors.kernel.org/ubuntu/pool/universe/m/mariadb-connector-c/libmariadb-dev_2.3.3-1_i386.deb
+        dpkg -x libmariadb-dev_2.3.3-1_i386.deb /tmp/extract
+        rm libmariadb-dev_2.3.3-1_i386.deb
+        mv /tmp/extract/usr/include $HOME/MariaDB/
+        #fuck what is this even?
+        mv $HOME/MariaDB/include/mariadb $HOME/MariaDB/include/mysql
+    fi
+
+    cd artifacts
+    export CXX=g++-7
+    cmake .. -DMARIA_INCLUDE_DIR=$HOME/MariaDB/include
+    make
+    mv src/BSQL/libBSQL.so ../../
 fi

tools/travis/install_build_tools.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 set -e
 
+source dependencies.sh
+
 if [ "$BUILD_TOOLS" = true ]; then
       rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $NODE_VERSION
       npm install -g gulp-cli