From fce393d77ce7989128de5e2ee1603472fe2ba205 Mon Sep 17 00:00:00 2001
From: VaclavT <vaclavt@gmail.com>
Date: Tue, 11 Jan 2022 00:05:31 +0100
Subject: [PATCH] buildinx script update

---
 utils/local_install.sh  |  6 +++---
 utils/remote_install.sh | 43 -----------------------------------------
 2 files changed, 3 insertions(+), 46 deletions(-)
 delete mode 100755 utils/remote_install.sh

diff --git a/utils/local_install.sh b/utils/local_install.sh
index 2db10bb..af572db 100755
--- a/utils/local_install.sh
+++ b/utils/local_install.sh
@@ -1,15 +1,15 @@
 #!/bin/sh
 
 echo "cleaning"
-/usr/bin/cmake --build /home/ubuntu/mlisp/build --config Release --target clean -j 4 --
+cmake --build ./build --config Release --target clean -j 4 --
 echo "building ml"
-/usr/bin/cmake --build /home/ubuntu/mlisp/build --config Release --target all -j 4 --
+cmake --build ./build --config Release --target all -j 4 --
 
 echo ""
 echo "copying lsp files"
 cp stdlib/*.lsp /usr/local/var/mlisp/
 echo "copying ml file"
-cp /home/ubuntu/mlisp/build/ml /usr/local/bin/ml
+cp ./build/ml /usr/local/bin/ml
 
 echo ""
 echo "if syntax has changed you may use"
diff --git a/utils/remote_install.sh b/utils/remote_install.sh
deleted file mode 100755
index 52f1276..0000000
--- a/utils/remote_install.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-echo "Creating zip"
-touch /tmp/mlisp.zip
-rm /tmp/mlisp.zip
-zip -r /tmp/mlisp.zip mlisp/*
-
-
-
-echo "Copying zip"
-ssh -p 5333 root@46.28.109.184 "rm /tmp/mlisp.zip"
-ssh -p 5333 root@46.28.109.184 "rm -rf /tmp/mlisp/"
-scp -P 5333 /tmp/mlisp.zip root@46.28.109.184:/tmp
-
-
-echo "Unziping zip"
-ssh -p 5333 vaclavt@46.28.109.184 "cd /tmp/; unzip mlisp.zip"
-
-
-if [ "$#" -eq 1 ]; then
-    echo "Copy only requested, exiting."
-    exit 0;
-fi
-
-echo "Building ml"
-ssh -p 5333 root@46.28.109.184 "cd /tmp/mlisp; gcc -std=c99 -c -O3 -o linenoise.o clib/linenoise.c"
-ssh -p 5333 root@46.28.109.184 "cd /tmp/mlisp; c++ -c -O3  -I/usr/local/opt/openssl/include -Iclib -I./ --std=c++17  ml.cpp ml_io.cpp ml_date.cpp ml_string.cpp ml_util.cpp ml_profiler.cpp ml_usql.cpp  clib/json11.cpp clib/csvparser.cpp clib/sslclient.cpp clib/tcpnet.cpp clib/printf.cpp usql/exception.cpp usql/lexer.cpp usql/parser.cpp usql/usql.cpp usql/table.cpp usql/row.cpp usql/csvreader.cpp usql/usql.cpp usql/usql_ddl.cpp usql/usql_dml.cpp usql/usql_function.cpp usql/settings.cpp"
-ssh -p 5333 root@46.28.109.184 "cd /tmp/mlisp; c++ -o ml -O3 -L/usr/local/lib -L/usr/local/opt/openssl/lib -L/lib/x86_64-linux-gnu -lm -lstdc++ -lcrypto -lssl *.o"
-
-
-echo "Installing new version"
-ssh -p 5333 root@46.28.109.184 "mkdir -p /usr/local/var/mlisp"
-ssh -p 5333 root@46.28.109.184 "chown vaclavt: /usr/local/var/mlisp"
-
-ssh -p 5333 root@46.28.109.184 "cp /tmp/mlisp/ml /usr/local/bin"
-ssh -p 5333 root@46.28.109.184 "cp /tmp/mlisp/stdlib/*.lsp /usr/local/var/mlisp"
-
-ssh -p 5333 root@46.28.109.184 "chmod +x /usr/local/bin/ml"
-ssh -p 5333 root@46.28.109.184 "chown vaclavt: /usr/local/bin/ml"
-ssh -p 5333 root@46.28.109.184 "chown vaclavt: /usr/local/var/mlisp"
-
-
-echo "Completed"