Initial .NET Core build. Suppress registry defaults, auto-update, goat mode and STOP with exit code in portable build. Also re-implemented CommandLineParser using Environment.GetCommandLineArgs() instead of XCALL CMDLN. Also worked around a String.Split() compiler bug in portable mode.

Author: SteveIves

CodeGen/CodeGen.dbl

@@ -98,6 +98,8 @@ proc
 		ok = false
 	end
 
+	.ifndef D_PORTABLE
+
 	;;-------------------------------------------------------------------------
 	;;Is an auto update check scheduled and due?
 
@@ -223,10 +225,12 @@ proc
 		end
 	end
 
+	.endc
 
 	;;-------------------------------------------------------------------------
 	;;Just a little fun!
 
+	.ifndef D_PORTABLE
 	if (ok && (CommandLineParser.Parse("goat")))
 	begin
 		Console.WriteLine(StringTools.GetGoat(false))
@@ -243,6 +247,7 @@ proc
 		endtry
 		ok = false
 	end
+	.endc
 
 	;;-------------------------------------------------------------------------
 	;;OK, looks like we're going to be generating some code
@@ -1150,6 +1155,11 @@ proc
 		Console.WriteLine()
 	end
 
+	Environment.ExitCode = exitCode
+
+	.ifndef D_PORTABLE
+	;;TODO: Portable doesn't like this right now (11/17)
 	stop exitCode
+	.endc
 
 endmain

CodeGen/UpdateManager.dbl

@@ -40,6 +40,8 @@
 ;;
 ;;*****************************************************************************
 
+.ifndef D_PORTABLE
+
 import System
 import System.Diagnostics
 import System.IO
@@ -270,3 +272,5 @@ namespace CodeGen
 	endclass
 
 endnamespace
+
+.endc

CodeGenEngine/CodeGenerator.dbl

@@ -102,19 +102,17 @@ namespace CodeGen.Engine
 			;;Make the current version number available in the expander
 			context.Version = CODEGEN_VERSION
 
+			.ifndef D_PORTABLE
 			;;Is CODEGEN_TPLDIR already set in the environment?
 			data templateFolder = Environment.GetEnvironmentVariable("CODEGEN_TPLDIR")
 			if (String.IsNullOrWhiteSpace(templateFolder))
 			begin
 				;;No, look in the registry for the value set by InstallShield
-				data templateFolderFound = false
-				
 				templateFolder = (String)Registry.GetValue("HKEY_LOCAL_MACHINE\SOFTWARE\Synergex\CodeGen","TemplatePath","")
 				if (!String.IsNullOrWhiteSpace(templateFolder)) then
 				begin
 					;;Found it
 					Environment.SetEnvironmentVariable("CODEGEN_TPLDIR",templateFolder.Trim())
-					templateFolderFound = true
 				end
 				else if (Environment.Is64BitProcess)
 				begin
@@ -124,17 +122,17 @@ namespace CodeGen.Engine
 					begin
 						;;Found it
 						Environment.SetEnvironmentVariable("CODEGEN_TPLDIR",templateFolder.Trim())
-						templateFolderFound = true
 					end
 				end
 			end
-			
+			.endc
 			;;Is CODEGEN_AUTHOR already set in the environment?
 			data authorName = Environment.GetEnvironmentVariable("CODEGEN_AUTHOR")
 			if (!String.IsNullOrWhiteSpace(authorName)) then
 				context.Author = authorName
 			else
 			begin
+				.ifndef D_PORTABLE
 				;;No, look in the registry for the value set by InstallShield
 				authorName = (String)Registry.GetValue("HKEY_LOCAL_MACHINE\SOFTWARE\Synergex\CodeGen","DefaultAuthor","")
 				if (!String.IsNullOrWhiteSpace(authorName)) then
@@ -146,6 +144,7 @@ namespace CodeGen.Engine
 					if (!String.IsNullOrWhiteSpace(authorName))
 						context.Author = authorName
 				end
+				.endc
 			end
 
 			;;Is CODEGEN_COMPANY already set in the environment?
@@ -154,6 +153,7 @@ namespace CodeGen.Engine
 				context.Company = companyName
 			else
 			begin
+				.ifndef D_PORTABLE
 				;;No, look in the registry for the value set by InstallShield
 				companyName = (String)Registry.GetValue("HKEY_LOCAL_MACHINE\SOFTWARE\Synergex\CodeGen","DefaultCompany","")
 				if (!String.IsNullOrWhiteSpace(companyName)) then
@@ -165,6 +165,7 @@ namespace CodeGen.Engine
 					if (!String.IsNullOrWhiteSpace(companyName))
 						context.Company = companyName
 				end
