fbdoc & tools update May 2019

doc/fbc.1

@@ -1,4 +1,4 @@
-.TH FBC 1 "2019-01-01" "FreeBASIC Compiler 1.07.0" "FreeBASIC Compiler"
+.TH FBC 1 "2019-05-20" "FreeBASIC Compiler 1.07.0" "FreeBASIC Compiler"
 .SH NAME
 fbc \- The FreeBASIC compiler
 .SH DESCRIPTION
@@ -102,6 +102,9 @@ Do not include the default libraries
 \fB\-noerrline\fR
 Do not show source context in error messages
 .TP
+\fB\-nostrip\fR
+Do not strip symbol information from the output file
+.TP
 \fB\-o\fR \fIfile\fR
 Set .o file name for corresponding input .bas
 .TP
@@ -147,6 +150,9 @@ Select win32 subsystem
 \fB\-static\fR
 Prefer static libraries over dynamic ones when linking
 .TP
+\fB\-strip\fR
+Omit all symbol information from the output file
+.TP
 \fB\-t\fR \fIvalue\fR
 Set Win32/DOS .exe stack size in kbytes, default: 1024
 .TP

doc/fbchkdoc/chkdocs.bas

@@ -2226,7 +2226,8 @@ if( app_opt.help ) then
 end if
 
 cmd_opts_resolve()
-cmd_opts_check()
+cmd_opts_check_cache()
+cmd_opts_check_url()
 
 if( (opt and OPT_ALL) = 0 ) then
 	print "No options specified"

doc/fbchkdoc/cmd_opts.bas

@@ -55,6 +55,7 @@ type CMD_OPTS_PRIVATE
 	enable_autocache as boolean  '' automatically select a cache if none given on the command line
 	enable_pagelist as boolean   '' enable reading in a text file with a list of page names
 	enable_manual as boolean     '' enable the manual dir option
+	enable_database as boolean   '' enable db_* options
 
 	print as boolean             '' -printopts option on command line
 
@@ -89,6 +90,21 @@ type CMD_OPTS_PRIVATE
 	manual as boolean            '' -manual_dir given on command line
 	manual_dir as string         '' value of '-manual_dir DIR' given on command line
 
+	db_host_is_set as boolean    '' -db_host given on command line
+	db_host as string            '' value of '-db_host TEXT' given on command line
+
+	db_user_is_set as boolean    '' -db_user given on command line
+	db_user as string            '' value of '-db_user TEXT' given on command line
+
+	db_pass_is_set as boolean    '' -db_pass given on command line
+	db_pass as string            '' value of '-db_pass TEXT' given on command line
+
+	db_name_is_set as boolean    '' -db_name given on command line
+	db_name as string            '' value of '-db_name TEXT' given on command line
+
+	db_port_is_set as boolean    '' -db_port given on command line
+	db_port as integer           '' value of '-db_port NUMBER' given on command line
+
 end type
 
 dim shared cmd_opt as CMD_OPTS_PRIVATE
@@ -107,6 +123,7 @@ sub cmd_opts_init( byval opts_flags as const CMD_OPTS_ENABLE_FLAGS )
 	cmd_opt.enable_autocache = cbool( opts_flags and CMD_OPTS_ENABLE_AUTOCACHE )
 	cmd_opt.enable_pagelist = cbool( opts_flags and CMD_OPTS_ENABLE_PAGELIST )
 	cmd_opt.enable_manual = cbool( opts_flags and CMD_OPTS_ENABLE_MANUAL )
+	cmd_opt.enable_database = cbool( opts_flags and CMD_OPTS_ENABLE_DATABASE )
 
 	'' general options
 
@@ -132,6 +149,23 @@ sub cmd_opts_init( byval opts_flags as const CMD_OPTS_ENABLE_FLAGS )
 	cmd_opt.ca = false       '' -certificate given on command line
 	cmd_opt.ca_file = ""     '' value of '-certificate FILE' given on command line 
 
+	'' database options
+
+	cmd_opt.db_host_is_set = false   '' -db_host given on command line
+	cmd_opt.db_host = ""             '' value of '-db_host TEXT' given on command line
+
+	cmd_opt.db_user_is_set = false   '' -db_user given on command line
+	cmd_opt.db_user = ""             '' value of '-db_user TEXT' given on command line
+
+	cmd_opt.db_pass_is_set = false   '' -db_pass given on command line
+	cmd_opt.db_pass = ""             '' value of '-db_pass TEXT' given on command line
+
+	cmd_opt.db_name_is_set = false   '' -db_name given on command line
+	cmd_opt.db_name = ""             '' value of '-db_name TEXT' given on command line
+
+	cmd_opt.db_port_is_set = false   '' -db_port given on command line
+	cmd_opt.db_port = 0              '' value of '-db_port NUMBER' given on command line
+
 	'' login options
 
 	cmd_opt.user = false     '' -u given on command line
