From 7f07c40ee4dcc92670222fa4efcfccbf03182ac7 Mon Sep 17 00:00:00 2001 From: Ebben Feagan Date: Sun, 28 Apr 2013 22:07:11 -0500 Subject: [PATCH 01/11] rtlib: fixed warning about uninitialized values and built error on mingw There theoretically were instances where the value would be uinitialized. The build errors only affect certain gcc versions and the way implemented should not interfere with a working compiler. --- src/rtlib/io_printusg.c | 4 ++-- src/rtlib/win32/hinit.c | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/rtlib/io_printusg.c b/src/rtlib/io_printusg.c index 42594eed3c..4c9a69cfaa 100644 --- a/src/rtlib/io_printusg.c +++ b/src/rtlib/io_printusg.c @@ -1386,7 +1386,7 @@ static unsigned long long hScaleDoubleToULL( double value, int *pval_exp ) FBCALL int fb_PrintUsingDouble( int fnum, double value, int mask ) { - int val_exp; + int val_exp = 0; int flags; unsigned long long val_ull = 1; @@ -1422,7 +1422,7 @@ FBCALL int fb_PrintUsingDouble( int fnum, double value, int mask ) FBCALL int fb_PrintUsingSingle( int fnum, float value_f, int mask ) { - int val_exp; + int val_exp = 0; int flags; unsigned long long val_ull = 1; diff --git a/src/rtlib/win32/hinit.c b/src/rtlib/win32/hinit.c index 8e2c30655f..db84fff974 100644 --- a/src/rtlib/win32/hinit.c +++ b/src/rtlib/win32/hinit.c @@ -21,6 +21,14 @@ FB_CONSOLE_CTX __fb_con /* not initialized */; void fb_hInit( void ) { #ifdef HOST_MINGW +#ifndef _clear87 +/* if __STRICT_ANSI__ is defined the _controlfp function is not defined in some versions of mingw-gcc */ +#define _PC_64 0x00000000 +#define _RC_NEAR 0x00000000 +#define _MCW_RC 0x00000300 /* Rounding */ +#define _MCW_PC 0x00030000 /* Precision */ +_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _controlfp (unsigned int unNew, unsigned int unMask); +#endif /* set FPU precision to 64-bit and round to nearest (as in QB) */ _controlfp( _PC_64|_RC_NEAR, _MCW_PC|_MCW_RC ); #elif defined HOST_X86 From 5891fc1e6781461c00467d7955aef78fedd1611a Mon Sep 17 00:00:00 2001 From: Ebben Feagan Date: Sun, 28 Apr 2013 22:21:31 -0500 Subject: [PATCH 02/11] added travis ci yaml config --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..040631b3dd --- /dev/null +++ b/.travis.yml @@ -0,0 +1,8 @@ +language: c +install: wget http://downloads.sourceforge.net/fbc/FreeBASIC-0.24.0-linux.tar.gz?download && tar zxf FreeBASIC-0.24.0-linux.tar.gz && cd FreeBASIC-0.24.0-linux && sudo ./install.sh -i +script: make && cd tests && make check +branches: + only: + - master +compiler: + - gcc \ No newline at end of file From da897bbf032c019c401a9c5875056126036d90db Mon Sep 17 00:00:00 2001 From: Ebben Feagan Date: Sun, 28 Apr 2013 22:25:32 -0500 Subject: [PATCH 03/11] tweaking travis setup --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 040631b3dd..cb5ed0338c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: c -install: wget http://downloads.sourceforge.net/fbc/FreeBASIC-0.24.0-linux.tar.gz?download && tar zxf FreeBASIC-0.24.0-linux.tar.gz && cd FreeBASIC-0.24.0-linux && sudo ./install.sh -i +install: wget -O fb.tar.gz http://downloads.sourceforge.net/fbc/FreeBASIC-0.24.0-linux.tar.gz?download && tar zxf fb.tar.gz && cd FreeBASIC-0.24.0-linux && sudo ./install.sh -i script: make && cd tests && make check branches: only: From e09997ceb355fddf807b027fcbe40b4d2c3f55c0 Mon Sep 17 00:00:00 2001 From: Ebben Feagan Date: Sun, 28 Apr 2013 22:28:17 -0500 Subject: [PATCH 04/11] tweaking travis setup --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cb5ed0338c..2f5684da9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,9 @@ language: c -install: wget -O fb.tar.gz http://downloads.sourceforge.net/fbc/FreeBASIC-0.24.0-linux.tar.gz?download && tar zxf fb.tar.gz && cd FreeBASIC-0.24.0-linux && sudo ./install.sh -i +install: + - wget -O fb.tar.gz http://downloads.sourceforge.net/fbc/FreeBASIC-0.24.0-linux.tar.gz?download + - tar zxf fb.tar.gz + - cd FreeBASIC-0.24.0-linux + - sudo ./install.sh -i script: make && cd tests && make check branches: only: From ab200d8354447f3e74cdca57770d27f544d6db1c Mon Sep 17 00:00:00 2001 From: Ebben Feagan Date: Sun, 28 Apr 2013 22:31:03 -0500 Subject: [PATCH 05/11] tweaking travis setup --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 2f5684da9c..e2a5789778 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ install: - tar zxf fb.tar.gz - cd FreeBASIC-0.24.0-linux - sudo ./install.sh -i + - cd .. script: make && cd tests && make check branches: only: From 81fb07f13046d7057ad884dfe5e56a11ed73c6d7 Mon Sep 17 00:00:00 2001 From: Ebben Feagan Date: Sun, 28 Apr 2013 22:34:12 -0500 Subject: [PATCH 06/11] tweaking travis setup --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e2a5789778..415d1a9dd6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,11 @@ language: c install: - - wget -O fb.tar.gz http://downloads.sourceforge.net/fbc/FreeBASIC-0.24.0-linux.tar.gz?download + - wget -q -O fb.tar.gz http://downloads.sourceforge.net/fbc/FreeBASIC-0.24.0-linux.tar.gz?download - tar zxf fb.tar.gz - cd FreeBASIC-0.24.0-linux - sudo ./install.sh -i - cd .. -script: make && cd tests && make check +script: make FBC=/usr/local/fbc && cd tests && make check branches: only: - master From 9f0316a5cefd6d4d87ad32413b1f60ed0f9b8051 Mon Sep 17 00:00:00 2001 From: Ebben Feagan Date: Sun, 28 Apr 2013 22:37:29 -0500 Subject: [PATCH 07/11] tweaking travis setup --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 415d1a9dd6..43ada5e765 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ install: - cd FreeBASIC-0.24.0-linux - sudo ./install.sh -i - cd .. -script: make FBC=/usr/local/fbc && cd tests && make check +script: make FBC=/usr/local/bin/fbc && cd tests && make check branches: only: - master From 67b6cdb952fde45b24ff52473bce632aec540937 Mon Sep 17 00:00:00 2001 From: Ebben Feagan Date: Sun, 28 Apr 2013 22:46:28 -0500 Subject: [PATCH 08/11] tweaking travis setup --- .travis.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 43ada5e765..83c747738d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,18 @@ language: c install: - wget -q -O fb.tar.gz http://downloads.sourceforge.net/fbc/FreeBASIC-0.24.0-linux.tar.gz?download - - tar zxf fb.tar.gz + - tar zxf fb.tar.gz + - mkdir fbinstall - cd FreeBASIC-0.24.0-linux - - sudo ./install.sh -i + - sudo ./install.sh -i ../fbinstall - cd .. -script: make FBC=/usr/local/bin/fbc && cd tests && make check + - ls + - sudo apt-get install libncurses5-dev libstdc++6-4.3-dev build-essential libX11-dev libXext-dev libXpm-dev libXrender-dev libXrandr-dev libgpm-dev +script: make FBC=fbinstall/bin/fbc && cd tests && make check branches: only: - master compiler: - - gcc \ No newline at end of file + - gcc +notifications: + email: false \ No newline at end of file From 8b710917132c8d552159e787923a030f8b567e37 Mon Sep 17 00:00:00 2001 From: Ebben Feagan Date: Sun, 28 Apr 2013 22:51:16 -0500 Subject: [PATCH 09/11] tweaking travis setup --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 83c747738d..237149bf04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ install: - sudo ./install.sh -i ../fbinstall - cd .. - ls - - sudo apt-get install libncurses5-dev libstdc++6-4.3-dev build-essential libX11-dev libXext-dev libXpm-dev libXrender-dev libXrandr-dev libgpm-dev + - sudo apt-get install libncurses5-dev libstdc++6 build-essential libX11-dev libXext-dev libXpm-dev libXrender-dev libXrandr-dev libgpm-dev script: make FBC=fbinstall/bin/fbc && cd tests && make check branches: only: From bddb7e657623ecf2b9275e8a40c33ceedc652eb1 Mon Sep 17 00:00:00 2001 From: Ebben Feagan Date: Sun, 28 Apr 2013 22:55:58 -0500 Subject: [PATCH 10/11] tweaking travis setup --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 237149bf04..4e1a1b99f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,9 @@ install: - cd FreeBASIC-0.24.0-linux - sudo ./install.sh -i ../fbinstall - cd .. - - ls + - ls fbinstall/bin - sudo apt-get install libncurses5-dev libstdc++6 build-essential libX11-dev libXext-dev libXpm-dev libXrender-dev libXrandr-dev libgpm-dev -script: make FBC=fbinstall/bin/fbc && cd tests && make check +script: make FBC=$PWD/fbinstall/bin/fbc && cd tests && make check branches: only: - master From 31e25388c20f24a8b798b25ca634cfe1d6251df2 Mon Sep 17 00:00:00 2001 From: Ebben Feagan Date: Mon, 29 Apr 2013 21:31:37 -0500 Subject: [PATCH 11/11] changing travis to hardcoded path --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4e1a1b99f7..11c1ae7756 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ install: - cd .. - ls fbinstall/bin - sudo apt-get install libncurses5-dev libstdc++6 build-essential libX11-dev libXext-dev libXpm-dev libXrender-dev libXrandr-dev libgpm-dev -script: make FBC=$PWD/fbinstall/bin/fbc && cd tests && make check +script: make FBC=/home/travis/build/mudhairless/fbc/fbinstall/bin/fbc && cd tests && make check branches: only: - master