Merge branch 'master v1.19.58' into mod

.gitignore

@@ -2,6 +2,7 @@
 #exclude general
 *.bak
 *.tmp
+*.orig
 /*.dbf
 /*.CDX
 /*.fxp

Documentacion/github/FoxBin2Prg_Changes.md

@@ -34,6 +34,8 @@ _**Note:** you can click on the version number for downloading this version from
 | - | - | - | - |
 | 2021/03/05 | LScheffler | [v1.19.57]() | **Bug Fix**: RedirectClassType = 2, UseClassPerFile = 2 failed |
 | 2021/xx/xx | LScheffler | [v1.19.5x]() | **Doc**: Improved, Better description of ClassPerFileCheck. |
+| 2021/03/04 | Doug Hennig | [v1.19.58]() | Added support for writing to a different folder than the source code using a new tcOutputFolder parameter |
+| | | | Added a configuration item: HomeDir, which determines if HomeDir is saved in PJ2 files (the default is 1 for Yes) |
 | 2021/03/05 | LScheffler | [v1.19.57]() | **Bug Fix**: RedirectClassType = 2 mixed up PATH |
 | | | | **Doc**: Improved |
 | 2021/03/04 | LScheffler | [v1.19.56]() | **Feature**: New value 2 for option RedirectClassType = 2, just process the single class for input in form file[.baseclass].class.vc2 |

Documentacion/github/FoxBin2Prg_Internals.md

@@ -123,6 +123,7 @@ These are the FoxBin2Prg.cfg configuration file settings and their meaning:
 | [ClassPerFileCheck](#classperfilecheck) | _0_, 1 | 0=Don't check file.class.vc2 inclusion,<br/>1=Check file.class.vc2 inclusion<br/>Only used if import file is in file[.baseclass].class.tx2 syntax.<br/>Ignored for RedirectClassType: 2 |
 | ClearDBFLastUpdate | 0, _1_ | 0=Keep DBF LastUpdate, 1=Clear DBF LastUpdate. Useful for Diff, minimizes differences. |
 | Language | _(auto)_, EN, FR, ES, DE | Language of templates, shown messages and LOGs. EN=English, FR=French, ES=Español, DE=German, Not defined = AUTOMATIC (using VERSION(3)) ||
+| HomeDir | 0, _1_ | 0 = don't save HomeDir in PJ2, 1 = save HomeDir in PJ2. Setting this to 0 prevents the PJ2 file from changing just because two developers have the project in different folders |
 
 ### Note
 The options will be read outside in, top to down. See [Multi-config](#multi-config)

README.md

@@ -125,6 +125,10 @@ To view a copy of this license, visit http://creativecommons.org/licenses/by/4.0
 
 ---
 ---
+## Changes in 1.19.58
+* Added support for writing to a different folder than the source code using a new tcOutputFolder parameter
+* Added a configuration item: HomeDir, which determines if HomeDir is saved in PJ2 files (the default is 1 for Yes)
+
 ## Changes by this fork (1.19.55)
 To get the new settings in config file, use the new create-a-template function:
 

ThorUpdater/FoxBin2PrgVersion.txt

@@ -1,11 +1,7 @@
 lparameters toUpdateObject
-local ldDate, ;
+local ldDate
-	lnJulian, ;
+ldDate = date()
-	lcJulian
+toUpdateObject.AvailableVersion = 'FoxBin2Prg-1.19.58' + ;
-ldDate   = date(2018,7,31)
-lnJulian = val(sys(11, ldDate)) - val(sys(11, {^2000-01-01}))
-lcJulian = padl(transform(lnJulian), 4, '0')
-toUpdateObject.AvailableVersion = 'FoxBin2Prg-1.19.51.4' + lcJulian + ;
 	'-update-' + dtoc(ldDate, 1)
 return toUpdateObject
 

ThorUpdater/Project.txt

@@ -1,5 +1,5 @@
 appName = FoxBin2Prg
 appID = FoxBin2Prg
-majorVersion = 1.19.51.5
+majorVersion = 1.19.58
 excludeFiles = *.bak,*.bat,*.fxp,*.tbk,*.tmp,*.dat,*.log,*.cvp,README.md,.gitignore,*.zip*,*.7z*,*- copia.*,*.private.*,test_*.*,xx*.*,*.lnk,vfp_init.*,tmp*.*,*.err, *.conflict.*, *.private.*
 excludeFolders = *.plastic*,*ThorUpdater*,*Documentacion*,*foxunit*,*foxunit_*,*pruebas varias*,*versiones*,*datos_test*

foxbin2prg.cfg.txt

@@ -1,6 +1,6 @@
 *################################################################################################################
 *FOXBIN2PRG.CFG configuration options: (If no values given, these are the DEFAULTS)
-*Version: v1.21.2
+*Version: v1.19.58
 *################################################################################################################
 
 *extension: tx2=newext          && Specify extensions to use. Default FoxBin2Prg extensions ends in '2' (see at the bottom)
@@ -18,6 +18,7 @@
 *Language: (auto)               && Language of shown messages and LOGs. EN=English, FR=French, ES=Espa<70>ol, DE=German, Not defined = AUTOMATIC [DEFAULT]
 *ExcludeDBFAutoincNextval: 0    && [0=Do not exclude this value from db2], 1=Exclude this value from db2
 *PRG_Compat_Level: 0            && [0=Legacy], 1=Use HELPSTRING as Class Procedure comment
+*HomeDir: 1			&& 0 = don't save HomeDir in PJ2, [1 = save HomeDir in PJ2]
 
 *-- Convertion options:
 *PJX_Conversion_Support: 2      && 0=No support, 1=Generate TXT only (Diff), 2=Generate TXT and BIN (Merge)

foxbin2prg.prg

@@ -247,11 +247,11 @@
 *                                                fails silent if classlib.vcx exists (compiles wrong lib), with message if not.
 * 04/03/2021	LScheffler	v1.19.56	Enhancement: New value for RedirectClassType = 2, just process the single class of classlib.class.vc2
 * 05/03/2021	LScheffler	v1.19.57	Bug Fix: For RedirectClassType = 2, Path was set wrong
+* 2021-03-04	DH			v1.19.58	Enhancement: added support for writing to a different folder than the source code (Doug Hennig)
+* 2021-03-04	DH			v1.19.58	Enhancement: added configuration item: HomeDir, which determines if HomeDir is saved in PJ2 files (Doug Hennig)
 * xx/03/2021	LScheffler	v1.19.5x	Bug Fix: For RedirectClassType = 2, Path was set wrong
 * xx/03/2021	LScheffler	v1.19.5x	Doc: Improved, Better description of ClassPerFileCheck.
 * xx/03/2021	LScheffler	v1.19.5x	Bug Fix: RedirectClassType = 2, UseClassPerFile = 2 failed.
-
-
 * </HISTORIAL DE CAMBIOS Y NOTAS IMPORTANTES>
 *
 *---------------------------------------------------------------------------------------------------
@@ -418,11 +418,14 @@
 *										NOTA: Si en vez de '1' se indica un Path (p.ej, el del proyecto, se usará como base para recompilar
 * tcNoTimestamps			(v? IN    ) Indica si se debe anular el timestamp ('1') o no ('0' ó vacío)
 * tcCFG_File				(v? IN    ) Indica si se debe usar un archivo de configuración distinto al predeterminado
+*** DH 2021-03-04: added tcOutputFolder parameter
+* tcOutputFolder			(v? IN    ) The output folder to write to (optional: if it isn't specified, the same folder as the source is used)
 *---------------------------------------------------------------------------------------------------
 *							Ej: DO FOXBIN2PRG.PRG WITH "C:\DESA\INTEGRACION\LIBRERIA.VCX"
 *---------------------------------------------------------------------------------------------------
+*** DH 2021-03-04: added tcOutputFolder parameter
 Lparameters tc_InputFile, tcType, tcTextName, tlGenText, tcDontShowErrors, tcDebug, tcDontShowProgress, tcOriginalFileName ;
-	, tcRecompile, tcNoTimestamps, tcCFG_File
+	, tcRecompile, tcNoTimestamps, tcCFG_File, tcOutputFolder
 
 *-- NO modificar! / Do NOT change!
 #Define C_CMT_I						'*--'
@@ -664,6 +667,11 @@ Endif
 Try
 	loEx	= Null
 	loCnv	= Createobject("c_foxbin2prg")
+*** DH 2021-03-04: handle tcOutputFolder
+	if not empty(tcOutputFolder)
+		loCnv.cOutputFolder = tcOutputFolder
+	endif not empty(tcOutputFolder)
+*** DH 2021-03-04: end of new code
 	lnResp	= loCnv.execute( tc_InputFile, tcType, tcTextName, tlGenText, tcDontShowErrors, tcDebug ;
 		, tcDontShowProgress, Null, @loEx, .F., tcOriginalFileName, tcRecompile, tcNoTimestamps ;
 		, .F., .F., .F., tcCFG_File )
@@ -853,7 +861,7 @@ Define Class c_foxbin2prg As Session
 	Protected n_CFG_Actual, l_Main_CFG_Loaded, o_Configuration, l_CFG_CachedAccess
 *--
 	n_FB2PRG_Version				= 1.19
-	c_FB2PRG_Version_Real			= '1.19.57'
+	c_FB2PRG_Version_Real			= '1.19.58'
 *--
 	c_Language						= ''			&& EN, FR, ES, DE
 	c_SimulateError					= ''			&& SIMERR_I0, SIMERR_I1, SIMERR_O1
@@ -910,6 +918,8 @@ Define Class c_foxbin2prg As Session
 	l_DBF_IncludeDeleted            = .F.
 *!*	/Changed by: Lutz Scheffler 21.02.2021
 	n_UseClassPerFile 				= 0
+	n_PRG_Compat_Level				= 0				&& 0=COMPATIBLE WITH FoxBin2Prg v1.19.49 and earlier, 1=Include HELPSTRING
+	n_ExcludeDBFAutoincNextval		= 0
 	l_ClassPerFileCheck				= .F.
 	l_RedirectClassPerFileToMain	= .F.
 	n_RedirectClassType				= 0				&& 0=Redireccionar Todas las clases, 1=Redireccionar solo la clase indicada
@@ -962,7 +972,9 @@ Define Class c_foxbin2prg As Session
 	DBC_Conversion_Support			= 2
 	DBF_Conversion_Included			= ''
 	DBF_Conversion_Excluded			= ''
-
+*** DH 2021-03-04: added cOutputFolder and n_HomeDir properties
+	cOutputFolder					= ''			&& the folder to write files to (blank = same folder as source file)
+	n_HomeDir						= 1				&& 0 = don't save HomeDir in PJ2, 1 = save HomeDir in PJ2
 
 	Procedure Init
 		Lparameters tcCFG_File, tcCancelWithEscKey
@@ -1714,6 +1726,17 @@ Define Class c_foxbin2prg As Session
 	Endproc
 
 
+*** DH 2021-03-04: added n_HomeDir_Access
+	PROCEDURE n_HomeDir_ACCESS
+		IF THIS.n_CFG_Actual = 0 OR ISNULL( THIS.o_Configuration( THIS.n_CFG_Actual ) )
+			RETURN THIS.n_HomeDir
+		ELSE
+			RETURN NVL( THIS.o_Configuration( THIS.n_CFG_Actual ).n_HomeDir, THIS.n_HomeDir )
+		ENDIF
+	ENDPROC
+*** DH 2021-03-04: end of new code
+
+
 	Procedure changeFileAttribute
 * Using Win32 Functions in Visual FoxPro
 * example=103
@@ -2593,6 +2616,15 @@ Define Class c_foxbin2prg As Session
 									lo_CFG.n_PRG_Compat_Level	= Int( Val( lcValue ) )
 									.writeLog( C_TAB + Justfname(lcConfigFile) + ' > PRG_Compat_Level:           ' + Transform(lo_CFG.n_PRG_Compat_Level) )
 
+*** DH 2021-03-04: handle n_HomeDir configuration setting
+								CASE LEFT( laConfig(m.I), 8 ) == LOWER('HomeDir:')
+									lcValue	= ALLTRIM( SUBSTR( laConfig(m.I), 9 ) )
+									IF INLIST( lcValue, '0', '1' ) THEN
+										lo_CFG.n_HomeDir	= INT( VAL( lcValue ) )
+										.writeLog( C_TAB + JUSTFNAME(lcConfigFile) + ' > HomeDir:                ' + TRANSFORM(lo_CFG.n_HomeDir) )
+									ENDIF
+*** DH 2021-03-04: end of new code
+
 							Endcase
 						Endfor
 
@@ -4464,6 +4496,9 @@ Define Class c_foxbin2prg As Session
 
 					Endcase
 
+*** DH 2021-03-04: handle cOutputFolder
+					loConversor.cOutputFolder = This.cOutputFolder
+
 *-- Optimización: Comparación de los timestamps de InputFile y OutputFile para saber
 *-- si el OutputFile se debe regenerar o no.
 					lnFileCount	= Adir( laFiles, Forceext( .c_InputFile, '*' ), '', 1 )
@@ -6532,6 +6567,8 @@ Define Class c_conversor_base As Custom
 	c_ClaseActual			= ''
 	oFSO					= Null
 	n_Methods_LineNo		= 0			&& Número de línea del error dentro de "Methods"
+*** DH 2021-03-04: added cOutputFolder property
+	cOutputFolder			= ''
 
 
 
@@ -15934,6 +15971,12 @@ Define Class c_conversor_bin_a_prg As c_conversor_base
 				Local lcExpanded, llFileExists, lnBytes, lcOutputFile, laDirFile(1,5) ;
 					, loLang As CL_LANG Of 'FOXBIN2PRG.PRG'
 
+*** DH 2021-03-04: handle cOutputFolder
+				if not empty(This.cOutputFolder)
+					tcOutputFile = forcepath(tcOutputFile, This.cOutputFolder)
+				endif not empty(This.cOutputFolder)
+*** DH 2021-03-04: end of new code
+
 				lcExpanded	= Iif( '.' $ Juststem(tcOutputFile), 'X1', 'X0' )
 
 *-- addProcessedFile( tcFile, tcInOutType, tcProcessed, tcHasErrors, tcSupported, tcExpanded )
@@ -16852,9 +16895,19 @@ Define Class c_conversor_pjx_a_prg As c_conversor_bin_a_prg
 
 
 *-- Generación del proyecto
+*** DH 2021-03-04: only output HomeDir if we're supposed to
+					if toFoxBin2Prg.n_HomeDir = 1
 						TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
 							<<C_BUILDPROJ_I>>
 							<<>>*<.HomeDir = <<loProject._HomeDir>> />
+						ENDTEXT
+					else
+						TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
+							<<C_BUILDPROJ_I>>
+						ENDTEXT
+					endif toFoxBin2Prg.n_HomeDir = 1
+*** DH 2021-03-04: end of updated code
+					TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
 						<<>>
 						FOR EACH loProject IN _VFP.Projects FOXOBJECT
 						<<>>	loProject.Close()
@@ -17412,9 +17465,19 @@ Define Class c_conversor_pjm_a_prg As c_conversor_bin_a_prg
 					With This As c_conversor_pjm_a_prg Of 'FOXBIN2PRG.PRG'
 
 *-- Generación del proyecto
+*** DH 2021-03-04: only output HomeDir if we're supposed to
+					if toFoxBin2Prg.n_HomeDir = 1
 						TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
 							<<C_BUILDPROJ_I>>
 							<<>>*<.HomeDir = <<loProject._HomeDir>> />
+						ENDTEXT
+					else
+						TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
+							<<C_BUILDPROJ_I>>
+						ENDTEXT
+					endif toFoxBin2Prg.n_HomeDir = 1
+*** DH 2021-03-04: end of updated code
+					TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
 						<<>>
 						FOR EACH loProject IN _VFP.Projects FOXOBJECT
 						<<>>	loProject.Close()
@@ -29092,6 +29155,8 @@ Define Class CL_CFG As Custom
 	DBC_Conversion_Support			= Null
 	c_BackgroundImage				= Null
 	n_PRG_Compat_Level				= Null
+*** DH 2021-03-04: added n_HomeDir property
+	n_HomeDir						= NULL
 
 
 	Procedure CopyFrom
@@ -29155,6 +29220,8 @@ Define Class CL_CFG As Custom
 			.DBC_Conversion_Support			= toParentCFG.DBC_Conversion_Support
 			.c_BackgroundImage				= toParentCFG.c_BackgroundImage
 			.n_PRG_Compat_Level				= toParentCFG.n_PRG_Compat_Level
+*** DH 2021-03-04: handle n_HomeDir
+			.n_HomeDir						= toParentCFG.n_HomeDir
 		Endwith
 	Endproc
 
@@ -29325,7 +29392,6 @@ Define Class CL_LANG As Custom
 							.C_FILENAME_LOC													= "Fichier"
 							.C_FOXBIN2PRG_ERROR_CAPTION_LOC									= "ERREUR"
 							.C_FOXBIN2PRG_SYNTAX_INFO_LOC									= "SYNTAX AND PARAMETERS INFO"
-
 							TEXT TO .C_FOXBIN2PRG_SYNTAX_INFO_EXAMPLE_LOC TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
 						<<>>FoxBin2Prg Home Page and download: https://github.com/fdbozzo/foxbin2prg/wiki  -  Fernando D. Bozzo (2013.11.25)
 						<<>>
@@ -29358,6 +29424,7 @@ Define Class CL_LANG As Custom
 						<<>>
 						<<>>
 							ENDTEXT
+*** DH 2021-03-04: added HomeDir to text
 							TEXT TO .C_FOXBIN2PRG_SYNTAX_INFO_EXAMPLE_LOC_cfg TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
 						<<>>################################################################################################################
 						<<>>FOXBIN2PRG.CFG configuration options: (If no values given, these are the DEFAULTS)
@@ -29379,6 +29446,7 @@ Define Class CL_LANG As Custom
 						<<>>Language: (auto)               && Language of shown messages and LOGs. EN=English, FR=French, ES=Español, DE=German, Not defined = AUTOMATIC [DEFAULT]
 						<<>>ExcludeDBFAutoincNextval: 0    && [0=Do not exclude this value from db2], 1=Exclude this value from db2
 						<<>>PRG_Compat_Level: 0            && [0=Legacy], 1=Use HELPSTRING as Class Procedure comment
+						<<>>HomeDir: 1                     && 0 = don't save HomeDir in PJ2, [1 = save HomeDir in PJ2]
 						<<>>
 						<<>>-- Convertion options:
 						<<>>PJX_Conversion_Support: 2      && 0=No support, 1=Generate TXT only (Diff), 2=Generate TXT and BIN (Merge)
@@ -29570,6 +29638,7 @@ Define Class CL_LANG As Custom
 						<<>>
 						<<>>
 							ENDTEXT
+*** DH 2021-03-04: added HomeDir to text
 							TEXT TO .C_FOXBIN2PRG_SYNTAX_INFO_EXAMPLE_LOC_cfg TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
 						<<>>################################################################################################################
 						<<>>FOXBIN2PRG.CFG configuration options: (If no values given, these are the DEFAULTS)
@@ -29591,6 +29660,7 @@ Define Class CL_LANG As Custom
 						<<>>Language: (auto)               && Language of shown messages and LOGs. EN=English, FR=French, ES=Español, DE=German, Not defined = AUTOMATIC [DEFAULT]
 						<<>>ExcludeDBFAutoincNextval: 0    && [0=Do not exclude this value from db2], 1=Exclude this value from db2
 						<<>>PRG_Compat_Level: 0            && [0=Legacy], 1=Use HELPSTRING as Class Procedure comment
+						<<>>HomeDir: 1                     && 0 = don't save HomeDir in PJ2, [1 = save HomeDir in PJ2]
 						<<>>
 						<<>>-- Convertion options:
 						<<>>PJX_Conversion_Support: 2      && 0=No support, 1=Generate TXT only (Diff), 2=Generate TXT and BIN (Merge)
@@ -29783,6 +29853,7 @@ Define Class CL_LANG As Custom
 						<<>>cCFG_File:         Legt eine alternative Configurationsdate (CFG) fest, die statt der im foxbin2prg Verzeichnis genutzt werden soll. (Anm. des Übersetzers: Keine Angabe über Vererbung in der Verzeichnishierarchie)
 						<<>>
 							ENDTEXT
+*** DH 2021-03-04: added HomeDir to text
 							TEXT TO .C_FOXBIN2PRG_SYNTAX_INFO_EXAMPLE_LOC_cfg TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
 						<<>>################################################################################################################
 						<<>>FOXBIN2PRG.CFG Konfigurations Optionen: (Wird die Option nicht aufgeführt, ist der Wert im Beispiel der Default)
@@ -29814,6 +29885,7 @@ Define Class CL_LANG As Custom
 						<<>>Language: (auto)               && Sprache für Anzeigen und Logs. EN=English, FR=Français, ES=Español, DE=Deutsch, Nicht definiert = Automatisch [DEFAULT]
 						<<>>ExcludeDBFAutoincNextval: 0    && 0=Aus, 1=Entferne diesen Wert aus der Textdate der Datenbank (db2)
 						<<>>PRG_Compat_Level: 0            && [0=Legacy], 1=Nutze HELPSTRING als Class Procedure Kommentar
+						<<>>HomeDir: 1                     && 0 = don't save HomeDir in PJ2, [1 = save HomeDir in PJ2]
 						<<>>
 						<<>>----------------------------------------------------------------------------------------------------------------
 						<<>>-- Konvertierungs Optionen:
@@ -30034,6 +30106,7 @@ Define Class CL_LANG As Custom
 						<<>>
 						<<>>
 							ENDTEXT
+*** DH 2021-03-04: added HomeDir to text
 							TEXT TO .C_FOXBIN2PRG_SYNTAX_INFO_EXAMPLE_LOC_cfg TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
 						<<>>################################################################################################################
 						<<>>FOXBIN2PRG.CFG configuration options: (If no values given, these are the DEFAULTS)
@@ -30055,6 +30128,7 @@ Define Class CL_LANG As Custom
 						<<>>Language: (auto)               && Language of shown messages and LOGs. EN=English, FR=French, ES=Español, DE=German, Not defined = AUTOMATIC [DEFAULT]
 						<<>>ExcludeDBFAutoincNextval: 0    && [0=Do not exclude this value from db2], 1=Exclude this value from db2
 						<<>>PRG_Compat_Level: 0            && [0=Legacy], 1=Use HELPSTRING as Class Procedure comment
+						<<>>HomeDir: 1                     && 0 = don't save HomeDir in PJ2, [1 = save HomeDir in PJ2]
 						<<>>
 						<<>>-- Convertion options:
 						<<>>PJX_Conversion_Support: 2      && 0=No support, 1=Generate TXT only (Diff), 2=Generate TXT and BIN (Merge)