+				.endc
 			end			
 
 		endmethod

CodeGenEngine/CommandLineParser.dbl

@@ -62,93 +62,70 @@ namespace CodeGen.Engine
 			required in  a_opt          ,String			;;Option string to search for
 			required out a_optvals      ,@List<String>	;;Returned option values
 
-			.define MAXARGS 256
-			
-			stack record localData
-				fstatus         ,boolean				;;Function return status
-				command         ,a8192					;;Whole command line
-				num_args        ,i4						;;Number of arguments in whole command line
-				arg_pos         ,[MAXARGS] i4			;;Positions of arguments in whole command line
-				arg_len         ,[MAXARGS] i4			;;Lengths of arguments in whole command line
-				current_arg     ,i4						;;Index of current argument being processed
-				opt_char        ,a1						;;Character that precedes options (- or /)
-			endrecord
-			
-			.undefine MAXARGS
-			
 		proc
-			init localData
-			data option_value, String
-
-			fstatus = false
 			a_optvals = new List<String>()
+
+			data optionFound = false
+			data optionCharacter = %option(34) ? "/" : "-"
 
-			if (%option(34)) then
-				opt_char = '/'
-			else
-				opt_char = '-'
-			
-			xcall cmdln(command, num_args, arg_pos, arg_len)
-			
-			for current_arg from 1 thru num_args
-			begin
-				if (arg_pos[current_arg]&&arg_len[current_arg]) then
-					option_value = command(arg_pos[current_arg]:arg_len[current_arg])
-				else
-					option_value = ""
-				
-				;;Is this the requested option?
-				if (option_value.eqs.(opt_char+a_opt))
-					call process_argument
-			end
-			
-			mreturn fstatus
-			
-		process_argument,
-			
-			;;Found requested option
-			fstatus = true
-			
-			;;Process next argument
-			current_arg += 1
-			
-			if (arg_pos[current_arg]&&arg_len[current_arg]) then
-				option_value = command(arg_pos[current_arg]:arg_len[current_arg])
-			else
-				option_value = opt_char
-			
-			;;DO NOT CHANGE THE .ne. OPERATOR to != ... THEY ARE NOT THE SAME THING WITH STRING!
-			while(option_value.ne.opt_char)
+			data args = Environment.GetCommandLineArgs()
+
+			if (args.Length > 1)
 			begin
-				;;Strip leading and trailing quote characters
-				using option_value select
-				("'", '"'),
+				data ix, int
+				data option_value, String
+				for ix from 2 thru args.Length
 				begin
-					if ((option_value.Length>1)&&(option_value(option_value.Length:1)==option_value(1:1)))
+					option_value = args[ix]
+
+					;;Is this the requested option?
+					if (option_value.eqs.(optionCharacter+a_opt))
 					begin
-						if (option_value.Length>2) then
-							option_value = option_value(2,option_value.Length-1)
-						else
-							option_value = ""
-					end
-				end
-				endusing
+						;;Found requested option
+						optionFound = true
 
-				;;Add the value to the returned collection
-				a_optvals.Add(option_value)
-				
-				;;Process next argument
-				current_arg+=1
+						;;Are we out of arguments?
+						if (ix == args.Length)
+							exitloop
+
+						;;Move on to the next argument
+						option_value = args[ix+=1]
+			
+						;;DO NOT CHANGE THE .ne. OPERATOR to != ... THEY ARE NOT THE SAME THING WITH STRING!
+						while(!option_value.StartsWith(optionCharacter))
+						begin
+							;;Strip leading and trailing quote characters
+							using option_value select
+							("'", '"'),
+							begin
+								if ((option_value.Length>1)&&(option_value(option_value.Length:1)==option_value(1:1)))
+								begin
+									if (option_value.Length>2) then
+										option_value = option_value(2,option_value.Length-1)
+									else
+										option_value = ""
+								end
+							end
+							endusing
+
+							;;Add the value to the returned collection
+							a_optvals.Add(option_value)
+
+							;;Are we out of arguments?
+							if (ix == args.Length)
+								exitloop
 
-				if (arg_pos[current_arg]&&arg_len[current_arg]) then
-					option_value = command(arg_pos[current_arg]:arg_len[current_arg])
-				else
-					option_value = opt_char
-			end
+							;;Move on to the next argument
+							option_value = args[ix+=1]
+						end
 
-			;;Adjust counter to stay in correct position in loop
-			current_arg -= 1
-			return
+						;;Adjust counter to stay in correct position in loop
+						ix -= 1
+					end
+				end				
+			end
+
+			mreturn optionFound
 
 		endmethod