@@ -146,6 +180,8 @@ sub cmd_opts_init( byval opts_flags as const CMD_OPTS_ENABLE_FLAGS )
 	cmd_opt.manual = false   '' -manual_dir given on command line
 	cmd_opt.manual_dir = ""  '' value of '-manual_dir DIR' given on command line
 
+	cmd_opt.db_user_is_set = false
+
 	'' resolved options
 
 	app_opt.wiki_url = ""        '' export: resolved wiki url
@@ -156,9 +192,15 @@ sub cmd_opts_init( byval opts_flags as const CMD_OPTS_ENABLE_FLAGS )
 	app_opt.image_dir = ""       '' export: image directory
 	app_opt.manual_dir = ""      '' export: manual directory
 
-	app_opt.webPageCount = 0
-	redim app_opt.webPageList(1 to 1) as string
-	redim app_opt.webPageComments(1 to 1) as string
+	app_opt.db_host = ""         '' export: database host name
+	app_opt.db_user = ""         '' export: database user name
+	app_opt.db_pass = ""         '' export: database user password
+	app_opt.db_name = ""         '' export: database name
+	app_opt.db_port = 0          '' export: database port number
+
+	app_opt.pageCount = 0
+	redim app_opt.pageList(1 to 1) as string
+	redim app_opt.pageComments(1 to 1) as string
 
 	if( command(1) = "" ) then
 		app_opt.help = true
@@ -188,15 +230,15 @@ sub cmd_opts_unexpected_die( byval i as const integer )
 end sub
 
 ''
-sub cmd_opts_add_webpage( byref pagename as const string, byref cmt as const string )
+sub cmd_opts_add_page( byref pagename as const string, byref cmt as const string )
 	with app_opt
-		.webPageCount += 1
-		if( .webPageCount > ubound(.webPageList) ) then
-			redim preserve .webPageList(1 to Ubound(.webPageList) * 2)
-			redim preserve .webPageComments(1 to Ubound(.webPageComments) * 2)
+		.pageCount += 1
+		if( .pageCount > ubound(.pageList) ) then
+			redim preserve .pageList(1 to Ubound(.pageList) * 2)
+			redim preserve .pageComments(1 to Ubound(.pageComments) * 2)
 		end if
-		.webPageList(.webPageCount) = pagename
-		.webPageComments(.webPageCount) = cmt
+		.pageList(.pageCount) = pagename
+		.pageComments(.pageCount) = cmt
 	end with
 end sub
 
@@ -350,6 +392,81 @@ function cmd_opts_read( byref i as integer ) as boolean
 				return false
 			end if
 
+		case "-db_host"
+
+			if( cmd_opt.enable_database ) then
+
+				if( cmd_opt.db_host_is_set ) then
+					cmd_opts_duplicate_die( i )
+				end if
+				cmd_opt.db_host_is_set = true
+				i += 1
+				cmd_opt.db_host = command(i)
+
+			else
+				return false
+			end if
+
+		case "-db_user"
+
+			if( cmd_opt.enable_database ) then
+
+				if( cmd_opt.db_user_is_set ) then
+					cmd_opts_duplicate_die( i )
+				end if
+				cmd_opt.db_user_is_set = true
+				i += 1
+				cmd_opt.db_user = command(i)
+
+			else
+				return false
+			end if
+
+		case "-db_pass"
+
+			if( cmd_opt.enable_database ) then
+
+				if( cmd_opt.db_pass_is_set ) then
+					cmd_opts_duplicate_die( i )
+				end if
+				cmd_opt.db_pass_is_set = true
+				i += 1
+				cmd_opt.db_pass = command(i)
+
+			else
+				return false
+			end if
+
+		case "-db_name"
+
+			if( cmd_opt.enable_database ) then
+
+				if( cmd_opt.db_name_is_set ) then
+					cmd_opts_duplicate_die( i )
+				end if
+				cmd_opt.db_name_is_set = true
+				i += 1
+				cmd_opt.db_name = command(i)
+
+			else
+				return false
+			end if
+
+		case "-db_port"
+
+			if( cmd_opt.enable_database ) then
+
+				if( cmd_opt.db_port_is_set ) then
+					cmd_opts_duplicate_die( i )
+				end if
+				cmd_opt.db_port_is_set = true
+				i += 1
+				cmd_opt.db_port = cint( command(i) )
+
+			else
+				return false
+			end if
+
 		case "-ini"
 			if( cmd_opt.ini ) then
 				cmd_opts_duplicate_die( i )
@@ -375,14 +492,14 @@ function cmd_opts_read( byref i as integer ) as boolean
 							line input #h, x
 							x = ParsePageName( x, cmt )
 							if( x > "" ) then 
-								cmd_opts_add_webpage( x, cmt )
+								cmd_opts_add_page( x, cmt )
 							end if
 						wend
 						close #h
 					end if
 				end scope
 			else
