From ed3531bf5635fbe0cc22497efde3ece20879e8d8 Mon Sep 17 00:00:00 2001 From: coderJeff Date: Mon, 31 Dec 2018 13:17:43 -0500 Subject: [PATCH 01/24] makefile: check for MSYS_NT target --- makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/makefile b/makefile index c5a9bc2be0..7aa9bade0a 100644 --- a/makefile +++ b/makefile @@ -201,6 +201,8 @@ else else ifeq ($(uname),Linux) TARGET_OS := linux else ifneq ($(findstring MINGW,$(uname)),) + TARGET_OS := win32 + else ifneq ($(findstring MSYS_NT,$(uname)),) TARGET_OS := win32 else ifeq ($(uname),MS-DOS) TARGET_OS := dos From 086cbd0a40484f8390a52e58e2dcd6a5cb95af8f Mon Sep 17 00:00:00 2001 From: coderJeff Date: Mon, 31 Dec 2018 15:01:39 -0500 Subject: [PATCH 02/24] makefile: avoid long AR command line for MSYS_NT build platform --- makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/makefile b/makefile index 7aa9bade0a..4b0d47b01f 100644 --- a/makefile +++ b/makefile @@ -547,6 +547,10 @@ $(libdir)/libfb.a: $(LIBFB_C) $(LIBFB_S) | $(libdir) ifeq ($(TARGET_OS),dos) # Avoid hitting the command line length limit (the libfb.a ar command line # is very long...) + $(QUIET)rm -f $@ + $(QUIET_AR)$(AR) rcs $@ $(libfbobjdir)/*.o +else ifneq ($(findstring MSYS_NT,$(shell uname)),) + $(QUIET)rm -f $@ $(QUIET_AR)$(AR) rcs $@ $(libfbobjdir)/*.o else $(QUIET_AR)rm -f $@; $(AR) rcs $@ $^ @@ -567,6 +571,9 @@ ifeq ($(TARGET_OS),dos) # is very long...) $(QUIET)rm -f $@ $(QUIET_AR)$(AR) rcs $@ $(libfbmtobjdir)/*.o +else ifneq ($(findstring MSYS_NT,$(shell uname)),) + $(QUIET)rm -f $@ + $(QUIET_AR)$(AR) rcs $@ $(libfbmtobjdir)/*.o else $(QUIET_AR)rm -f $@; $(AR) rcs $@ $^ endif From 6e6713b694acf113ad8c93316b593195a493a3c6 Mon Sep 17 00:00:00 2001 From: coderJeff Date: Tue, 1 Jan 2019 01:00:06 -0500 Subject: [PATCH 03/24] build release script: update for mingw32/64 - download for ddraw.h and dinput.h - download Gorc.zip/GoRC.exe from author site --- contrib/release/build.sh | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/contrib/release/build.sh b/contrib/release/build.sh index 44c48a0bdc..e282c411f4 100755 --- a/contrib/release/build.sh +++ b/contrib/release/build.sh @@ -322,8 +322,14 @@ win32-mingworg) download_extract_mingw mpfr-3.1.2-2-mingw32-dll.tar.lzma # Add ddraw.h and dinput.h for FB's gfxlib2 - copyfile "../input/MinGW.org/ddraw.h" "include/ddraw.h" - copyfile "../input/MinGW.org/dinput.h" "include/dinput.h" + + # if ddraw.h & dinput.h were added manually: + # copyfile "../input/MinGW.org/ddraw.h" "include/ddraw.h" + # copyfile "../input/MinGW.org/dinput.h" "include/dinput.h" + + # download link for dx80_mgw.zip from https://liballeg.org/old.html + download dx80_mgw.zip https://download.tuxfamily.org/allegro/files/dx80_mgw.zip + unzip ../input/dx80_mgw.zip include/ddraw.h include/dinput.h # Work around http://sourceforge.net/p/mingw/bugs/2039/ patch -p0 < ../mingworg-fix-wcharh.patch @@ -466,7 +472,7 @@ windowsbuild() { # its gcc and not one from the host origPATH="$PATH" export PATH="$PWD/bin:$PATH" - + echo echo "building libffi" echo @@ -476,7 +482,8 @@ windowsbuild() { if [ "$target" = win64 ]; then CFLAGS=-O2 ../$libffi_title/configure --disable-shared --enable-static --build=x86_64-w64-mingw32 --host=x86_64-w64-mingw32 else - CFLAGS=-O2 ../$libffi_title/configure --disable-shared --enable-static + # force host even for 32-bit, we might be cross compiling from x86_64 to x86 + CFLAGS=-O2 ../$libffi_title/configure --disable-shared --enable-static --host=i686-w64-mingw32 fi make case "$target" in @@ -540,9 +547,12 @@ windowsbuild() { ;; esac - # TODO: GoRC.exe should really be taken from its homepage - # , but it was offline today - cp $bootfb_title/bin/$fbtarget/GoRC.exe fbc/bin/$fbtarget + # get GoRC.exe from previous fb release + # cp $bootfb_title/bin/$fbtarget/GoRC.exe fbc/bin/$fbtarget + + # get GoRC.exe from author site + download "Gorc.zip" "http://www.godevtool.com/Gorc.zip" + unzip ../input/Gorc.zip GoRC.exe -d fbc/bin/$fbtarget cp "$libffi_build"/.libs/libffi.a fbc/lib/$fbtarget From 0581057de2559d0e7342bb60d7c5bbb228654498 Mon Sep 17 00:00:00 2001 From: coderJeff Date: Tue, 1 Jan 2019 13:38:48 -0500 Subject: [PATCH 04/24] build release script: update for mingworg/mingw32 - mingw-w64/mingw32 needs explicit --host=i686-w64-mingw32 when cross compiling from mingw64 to mingw32 --- contrib/release/build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/release/build.sh b/contrib/release/build.sh index e282c411f4..20eb22346b 100755 --- a/contrib/release/build.sh +++ b/contrib/release/build.sh @@ -481,9 +481,11 @@ windowsbuild() { cd "$libffi_build" if [ "$target" = win64 ]; then CFLAGS=-O2 ../$libffi_title/configure --disable-shared --enable-static --build=x86_64-w64-mingw32 --host=x86_64-w64-mingw32 - else + elif [ "$target" = win32 ]; then # force host even for 32-bit, we might be cross compiling from x86_64 to x86 CFLAGS=-O2 ../$libffi_title/configure --disable-shared --enable-static --host=i686-w64-mingw32 + else + CFLAGS=-O2 ../$libffi_title/configure --disable-shared --enable-static fi make case "$target" in From ef4453525fdc863db0e745c4b90416e03006d9ca Mon Sep 17 00:00:00 2001 From: coderJeff Date: Fri, 4 Jan 2019 01:13:36 -0500 Subject: [PATCH 05/24] fbdoc: copyright updates for 2019 --- doc/fbdoc/fbdoc.bas | 4 ++-- doc/fbdoc/readme.txt | 2 +- doc/libfbdoc/CFbCode.bas | 2 +- doc/libfbdoc/CFbCode.bi | 2 +- doc/libfbdoc/CHttp.bas | 2 +- doc/libfbdoc/CHttp.bi | 2 +- doc/libfbdoc/CHttpForm.bas | 2 +- doc/libfbdoc/CHttpForm.bi | 2 +- doc/libfbdoc/CHttpStream.bas | 2 +- doc/libfbdoc/CHttpStream.bi | 2 +- doc/libfbdoc/COptions.bas | 2 +- doc/libfbdoc/COptions.bi | 2 +- doc/libfbdoc/CPage.bas | 2 +- doc/libfbdoc/CPage.bi | 2 +- doc/libfbdoc/CPageList.bas | 2 +- doc/libfbdoc/CPageList.bi | 2 +- doc/libfbdoc/CRegex.bas | 2 +- doc/libfbdoc/CRegex.bi | 2 +- doc/libfbdoc/CWakka2Html.bas | 2 +- doc/libfbdoc/CWakka2Html.bi | 2 +- doc/libfbdoc/CWakka2fbhelp.bas | 2 +- doc/libfbdoc/CWakka2fbhelp.bi | 2 +- doc/libfbdoc/CWakka2texinfo.bas | 2 +- doc/libfbdoc/CWakka2texinfo.bi | 2 +- doc/libfbdoc/CWiki.bas | 2 +- doc/libfbdoc/CWiki.bi | 2 +- doc/libfbdoc/CWiki2Chm.bas | 2 +- doc/libfbdoc/CWiki2Chm.bi | 2 +- doc/libfbdoc/CWiki2fbhelp.bas | 2 +- doc/libfbdoc/CWiki2fbhelp.bi | 2 +- doc/libfbdoc/CWiki2texinfo.bas | 2 +- doc/libfbdoc/CWiki2texinfo.bi | 2 +- doc/libfbdoc/CWiki2txt.bas | 2 +- doc/libfbdoc/CWiki2txt.bi | 2 +- doc/libfbdoc/CWikiCache.bas | 2 +- doc/libfbdoc/CWikiCache.bi | 2 +- doc/libfbdoc/CWikiCon.bas | 2 +- doc/libfbdoc/CWikiCon.bi | 2 +- doc/libfbdoc/fbdoc_buildtoc.bas | 2 +- doc/libfbdoc/fbdoc_buildtoc.bi | 2 +- doc/libfbdoc/fbdoc_cache.bas | 2 +- doc/libfbdoc/fbdoc_cache.bi | 2 +- doc/libfbdoc/fbdoc_defs.bi | 2 +- doc/libfbdoc/fbdoc_keywords.bas | 2 +- doc/libfbdoc/fbdoc_keywords.bi | 2 +- doc/libfbdoc/fbdoc_lang.bas | 2 +- doc/libfbdoc/fbdoc_lang.bi | 2 +- doc/libfbdoc/fbdoc_loader.bas | 2 +- doc/libfbdoc/fbdoc_loader.bi | 2 +- doc/libfbdoc/fbdoc_loader_sql.bas | 2 +- doc/libfbdoc/fbdoc_loader_sql.bi | 2 +- doc/libfbdoc/fbdoc_loader_web.bas | 2 +- doc/libfbdoc/fbdoc_loader_web.bi | 2 +- doc/libfbdoc/fbdoc_misc.bas | 2 +- doc/libfbdoc/fbdoc_misc.bi | 2 +- doc/libfbdoc/fbdoc_string.bas | 2 +- doc/libfbdoc/fbdoc_string.bi | 2 +- doc/libfbdoc/fbdoc_templates.bas | 2 +- doc/libfbdoc/fbdoc_templates.bi | 2 +- doc/libfbdoc/hash.bas | 2 +- doc/libfbdoc/hash.bi | 2 +- doc/libfbdoc/list.bas | 2 +- doc/libfbdoc/list.bi | 2 +- doc/libfbdoc/printlog.bas | 2 +- doc/libfbdoc/printlog.bi | 2 +- 65 files changed, 66 insertions(+), 66 deletions(-) diff --git a/doc/fbdoc/fbdoc.bas b/doc/fbdoc/fbdoc.bas index c22ccdd47c..2147cf48f3 100644 --- a/doc/fbdoc/fbdoc.bas +++ b/doc/fbdoc/fbdoc.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by @@ -138,7 +138,7 @@ end sub if( bShowVersion ) then print "FreeBASIC User's Manual Converter/Generator - Version 1.00" - print "Copyright (C) 2006-2018 The FreeBASIC development team." + print "Copyright (C) 2006-2019 The FreeBASIC development team." end 1 end if diff --git a/doc/fbdoc/readme.txt b/doc/fbdoc/readme.txt index 4495bab7fb..be55c102e2 100644 --- a/doc/fbdoc/readme.txt +++ b/doc/fbdoc/readme.txt @@ -1,6 +1,6 @@ fbdoc - FreeBASIC User's Manual Converter/Generator - Copyright (C) 2006-2018 The FreeBASIC development team. + Copyright (C) 2006-2019 The FreeBASIC development team. License: diff --git a/doc/libfbdoc/CFbCode.bas b/doc/libfbdoc/CFbCode.bas index 5501c790d7..4eccdda118 100644 --- a/doc/libfbdoc/CFbCode.bas +++ b/doc/libfbdoc/CFbCode.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CFbCode.bi b/doc/libfbdoc/CFbCode.bi index 88af1a8f81..c685da53ec 100644 --- a/doc/libfbdoc/CFbCode.bi +++ b/doc/libfbdoc/CFbCode.bi @@ -2,7 +2,7 @@ #define __CFBCODE_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CHttp.bas b/doc/libfbdoc/CHttp.bas index 9185d9518b..e577104de6 100644 --- a/doc/libfbdoc/CHttp.bas +++ b/doc/libfbdoc/CHttp.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CHttp.bi b/doc/libfbdoc/CHttp.bi index 065e12377a..65214b84d8 100644 --- a/doc/libfbdoc/CHttp.bi +++ b/doc/libfbdoc/CHttp.bi @@ -2,7 +2,7 @@ #define __CHTTP_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CHttpForm.bas b/doc/libfbdoc/CHttpForm.bas index 1adfac1154..de9863e9ba 100644 --- a/doc/libfbdoc/CHttpForm.bas +++ b/doc/libfbdoc/CHttpForm.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CHttpForm.bi b/doc/libfbdoc/CHttpForm.bi index 4d005dbf4c..60e6d9e5d5 100644 --- a/doc/libfbdoc/CHttpForm.bi +++ b/doc/libfbdoc/CHttpForm.bi @@ -2,7 +2,7 @@ #define __CHTTPFORM_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CHttpStream.bas b/doc/libfbdoc/CHttpStream.bas index 5b8ee8be3f..732296be29 100644 --- a/doc/libfbdoc/CHttpStream.bas +++ b/doc/libfbdoc/CHttpStream.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CHttpStream.bi b/doc/libfbdoc/CHttpStream.bi index dbeb0c0111..da3a37b186 100644 --- a/doc/libfbdoc/CHttpStream.bi +++ b/doc/libfbdoc/CHttpStream.bi @@ -2,7 +2,7 @@ #define __CHTTPSTREAM_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/COptions.bas b/doc/libfbdoc/COptions.bas index a7b1147bb3..67ec73b26a 100644 --- a/doc/libfbdoc/COptions.bas +++ b/doc/libfbdoc/COptions.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/COptions.bi b/doc/libfbdoc/COptions.bi index 2868524030..56a3fbcf4e 100644 --- a/doc/libfbdoc/COptions.bi +++ b/doc/libfbdoc/COptions.bi @@ -2,7 +2,7 @@ #define __COPTIONS_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CPage.bas b/doc/libfbdoc/CPage.bas index 399e87c2bb..cfa1f2e35d 100644 --- a/doc/libfbdoc/CPage.bas +++ b/doc/libfbdoc/CPage.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CPage.bi b/doc/libfbdoc/CPage.bi index a26afa473e..4618379c1d 100644 --- a/doc/libfbdoc/CPage.bi +++ b/doc/libfbdoc/CPage.bi @@ -2,7 +2,7 @@ #define __CPAGE_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CPageList.bas b/doc/libfbdoc/CPageList.bas index e62d91dc86..87ea5a508f 100644 --- a/doc/libfbdoc/CPageList.bas +++ b/doc/libfbdoc/CPageList.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CPageList.bi b/doc/libfbdoc/CPageList.bi index 54f79a531b..b5c784b639 100644 --- a/doc/libfbdoc/CPageList.bi +++ b/doc/libfbdoc/CPageList.bi @@ -2,7 +2,7 @@ #define __BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CRegex.bas b/doc/libfbdoc/CRegex.bas index 687a911ec6..55a543f0b7 100644 --- a/doc/libfbdoc/CRegex.bas +++ b/doc/libfbdoc/CRegex.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CRegex.bi b/doc/libfbdoc/CRegex.bi index 823ada9a82..40377b3344 100644 --- a/doc/libfbdoc/CRegex.bi +++ b/doc/libfbdoc/CRegex.bi @@ -2,7 +2,7 @@ #define __CREGEX_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CWakka2Html.bas b/doc/libfbdoc/CWakka2Html.bas index 8eca141733..3437c86477 100644 --- a/doc/libfbdoc/CWakka2Html.bas +++ b/doc/libfbdoc/CWakka2Html.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CWakka2Html.bi b/doc/libfbdoc/CWakka2Html.bi index e1259856b1..f206e2362e 100644 --- a/doc/libfbdoc/CWakka2Html.bi +++ b/doc/libfbdoc/CWakka2Html.bi @@ -2,7 +2,7 @@ #define __CWAKKA2HTML_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CWakka2fbhelp.bas b/doc/libfbdoc/CWakka2fbhelp.bas index 302749228b..c123e4cc0c 100644 --- a/doc/libfbdoc/CWakka2fbhelp.bas +++ b/doc/libfbdoc/CWakka2fbhelp.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CWakka2fbhelp.bi b/doc/libfbdoc/CWakka2fbhelp.bi index 3e5ff0b2ab..a33150ba49 100644 --- a/doc/libfbdoc/CWakka2fbhelp.bi +++ b/doc/libfbdoc/CWakka2fbhelp.bi @@ -2,7 +2,7 @@ #define __CWAKKA2FBHELP_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CWakka2texinfo.bas b/doc/libfbdoc/CWakka2texinfo.bas index 9fb1284d3a..1b37061751 100644 --- a/doc/libfbdoc/CWakka2texinfo.bas +++ b/doc/libfbdoc/CWakka2texinfo.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CWakka2texinfo.bi b/doc/libfbdoc/CWakka2texinfo.bi index 994de41af2..017e8bba46 100644 --- a/doc/libfbdoc/CWakka2texinfo.bi +++ b/doc/libfbdoc/CWakka2texinfo.bi @@ -2,7 +2,7 @@ #define __CWAKKA2TEXINFO_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CWiki.bas b/doc/libfbdoc/CWiki.bas index e6245cd090..a6bb7a7bac 100644 --- a/doc/libfbdoc/CWiki.bas +++ b/doc/libfbdoc/CWiki.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CWiki.bi b/doc/libfbdoc/CWiki.bi index 706cb046c1..16f4943953 100644 --- a/doc/libfbdoc/CWiki.bi +++ b/doc/libfbdoc/CWiki.bi @@ -2,7 +2,7 @@ #define __CWIKI_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CWiki2Chm.bas b/doc/libfbdoc/CWiki2Chm.bas index 7f284d598a..c87a9824fc 100644 --- a/doc/libfbdoc/CWiki2Chm.bas +++ b/doc/libfbdoc/CWiki2Chm.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CWiki2Chm.bi b/doc/libfbdoc/CWiki2Chm.bi index 7a07a66b28..9b847c8227 100644 --- a/doc/libfbdoc/CWiki2Chm.bi +++ b/doc/libfbdoc/CWiki2Chm.bi @@ -2,7 +2,7 @@ #define __CWIKI2CHM_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CWiki2fbhelp.bas b/doc/libfbdoc/CWiki2fbhelp.bas index 2a50f36f8d..d4c967e0a2 100644 --- a/doc/libfbdoc/CWiki2fbhelp.bas +++ b/doc/libfbdoc/CWiki2fbhelp.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CWiki2fbhelp.bi b/doc/libfbdoc/CWiki2fbhelp.bi index 917eaec5bb..a389ab2fb0 100644 --- a/doc/libfbdoc/CWiki2fbhelp.bi +++ b/doc/libfbdoc/CWiki2fbhelp.bi @@ -2,7 +2,7 @@ #define __CWIKI2FBHELP_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CWiki2texinfo.bas b/doc/libfbdoc/CWiki2texinfo.bas index ee75b87bce..fca500219e 100644 --- a/doc/libfbdoc/CWiki2texinfo.bas +++ b/doc/libfbdoc/CWiki2texinfo.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CWiki2texinfo.bi b/doc/libfbdoc/CWiki2texinfo.bi index a888ed558e..34a6c90438 100644 --- a/doc/libfbdoc/CWiki2texinfo.bi +++ b/doc/libfbdoc/CWiki2texinfo.bi @@ -2,7 +2,7 @@ #define __CWIKI2TEXINFO_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CWiki2txt.bas b/doc/libfbdoc/CWiki2txt.bas index 0efdf5170d..7f7827920c 100644 --- a/doc/libfbdoc/CWiki2txt.bas +++ b/doc/libfbdoc/CWiki2txt.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CWiki2txt.bi b/doc/libfbdoc/CWiki2txt.bi index 13110ce6b7..9dd4babf9d 100644 --- a/doc/libfbdoc/CWiki2txt.bi +++ b/doc/libfbdoc/CWiki2txt.bi @@ -2,7 +2,7 @@ #define __CWIKI2TXT_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CWikiCache.bas b/doc/libfbdoc/CWikiCache.bas index 72c78c72d6..165ada975c 100644 --- a/doc/libfbdoc/CWikiCache.bas +++ b/doc/libfbdoc/CWikiCache.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CWikiCache.bi b/doc/libfbdoc/CWikiCache.bi index ef2847d069..cb02d64dc5 100644 --- a/doc/libfbdoc/CWikiCache.bi +++ b/doc/libfbdoc/CWikiCache.bi @@ -2,7 +2,7 @@ #define __CWIKICACHE_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CWikiCon.bas b/doc/libfbdoc/CWikiCon.bas index 13def02fb6..218c44eb9d 100644 --- a/doc/libfbdoc/CWikiCon.bas +++ b/doc/libfbdoc/CWikiCon.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/CWikiCon.bi b/doc/libfbdoc/CWikiCon.bi index 0376deb966..9b10760383 100644 --- a/doc/libfbdoc/CWikiCon.bi +++ b/doc/libfbdoc/CWikiCon.bi @@ -2,7 +2,7 @@ #define __CWIKICON_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/fbdoc_buildtoc.bas b/doc/libfbdoc/fbdoc_buildtoc.bas index 7d8af9fff9..8a9b1336d6 100644 --- a/doc/libfbdoc/fbdoc_buildtoc.bas +++ b/doc/libfbdoc/fbdoc_buildtoc.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/fbdoc_buildtoc.bi b/doc/libfbdoc/fbdoc_buildtoc.bi index 6471bd6e5b..264365af58 100644 --- a/doc/libfbdoc/fbdoc_buildtoc.bi +++ b/doc/libfbdoc/fbdoc_buildtoc.bi @@ -2,7 +2,7 @@ #define __FBDOC_BUILDTOC_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/fbdoc_cache.bas b/doc/libfbdoc/fbdoc_cache.bas index a996f9e922..9907cdd1ad 100644 --- a/doc/libfbdoc/fbdoc_cache.bas +++ b/doc/libfbdoc/fbdoc_cache.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/fbdoc_cache.bi b/doc/libfbdoc/fbdoc_cache.bi index f33c80f506..f52b04ad82 100644 --- a/doc/libfbdoc/fbdoc_cache.bi +++ b/doc/libfbdoc/fbdoc_cache.bi @@ -2,7 +2,7 @@ #define __FBDOC_CACHE_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/fbdoc_defs.bi b/doc/libfbdoc/fbdoc_defs.bi index 1d0fab59d3..c4f4adf8bf 100644 --- a/doc/libfbdoc/fbdoc_defs.bi +++ b/doc/libfbdoc/fbdoc_defs.bi @@ -2,7 +2,7 @@ #define __FBDOC_DEFS_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/fbdoc_keywords.bas b/doc/libfbdoc/fbdoc_keywords.bas index b86badc0ce..54e3625ea3 100644 --- a/doc/libfbdoc/fbdoc_keywords.bas +++ b/doc/libfbdoc/fbdoc_keywords.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/fbdoc_keywords.bi b/doc/libfbdoc/fbdoc_keywords.bi index d847d71ba3..4476c906a1 100644 --- a/doc/libfbdoc/fbdoc_keywords.bi +++ b/doc/libfbdoc/fbdoc_keywords.bi @@ -2,7 +2,7 @@ #define __FBDOC_FIND_KEYWORDS_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/fbdoc_lang.bas b/doc/libfbdoc/fbdoc_lang.bas index 6e5e25f98c..c0d80d7a54 100644 --- a/doc/libfbdoc/fbdoc_lang.bas +++ b/doc/libfbdoc/fbdoc_lang.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/fbdoc_lang.bi b/doc/libfbdoc/fbdoc_lang.bi index e05fe498cc..7f39097148 100644 --- a/doc/libfbdoc/fbdoc_lang.bi +++ b/doc/libfbdoc/fbdoc_lang.bi @@ -2,7 +2,7 @@ #define __FBDOC_LANG_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/fbdoc_loader.bas b/doc/libfbdoc/fbdoc_loader.bas index 4163d4afa3..239920b0ae 100644 --- a/doc/libfbdoc/fbdoc_loader.bas +++ b/doc/libfbdoc/fbdoc_loader.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/fbdoc_loader.bi b/doc/libfbdoc/fbdoc_loader.bi index b45abae636..a3c4ef9731 100644 --- a/doc/libfbdoc/fbdoc_loader.bi +++ b/doc/libfbdoc/fbdoc_loader.bi @@ -2,7 +2,7 @@ #define __FBDOC_LOADER_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/fbdoc_loader_sql.bas b/doc/libfbdoc/fbdoc_loader_sql.bas index 1a8971810c..e73b0bb1db 100644 --- a/doc/libfbdoc/fbdoc_loader_sql.bas +++ b/doc/libfbdoc/fbdoc_loader_sql.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/fbdoc_loader_sql.bi b/doc/libfbdoc/fbdoc_loader_sql.bi index 31ab42b829..55c675b42a 100644 --- a/doc/libfbdoc/fbdoc_loader_sql.bi +++ b/doc/libfbdoc/fbdoc_loader_sql.bi @@ -2,7 +2,7 @@ #define __FBDOC_LOADER_SQL_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/fbdoc_loader_web.bas b/doc/libfbdoc/fbdoc_loader_web.bas index f6c07192cd..c45b1ebaaf 100644 --- a/doc/libfbdoc/fbdoc_loader_web.bas +++ b/doc/libfbdoc/fbdoc_loader_web.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/fbdoc_loader_web.bi b/doc/libfbdoc/fbdoc_loader_web.bi index 71290fb76d..88f450a647 100644 --- a/doc/libfbdoc/fbdoc_loader_web.bi +++ b/doc/libfbdoc/fbdoc_loader_web.bi @@ -2,7 +2,7 @@ #define __FBDOC_LOADER_WEB_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/fbdoc_misc.bas b/doc/libfbdoc/fbdoc_misc.bas index e49efacdd1..6f0a28c50b 100644 --- a/doc/libfbdoc/fbdoc_misc.bas +++ b/doc/libfbdoc/fbdoc_misc.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/fbdoc_misc.bi b/doc/libfbdoc/fbdoc_misc.bi index 03314cdcb0..2e2d9ff111 100644 --- a/doc/libfbdoc/fbdoc_misc.bi +++ b/doc/libfbdoc/fbdoc_misc.bi @@ -2,7 +2,7 @@ #define __FBDOC_MISC_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/fbdoc_string.bas b/doc/libfbdoc/fbdoc_string.bas index b8b1a63944..e56a136b2c 100644 --- a/doc/libfbdoc/fbdoc_string.bas +++ b/doc/libfbdoc/fbdoc_string.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/fbdoc_string.bi b/doc/libfbdoc/fbdoc_string.bi index 6b7baa221d..6730a7f0fc 100644 --- a/doc/libfbdoc/fbdoc_string.bi +++ b/doc/libfbdoc/fbdoc_string.bi @@ -2,7 +2,7 @@ #define __FBDOC_STRING_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/fbdoc_templates.bas b/doc/libfbdoc/fbdoc_templates.bas index ecb7cb4e0b..19429f4ee9 100644 --- a/doc/libfbdoc/fbdoc_templates.bas +++ b/doc/libfbdoc/fbdoc_templates.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/fbdoc_templates.bi b/doc/libfbdoc/fbdoc_templates.bi index 0a7c9cc9a3..d661078c3d 100644 --- a/doc/libfbdoc/fbdoc_templates.bi +++ b/doc/libfbdoc/fbdoc_templates.bi @@ -2,7 +2,7 @@ #define __FBDOC_TEMPLATES_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/hash.bas b/doc/libfbdoc/hash.bas index 991b004a92..c1f0a0ab68 100644 --- a/doc/libfbdoc/hash.bas +++ b/doc/libfbdoc/hash.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/hash.bi b/doc/libfbdoc/hash.bi index a38803a588..9cfc63fe18 100644 --- a/doc/libfbdoc/hash.bi +++ b/doc/libfbdoc/hash.bi @@ -2,7 +2,7 @@ #define __HASH_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/list.bas b/doc/libfbdoc/list.bas index a185d60477..0302f88a68 100644 --- a/doc/libfbdoc/list.bas +++ b/doc/libfbdoc/list.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/list.bi b/doc/libfbdoc/list.bi index 2192d6256e..303fb6662a 100644 --- a/doc/libfbdoc/list.bi +++ b/doc/libfbdoc/list.bi @@ -2,7 +2,7 @@ #define __LIST_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/printlog.bas b/doc/libfbdoc/printlog.bas index 0faa8c4c9d..0a5150dd90 100644 --- a/doc/libfbdoc/printlog.bas +++ b/doc/libfbdoc/printlog.bas @@ -1,5 +1,5 @@ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/libfbdoc/printlog.bi b/doc/libfbdoc/printlog.bi index facb588f7e..db19ea78db 100644 --- a/doc/libfbdoc/printlog.bi +++ b/doc/libfbdoc/printlog.bi @@ -2,7 +2,7 @@ #define __PRINTLOG_BI__ '' fbdoc - FreeBASIC User's Manual Converter/Generator -'' Copyright (C) 2006-2018 The FreeBASIC development team. +'' Copyright (C) 2006-2019 The FreeBASIC development team. '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by From df183b9fd581a8d684cbb8e56de55eb36603c86f Mon Sep 17 00:00:00 2001 From: coderJeff Date: Fri, 4 Jan 2019 01:15:53 -0500 Subject: [PATCH 06/24] fbc: copyright update for 2019 --- doc/fbc.1 | 4 ++-- readme.txt | 2 +- src/compiler/fbc.bas | 2 +- src/compiler/license.txt | 2 +- src/rtlib/license.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/fbc.1 b/doc/fbc.1 index f09766b63a..fe65954ee0 100644 --- a/doc/fbc.1 +++ b/doc/fbc.1 @@ -1,4 +1,4 @@ -.TH FBC 1 "2014-09-16" "FreeBASIC Compiler 1.06.0" "FreeBASIC Compiler" +.TH FBC 1 "2019-01-01" "FreeBASIC Compiler 1.06.0" "FreeBASIC Compiler" .SH NAME fbc \- The FreeBASIC compiler .SH DESCRIPTION @@ -196,7 +196,7 @@ The full language specification and help is available in wiki format at .B http://www.freebasic.net/wiki/ .SH COPYRIGHT -Copyright \(co 2004\-2013 The FreeBASIC Development Team +Copyright \(co 2004\-2019 The FreeBASIC Development Team .br This is free software. You may redistribute copies of it under the terms of the GNU General Public License . diff --git a/readme.txt b/readme.txt index 3fe045c70a..662dfddd79 100644 --- a/readme.txt +++ b/readme.txt @@ -1,6 +1,6 @@ FreeBASIC - A multi-platform BASIC Compiler - Copyright (C) 2004-2016 The FreeBASIC development team. + Copyright (C) 2004-2019 The FreeBASIC development team. Official site: http://www.freebasic.net/ Forum: http://www.freebasic.net/forum/ diff --git a/src/compiler/fbc.bas b/src/compiler/fbc.bas index 87657a7d5e..aa93e0bcb2 100644 --- a/src/compiler/fbc.bas +++ b/src/compiler/fbc.bas @@ -3425,7 +3425,7 @@ private sub hPrintVersion( ) print "FreeBASIC Compiler - Version " + FB_VERSION + _ " (" + FB_BUILD_DATE + "), built for " + fbGetHostId( ) + " (" & fbGetHostBits( ) & "bit)" - print "Copyright (C) 2004-2016 The FreeBASIC development team." + print "Copyright (C) 2004-2019 The FreeBASIC development team." #ifdef ENABLE_STANDALONE hAppendConfigInfo( config, "standalone" ) diff --git a/src/compiler/license.txt b/src/compiler/license.txt index 7cb4d4da46..cd6d93aa02 100644 --- a/src/compiler/license.txt +++ b/src/compiler/license.txt @@ -1,5 +1,5 @@ FreeBASIC Compiler - Multi-platform BASIC Compiler. -Copyright (C) 2004-2016 The FreeBASIC development team. +Copyright (C) 2004-2019 The FreeBASIC development team. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/src/rtlib/license.txt b/src/rtlib/license.txt index 5c05ae175e..92676a6457 100644 --- a/src/rtlib/license.txt +++ b/src/rtlib/license.txt @@ -1,5 +1,5 @@ libfb - FreeBASIC's runtime library -Copyright (C) 2004-2016 The FreeBASIC development team. +Copyright (C) 2004-2019 The FreeBASIC development team. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public From cd7acd0cf4c5b867c89bb162f23e07b03d748ae3 Mon Sep 17 00:00:00 2001 From: coderJeff Date: Tue, 1 Jan 2019 00:15:37 -0500 Subject: [PATCH 07/24] fbdoc: wiki snapshot 2019-01-01 --- doc/manual/cache/ExtLibfreeimage.wakka | 1 + doc/manual/cache/FBWiki.wakka | 2 +- doc/manual/cache/KeyPgColor.wakka | 2 +- doc/manual/cache/KeyPgDdfbwin32.wakka | 6 +++--- doc/manual/cache/KeyPgGetgraphics.wakka | 6 +++++- doc/manual/cache/KeyPgInteger.wakka | 2 +- doc/manual/cache/KeyPgNamespace.wakka | 2 ++ doc/manual/cache/KeyPgOpPlacementNew.wakka | 2 ++ doc/manual/cache/KeyPgString.wakka | 2 ++ doc/manual/cache/KeyPgType.wakka | 1 + doc/manual/cache/KeyPgUinteger.wakka | 2 +- doc/manual/cache/KeyPgUnion.wakka | 22 +++++++++++--------- doc/manual/cache/KeyPgWstring.wakka | 1 + doc/manual/cache/KeyPgZstring.wakka | 1 + doc/manual/cache/ProPgArrayIndex.wakka | 1 + doc/manual/cache/ProPgLiterals.wakka | 2 +- doc/manual/cache/TutFBgfxImgAndFontBuf.wakka | 2 ++ 17 files changed, 38 insertions(+), 19 deletions(-) diff --git a/doc/manual/cache/ExtLibfreeimage.wakka b/doc/manual/cache/ExtLibfreeimage.wakka index ac4e408063..fabc1a4de8 100644 --- a/doc/manual/cache/ExtLibfreeimage.wakka +++ b/doc/manual/cache/ExtLibfreeimage.wakka @@ -89,6 +89,7 @@ dim as string filename = command(1) dim as any ptr image = FI_Load(filename) if image <> 0 then put (0, 0), image + ImageDestroy(image) else print "Problem while loading file : " & filename end if diff --git a/doc/manual/cache/FBWiki.wakka b/doc/manual/cache/FBWiki.wakka index 32ce9d3bd1..f91262692d 100644 --- a/doc/manual/cache/FBWiki.wakka +++ b/doc/manual/cache/FBWiki.wakka @@ -4,7 +4,7 @@ Programmer's Guide & Tutorials: How to write programs in ""FreeBASIC"". **[[http://www.freebasic.net/forum/|FreeBASIC's Official Forum]]** - The best place to ask questions, present projects, stay up to date and meet ""FreeBASIC"" users & developers. + The best place to ask questions, present projects, stay up to date and meet ""FreeBASIC"" users & developers, including the [[https://www.freebasic.net/forum/viewforum.php?f=9|Documentation forum]] and its [[https://www.freebasic.net/forum/viewtopic.php?f=9&t=26694|Index page of draft articles]]. **[[http://sourceforge.net/projects/fbc/|FreeBASIC's SourceForge Page]]** Official ""FreeBASIC"" downloads are available here, as well as a bug tracker and the ""FreeBASIC"" Compiler's source code repository. diff --git a/doc/manual/cache/KeyPgColor.wakka b/doc/manual/cache/KeyPgColor.wakka index fb69341d83..64da5022a5 100644 --- a/doc/manual/cache/KeyPgColor.wakka +++ b/doc/manual/cache/KeyPgColor.wakka @@ -63,7 +63,7 @@ Print "Background: " & HIWORD(c) #Include "fbgfx.bi" -Dim As Integer fgcolor, bkcolor +Dim As ULong fgcolor, bkcolor Screenres 500, 500, 32 Width 500\8, 500\16 diff --git a/doc/manual/cache/KeyPgDdfbwin32.wakka b/doc/manual/cache/KeyPgDdfbwin32.wakka index b7ab9afabc..d0561b8d92 100644 --- a/doc/manual/cache/KeyPgDdfbwin32.wakka +++ b/doc/manual/cache/KeyPgDdfbwin32.wakka @@ -5,15 +5,15 @@ Intrinsic define set by the compiler ""__FB_WIN32__"" ## {{fbdoc item="desc"}} - Define without a value created at compile time if compiling to the ""Win32"" target. Default in ""Win32"" hosted version, or active if the //[[CompilerOpttarget|-target win32]]// command line option is used. It can be used to compile parts of the program only if the target is ""Win32"". + Define without a value created at compile time if compiling to the ""Win (32-bit or 64-bit)"" target. Default in ""Win"" hosted version, or active if the //[[CompilerOpttarget|-target win32]]// or //[[CompilerOpttarget|-target win64]]// command line option is used. It can be used to compile parts of the program only if the target is ""Win"". {{fbdoc item="ex"}} {{fbdoc item="filename" value="examples/manual/defines/fbwin32.bas"}}%%(freebasic) #IFDEF __FB_WIN32__ - ' ... instructions only for Win32 ... + ' ... instructions only for Win ... ' ... GetProcAddress ... #ELSE - ' ... instructions not for Win32 ... + ' ... instructions not for Win ... #ENDIF %% diff --git a/doc/manual/cache/KeyPgGetgraphics.wakka b/doc/manual/cache/KeyPgGetgraphics.wakka index f4640988c8..d313a8670e 100644 --- a/doc/manual/cache/KeyPgGetgraphics.wakka +++ b/doc/manual/cache/KeyPgGetgraphics.wakka @@ -6,7 +6,7 @@ Gets a copy of a portion of the current work page or an image buffer ## {{fbdoc item="param"}} ##//source//## - the address of an image buffer. + the address of an image buffer. If it's omitted, the current work page is copied. ##STEP## indicates that the following co-ordinates are not absolute co-ordinates. ##[STEP](//x1//, //y1//)## @@ -70,6 +70,8 @@ put (150,150), image put (150,200), image put (150,250), image +ImageDestroy(image) + '' And a frame around a whole screen.. line (0,0)-(400-1,300-1), rgb(255,255,0), b @@ -89,6 +91,8 @@ while ((inkey() = "") and (x < 350)) x += 10 wend + +ImageDestroy(big) %% {{fbdoc item="see"}} diff --git a/doc/manual/cache/KeyPgInteger.wakka b/doc/manual/cache/KeyPgInteger.wakka index bb0c89f69c..5b6133b596 100644 --- a/doc/manual/cache/KeyPgInteger.wakka +++ b/doc/manual/cache/KeyPgInteger.wakka @@ -18,7 +18,7 @@ Standard data type: 32-bit or 64-bit signed, same size as ##[[KeyPgSizeof|SizeOf {{fbdoc item="ex"}} {{fbdoc item="filename" value="examples/manual/datatype/integer.bas"}}%%(freebasic) -#if __FB_64BIT__ +#ifdef __FB_64BIT__ Dim x As Integer = &H8000000000000000 Dim y As Integer = &H7FFFFFFFFFFFFFFF Print "Integer Range = "; x; " to "; y diff --git a/doc/manual/cache/KeyPgNamespace.wakka b/doc/manual/cache/KeyPgNamespace.wakka index 0c66ea1108..bff2563e81 100644 --- a/doc/manual/cache/KeyPgNamespace.wakka +++ b/doc/manual/cache/KeyPgNamespace.wakka @@ -20,6 +20,8 @@ Declares a namespace block Namespaces implicitly have public access and this is not modifiable. A variable declared inside a namespace is always implicitly static and visible throughout the entire program even if the declaration modifier [[KeyPgShared|Shared]] is not specified (static and shared are optional, but this may improve code readability). + To access from outside a defined symbol in a namespace, add the namespace identifier followed by a dot as a prefix of the symbol, or bring the namespace symbols into the current scope by means of the [[KeyPgUsing|Using (Namespaces)]] statement. + Namespaces do not have any effect on the visibility of a define. It is possible to define a namespace in two or more declarations. diff --git a/doc/manual/cache/KeyPgOpPlacementNew.wakka b/doc/manual/cache/KeyPgOpPlacementNew.wakka index 14fd3858d2..145d655d04 100644 --- a/doc/manual/cache/KeyPgOpPlacementNew.wakka +++ b/doc/manual/cache/KeyPgOpPlacementNew.wakka @@ -30,6 +30,8 @@ Operator to construct an object at a specified memory address. It is incorrect to call ##[[KeyPgOpDelete|Delete Statement]]## on the address. The proper way is to only call the destructor if one exists (implicitly or explicitly), with syntax as for a member method by using member access operator. See examples below for proper ##**Placement New**## operator usage. + ##**Placement New[]**## operator is the array-version of the ##**Placement New**## operator and constructs the specified number of objects from the specified memory location. The default constructor for the type will be used to set the initial values for each item. + Specifying an initial value of ##[[KeyPgAny|Any]]##, as in ##**New**(//address//)//datatype// (**Any**)## or ##**New**(//address//)//datatype//[//count//] {**Any**}## will not initialize the data. This is only valid on data types that do not have constructors (otherwise for data types with constructors, syntax of simple pointer conversion, like //Cptr(datatype Ptr, address)//, can be substituted to the invalid use of New...Any). Because it does not provide any dynamic memory allocation process, the ##**Placement New**## operator (unlike the ##[[KeyPgOpNew|New Expression]]## operator) does not allow any overloading by a member operator for user-defined types. diff --git a/doc/manual/cache/KeyPgString.wakka b/doc/manual/cache/KeyPgString.wakka index 1c8594afa3..179e16d60c 100644 --- a/doc/manual/cache/KeyPgString.wakka +++ b/doc/manual/cache/KeyPgString.wakka @@ -92,5 +92,7 @@ silly_print( "Status: " + status ) - ##[[KeyPgStr|Str]]## - ##[[KeyPgOpStrptr|Strptr]]## - ##[[KeyPgOpVarptr|Varptr]]## + - ##[[TblVarTypes|Standard Data Type Limits]]## + {{fbdoc item="back" value="CatPgStdDataTypes|Standard Data Types"}}{{fbdoc item="back" value="CatPgString|String Functions"}} \ No newline at end of file diff --git a/doc/manual/cache/KeyPgType.wakka b/doc/manual/cache/KeyPgType.wakka index ee28891894..56f0484130 100644 --- a/doc/manual/cache/KeyPgType.wakka +++ b/doc/manual/cache/KeyPgType.wakka @@ -54,6 +54,7 @@ Declares a user-defined type. //Variable-length data// In ""FreeBASIC"", Type data structures must ultimately be fixed-size, such that the compiler knows how much memory to allocate for objects of that Type. Nevertheless, Types may contain variable-length (dynamic) string or array data members. However, the string's/array's data will not be embedded in the Type directly. Instead, the Type will only contain a ##[[KeyPgString|String]]##/array descriptor structure, which ""FreeBASIC"" uses behind the scenes to manage the variable-length string/array data. For sizing the structure of the array descriptor in the Type, a variable-length (dynamic) array data member must be always declared by using ##[[KeyPgAny|Any(s)]]## in place of the array bounds, in order to fix the amount of dimensions based on the number of Anys specified. + Variable-length array fields are considered as pseudo-objects when they are declared in a ##**Type**##, just like variable-length strings (the implicit copy constructor and the implicit let operator themselves support [re]sizing and copying such arrays). Because of that, saving such a Type into a file will write out the descriptor, not the actual string/array data. In order to embed strings/arrays into Types directly, fixed-length strings/arrays must be used. diff --git a/doc/manual/cache/KeyPgUinteger.wakka b/doc/manual/cache/KeyPgUinteger.wakka index 97cdd09350..598fe82245 100644 --- a/doc/manual/cache/KeyPgUinteger.wakka +++ b/doc/manual/cache/KeyPgUinteger.wakka @@ -17,7 +17,7 @@ Equivalent to ##[[KeyPgUnsigned|Unsigned]] [[KeyPgInteger|Integer]]##. {{fbdoc item="ex"}} {{fbdoc item="filename" value="examples/manual/datatype/uinteger.bas"}}%%(freebasic) -#if __FB_64BIT__ +#ifdef __FB_64BIT__ Dim x As UInteger = 0 Dim y As UInteger = &HFFFFFFFFFFFFFFFF Print "UInteger Range = "; x; " to "; y diff --git a/doc/manual/cache/KeyPgUnion.wakka b/doc/manual/cache/KeyPgUnion.wakka index dee92229bc..418e4ccca7 100644 --- a/doc/manual/cache/KeyPgUnion.wakka +++ b/doc/manual/cache/KeyPgUnion.wakka @@ -17,20 +17,22 @@ Declares a union user defined type. Any of the supported member functions {{fbdoc item="desc"}} - Unions are similar to a ##[[KeyPgType|Type]]## structure, except that the elements of a union occupy the same space in memory. - Like Type, Union can use the optional ##[[KeyPgField|Field]] = //number//## specifier and supports also inheritance through the use of the [[KeyPgExtends|Extends]] keyword. - Unlike Type, Union can not contain variable-length strings and arrays, and more generally fields (or can not have bases) with constructors or destructors. Therefore, Union does not support to inherit from the ##[[KeyPgObject|Object]]## built-in type. - The size of the Union is the size of the largest data item. A data item can be an unnamed ##[[KeyPgType|Type]]##. Since they occupy the same space, only one element can usually be used at a given time. + The data elements of a ##**Union**## occupy a common space in memory (same memory address for all data elements of the ##**Union**##). A data element of a ##**Union**## can be a simple data field or an unnamed ##[[KeyPgType|Type]]## block of data fields. + The size of the ##**Union**## is the size of the largest data element. + Since they occupy a common memory space, only one data element can usually be used at a given time (when a given data element is written, the other data elements sharing the common union space may be overwritten or mutilated). - Unions support member functions including ##[[KeyPgConstructor|Constructor]]##, ##[[KeyPgDestructor|Destructor]]##, ##[[KeyPgMemberFunction|Function]]##, ##[[KeyPgOperator|Operator]]##, ##[[KeyPgProperty|Property]]## and ##[[KeyPgMemberSub|Sub]]##. All members of a union are public and access control is not supported. + Like ##[[KeyPgType|Type]]##, ##**Union**## can use the optional ##[[KeyPgField|Field]] = //number//## specifier for field alignment, and supports also inheritance through the use of the [[KeyPgExtends|Extends]] keyword. + Unlike ##[[KeyPgType|Type]]##, ##**Union**## can not contain variable-length strings and arrays, and more generally can not have object fields (or bases) with constructors or destructors. Therefore, ##**Union**## does not support to inherit from the ##[[KeyPgObject|Object]]## built-in type. - Nested unnamed type or union cannot have procedure members or static data members (same restriction for local named type/union). + A ##**Union**## supports member procedures including ##[[KeyPgConstructor|Constructor]]##, ##[[KeyPgDestructor|Destructor]]##, ##[[KeyPgMemberFunction|Function]]##, ##[[KeyPgOperator|Operator]]##, ##[[KeyPgProperty|Property]]## and ##[[KeyPgMemberSub|Sub]]##. All members of a ##**Union**## are public and access modifiers are not supported. - A ##**Union**## can be passed as a user defined type to overloaded operator functions. + Nested unnamed ##[[KeyPgType|Type]]## or ##**Union**## can not have procedure members or static data members (same restriction for local scope named Type/Union). - **Note:** When ##**Union**## extends a base, it can be confusing because no new fields are added to the base, but instead the base is added to the derived Union. This means that fields in the derived Union can share the same memory space like the base (here it doesn't matter whether the base is a Union or not). Of course it can be dangerous, but that is always the problem with Unions. - If only the base is a Union, then it won't be affected by fields from the derived UDT. - Since Union is not allowed to have complex fields (i.e. UDTs with constructor/destructor, or dynamic strings), a derived Union cannot be allowed to have (contain) a complex base. + A ##**Union**## can be passed in a similar way of a User Defined Type to overloaded operator procedures. + + **Note:** When ##**Union**## extends a base, it can be confusing because no new fields are added to the base, but instead the base is added to the derived Union. This means that data elements in the derived Union can share the same memory space like the base (here it doesn't matter whether the base is a ##**Union**## or not). Of course it can be dangerous, but that is always the problem with Unions. + If only the base is a ##**Union**##, then it won't be affected by data elements from the derived UDT. + Since ##**Union**## is not allowed to have complex data elements (i.e. UDTs with constructor/destructor, or dynamic strings), a derived Union can not be allowed to have (contain) a complex base. {{fbdoc item="ex"}} {{fbdoc item="filename" value="examples/manual/udt/union.bas"}}%%(freebasic) diff --git a/doc/manual/cache/KeyPgWstring.wakka b/doc/manual/cache/KeyPgWstring.wakka index b3e4d47af2..f3300ef7f0 100644 --- a/doc/manual/cache/KeyPgWstring.wakka +++ b/doc/manual/cache/KeyPgWstring.wakka @@ -60,5 +60,6 @@ print len(*str2) 'returns 12, the length of the string it points to - ##[[KeyPgWhex|Whex]]## - ##[[KeyPgWoct|Woct]]## - ##[[KeyPgWinput|Winput()]]## + - ##[[TblVarTypes|Standard Data Type Limits]]## {{fbdoc item="back" value="CatPgStdDataTypes|Standard Data Types"}}{{fbdoc item="back" value="CatPgString|String Functions"}} \ No newline at end of file diff --git a/doc/manual/cache/KeyPgZstring.wakka b/doc/manual/cache/KeyPgZstring.wakka index 5ee89486c9..17a14ab264 100644 --- a/doc/manual/cache/KeyPgZstring.wakka +++ b/doc/manual/cache/KeyPgZstring.wakka @@ -46,5 +46,6 @@ print len(*str2) 'returns 12, the size of the string it contains {{fbdoc item="see"}} - ##[[KeyPgString|String]]## - ##[[KeyPgWstring|Wstring]]## + - ##[[TblVarTypes|Standard Data Type Limits]]## {{fbdoc item="back" value="CatPgStdDataTypes|Standard Data Types"}}{{fbdoc item="back" value="CatPgString|String Functions"}} \ No newline at end of file diff --git a/doc/manual/cache/ProPgArrayIndex.wakka b/doc/manual/cache/ProPgArrayIndex.wakka index a79f98de1a..75116bfc08 100644 --- a/doc/manual/cache/ProPgArrayIndex.wakka +++ b/doc/manual/cache/ProPgArrayIndex.wakka @@ -100,5 +100,6 @@ END SUB - ##[[KeyPgSub|Sub]]## - [[ProPgVariables|Variables]] - [[ProPgVariableScope|Variable Scope]] + - ##[[TblVarTypes|Standard Data Type Limits]]## {{fbdoc item="back" value="CatPgProgrammer|Programmer's Guide"}} \ No newline at end of file diff --git a/doc/manual/cache/ProPgLiterals.wakka b/doc/manual/cache/ProPgLiterals.wakka index 9c2361f4af..c140cd9812 100644 --- a/doc/manual/cache/ProPgLiterals.wakka +++ b/doc/manual/cache/ProPgLiterals.wakka @@ -87,7 +87,7 @@ Dim e as double = 743.1E13 Dim f as single = 743D! %% - A suffix of "##!##" or "##F##" on a number specifies a single precision (32 bit total) floating point value. A suffix of "##""#""##" specifies a double precision float. + A suffix of "##!##" or "##F##" on a number specifies a single precision (32 bit total) floating point value. A suffix of "##""#""##" or "##D##" specifies a double precision float. Note that the letter suffixes and exponent specifiers are all case-insensitive. {{fbdoc item="filename" value="examples/manual/proguide/literals/singsuff.bas"}}%%(freebasic) diff --git a/doc/manual/cache/TutFBgfxImgAndFontBuf.wakka b/doc/manual/cache/TutFBgfxImgAndFontBuf.wakka index 5980072be7..30fef8e71f 100644 --- a/doc/manual/cache/TutFBgfxImgAndFontBuf.wakka +++ b/doc/manual/cache/TutFBgfxImgAndFontBuf.wakka @@ -486,6 +486,8 @@ Next Put (0,0), myBuf, pset sleep +ImageDestroy( myBuf ) + /' ScreenPtr: From aa3fcebe747fcc1c34b58b4a4de544106906bf3b Mon Sep 17 00:00:00 2001 From: coderJeff Date: Sun, 13 Jan 2019 18:35:19 -0500 Subject: [PATCH 08/24] fbdoc: wiki snapshot 2019-01-12 --- doc/manual/cache/KeyPgAsc.wakka | 1 + doc/manual/cache/KeyPgDylibload.wakka | 2 ++ doc/manual/cache/KeyPgThis.wakka | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/manual/cache/KeyPgAsc.wakka b/doc/manual/cache/KeyPgAsc.wakka index c3f193467b..21b751c01e 100644 --- a/doc/manual/cache/KeyPgAsc.wakka +++ b/doc/manual/cache/KeyPgAsc.wakka @@ -17,6 +17,7 @@ Returns the corresponding ASCII or Unicode integer representation of a character {{fbdoc item="ret"}} The raw character value stored at ##//position//## in ##//str//##. + If both ##//str//## and ##//position//## can be evaluated at compile time (like ##**Asc**("a")## or ##**Asc**(chr(97))## or ##**Asc**("abc", 2)## ...), the value is returned in a ##[[KeyPgUinteger|uinteger]]## result, otherwise in a ##[[KeyPgUlong|ulong]]## result. {{fbdoc item="desc"}} If ##//str//## is a ##[[KeyPgString|String]]## or a ##[[KeyPgZstring|ZString]]##, the ##[[KeyPgUbyte|UByte]]## value at that ##//position//## is returned. This will be a 7-bit [[CptAscii|ASCII]] code, or even a 8-bit character value from some code-page, depending on the string data stored in ##//str//##. diff --git a/doc/manual/cache/KeyPgDylibload.wakka b/doc/manual/cache/KeyPgDylibload.wakka index 3edf9693de..4fd17d2e5e 100644 --- a/doc/manual/cache/KeyPgDylibload.wakka +++ b/doc/manual/cache/KeyPgDylibload.wakka @@ -16,6 +16,8 @@ Loads to a Dynamic Link Library (DLL) into memory at runtime {{fbdoc item="desc"}} ##[[KeyPgDylibload|Dylibload]]## is used to link at runtime libraries to your program. This function does the link and returns a handle that must be used with ##[[KeyPgDylibsymbol|Dylibsymbol]]## when calling a function in the library and with ##[[KeyPgDylibfree|Dylibfree]]## when releasing the library. + + Note: If the ##//filename//## string (without extension) already includes a character dot (##.##), it may be mandatory to explicitly specify the filename extension to avoid any parser ambiguity. {{fbdoc item="ex"}} See the dynamic loading example on the [[ProPgSharedLibraries|Shared Libraries]] page. diff --git a/doc/manual/cache/KeyPgThis.wakka b/doc/manual/cache/KeyPgThis.wakka index d43c14266f..ca5667f7be 100644 --- a/doc/manual/cache/KeyPgThis.wakka +++ b/doc/manual/cache/KeyPgThis.wakka @@ -9,13 +9,13 @@ Hidden instance parameter passed to non-static member functions in a ##[[KeyPgTy End With ## {{fbdoc item="desc"}} - ##**This**## is a reference to an instance of a ##[[KeyPgType|Type]]## or ##[[KeyPgClass|Class]]## that is passed as a hidden argument to all non-static member functions of that type or class. Non-static member functions are procedures declared inside the body of a ##[[KeyPgType|Type]]## or ##[[KeyPgClass|Class]]## and include ##[[KeyPgMemberSub|Sub]]##, ##[[KeyPgMemberFunction|Function]]##, ##[[KeyPgConstructor|Constructor]]##, ##[[KeyPgDestructor|Destructor]]##, assignment or ##[[KeyPgOpCast|Cast]]## ##[[KeyPgOperator|Operator]]##, and ##[[KeyPgProperty|Property]]## procedures. + ##**This**## is a reference to an instance of a ##[[KeyPgType|Type]]## or ##[[KeyPgClass|Class]]## that is passed (through a hidden ##[[KeyPgByref|Byref parameter]]##) to all non-static member functions of that type or class. Non-static member functions are procedures declared inside the body of a ##[[KeyPgType|Type]]## or ##[[KeyPgClass|Class]]## and include ##[[KeyPgMemberSub|Sub]]##, ##[[KeyPgMemberFunction|Function]]##, ##[[KeyPgConstructor|Constructor]]##, ##[[KeyPgDestructor|Destructor]]##, assignment or ##[[KeyPgOpCast|Cast]]## ##[[KeyPgOperator|Operator]]##, and ##[[KeyPgProperty|Property]]## procedures. The ##**This**## additional parameter has the same data type as the ##[[KeyPgType|Type]]## or ##[[KeyPgClass|Class]]## in which the procedure is declared. The ##**This**## parameter can be used just like any other variable, ie., pass it to procedures taking an object of the same type, call other member procedures and access member data using ##[[KeyPgOpMemberAccess|Operator . (Member access)]]##, etc. - Most of the time, using ##**This**## explicitly for member access is unnecessary; member procedures can refer to other members of the instance which they are passed directly by name, without having to qualify it with ##**This**## and ##[[KeyPgOpMemberAccess|Operator . (Member access)]]##. The only times when you need to qualify member names with ##**This**## is when the member name is hidden, for example, by a local variable or parameter. In these situations, qualifying the member name is the only way to refer to these hidden member names. + Most of the time, using ##**This**## explicitly for member access is unnecessary; member procedures can refer to other members of the instance which they are passed directly by name, without having to qualify it with ##**This**## and ##[[KeyPgOpMemberAccess|Operator . (Member access)]]##. The only times when you need to qualify member names with ##**This**## is when the member is shadowed, for example by duplicating its name for a local variable or parameter. In these situations, qualifying the member name is the only way to refer to these masked member names. {{fbdoc item="ex"}} {{fbdoc item="filename" value="examples/manual/udt/this.bas"}}%%(freebasic) From e114f9947f0015f722e8385e5d224481f3475ad3 Mon Sep 17 00:00:00 2001 From: coderJeff Date: Sun, 13 Jan 2019 18:44:57 -0500 Subject: [PATCH 09/24] fbchkdoc: copyright update 2019 --- doc/fbchkdoc/buffer.bas | 2 +- doc/fbchkdoc/chkdocs.bas | 2 +- doc/fbchkdoc/cmd_opts.bas | 2 +- doc/fbchkdoc/cmd_opts.bi | 2 +- doc/fbchkdoc/delextra.bas | 2 +- doc/fbchkdoc/fmtcode.bas | 2 +- doc/fbchkdoc/funcs.bas | 2 +- doc/fbchkdoc/funcs.bi | 2 +- doc/fbchkdoc/funcsdir.bas | 2 +- doc/fbchkdoc/getimage.bas | 2 +- doc/fbchkdoc/getindex.bas | 2 +- doc/fbchkdoc/getpage.bas | 2 +- doc/fbchkdoc/mkerrlst.bas | 2 +- doc/fbchkdoc/mkimglst.bas | 2 +- doc/fbchkdoc/mkprntoc.bas | 2 +- doc/fbchkdoc/putpage.bas | 2 +- doc/fbchkdoc/readme.txt | 2 +- doc/fbchkdoc/rebuild.bas | 2 +- doc/fbchkdoc/replace.bas | 2 +- doc/fbchkdoc/samps.bas | 4 ++-- doc/fbchkdoc/samps_file.bas | 2 +- doc/fbchkdoc/samps_logfile.bas | 2 +- doc/fbchkdoc/spell.bas | 2 +- doc/fbchkdoc/spellcheck.bas | 2 +- doc/fbchkdoc/spellit.bas | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/doc/fbchkdoc/buffer.bas b/doc/fbchkdoc/buffer.bas index 7094d9b691..9ec85b70aa 100644 --- a/doc/fbchkdoc/buffer.bas +++ b/doc/fbchkdoc/buffer.bas @@ -1,5 +1,5 @@ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2008-2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2008-2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/fbchkdoc/chkdocs.bas b/doc/fbchkdoc/chkdocs.bas index 30438d7433..d6c350ddc9 100644 --- a/doc/fbchkdoc/chkdocs.bas +++ b/doc/fbchkdoc/chkdocs.bas @@ -1,5 +1,5 @@ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2008-2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2008-2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/fbchkdoc/cmd_opts.bas b/doc/fbchkdoc/cmd_opts.bas index 928626be00..8935c8021f 100644 --- a/doc/fbchkdoc/cmd_opts.bas +++ b/doc/fbchkdoc/cmd_opts.bas @@ -1,5 +1,5 @@ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/fbchkdoc/cmd_opts.bi b/doc/fbchkdoc/cmd_opts.bi index b6e093c48d..35b2968517 100644 --- a/doc/fbchkdoc/cmd_opts.bi +++ b/doc/fbchkdoc/cmd_opts.bi @@ -2,7 +2,7 @@ #define __FBCHKDOC_CMD_OPTS_BI__ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/fbchkdoc/delextra.bas b/doc/fbchkdoc/delextra.bas index da06cb0f88..2763f52a4d 100644 --- a/doc/fbchkdoc/delextra.bas +++ b/doc/fbchkdoc/delextra.bas @@ -1,5 +1,5 @@ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2008-2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2008-2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/fbchkdoc/fmtcode.bas b/doc/fbchkdoc/fmtcode.bas index 8d691e05d6..24b55d5452 100644 --- a/doc/fbchkdoc/fmtcode.bas +++ b/doc/fbchkdoc/fmtcode.bas @@ -1,5 +1,5 @@ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2008-2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2008-2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/fbchkdoc/funcs.bas b/doc/fbchkdoc/funcs.bas index 32eef991f2..94efcb60de 100644 --- a/doc/fbchkdoc/funcs.bas +++ b/doc/fbchkdoc/funcs.bas @@ -1,5 +1,5 @@ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2008-2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2008-2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/fbchkdoc/funcs.bi b/doc/fbchkdoc/funcs.bi index 535fadadef..c2d5a30ca0 100644 --- a/doc/fbchkdoc/funcs.bi +++ b/doc/fbchkdoc/funcs.bi @@ -2,7 +2,7 @@ #define __FBCHKDOC_FUNCS_BI__ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2008-2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2008-2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/fbchkdoc/funcsdir.bas b/doc/fbchkdoc/funcsdir.bas index 22498f090a..db1974f000 100644 --- a/doc/fbchkdoc/funcsdir.bas +++ b/doc/fbchkdoc/funcsdir.bas @@ -1,5 +1,5 @@ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2008-2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2008-2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/fbchkdoc/getimage.bas b/doc/fbchkdoc/getimage.bas index c104184da1..8f725efd29 100644 --- a/doc/fbchkdoc/getimage.bas +++ b/doc/fbchkdoc/getimage.bas @@ -1,5 +1,5 @@ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2008-2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2008-2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/fbchkdoc/getindex.bas b/doc/fbchkdoc/getindex.bas index 75f4144c73..485759a4e0 100644 --- a/doc/fbchkdoc/getindex.bas +++ b/doc/fbchkdoc/getindex.bas @@ -1,5 +1,5 @@ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2008-2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2008-2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/fbchkdoc/getpage.bas b/doc/fbchkdoc/getpage.bas index 2c95646b5d..80a37e4c27 100644 --- a/doc/fbchkdoc/getpage.bas +++ b/doc/fbchkdoc/getpage.bas @@ -1,5 +1,5 @@ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2008-2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2008-2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/fbchkdoc/mkerrlst.bas b/doc/fbchkdoc/mkerrlst.bas index 590bf48fe9..64747c4755 100644 --- a/doc/fbchkdoc/mkerrlst.bas +++ b/doc/fbchkdoc/mkerrlst.bas @@ -1,5 +1,5 @@ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2008-2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2008-2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/fbchkdoc/mkimglst.bas b/doc/fbchkdoc/mkimglst.bas index f476378357..e4628fa2fb 100644 --- a/doc/fbchkdoc/mkimglst.bas +++ b/doc/fbchkdoc/mkimglst.bas @@ -1,5 +1,5 @@ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2008-2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2008-2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/fbchkdoc/mkprntoc.bas b/doc/fbchkdoc/mkprntoc.bas index 996906afb1..860f4134e0 100644 --- a/doc/fbchkdoc/mkprntoc.bas +++ b/doc/fbchkdoc/mkprntoc.bas @@ -1,5 +1,5 @@ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2008-2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2008-2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/fbchkdoc/putpage.bas b/doc/fbchkdoc/putpage.bas index c2accddd25..a4ddf44fe1 100644 --- a/doc/fbchkdoc/putpage.bas +++ b/doc/fbchkdoc/putpage.bas @@ -1,5 +1,5 @@ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2008-2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2008-2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/fbchkdoc/readme.txt b/doc/fbchkdoc/readme.txt index 83d1bf09a3..122299876a 100644 --- a/doc/fbchkdoc/readme.txt +++ b/doc/fbchkdoc/readme.txt @@ -1,5 +1,5 @@ fbchkdoc - FreeBASIC Wiki Management Tools -Copyright (C) 2008-2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +Copyright (C) 2008-2019 Jeffery R. Marshall (coder[at]execulink[dot]com) A collection of utilities to help maintain the FreeBASIC documentation at https://www.freebasic.net/wiki diff --git a/doc/fbchkdoc/rebuild.bas b/doc/fbchkdoc/rebuild.bas index b0f510615e..4c81fc881c 100644 --- a/doc/fbchkdoc/rebuild.bas +++ b/doc/fbchkdoc/rebuild.bas @@ -1,5 +1,5 @@ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2008-2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2008-2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/fbchkdoc/replace.bas b/doc/fbchkdoc/replace.bas index 2f81f830d3..ca6643b02f 100644 --- a/doc/fbchkdoc/replace.bas +++ b/doc/fbchkdoc/replace.bas @@ -1,5 +1,5 @@ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2008-2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2008-2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/fbchkdoc/samps.bas b/doc/fbchkdoc/samps.bas index 14e160b9ed..81cea63ec2 100644 --- a/doc/fbchkdoc/samps.bas +++ b/doc/fbchkdoc/samps.bas @@ -1,5 +1,5 @@ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2008-2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2008-2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by @@ -451,7 +451,7 @@ function cmd_update_proc() as integer h = freefile open "changed.txt" for output as #h for i = 1 to nchanges - print #h, " - " & changes(i) & " ? [example updated from SVN]" + print #h, " - " & changes(i) & " ? [example updated from repo]" next close #h diff --git a/doc/fbchkdoc/samps_file.bas b/doc/fbchkdoc/samps_file.bas index 27d0794752..7f54371f25 100644 --- a/doc/fbchkdoc/samps_file.bas +++ b/doc/fbchkdoc/samps_file.bas @@ -1,5 +1,5 @@ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2008-2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2008-2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/fbchkdoc/samps_logfile.bas b/doc/fbchkdoc/samps_logfile.bas index 7067abe914..06a6404517 100644 --- a/doc/fbchkdoc/samps_logfile.bas +++ b/doc/fbchkdoc/samps_logfile.bas @@ -1,5 +1,5 @@ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2008-2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2008-2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/fbchkdoc/spell.bas b/doc/fbchkdoc/spell.bas index 375847b719..5af516ca79 100644 --- a/doc/fbchkdoc/spell.bas +++ b/doc/fbchkdoc/spell.bas @@ -1,5 +1,5 @@ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2008-2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2008-2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/fbchkdoc/spellcheck.bas b/doc/fbchkdoc/spellcheck.bas index 5525a9e705..7968975e4b 100644 --- a/doc/fbchkdoc/spellcheck.bas +++ b/doc/fbchkdoc/spellcheck.bas @@ -1,5 +1,5 @@ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2008-2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2008-2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by diff --git a/doc/fbchkdoc/spellit.bas b/doc/fbchkdoc/spellit.bas index 86c7a23f78..fb5925bb9d 100644 --- a/doc/fbchkdoc/spellit.bas +++ b/doc/fbchkdoc/spellit.bas @@ -1,5 +1,5 @@ '' fbchkdoc - FreeBASIC Wiki Management Tools -'' Copyright (C) 2008-2018 Jeffery R. Marshall (coder[at]execulink[dot]com) +'' Copyright (C) 2008-2019 Jeffery R. Marshall (coder[at]execulink[dot]com) '' '' This program is free software; you can redistribute it and/or modify '' it under the terms of the GNU General Public License as published by From 08ec6cf8f7b903bc66eb2b97a12a9408b176e399 Mon Sep 17 00:00:00 2001 From: coderJeff Date: Sun, 13 Jan 2019 18:46:00 -0500 Subject: [PATCH 10/24] fbdoc: wiki snapshot 2019-01-13 --- doc/manual/cache/ExtLibcryptlib.wakka | 2 +- doc/manual/cache/KeyPgColor.wakka | 7 +++--- doc/manual/cache/KeyPgOpNewOverload.wakka | 26 +++++++++++------------ doc/manual/cache/ProPgFixLenArrays.wakka | 2 +- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/doc/manual/cache/ExtLibcryptlib.wakka b/doc/manual/cache/ExtLibcryptlib.wakka index e104c2b977..f8c715dbab 100644 --- a/doc/manual/cache/ExtLibcryptlib.wakka +++ b/doc/manual/cache/ExtLibcryptlib.wakka @@ -41,7 +41,7 @@ Function calc_hash( ByVal filename As String, ByVal algo As CRYPT_ALGO_TYPE ) As cryptEncrypt( ctx, 0, 0 ) '' get the hash result - Dim As Integer buffersize = BUFFER_SIZE + Dim As Long buffersize = BUFFER_SIZE cryptGetAttributeString( ctx, CRYPT_CTXINFO_HASHVALUE, @buffer(0), @buffersize ) '' convert to hexadecimal diff --git a/doc/manual/cache/KeyPgColor.wakka b/doc/manual/cache/KeyPgColor.wakka index 64da5022a5..8610943845 100644 --- a/doc/manual/cache/KeyPgColor.wakka +++ b/doc/manual/cache/KeyPgColor.wakka @@ -61,11 +61,12 @@ Print "Background: " & HIWORD(c) {{fbdoc item="filename" value="examples/manual/gfx/color2.bas"}}%%(freebasic) ' In 32-bit color depth, Function Color() returns only the foreground color -#Include "fbgfx.bi" +#include "fbgfx.bi" -Dim As ULong fgcolor, bkcolor +'' screencontrol expects integer/uinteger +Dim As UInteger fgcolor, bkcolor -Screenres 500, 500, 32 +ScreenRes 500, 500, 32 Width 500\8, 500\16 Color &HFFFF00, &H0000FF Cls diff --git a/doc/manual/cache/KeyPgOpNewOverload.wakka b/doc/manual/cache/KeyPgOpNewOverload.wakka index 123e32458a..e344036c9f 100644 --- a/doc/manual/cache/KeyPgOpNewOverload.wakka +++ b/doc/manual/cache/KeyPgOpNewOverload.wakka @@ -95,24 +95,24 @@ memory deallocation from 'Delete[]' at address 33775648 Const ALIGN = 256 Type UDT - Dim As Byte a(0 to 10 * 1024 * 1024 - 1) '' 10 megabyte fixed array - Declare Operator New (Byval size As UInteger) As Any Ptr - Declare Operator Delete (Byval buffer As Any Ptr) + Dim As Byte a(0 To 10 * 1024 * 1024 - 1) '' 10 megabyte fixed array + Declare Operator New (ByVal size As UInteger) As Any Ptr + Declare Operator Delete (ByVal buffer As Any Ptr) Declare Constructor () Declare Destructor () End Type -Operator UDT.New (Byval size As UInteger) As Any Ptr +Operator UDT.New (ByVal size As UInteger) As Any Ptr Print " Overloaded New operator, with parameter size = &h" & Hex(size) - Dim pOrig As Any Ptr = Callocate(ALIGN-1 + Sizeof(UDT Ptr) + size) - Dim pMin As Any Ptr = pOrig + Sizeof(UDT Ptr) - Dim p As Any Ptr = pMin + ALIGN-1 - (Culng(pMin + ALIGN-1) Mod ALIGN) + Dim pOrig As Any Ptr = CAllocate(ALIGN-1 + SizeOf(UDT Ptr) + size) + Dim pMin As Any Ptr = pOrig + SizeOf(UDT Ptr) + Dim p As Any Ptr = pMin + ALIGN-1 - (CUInt(pMin + ALIGN-1) Mod ALIGN) Cast(Any Ptr Ptr, p)[-1] = pOrig Operator = p Print " real pointer = &h" & Hex(pOrig), "return pointer = &h" & Hex(p) End Operator -Operator UDT.Delete (Byval buffer As Any Ptr) +Operator UDT.Delete (ByVal buffer As Any Ptr) Print " Overloaded Delete operator, with parameter buffer = &h" & Hex(buffer) Dim pOrig As Any Ptr = Cast(Any Ptr Ptr, buffer)[-1] Deallocate(pOrig) @@ -125,7 +125,7 @@ End Constructor Destructor UDT () Print " Destructor, @This = &h" & Hex(@This) -End destructor +End Destructor Print "'Dim As UDT Ptr p = New UDT'" Dim As UDT Ptr p = New UDT @@ -184,7 +184,7 @@ Dim UDTmanager.upbound As UInteger = 0 Function UDTmanager.printLine (ByRef text As String, ByVal index As UInteger, ByVal sign As Integer) As UInteger Dim As UInteger total = 0 For I As UInteger = 1 To UDTmanager.upbound - If I <> index Orelse Sgn(sign) > 0 Then + If I <> index OrElse Sgn(sign) > 0 Then total += UDTmanager.bytes(I) End If Next I @@ -266,15 +266,15 @@ End Operator Print "Message",, "Address" & Space(SizeOf(Any Ptr)), "Size", "Total" Print Randomize -Dim As UDTmanager Ptr pu1 = New UDTmanager[Rnd() * 256 + 1] -Dim As UDTmanager Ptr pu2 = New UDTmanager[Rnd() * 256 + 1] +Dim As UDTmanager Ptr pu1 = New UDTmanager[cuint(Rnd() * 256 + 1)] +Dim As UDTmanager Ptr pu2 = New UDTmanager[cuint(Rnd() * 256 + 1)] Dim As UDTmanager Ptr pu3 = Cast(UDTmanager Ptr, 1) Delete[] pu2 Delete[] pu3 Delete[] pu2 Delete[] pu1 Do - Dim As UDTmanager Ptr pu = New UDTmanager[Rnd() * 512 + 1] + Dim As UDTmanager Ptr pu = New UDTmanager[cuint(Rnd() * 512 + 1)] Loop %% diff --git a/doc/manual/cache/ProPgFixLenArrays.wakka b/doc/manual/cache/ProPgFixLenArrays.wakka index e5d51ccf51..678ece4ce8 100644 --- a/doc/manual/cache/ProPgFixLenArrays.wakka +++ b/doc/manual/cache/ProPgFixLenArrays.wakka @@ -27,7 +27,7 @@ Dim b(0 To 1) As Integer '' 1-dimensional, 2 elements (0 and 1) Dim c(5 To 10) As Integer '' 1-dimensional, 5 elements (5, 6, 7, 8, 9 and 10) Dim d(1 To 2, 1 To 2) As Integer '' 2-dimensional, 4 elements: (1,1), (1,2), (2,1), (2,2) -Dim e(99, 99, 99, 99) As Integer '' 4-dimensional, 100 * 100 * 100 * 100 elements +Dim e(9, 9, 9, 9) As Integer '' 4-dimensional, 10 * 10 * 10 * 10 elements %% For an array to be declared fixed-length, the boundaries must be specified using only number literals or ##[[KeyPgConst|Const]]## values or ##[[KeyPgEnum|Enum]]## constants. From 17228f184fea761d7337d906bb7da708b9c151cf Mon Sep 17 00:00:00 2001 From: coderJeff Date: Sun, 13 Jan 2019 18:46:24 -0500 Subject: [PATCH 11/24] fbdoc: examples/manual update 2019-01-13 --- examples/manual/datatype/integer.bas | 2 +- examples/manual/datatype/uinteger.bas | 2 +- examples/manual/defines/fbwin32.bas | 4 ++-- examples/manual/extras/freeimage.bas | 1 + examples/manual/gfx/color2.bas | 3 ++- examples/manual/gfx/get.bas | 4 ++++ examples/manual/libraries/cryptlib.bas | 2 +- examples/manual/proguide/arrays/fixedlen_bounds.bas | 2 +- examples/manual/udt/newoverload1.bas | 2 +- examples/manual/udt/newoverload2.bas | 6 +++--- examples/manual/udt/operator2.bas | 2 +- 11 files changed, 18 insertions(+), 12 deletions(-) diff --git a/examples/manual/datatype/integer.bas b/examples/manual/datatype/integer.bas index 883823a9a2..5b7ee396d5 100644 --- a/examples/manual/datatype/integer.bas +++ b/examples/manual/datatype/integer.bas @@ -6,7 +6,7 @@ '' See Also: https://www.freebasic.net/wiki/wikka.php?wakka=KeyPgInteger '' -------- -#if __FB_64BIT__ +#ifdef __FB_64BIT__ Dim x As Integer = &H8000000000000000 Dim y As Integer = &H7FFFFFFFFFFFFFFF Print "Integer Range = "; x; " to "; y diff --git a/examples/manual/datatype/uinteger.bas b/examples/manual/datatype/uinteger.bas index ced9758a4a..0ea56f2650 100644 --- a/examples/manual/datatype/uinteger.bas +++ b/examples/manual/datatype/uinteger.bas @@ -6,7 +6,7 @@ '' See Also: https://www.freebasic.net/wiki/wikka.php?wakka=KeyPgUinteger '' -------- -#if __FB_64BIT__ +#ifdef __FB_64BIT__ Dim x As UInteger = 0 Dim y As UInteger = &HFFFFFFFFFFFFFFFF Print "UInteger Range = "; x; " to "; y diff --git a/examples/manual/defines/fbwin32.bas b/examples/manual/defines/fbwin32.bas index b2c4f82790..f8554e67af 100644 --- a/examples/manual/defines/fbwin32.bas +++ b/examples/manual/defines/fbwin32.bas @@ -7,8 +7,8 @@ '' -------- #ifdef __FB_WIN32__ - ' ... instructions only for Win32 ... + ' ... instructions only for Win ... ' ... GetProcAddress ... #else - ' ... instructions not for Win32 ... + ' ... instructions not for Win ... #endif diff --git a/examples/manual/extras/freeimage.bas b/examples/manual/extras/freeimage.bas index 8d4c5d39e2..e6208f85ab 100644 --- a/examples/manual/extras/freeimage.bas +++ b/examples/manual/extras/freeimage.bas @@ -84,6 +84,7 @@ Dim As String filename = Command(1) Dim As Any Ptr image = FI_Load(filename) If image <> 0 Then Put (0, 0), image + ImageDestroy(image) Else Print "Problem while loading file : " & filename End If diff --git a/examples/manual/gfx/color2.bas b/examples/manual/gfx/color2.bas index 1566542b5a..72970b11c6 100644 --- a/examples/manual/gfx/color2.bas +++ b/examples/manual/gfx/color2.bas @@ -10,7 +10,8 @@ #include "fbgfx.bi" -Dim As Integer fgcolor, bkcolor +'' screencontrol expects integer/uinteger +Dim As UInteger fgcolor, bkcolor ScreenRes 500, 500, 32 Width 500\8, 500\16 diff --git a/examples/manual/gfx/get.bas b/examples/manual/gfx/get.bas index 7dfa0e2a09..0ee2d6b752 100644 --- a/examples/manual/gfx/get.bas +++ b/examples/manual/gfx/get.bas @@ -33,6 +33,8 @@ Put (150,150), image Put (150,200), image Put (150,250), image +ImageDestroy(image) + '' And a frame around a whole screen.. Line (0,0)-(400-1,300-1), RGB(255,255,0), b @@ -52,3 +54,5 @@ While ((Inkey() = "") And (x < 350)) x += 10 Wend + +ImageDestroy(big) diff --git a/examples/manual/libraries/cryptlib.bas b/examples/manual/libraries/cryptlib.bas index 0be324cfdc..d419179fbf 100644 --- a/examples/manual/libraries/cryptlib.bas +++ b/examples/manual/libraries/cryptlib.bas @@ -38,7 +38,7 @@ Function calc_hash( ByVal filename As String, ByVal algo As CRYPT_ALGO_TYPE ) As cryptEncrypt( ctx, 0, 0 ) '' get the hash result - Dim As Integer buffersize = BUFFER_SIZE + Dim As Long buffersize = BUFFER_SIZE cryptGetAttributeString( ctx, CRYPT_CTXINFO_HASHVALUE, @buffer(0), @buffersize ) '' convert to hexadecimal diff --git a/examples/manual/proguide/arrays/fixedlen_bounds.bas b/examples/manual/proguide/arrays/fixedlen_bounds.bas index b3986aa0bf..41f37e5ad4 100644 --- a/examples/manual/proguide/arrays/fixedlen_bounds.bas +++ b/examples/manual/proguide/arrays/fixedlen_bounds.bas @@ -11,4 +11,4 @@ Dim b(0 To 1) As Integer '' 1-dimensional, 2 elements (0 and 1) Dim c(5 To 10) As Integer '' 1-dimensional, 5 elements (5, 6, 7, 8, 9 and 10) Dim d(1 To 2, 1 To 2) As Integer '' 2-dimensional, 4 elements: (1,1), (1,2), (2,1), (2,2) -Dim e(99, 99, 99, 99) As Integer '' 4-dimensional, 100 * 100 * 100 * 100 elements +Dim e(9, 9, 9, 9) As Integer '' 4-dimensional, 10 * 10 * 10 * 10 elements diff --git a/examples/manual/udt/newoverload1.bas b/examples/manual/udt/newoverload1.bas index fae619f947..a885e48846 100644 --- a/examples/manual/udt/newoverload1.bas +++ b/examples/manual/udt/newoverload1.bas @@ -20,7 +20,7 @@ Operator UDT.New (ByVal size As UInteger) As Any Ptr Print " Overloaded New operator, with parameter size = &h" & Hex(size) Dim pOrig As Any Ptr = CAllocate(ALIGN-1 + SizeOf(UDT Ptr) + size) Dim pMin As Any Ptr = pOrig + SizeOf(UDT Ptr) - Dim p As Any Ptr = pMin + ALIGN-1 - (CULng(pMin + ALIGN-1) Mod ALIGN) + Dim p As Any Ptr = pMin + ALIGN-1 - (CUInt(pMin + ALIGN-1) Mod ALIGN) Cast(Any Ptr Ptr, p)[-1] = pOrig Operator = p Print " real pointer = &h" & Hex(pOrig), "return pointer = &h" & Hex(p) diff --git a/examples/manual/udt/newoverload2.bas b/examples/manual/udt/newoverload2.bas index ff1d46271c..c5c070cd4c 100644 --- a/examples/manual/udt/newoverload2.bas +++ b/examples/manual/udt/newoverload2.bas @@ -112,13 +112,13 @@ End Operator Print "Message",, "Address" & Space(SizeOf(Any Ptr)), "Size", "Total" Print Randomize -Dim As UDTmanager Ptr pu1 = New UDTmanager[Rnd() * 256 + 1] -Dim As UDTmanager Ptr pu2 = New UDTmanager[Rnd() * 256 + 1] +Dim As UDTmanager Ptr pu1 = New UDTmanager[cuint(Rnd() * 256 + 1)] +Dim As UDTmanager Ptr pu2 = New UDTmanager[cuint(Rnd() * 256 + 1)] Dim As UDTmanager Ptr pu3 = Cast(UDTmanager Ptr, 1) Delete[] pu2 Delete[] pu3 Delete[] pu2 Delete[] pu1 Do - Dim As UDTmanager Ptr pu = New UDTmanager[Rnd() * 512 + 1] + Dim As UDTmanager Ptr pu = New UDTmanager[cuint(Rnd() * 512 + 1)] Loop diff --git a/examples/manual/udt/operator2.bas b/examples/manual/udt/operator2.bas index 2b5e78ef4b..0ab3c4a57f 100644 --- a/examples/manual/udt/operator2.bas +++ b/examples/manual/udt/operator2.bas @@ -22,7 +22,7 @@ Operator UDT.New (ByVal size As UInteger) As Any Ptr Print " Overloaded New operator, with parameter size = &h" & Hex(size) Dim pOrig As Any Ptr = CAllocate(ALIGN-1 + SizeOf(UDT Ptr) + size) Dim pMin As Any Ptr = pOrig + SizeOf(UDT Ptr) - Dim p As Any Ptr = pMin + ALIGN-1 - (CULng(pMin + ALIGN-1) Mod ALIGN) + Dim p As Any Ptr = pMin + ALIGN-1 - (CUInt(pMin + ALIGN-1) Mod ALIGN) Cast(Any Ptr Ptr, p)[-1] = pOrig Operator = p Print " real pointer = &h" & Hex(pOrig), "return pointer = &h" & Hex(p) From 516f2cddc140b1f39bd40abb6a25f54de230cee9 Mon Sep 17 00:00:00 2001 From: coderJeff Date: Sun, 13 Jan 2019 19:52:55 -0500 Subject: [PATCH 12/24] fbdoc: wiki snaphot 2019-01-13 --- doc/manual/cache/KeyPgByref.wakka | 2 +- doc/manual/cache/KeyPgRandom.wakka | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/manual/cache/KeyPgByref.wakka b/doc/manual/cache/KeyPgByref.wakka index 341e5dd04f..28772d346a 100644 --- a/doc/manual/cache/KeyPgByref.wakka +++ b/doc/manual/cache/KeyPgByref.wakka @@ -14,7 +14,7 @@ Declaration specifier to explicitly pass a parameter by reference Opposite of ##[[KeyPgByval|ByVal]]##. - **Note:** A constant or a literal expression can also be passed to such a procedure (which gets by reference), but they are obviously not modifiable. In that case, the compiler passes by reference a temporary variable initialized with the constant or the literal expression. + **Note:** A constant or a literal expression can also be passed to such a procedure (which gets by reference), but they are obviously not modifiable from the procedure body. In that case, the compiler passes by reference a temporary variable initialized with the constant or the literal expression. **Warning:** When passing by reference, it is recommended to pass an argument of the same type (or fully compatible, like a derived type for example) as that of the declared parameter. Although in some cases the compiler accepts to pass a different type, often the result is not the one expected. diff --git a/doc/manual/cache/KeyPgRandom.wakka b/doc/manual/cache/KeyPgRandom.wakka index 1a76febc88..fac69dd6da 100644 --- a/doc/manual/cache/KeyPgRandom.wakka +++ b/doc/manual/cache/KeyPgRandom.wakka @@ -1,5 +1,5 @@ {{fbdoc item="title" value="RANDOM"}}---- -Specifies file or device to be opened for binary mode +Specifies file or device to be opened for random access mode {{fbdoc item="syntax"}}## [[KeyPgOpen|Open]] //filename// for **Random** [[[KeyPgAccess|Access]] //access_type//] [[[KeyPgLock|Lock]] //lock_type//] as [#]//filenum// [Len = //record_length//] From 2663b32e94670edca7dce310056700c6379e1077 Mon Sep 17 00:00:00 2001 From: coderJeff Date: Sat, 19 Jan 2019 13:55:31 -0500 Subject: [PATCH 13/24] makefile: create a use src/compiler/obj for faster rebuilding of multiple targets --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index 4b0d47b01f..aeca4c07eb 100644 --- a/makefile +++ b/makefile @@ -342,7 +342,7 @@ else prefixincdir := $(prefix)/include/$(FBNAME) prefixlibdir := $(prefix)/$(libdir) endif -fbcobjdir := src/compiler/obj +fbcobjdir := src/compiler/obj/$(FBTARGET) libfbobjdir := src/rtlib/obj/$(libsubdir) libfbpicobjdir := src/rtlib/obj/$(libsubdir)/pic libfbmtobjdir := src/rtlib/obj/$(libsubdir)/mt From 89b899d8eb117b4454e5e7d864ff2ff9628c21fe Mon Sep 17 00:00:00 2001 From: jeff marshall Date: Fri, 25 Jan 2019 15:55:33 -0500 Subject: [PATCH 14/24] fbhelp: fix variable declaraion to compile on linux Author: coderJeff --- doc/fbhelp/fbhelp_file.bas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/fbhelp/fbhelp_file.bas b/doc/fbhelp/fbhelp_file.bas index 6c082c2096..bda37dbb66 100644 --- a/doc/fbhelp/fbhelp_file.bas +++ b/doc/fbhelp/fbhelp_file.bas @@ -36,12 +36,12 @@ #include "zlib.bi" type HFILE as gzfile + dim shared hf_is_uncompressed as integer = FALSE #define hf_open( _filename, _mode ) gzopen( _filename, _mode ) #if defined( __FB_WIN32__ ) '' on windows, gzseek() is bugged on uncompressed streams and only succeed after a gzrewind() - dim shared hf_is_uncompressed as integer = FALSE private sub hf_rewind( byval h as HFILE ) if( hf_is_uncompressed <> 0 ) then gzrewind( h ) From 58636f8742f3c57d1c612ba9f476d1adefb6ea0a Mon Sep 17 00:00:00 2001 From: coderJeff Date: Sat, 19 Jan 2019 15:47:15 -0500 Subject: [PATCH 15/24] build release script: allow for src/compiler/obj/, and cache libffi - expect use src/compiler/obj/ directory - cache key files from libffi builds, for faster rebuilding --- contrib/release/build.sh | 51 ++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/contrib/release/build.sh b/contrib/release/build.sh index 20eb22346b..7a6ad6080a 100755 --- a/contrib/release/build.sh +++ b/contrib/release/build.sh @@ -11,7 +11,7 @@ # to build (or a tag/branch name). # # The standalone fbc is built in the same directory as the normal fbc, by just -# rebuilding src/compiler/obj/fbc.o (that's all that's affected by +# rebuilding src/compiler/obj/$fbtarget/fbc.o (that's all that's affected by # ENABLE_STANDALONE, except for the directory layout). This way we avoid # unnecessary full rebuilds. # @@ -428,7 +428,7 @@ EOF cmd /c build.bat echo "building standalone fbc:" - rm fbc/src/compiler/obj/fbc.o + rm fbc/src/compiler/obj/$fbtarget/fbc.o cmd /c buildsa.bat mkdir -p fbc/bin/dos @@ -467,12 +467,20 @@ linuxbuild() { cp fbc/contrib/manifest/FreeBASIC-$fbtarget.lst ../output } -windowsbuild() { - # Add our toolchain's bin/ to the PATH, so hopefully we'll only use - # its gcc and not one from the host - origPATH="$PATH" - export PATH="$PWD/bin:$PATH" - +libffibuild() { + + # do we already have the files we need? + if [ -f "../input/$libffi_title/$target/ffi.h" ]; then + if [ -f "../input/$libffi_title/$target/ffitarget.h" ]; then + if [ -f "../input/$libffi_title/$target/libffi.a" ]; then + echo + echo "using cached libffi: $libffi_title/$target" + echo + return + fi + fi + fi + echo echo "building libffi" echo @@ -488,12 +496,25 @@ windowsbuild() { CFLAGS=-O2 ../$libffi_title/configure --disable-shared --enable-static fi make - case "$target" in - win32) cp include/ffi.h include/ffitarget.h ../i686-w64-mingw32/include;; - win32-mingworg) cp include/ffi.h include/ffitarget.h ../include;; - win64) cp include/ffi.h include/ffitarget.h ../x86_64-w64-mingw32/include;; - esac + # stash some files in the input folder to make rebuilding faster + mkdir -p ../../input/$libffi_title/$target + cp include/ffi.h include/ffitarget.h ../../input/$libffi_title/$target + cp .libs/libffi.a ../../input/$libffi_title/$target cd .. +} + +windowsbuild() { + # Add our toolchain's bin/ to the PATH, so hopefully we'll only use + # its gcc and not one from the host + origPATH="$PATH" + export PATH="$PWD/bin:$PATH" + + libffibuild + case "$target" in + win32) cp ../input/$libffi_title/$target/ffi.h ../input/$libffi_title/$target/ffitarget.h ./i686-w64-mingw32/include;; + win32-mingworg) cp ../input/$libffi_title/$target/ffi.h ../input/$libffi_title/$target/ffitarget.h ./include;; + win64) cp ../input/$libffi_title/$target/ffi.h ../input/$libffi_title/$target/ffitarget.h ./x86_64-w64-mingw32/include;; + esac cd fbc echo @@ -512,7 +533,7 @@ windowsbuild() { echo echo "building standalone fbc" echo - rm src/compiler/obj/fbc.o + rm src/compiler/obj/$fbtarget/fbc.o make ENABLE_STANDALONE=1 cd .. @@ -556,7 +577,7 @@ windowsbuild() { download "Gorc.zip" "http://www.godevtool.com/Gorc.zip" unzip ../input/Gorc.zip GoRC.exe -d fbc/bin/$fbtarget - cp "$libffi_build"/.libs/libffi.a fbc/lib/$fbtarget + cp ../input/$libffi_title/$target/libffi.a fbc/lib/$fbtarget # Reduce .exe sizes by dropping debug info # (this was at least needed for MinGW.org's gdb, and probably nothing else, From faefeab7d9b5170354534dd359dc1bf9415838b2 Mon Sep 17 00:00:00 2001 From: coderJeff Date: Tue, 22 Jan 2019 09:14:20 -0500 Subject: [PATCH 16/24] fbc-tests: unit-tests.mk, log-tests.mk - combine search in to a single find | grep | sed, - use intermediate file for really long command line when linking - break up long command lines (otherwise will fail on cmd.exe shell) - force xargs to succeed even when no matches found (otherwise will abort prematurely) - explicity clean fbc-tests.o (it's not part of unit-tests.inc) --- tests/log-tests.mk | 73 +++++++++++++++++++++++++-------------------- tests/unit-tests.mk | 30 ++++++++++++------- 2 files changed, 59 insertions(+), 44 deletions(-) diff --git a/tests/log-tests.mk b/tests/log-tests.mk index 665acd983d..ee6e68e426 100644 --- a/tests/log-tests.mk +++ b/tests/log-tests.mk @@ -75,6 +75,10 @@ endif # ------------------------------------------------------------------------ LOG_TESTS_INC := log-tests-$(FB_LANG).inc +LOG_TESTS_LOG_LST := log-tests-log-$(FB_LANG).lst +LOG_TESTS_OBJ_LST := log-tests-obj-$(FB_LANG).lst + +LOG_TESTS_RESULTS_LOG := log-tests-results-$(FB_LANG).log FAILED_LOG_TESTS_INC := failed-log-tests-$(FB_LANG).inc FAILED_LOG := failed-$(FB_LANG).log @@ -144,6 +148,12 @@ $(LOGLIST_MULTI_MODULE_OK) \ $(LOGLIST_MULTI_MODULE_FAIL) \ ) +OBJLIST_ALL := $(strip \ +$(OBJLIST_COMPILE_ONLY_OK) \ +$(OBJLIST_COMPILE_ONLY_FAIL) \ +$(OBJLIST_COMPILE_AND_RUN_OK) \ +$(OBJLIST_COMPILE_AND_RUN_FAIL) \ +) # set ABORT_CMD := false to abort on failed tests, true to continue anyway ABORT_CMD := true @@ -337,13 +347,34 @@ $(LOG_TESTS_INC) : >> $(LOG_TESTS_INC) @$(ECHO) "#" >> $(LOG_TESTS_INC) +# hack: use the auto-generated list of tests to create a temporary file +# containing a list of all the .o & .log files. The command line can be +# very long and some shells (like cmd.exe) won't handle it. + + @$(PRINTF) "." + @$(GREP) $(LOG_TESTS_INC) -i -e ".*+=.*\.b.*" \ +| $(SED) 's/^.* += \(.*\)\(\.b.*\)/\1\.o/g' \ +> $(LOG_TESTS_OBJ_LST) + +$(LOG_TESTS_LOG_LST) : $(LOG_TESTS_INC) + @$(PRINTF) "." + @$(GREP) $(LOG_TESTS_INC) -i -e "^.*+=.*\.b.*" \ +| $(SED) 's/^.* += \(.*\)\(\.b.*\)/\1\.log/g' \ +> $(LOG_TESTS_LOG_LST) + @$(ECHO) " Done" # ------------------------------------------------------------------------ # results # +# use xargs to manage the number of maximum number of arguments passed to grep and store the +# results in a single file +# +# +$(LOG_TESTS_RESULTS_LOG): $(LOG_TESTS_LOG_LST) $(LOGLIST_ALL) + @$(XARGS) -a $(LOG_TESTS_LOG_LST) $(GREP) -i -E '^.*[[:space:]]*:[[:space:]]*RESULT=FAILED' ; true > $@ -results : $(LOGLIST_ALL) +results : $(LOG_TESTS_RESULTS_LOG) @$(PRINTF) "\n\nFAILED LOG - for log-tests -lang $(FB_LANG)\n" > $(FAILED_LOG) @@ -351,7 +382,7 @@ ifeq ($(LOGLIST_ALL),) @$(PRINTF) "None Found\n\n" >> $(FAILED_LOG) else @if \ -$(GREP) -i -E '^.*[[:space:]]*:[[:space:]]*RESULT=FAILED' $(LOGLIST_ALL) \ +$(GREP) -i -E '^.*[[:space:]]*:[[:space:]]*RESULT=FAILED' $(LOG_TESTS_RESULTS_LOG) \ ; then \ $(PRINTF) " \n" && \ true \ @@ -374,53 +405,29 @@ mostlyclean : clean_tests .PHONY: clean_tests clean_tests : @$(ECHO) Cleaning log-tests for -lang $(FB_LANG) ... -ifneq ($(OBJLIST_COMPILE_ONLY_OK),) - @$(RM) $(OBJLIST_COMPILE_ONLY_OK) -endif -ifneq ($(LOGLIST_COMPILE_ONLY_OK),) - @$(RM) $(LOGLIST_COMPILE_ONLY_OK) -endif -ifneq ($(OBJLIST_COMPILE_ONLY_FAIL),) - @$(RM) $(OBJLIST_COMPILE_ONLY_FAIL) -endif -ifneq ($(LOGLIST_COMPILE_ONLY_FAIL),) - @$(RM) $(LOGLIST_COMPILE_ONLY_FAIL) + $(RM) $(LOG_TESTS_RESULTS_LOG) +ifneq ($(LOGLIST_ALL),) + @if [ -f $(LOG_TESTS_LOG_LST) ]; then $(XARGS) -r -a $(LOG_TESTS_LOG_LST) $(RM) ; fi + @if [ -f $(LOG_TESTS_OBJ_LST) ]; then $(XARGS) -r -a $(LOG_TESTS_OBJ_LST) $(RM) ; fi endif + ifneq ($(APPLIST_COMPILE_AND_RUN_OK),) @$(RM) $(APPLIST_COMPILE_AND_RUN_OK) endif -ifneq ($(OBJLIST_COMPILE_AND_RUN_OK),) - @$(RM) $(OBJLIST_COMPILE_AND_RUN_OK) -endif -ifneq ($(LOGLIST_COMPILE_AND_RUN_OK),) - @$(RM) $(LOGLIST_COMPILE_AND_RUN_OK) -endif -ifneq ($(OBJLIST_COMPILE_AND_RUN_FAIL),) - @$(RM) $(OBJLIST_COMPILE_AND_RUN_FAIL) -endif ifneq ($(APPLIST_COMPILE_AND_RUN_FAIL),) @$(RM) $(APPLIST_COMPILE_AND_RUN_FAIL) endif -ifneq ($(LOGLIST_COMPILE_AND_RUN_FAIL),) - @$(RM) $(LOGLIST_COMPILE_AND_RUN_FAIL) -endif ifneq ($(SRCLIST_MULTI_MODULE_OK),) @for s in $(SRCLIST_MULTI_MODULE_OK) ; do $(MAKE) -f bmk-make.mk clean BMK=$$s TEST_MODE=MULTI_MODULE_OK ; done endif -ifneq ($(LOGLIST_MULTI_MODULE_OK),) - @$(RM) $(LOGLIST_MULTI_MODULE_OK) -endif ifneq ($(SRCLIST_MULTI_MODULE_FAIL),) @for s in $(SRCLIST_MULTI_MODULE_FAIL) ; do $(MAKE) -f bmk-make.mk clean BMK=$$s TEST_MODE=MULTI_MODULE_FAIL ; done endif -ifneq ($(LOGLIST_MULTI_MODULE_FAIL),) - @$(RM) $(LOGLIST_MULTI_MODULE_FAIL) -endif .PHONY: clean_include clean_include : - $(RM) $(LOG_TESTS_INC) - @$(RM) $(FAILED_LOG) + $(RM) $(LOG_TESTS_INC) $(LOG_TESTS_LOG_LST) $(LOG_TESTS_OBJ_LST) + @$(RM) $(FAILED_LOG) .PHONY: clean_failed_include clean_failed_include : diff --git a/tests/unit-tests.mk b/tests/unit-tests.mk index a6b9307591..cd1949d91c 100644 --- a/tests/unit-tests.mk +++ b/tests/unit-tests.mk @@ -49,6 +49,7 @@ endif # ------------------------------------------------------------------------ UNIT_TESTS_INC := unit-tests.inc +UNIT_TESTS_OBJ_LST := unit-tests-obj.lst SRCLIST := ifeq ($(MAKECMDGOALS),mostlyclean) @@ -135,7 +136,7 @@ OBJLIST := $(SRCLIST:%.bas=%.o) # .PHONY: all -all : make_fbcunit $(UNIT_TESTS_INC) build_tests run_tests +all : make_fbcunit $(UNIT_TESTS_OBJ_LST) build_tests run_tests .PHONY: make_fbcunit make_fbcunit : $(FBCU_BIN) @@ -154,20 +155,27 @@ $(UNIT_TESTS_INC) : $(DIRLIST_INC) @$(ECHO) "# This file automatically generated - DO NOT EDIT" > $(UNIT_TESTS_INC) @$(ECHO) "#" >> $(UNIT_TESTS_INC) @$(FIND) $(DIRLIST) -type f -name '*.bas' -or -name '*.bmk' \ -| $(XARGS) $(GREP) -l -i -E '#[[:space:]]*include[[:space:]](once)*[[:space:]]*\"fbcu(nit)?\.bi\"' \ -| $(SED) -e 's/\(^.*\)/\SRCLIST \+\= \.\/\1/g' \ ->> $(UNIT_TESTS_INC) - @$(FIND) $(DIRLIST) -type f -name '*.bas' -or -name '*.bmk' \ -| $(XARGS) $(GREP) -l -i -E '[[:space:]]*.[[:space:]]*TEST_MODE[[:space:]]*\:[[:space:]]*FBCUNIT_COMPATIBLE' \ +| $(XARGS) $(GREP) -l -i -E \ +'(#[[:space:]]*include[[:space:]](once)*[[:space:]]*\"fbcu(nit)?\.bi\")|([[:space:]]*.[[:space:]]*TEST_MODE[[:space:]]*\:[[:space:]]*FBCUNIT_COMPATIBLE)' \ | $(SED) -e 's/\(^.*\)/\SRCLIST \+\= \.\/\1/g' \ >> $(UNIT_TESTS_INC) @$(ECHO) "Done" +# hack: generate the file UNIT_TESTS_OBJ_LST from UNIT_TESTS_INC +# Use the auto-generated list of tests to create a temporary file +# containing a list of all the object files. The command line can be +# very long and some shells (like cmd.exe) won't handle it. + +$(UNIT_TESTS_OBJ_LST) : $(UNIT_TESTS_INC) + @$(GREP) $(UNIT_TESTS_INC) -i -e 'SRCLIST +=' \ +| $(SED) 's/^SRCLIST += \(.*\)\(\.b.*\)/\1\.o/g' \ +> $(UNIT_TESTS_OBJ_LST) + # ------------------------------------------------------------------------ .PHONY: build_tests -build_tests : $(OBJLIST) $(UNIT_TESTS_INC) - $(FBC) $(FBC_LFLAGS) $(OBJLIST) +build_tests : ./$(MAINBAS).o $(OBJLIST) $(UNIT_TESTS_OBJ_LST) + $(FBC) $(FBC_LFLAGS) @$(UNIT_TESTS_OBJ_LST) ./$(MAINBAS).o .PHONY: run_tests run_tests : build_tests @@ -186,7 +194,8 @@ clean_main_exe : .PHONY: clean_tests clean_tests : @$(ECHO) Cleaning unit-tests files ... - @$(RM) $(OBJLIST) + @$(RM) ./$(MAINBAS).o + @if [ -f $(UNIT_TESTS_OBJ_LST) ]; then $(XARGS) -r -a $(UNIT_TESTS_OBJ_LST) $(RM) ; fi .PHONY: clean_fbcu clean_fbcu : @@ -194,5 +203,4 @@ clean_fbcu : .PHONY: clean_include clean_include : - $(RM) $(UNIT_TESTS_INC) - + $(RM) $(UNIT_TESTS_INC) $(UNIT_TESTS_OBJ_LST) From 68b626f8aea0060726025b1ae2c4eb130458f1c9 Mon Sep 17 00:00:00 2001 From: coderJeff Date: Wed, 23 Jan 2019 20:29:22 -0500 Subject: [PATCH 17/24] build release script: add downloads for djgpp sockets and pthreads, patch for pthread.h --- contrib/release/build.sh | 26 +++++++++++++++-------- contrib/release/djgpp-pthread-types.patch | 20 +++++++++++++++++ 2 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 contrib/release/djgpp-pthread-types.patch diff --git a/contrib/release/build.sh b/contrib/release/build.sh index 7a6ad6080a..b5959e17c7 100755 --- a/contrib/release/build.sh +++ b/contrib/release/build.sh @@ -251,7 +251,7 @@ dos) djver=205 gccver=710 - djgppgccversiondir=7.1.0 + djgppgccversiondir=7 bnuver=229 gdbver=771 djpkg=current @@ -268,6 +268,9 @@ dos) download_djgpp ${djpkg}/v2gnu/ fil41br2 download_djgpp ${djpkg}/v2gnu/ mak421b download_djgpp ${djpkg}/v2gnu/ shl2011br2 + download_djgpp ${djpkg}/v2gnu/ pth207b + + download_djgpp ${djpkg}/v2tk/ ls080b # Sources for stuff that goes into the FB-dos package (needs updating to new versions) download_djgpp ${djpkg}/v2gnu/ bnu${bnuver}s @@ -275,16 +278,21 @@ dos) download_djgpp ${djpkg}/v2gnu/ gdb${gdbver}s download_djgpp ${djpkg}/v2/ djlsr${djver} - unzip -q ../input/DJGPP/djdev${djver}.zip + unzip -qo ../input/DJGPP/djdev${djver}.zip + + unzip -qo ../input/DJGPP/shl2011br2.zip + unzip -qo ../input/DJGPP/fil41br2.zip + unzip -qo ../input/DJGPP/mak421b.zip + unzip -qo ../input/DJGPP/pth207b.zip + + unzip -qo ../input/DJGPP/ls080b.zip - unzip -q ../input/DJGPP/shl2011br2.zip - unzip -q ../input/DJGPP/fil41br2.zip - unzip -q ../input/DJGPP/mak421b.zip + unzip -qo ../input/DJGPP/gdb${gdbver}b.zip + unzip -qo ../input/DJGPP/bnu${bnuver}b.zip + unzip -qo ../input/DJGPP/gcc${gccver}b.zip + unzip -qo ../input/DJGPP/gpp${gccver}b.zip - unzip -q ../input/DJGPP/gdb${gdbver}b.zip - unzip -q ../input/DJGPP/bnu${bnuver}b.zip - unzip -q ../input/DJGPP/gcc${gccver}b.zip - unzip -q ../input/DJGPP/gpp${gccver}b.zip + patch -p0 < ../djgpp-fix-pthread.patch ;; win32) get_mingww64_toolchain 32 i686 diff --git a/contrib/release/djgpp-pthread-types.patch b/contrib/release/djgpp-pthread-types.patch new file mode 100644 index 0000000000..4366511cd4 --- /dev/null +++ b/contrib/release/djgpp-pthread-types.patch @@ -0,0 +1,20 @@ +--- pthread.h.orig 2007-04-13 15:37:00.000000000 -0400 ++++ pthread.h 2019-01-03 15:54:18.000000000 -0500 +@@ -110,11 +110,17 @@ + */ + #include /* for ssize_t */ + #include /* for struct timeval */ ++#if 0 + #include /* for sockaddr */ ++#endif + #include /* for sigset_t */ ++#if 0 + #include /* for struct timespec */ ++#endif + #include /* for off_t */ ++#if 0 + #include ++#endif + + /* + * Unprotect namespace, so we can define our own variants now From 75ec90400cde1c351318613a1d4447d24720ab6e Mon Sep 17 00:00:00 2001 From: coderJeff Date: Sun, 27 Jan 2019 07:20:16 -0500 Subject: [PATCH 18/24] fbc-tests: unit-tests.mk, fix command quoting for grep --- tests/unit-tests.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit-tests.mk b/tests/unit-tests.mk index cd1949d91c..f5f8efcde4 100644 --- a/tests/unit-tests.mk +++ b/tests/unit-tests.mk @@ -156,7 +156,7 @@ $(UNIT_TESTS_INC) : $(DIRLIST_INC) @$(ECHO) "#" >> $(UNIT_TESTS_INC) @$(FIND) $(DIRLIST) -type f -name '*.bas' -or -name '*.bmk' \ | $(XARGS) $(GREP) -l -i -E \ -'(#[[:space:]]*include[[:space:]](once)*[[:space:]]*\"fbcu(nit)?\.bi\")|([[:space:]]*.[[:space:]]*TEST_MODE[[:space:]]*\:[[:space:]]*FBCUNIT_COMPATIBLE)' \ +"(#[[:space:]]*include[[:space:]](once)*[[:space:]]*\"fbcu(nit)?\.bi\")|([[:space:]]*.[[:space:]]*TEST_MODE[[:space:]]*\:[[:space:]]*FBCUNIT_COMPATIBLE)" \ | $(SED) -e 's/\(^.*\)/\SRCLIST \+\= \.\/\1/g' \ >> $(UNIT_TESTS_INC) @$(ECHO) "Done" From 2a313aeb1eb8c6a10861e71c5bfb79f4fcac0f42 Mon Sep 17 00:00:00 2001 From: coderJeff Date: Sun, 27 Jan 2019 07:21:32 -0500 Subject: [PATCH 19/24] fbc-tests: varargs.bas: snprintf() should be standard stdio function --- inc/crt/dos/stdio.bi | 3 ++- tests/crt/varargs.bas | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/inc/crt/dos/stdio.bi b/inc/crt/dos/stdio.bi index ad62aa630a..25ccbb9507 100644 --- a/inc/crt/dos/stdio.bi +++ b/inc/crt/dos/stdio.bi @@ -41,5 +41,6 @@ declare function popen cdecl alias "popen" (byval as zstring ptr, byval as zstri declare function pclose cdecl alias "pclose" (byval as FILE ptr) as integer declare function getw cdecl alias "getw" (byval as FILE ptr) as integer declare function putw cdecl alias "putw" (byval as integer, byval as FILE ptr) as integer +declare function snprintf cdecl alias "snprintf" (byval as zstring ptr, byval as size_t, byval as zstring ptr, ...) as long -#endif \ No newline at end of file +#endif diff --git a/tests/crt/varargs.bas b/tests/crt/varargs.bas index 863ae2eca7..8c68f7b5dd 100644 --- a/tests/crt/varargs.bas +++ b/tests/crt/varargs.bas @@ -5,9 +5,6 @@ SUITE( fbc_tests.crt.varargs ) TEST( args ) - #ifndef snprintf - CU_FAIL( snprintf not available for this target ) - #else '' To test varargs even under -gen gcc, when other vararg tests are '' disabled due to va_first() being disallowed in -gen gcc const BUFFER_SIZE = 128 @@ -16,7 +13,6 @@ SUITE( fbc_tests.crt.varargs ) dim as zstring ptr pz = @"hello" snprintf( @z, BUFFER_SIZE, "%i %s %i", i, pz, clng( 456 ) ) CU_ASSERT( z = "123 hello 456" ) - #endif END_TEST From cb13be693cb2ffe6033f166ae45ce531f33ba6ec Mon Sep 17 00:00:00 2001 From: coderJeff Date: Sat, 26 Jan 2019 09:13:03 -0500 Subject: [PATCH 20/24] fbdoc: helper makefile to build the fbdoc binaries --- doc/makefile | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 doc/makefile diff --git a/doc/makefile b/doc/makefile new file mode 100644 index 0000000000..b108a5ce07 --- /dev/null +++ b/doc/makefile @@ -0,0 +1,64 @@ +OS := $(shell uname) +ifeq ($(OS),Linux) + EXEEXT := +else + EXEEXT := .exe +endif + +FBC := fbc + +FBDOC_MAKE := fbdoc/makefile +FBDOC_SRCS := $(wildcard fbdoc/*.bas) +FBDOC_HDRS := $(wildcard fbdoc/*.bi) +FBDOC_BINS := fbdoc/fbdoc$(EXEEXT) + +LIBFBDOC_MAKE := libfbdoc/makefile +LIBFBDOC_SRCS := $(wildcard libfbdoc/*.bas) +LIBFBDOC_HDRS := $(wildcard libfbdoc/*.bi) +LIBFBDOC_BINS := libfbdoc/libfbdoc.a + +FBCHKDOC_MAKE := fbchkdoc/makefile +FBCHKDOC_SRCS := $(wildcard fbchkdoc/*.bas) +FBCHKDOC_HDRS := $(wildcard fbchkdoc/*.bi) +FBCHKDOC_BINS := fbchkdoc/getindex$(EXEEXT) +FBCHKDOC_BINS += fbchkdoc/getpage$(EXEEXT) +FBCHKDOC_BINS += fbchkdoc/putpage$(EXEEXT) +FBCHKDOC_BINS += fbchkdoc/chkdocs$(EXEEXT) +FBCHKDOC_BINS += fbchkdoc/replace$(EXEEXT) +FBCHKDOC_BINS += fbchkdoc/rebuild$(EXEEXT) +FBCHKDOC_BINS += fbchkdoc/mkprntoc$(EXEEXT) +FBCHKDOC_BINS += fbchkdoc/mkerrlst$(EXEEXT) +FBCHKDOC_BINS += fbchkdoc/delextra$(EXEEXT) +FBCHKDOC_BINS += fbchkdoc/mkimglst$(EXEEXT) +FBCHKDOC_BINS += fbchkdoc/getimage$(EXEEXT) +FBCHKDOC_BINS += fbchkdoc/spellit$(EXEEXT) +FBCHKDOC_BINS += fbchkdoc/spell$(EXEEXT) +FBCHKDOC_BINS += fbchkdoc/samps$(EXEEXT) +FBCHKDOC_BINS += fbchkdoc/pretty$(EXEEXT) + +MAKEFBHELP_MAKE := makefbhelp/makefile +MAKEFBHELP_SRCS := $(wildcard makefbhelp/*.bas) +MAKEFBHELP_HDRS := $(wildcard makefbhelp/*.bi) +MAKEFBHELP_BINS := makefbhelp/makefbhelp$(EXEEXT) + +.PHONY: clean +all: $(FBDOC_BINS) $(FBCHKDOC_BINS) $(MAKEFBHELP_BINS) + +$(FBDOC_BINS): $(FBDOC_SRCS) $(FBDOC_HDRS) $(FBDOC_MAKE) $(LIBFBDOC_BINS) + cd fbdoc && make FBC=$(FBC) + +$(LIBFBDOC_BINS): $(LIBFBDOC_SRCS) $(LIBFBDOC_HDRS) $(LIBFBDOC_MAKE) + cd libfbdoc && make FBC=$(FBC) + +$(FBCHKDOC_BINS): $(FBCHKDOC_SRCS) $(FBCHKDOC_HDRS) $(FBCHKDOC_MAKE) $(LIBFBDOC_BINS) + cd fbchkdoc && make FBC=$(FBC) + +$(MAKEFBHELP_BINS): $(MAKEFBHELP_SRCS) $(MAKEFBHELP_HDRS) $(MAKEFBHELP_MAKE) + cd makefbhelp && make FBC=$(FBC) + +.PHONY: clean +clean: + cd fbdoc && make clean + cd fbchkdoc && make clean + cd makefbhelp && make clean + cd libfbdoc && make clean From 6f73bcbbf0c7d77fe66dc95e8a8dbb5222514b33 Mon Sep 17 00:00:00 2001 From: coderJeff Date: Sat, 26 Jan 2019 15:46:16 -0500 Subject: [PATCH 21/24] examples: BASS: fix BASS_Init() return value check --- examples/sound/BASS/demo.bas | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/sound/BASS/demo.bas b/examples/sound/BASS/demo.bas index de6f36c1ad..7d9f91d810 100644 --- a/examples/sound/BASS/demo.bas +++ b/examples/sound/BASS/demo.bas @@ -8,7 +8,7 @@ If (HiWord(BASS_GetVersion()) <> BASSVERSION) Then End If ' Initialize BASS using the default device at 44.1 KHz. -If (BASS_Init(-1, 44100, 0, 0, 0) <> TRUE) Then +If (BASS_Init(-1, 44100, 0, 0, 0) = FALSE) Then Print "Could not initialize audio! BASS returned error " & BASS_ErrorGetCode() GetKey End @@ -86,7 +86,7 @@ Do End Select ' Print music progress - Locate currentLine + Locate currentLine, 1 Dim As QWORD trackerPosition = BASS_ChannelGetPosition(musicHandle, BASS_POS_MUSIC_ORDER) Dim As Double secondsPosition = BASS_ChannelBytes2Seconds(musicHandle, BASS_ChannelGetPosition(musicHandle, BASS_POS_BYTE)) Print "Music position: Order: " & LoWord(trackerPosition) & ", Row: " & HiWord(trackerPosition) & " (" & CInt(secondsPosition) & " seconds) " From a487bd694e4d86c32d2073ebf37e200295d61995 Mon Sep 17 00:00:00 2001 From: coderJeff Date: Sun, 27 Jan 2019 08:09:23 -0500 Subject: [PATCH 22/24] build release script: add socket and pthread libraries for dos --- contrib/release/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/release/build.sh b/contrib/release/build.sh index b5959e17c7..5715872e33 100755 --- a/contrib/release/build.sh +++ b/contrib/release/build.sh @@ -444,6 +444,8 @@ EOF cp lib/crt0.o lib/gcrt0.o lib/libdbg.a lib/libemu.a lib/libm.a fbc/lib/dos/ cp lib/libstdcxx.a fbc/lib/dos/libstdcx.a cp lib/libsupcxx.a fbc/lib/dos/libsupcx.a + cp lib/libsocket.a fbc/lib/dos/libsocket.a + cp lib/libpthread.a fbc/lib/dos/libpthread.a cp lib/gcc/djgpp/$djgppgccversiondir/libgcc.a fbc/lib/dos/ cd fbc From a4d5422f1c5dd6dc8ae34caa90e524f565303d9f Mon Sep 17 00:00:00 2001 From: coderJeff Date: Sun, 27 Jan 2019 21:49:23 -0500 Subject: [PATCH 23/24] build release script: add dxe3gen.exe to dos package --- contrib/release/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/release/build.sh b/contrib/release/build.sh index 5715872e33..dc5b4b82d1 100755 --- a/contrib/release/build.sh +++ b/contrib/release/build.sh @@ -441,6 +441,7 @@ EOF mkdir -p fbc/bin/dos cp bin/ar.exe bin/as.exe bin/gdb.exe bin/gprof.exe bin/ld.exe fbc/bin/dos/ + cp bin/dxe3gen.exe fbc/bin/dos/ cp lib/crt0.o lib/gcrt0.o lib/libdbg.a lib/libemu.a lib/libm.a fbc/lib/dos/ cp lib/libstdcxx.a fbc/lib/dos/libstdcx.a cp lib/libsupcxx.a fbc/lib/dos/libsupcx.a From 59462d16024db0e7280856eb0260ae487d3c79d3 Mon Sep 17 00:00:00 2001 From: coderJeff Date: Sun, 27 Jan 2019 22:10:06 -0500 Subject: [PATCH 24/24] fbdoc: wiki snapshot 2019-01-27 --- doc/manual/cache/ProPgInitialization.wakka | 2 +- examples/manual/proguide/init/udtarray.bas | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/manual/cache/ProPgInitialization.wakka b/doc/manual/cache/ProPgInitialization.wakka index 7a465cbfa8..3af0b1cde6 100644 --- a/doc/manual/cache/ProPgInitialization.wakka +++ b/doc/manual/cache/ProPgInitialization.wakka @@ -25,7 +25,7 @@ Type mytype var3 As ZString Ptr End Type -Dim MyVar(2) As mytype => _ +Dim MyVar(0 to 1) As mytype => _ { _ (1.0, 1, @"Hello"), _ (2.0, 2, @"GoodBye") _ diff --git a/examples/manual/proguide/init/udtarray.bas b/examples/manual/proguide/init/udtarray.bas index 0cb5105049..4f0ff27702 100644 --- a/examples/manual/proguide/init/udtarray.bas +++ b/examples/manual/proguide/init/udtarray.bas @@ -12,7 +12,7 @@ Type mytype var3 As ZString Ptr End Type -Dim MyVar(2) As mytype => _ +Dim MyVar(0 To 1) As mytype => _ { _ (1.0, 1, @"Hello"), _ (2.0, 2, @"GoodBye") _