Fix build scripts (#392, #491)

Author: vtereshkov

box.json

@@ -11,8 +11,10 @@
     "include": [
         "umka.exe",
         "umka",
-        "libumka.so",
         "libumka.dll",
+        "libumka.so",
+        "libumka_static_windows.a",
+        "libumka_static_linux.a",
         "umka_api.h"
     ],
     "pre_build": "sh umbox_pre_build.sh",

build_linux.sh

@@ -5,32 +5,34 @@ gccflags="-s -fPIC -O3 -malign-double -fno-strict-aliasing -fvisibility=hidden -
 sourcefiles="umka_api.c umka_common.c umka_compiler.c umka_const.c   umka_decl.c umka_expr.c
              umka_gen.c umka_ident.c  umka_lexer.c    umka_runtime.c umka_stmt.c umka_types.c umka_vm.c"
 
-rm umka_linux -rf && # remove previous build
+rm umka_linux -rf
 
-cd src &&
+cd src
 
-gcc $gccflags -c $sourcefiles &&
-gcc -s -shared -fPIC -static-libgcc *.o -o libumka.so -lm -ldl &&
+rm -f *.o
+rm -f *.a
 
-gcc $gccflags -c umka.c &&
-gcc -s umka.o -o umka -static-libgcc -L$PWD -lm -lumka -Wl,-rpath,'$ORIGIN' &&
-ar rcs libumka_static.a *.o &&
+gcc $gccflags -c $sourcefiles
+gcc -s -shared -fPIC -static-libgcc *.o -o libumka.so -lm -ldl
+ar rcs libumka_static_linux.a *.o
 
-rm -f *.o &&
-rm -f *.a &&
+gcc $gccflags -c umka.c
+gcc -s umka.o -o umka -static-libgcc -L$PWD -lm -lumka -Wl,-rpath,'$ORIGIN'
 
-cd .. &&
+rm -f *.o
 
-mkdir umka_linux/examples/3dcam -p &&
-mkdir umka_linux/examples/fractal -p &&
-mkdir umka_linux/examples/lisp -p &&
-mkdir umka_linux/examples/raytracer -p &&
-mkdir umka_linux/doc &&
+cd ..
 
-mv src/libumka* src/umka umka_linux/ &&
-cp src/umka_api.h Umka.sublime-syntax LICENSE umka_linux/ &&
+mkdir umka_linux/examples/3dcam -p
+mkdir umka_linux/examples/fractal -p
+mkdir umka_linux/examples/lisp -p
+mkdir umka_linux/examples/raytracer -p
+mkdir umka_linux/doc
 
-cp examples/* umka_linux/examples -r &&
+mv src/libumka* src/umka umka_linux/
+cp src/umka_api.h Umka.sublime-syntax LICENSE umka_linux/
+
+cp examples/* umka_linux/examples -r
 cp doc/* umka_linux/doc
 
-echo Build successful
+echo Build finished

build_linux_mingw.sh

@@ -5,7 +5,7 @@ gccflags="-s -fPIC -O3 -malign-double -fno-strict-aliasing -fvisibility=hidden -
 sourcefiles="umka_api.c umka_common.c umka_compiler.c umka_const.c   umka_decl.c umka_expr.c
              umka_gen.c umka_ident.c  umka_lexer.c    umka_runtime.c umka_stmt.c umka_types.c umka_vm.c"
 
-rm umka_windows_mingw -rf # remove previous build
+rm umka_windows_mingw -rf
 
 cd src
 
@@ -14,13 +14,12 @@ rm -f *.a
 
 x86_64-w64-mingw32-gcc $gccflags -c $sourcefiles
 x86_64-w64-mingw32-gcc -s -shared -fPIC -static-libgcc *.o -o libumka.dll -lm
+ar rcs libumka_static.a *.o
 
 x86_64-w64-mingw32-gcc $gccflags -c umka.c
 x86_64-w64-mingw32-gcc -s umka.o -o umka.exe -static-libgcc -lm -L. -lumka -Wl,-rpath,'$ORIGIN'
-ar rcs libumka_static.a *.o
 
 rm -f *.o
-rm -f *.a
 
 cd ..
 
@@ -36,4 +35,4 @@ cp src/umka_api.h Umka.sublime-syntax LICENSE umka_windows_mingw/
 cp examples/* umka_windows_mingw/examples -r
 cp doc/* umka_windows_mingw/doc
 
-echo Build successful
+echo Build finished

build_windows_mingw.bat

@@ -2,7 +2,7 @@ cd src
 
 gcc -s -O3 -malign-double -fno-strict-aliasing -fvisibility=hidden -DUMKA_BUILD -DUMKA_EXT_LIBS -Wall -Wno-format-security -c umka_api.c umka_common.c umka_compiler.c umka_const.c umka_decl.c umka_expr.c umka_gen.c umka_ident.c umka_lexer.c umka_runtime.c umka_stmt.c umka_types.c umka_vm.c 
 gcc -s -shared -Wl,--output-def=libumka.def -Wl,--out-implib=libumka.a -Wl,--dll *.o -o libumka.dll -static-libgcc -static
-ar rcs libumka_static.a *.o
+ar rcs libumka_static_windows.a *.o
 
 gcc -s -O3 -malign-double -fno-strict-aliasing -Wall -c umka.c 
 gcc -s umka.o -o umka.exe -static-libgcc -static -L%cd% -lm -lumka

umbox_post_build.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
 rm -rf umka_linux umka_windows_mingw
-rm -f umka_api.h libumka.so libumka.dll umka umka.exe
+rm -f umka_api.h libumka.so libumka.dll umka umka.exe libumka_static_windows.a libumka_static_linux.a

umbox_pre_build.sh

@@ -2,8 +2,13 @@
 
 ./build_linux.sh
 ./build_linux_mingw.sh
+
 cp umka_linux/umka .
 cp umka_linux/libumka.so .
+cp umka_linux/libumka_static_linux.a .
+
 cp umka_windows_mingw/umka.exe .
 cp umka_windows_mingw/libumka.dll .
+cp umka_windows_mingw/libumka_static_windows.a .
+
 cp src/umka_api.h .