-				cmd_opts_add_webpage( command(i), "" )
+				cmd_opts_add_page( command(i), "" )
 			end if
 
 		else
@@ -421,6 +538,11 @@ function cmd_opts_resolve() as boolean
 	dim as string dev_pass = ""
 	dim as string def_image_dir = hardcoded.default_image_dir
 	dim as string def_manual_dir = hardcoded.default_manual_dir
+	dim as string db_host = ""
+	dim as string db_user = ""
+	dim as string db_pass = ""
+	dim as string db_name = ""
+	dim as integer db_port = 3306
 
 	'' -ini FILE on the command line overrides the hardcoded value
 	if( cmd_opt.ini ) then
@@ -445,6 +567,11 @@ function cmd_opts_resolve() as boolean
 			dev_pass = opts->Get( "dev_password" )
 			def_image_dir = opts->Get( "image_dir" )
 			def_manual_dir = opts->Get( "manual_dir" )
+			db_host = opts->Get( "db_host" )
+			db_user = opts->Get( "db_user" )
+			db_pass = opts->Get( "db_pass" )
+			db_name = opts->Get( "db_name" )
+			db_port = cint( opts->Get( "db_port" ) )
 			delete opts
 		elseif( cmd_opt.ini ) then
 			'' if we explicitly gave the -ini FILE option, report the error
@@ -513,6 +640,36 @@ function cmd_opts_resolve() as boolean
 		app_opt.manual_dir = def_manual_dir
 	end if
 
+	if( cmd_opt.db_host_is_set ) then
+		app_opt.db_host = cmd_opt.db_host
+	else
+		app_opt.db_host = db_host
+	end if
+
+	if( cmd_opt.db_user_is_set ) then
+		app_opt.db_user = cmd_opt.db_user
+	else
+		app_opt.db_user = db_user
+	end if
+
+	if( cmd_opt.db_pass_is_set ) then
+		app_opt.db_pass = cmd_opt.db_pass
+	else
+		app_opt.db_pass = db_pass
+	end if
+
+	if( cmd_opt.db_name_is_set ) then
+		app_opt.db_name = cmd_opt.db_name
+	else
+		app_opt.db_name = db_name
+	end if
+
+	if( cmd_opt.db_port_is_set ) then
+		app_opt.db_port = cmd_opt.db_port
+	else
+		app_opt.db_port = db_port
+	end if
+
 	if( cmd_opt.print ) then
 
 		print "ini_file = " & ini_file
@@ -537,6 +694,11 @@ function cmd_opts_resolve() as boolean
 		print "wiki_password = " & "*****"
 		print "image_dir = " & app_opt.image_dir
 		print "manual_dir = " & app_opt.manual_dir
+		print "db_host = " & app_opt.db_host
+		print "db_user = " & app_opt.db_user
+		print "db_pass = " & app_opt.db_pass
+		print "db_name = " & app_opt.db_name
+		print "db_port = " & app_opt.db_port
 		print
 
 		end 1
@@ -548,7 +710,7 @@ function cmd_opts_resolve() as boolean
 end function
 
 ''
-function cmd_opts_check() as boolean
+function cmd_opts_check_cache() as boolean
 
 	if( cmd_opt.enable_cache ) then
 		'' check that we have the values we need
@@ -557,6 +719,13 @@ function cmd_opts_check() as boolean
 		end if
 	end if
 
+	function = true
+
+end function
+
+''
+function cmd_opts_check_url() as boolean
+
 	if( cmd_opt.enable_url ) then
 		if( app_opt.wiki_url = "" ) then
 			cmd_opts_die( "no url specified" )
@@ -567,6 +736,28 @@ function cmd_opts_check() as boolean
 
 end function
 
+''
+function cmd_opts_check_database() as boolean
+
+	if( cmd_opt.enable_database ) then
+		'' check that we have the values we need
+		if( app_opt.db_host = "" ) then
+			cmd_opts_die( "no database host specified" )
+		elseif( app_opt.db_user = "" ) then
+			cmd_opts_die( "no database user login name specified" )
+		elseif( app_opt.db_pass = "" ) then
+			cmd_opts_die( "no database user login password specified" )
+		elseif( app_opt.db_name = "" ) then
+			cmd_opts_die( "no database name specified" )
+		elseif( app_opt.db_port = 0 ) then
+			cmd_opts_die( "no database port specified" )
+		end if
+	end if
+
+	function = true
+
+end function
+
 ''
 sub cmd_opts_show_help_item _
 	( _
@@ -655,5 +846,12 @@ sub cmd_opts_show_help( byref action as const string = "", locations as boolean
 		print "   -manual_dir DIR  override the manual directory location"
 	end if
 
+	if( cmd_opt.enable_database ) then
+		print "   -db_host         database host name"
+		print "   -db_user         database user login name"
+		print "   -db_pass         database user login password"
+		print "   -db_name         database name"
+		print "   -db_port         database port number"
+	end if
 
-end sub
+end sub