update v2.50

5 files changed, 25 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 15b0b169f154..23b337187c2a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = uasm
-	pkgdesc = free MASM-compatible assembler based on JWasm
-	pkgver = 2.47.1
+	pkgdesc = Continued evolution of JWasm
+	pkgver = 2.50
 	pkgrel = 1
 	url = http://www.terraspace.co.uk/uasm.html
 	arch = x86_64
 	license = custom:JWasm License
 	license = custom:Sybase Open Watcom Public License
-	source = uasm::git+https://github.com/Terraspace/UASM.git#commit=f36556139c658bb8f970579d6d84497210d10958
-	source = suppress_color_from_help.patch
+	source = uasm::git+https://github.com/Terraspace/UASM.git#commit=41002d262d3a9d6ca737d72e86f6f1328d42478d
+	source = uasm-default-nocolor.sh
 	md5sums = SKIP
-	md5sums = 7a0e3562bfd82b3b9470bc67aaad2b03
+	md5sums = 16ee809dee22b3f4aa39536330b5c117
 
 pkgname = uasm
 
diff --git a/.gitignore b/.gitignore
index 37cb93ba733e..e8e758998b37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *
 
-!suppress_color_from_help.patch
+# !suppress_color_from_help.patch
+!uasm-default-nocolor.sh
 !PKGBUILD
 !.SRCINFO
 !.gitignore
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 9d45cba019fd..8a6c2110d504 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer: Darren Wu <$(base64 --decode <<<'ZGFycmVuMTk5NzA4MTBAZ21haWwuY29tCg==')>
+# Maintainer: Darren Ng <$(base64 --decode <<<'ZGFycmVuMTk5NzA4MTBAZ21haWwuY29tCg==')>
 
 pkgname="uasm"
-pkgver=2.47.1
+pkgver=2.50
 pkgrel=1
-pkgdesc="free MASM-compatible assembler based on JWasm"
+pkgdesc="Continued evolution of JWasm" # http://www.terraspace.co.uk/uasm.html#p1
 arch=('x86_64')
 url="http://www.terraspace.co.uk/uasm.html"
 license=(
@@ -11,48 +11,29 @@ license=(
   'custom:Sybase Open Watcom Public License'
 )
 # options=(!strip debug)
-# options=(!strip)
-# PKGEXT=.pkg.tar
-# source=('uasm::git+https://github.com/Terraspace/UASM.git#branch=v2.47.1')
 source=(
-  # https://travis-ci.org/Terraspace/UASM/branches
-  'uasm::git+https://github.com/Terraspace/UASM.git#commit=f36556139c658bb8f970579d6d84497210d10958'
-  'suppress_color_from_help.patch'
+  # 'uasm::git+https://github.com/Terraspace/UASM.git#branch=v5.0'
+  'uasm::git+https://github.com/Terraspace/UASM.git#commit=41002d262d3a9d6ca737d72e86f6f1328d42478d'
+  'uasm-default-nocolor.sh'
 )
 md5sums=(
   'SKIP'
-  '7a0e3562bfd82b3b9470bc67aaad2b03'
+  '16ee809dee22b3f4aa39536330b5c117'
 )
 
-
-prepare() {
-
-  # if [ "$(git rev-parse HEAD)"!="f36556139c658bb8f970579d6d84497210d10958" ];then
-  #   echo "Error."
-  #   echo "Branch v2.47.1 should be at f36556139c658bb8f970579d6d84497210d10958."
-  #   exit 1
-  # fi
-
-  patch --verbose "$srcdir/$pkgname/errmsg.c" "$srcdir/suppress_color_from_help.patch"
-  # patch -p1 -i "$srcdir/$pkgname-$pkgver.patch"
-
-}
-
 build() {
   cd "$srcdir/$pkgname"
-  # CFLAGS="-g" CXXFLAGS="-g" DEBUG=1 make -f GccUnix.mak
-  make -f GccUnix.mak
+  make -f gccLinux64.mak
 }
 
-
 package() {
   cd "$srcdir/$pkgname"
 
-  install -v -Dm755 GccUnixR/uasm "$pkgdir/usr/bin/uasm"
+  install -v -Dm755 GccUnixR/uasm "$pkgdir/usr/bin/uasm-color"
+  install -v -Dm755 "$srcdir/uasm-default-nocolor.sh" "$pkgdir/usr/bin/uasm"
 
   install -v -dDm755 "$pkgdir/usr/share/doc/uasm"
-
-  install -v -m644 Readme.txt History.txt Doc/* "$pkgdir/usr/share/doc/uasm/" # 7 txts
+  install -v -m644 Readme.txt History.txt Doc/* "$pkgdir/usr/share/doc/uasm/"
 
   install -v -Dm644 License.txt "$pkgdir/usr/share/licenses/$pkgname/License.txt"
 }
diff --git a/suppress_color_from_help.patch b/suppress_color_from_help.patch
deleted file mode 100644
index 7cc83c3702b3..000000000000
--- a/suppress_color_from_help.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- errmsg.c	2019-02-16 18:24:54.410110160 +0800
-+++ errmsg.c	2019-02-16 18:22:39.476943887 +0800
-@@ -166,8 +166,8 @@
- 
- 			SetConsoleTextAttribute(hConsole, screenBufferInfo.wAttributes);
- 		#else
--			printf(FGRN("%s"), MsgGetEx(MSG_UASM));
--			printf(FCYN("%s\n"), MsgGetEx(MSG_UASM2));
-+			printf("%s", MsgGetEx(MSG_UASM));
-+			printf("%s\n", MsgGetEx(MSG_UASM2));
- 		#endif	
- 
-         return( 4 ); /* return number of lines printed */
-@@ -200,7 +200,7 @@
- 	#else	
- 		for (p = usage2; *p != '\n'; ) {
- 			const char *p2 = p + strlen(p) + 1;
--			printf(FYEL("%-20s %s\n"), p, p2);
-+			printf("%-20s %s\n", p, p2);
- 			p = p2 + strlen(p2) + 1;
- 		}
- 	#endif
-@@ -217,7 +217,7 @@
- 	#else
- 		for (p = usage; *p != '\n'; ) {
- 			const char *p2 = p + strlen(p) + 1;
--			printf(FWHT("%-20s %s\n"), p, p2);
-+			printf("%-20s %s\n", p, p2);
- 			p = p2 + strlen(p2) + 1;
- 		}
- 	#endif
diff --git a/uasm-default-nocolor.sh b/uasm-default-nocolor.sh
new file mode 100644
index 000000000000..5146d2098444
--- /dev/null
+++ b/uasm-default-nocolor.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# https://superuser.com/a/380778/744579
+/usr/bin/uasm-color $@ | sed 's/\x1b\[[0-9;]*m//g'
+
+# https://stackoverflow.com/a/18000433/8243991
+# /usr/bin/uasm-color $@ | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[mGK]//g"
\ No newline at end of file