From bedd44eb6b7b250403b0edc707cc4dce473a609f Mon Sep 17 00:00:00 2001
From: Jan <jan@laupetin.net>
Date: Thu, 4 Mar 2021 08:46:18 -0800
Subject: [PATCH] Move scripts to scripts folder and remove unused docker image
 stuff

---
 .gitlab-ci.yml          | 5 +----
 build-linux.sh          | 6 ------
 ci/Dockerfile           | 6 ------
 ci/create-image.sh      | 6 ------
 ci/scripts/build.sh     | 6 ------
 ci/scripts/test.sh      | 8 --------
 scripts/make-clean.sh   | 7 +++++++
 scripts/make-debug.sh   | 6 ++++++
 scripts/make-release.sh | 6 ++++++
 9 files changed, 20 insertions(+), 36 deletions(-)
 delete mode 100755 build-linux.sh
 delete mode 100644 ci/Dockerfile
 delete mode 100755 ci/create-image.sh
 delete mode 100755 ci/scripts/build.sh
 delete mode 100755 ci/scripts/test.sh
 create mode 100755 scripts/make-clean.sh
 create mode 100755 scripts/make-debug.sh
 create mode 100755 scripts/make-release.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a6d7250a..5917535b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,11 +13,8 @@ build-gcc:
       - docker
       - linux
     script:
-        - "echo pwd: $(pwd)"
-        - "echo ls: $(ls)"
-        - "echo ls ci: $(ls ./ci)"
         - "./generate.sh"
-        - "./build-linux.sh"
+        - "./scripts/make-release.sh"
 
 test-gcc:
     image: laupetin/gcc-9-multilib:latest
diff --git a/build-linux.sh b/build-linux.sh
deleted file mode 100755
index d83828fe..00000000
--- a/build-linux.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# Go to repository root
-cd "$(dirname "$0")" || exit 2
-
-make -C build -j$(nproc) config=release_x86 all
\ No newline at end of file
diff --git a/ci/Dockerfile b/ci/Dockerfile
deleted file mode 100644
index ffe65afb..00000000
--- a/ci/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM ubuntu:focal
-
-RUN /bin/sh -c "dpkg --add-architecture i386"
-RUN /bin/sh -c "apt-get update && apt-get upgrade -y && apt-get install -y git make g++ gcc-9 g++-9 gcc-9-multilib g++-9-multilib"
-
-CMD ["/bin/bash"]
\ No newline at end of file
diff --git a/ci/create-image.sh b/ci/create-image.sh
deleted file mode 100755
index 2837b72b..00000000
--- a/ci/create-image.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Go to repository root
-cd "$(dirname "$0")" || exit 2
-
-docker build -t oat .
\ No newline at end of file
diff --git a/ci/scripts/build.sh b/ci/scripts/build.sh
deleted file mode 100755
index d42648c4..00000000
--- a/ci/scripts/build.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Go to repository root
-cd "$(dirname "$0")/../.." || exit 2
-
-docker run --rm -v "$(pwd):/mnt/oat" oat /bin/bash -c "/mnt/oat/generate.sh && /mnt/oat/build-linux.sh"
\ No newline at end of file
diff --git a/ci/scripts/test.sh b/ci/scripts/test.sh
deleted file mode 100755
index 50e6fb54..00000000
--- a/ci/scripts/test.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# Go to repository root
-cd "$(dirname "$0")/../../build/lib" || exit 2
-
-./Release_x86/tests/ObjCommonTests
-./Release_x86/tests/ZoneCodeGeneratorLibTests
-./Release_x86/tests/ZoneCommonTests
\ No newline at end of file
diff --git a/scripts/make-clean.sh b/scripts/make-clean.sh
new file mode 100755
index 00000000..040538a1
--- /dev/null
+++ b/scripts/make-clean.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Go to repository root
+cd "$(dirname "$0")/.." || exit 2
+
+make -C build -j$(nproc) config=debug_x86 clean
+make -C build -j$(nproc) config=release_x86 clean
\ No newline at end of file
diff --git a/scripts/make-debug.sh b/scripts/make-debug.sh
new file mode 100755
index 00000000..39c6944c
--- /dev/null
+++ b/scripts/make-debug.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Go to repository root
+cd "$(dirname "$0")/.." || exit 2
+
+make -C build -j$(nproc) config=debug_x86 all
\ No newline at end of file
diff --git a/scripts/make-release.sh b/scripts/make-release.sh
new file mode 100755
index 00000000..0153ba72
--- /dev/null
+++ b/scripts/make-release.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Go to repository root
+cd "$(dirname "$0")/.." || exit 2
+
+make -C build -j$(nproc) config=release_x86 all
\ No newline at end of file