From 9a549379f6211b2615bca72c5564686756cdc94d Mon Sep 17 00:00:00 2001 From: Kieron Morris Date: Thu, 29 Oct 2020 00:51:43 +0000 Subject: [PATCH] Corrected build scripts for SVN->Git --- compile.sh | 2 +- updatevm.sh | 13 ++++--------- versioning.sh | 2 +- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/compile.sh b/compile.sh index d060781e..e7ab8887 100755 --- a/compile.sh +++ b/compile.sh @@ -108,5 +108,5 @@ checksum=$(md5sum release/Asuro.iso | awk '{print $1}') wget -q https://img.shields.io/badge/checksum-$checksum-important.svg -O release/checksum.svg cd release touch * -svn commit -m "Versioning Auto-Commit" +#svn commit -m "Versioning Auto-Commit" cd .. diff --git a/updatevm.sh b/updatevm.sh index 31995069..7b3adeb1 100755 --- a/updatevm.sh +++ b/updatevm.sh @@ -1,11 +1,6 @@ #!/bin/sh DIRECTORY="src/vm" -if [ -d "$DIRECTORY" ]; then - cd "src/vm" - svn update - cd ".." - cd ".." -else - cd src - svn checkout https://spexeah.com:8443/svn/MINJ/src/vm -fi +rm -rf /tmp/MINJ +git clone https://gitlab.spexeah.com/spexeah/MINJ.git /tmp/MINJ +rm -rf $DIRECTORY +cp -rf /tmp/MINJ/src/vm $DIRECTORY \ No newline at end of file diff --git a/versioning.sh b/versioning.sh index 94645dd9..965707c5 100755 --- a/versioning.sh +++ b/versioning.sh @@ -12,7 +12,7 @@ done <"$file" linecount=$(./loc.sh | awk '{print $1}') sourcecount=$(find src -type f | wc -l) drivercount=$(find src/driver -type f | wc -l) -revision=$(svn info | grep Revision | awk '{print $2}') +revision=$(git rev-list --count HEAD) fpcversion=$(fpc -h | grep -m 1 version | awk '{print $5}') makeversion=$(make -v | grep GNU | awk '{print $3}') nasmversion=$(nasm -v | awk '{print $3'})