diff --git a/CLEAR ALL.exe b/CLEAR ALL.exe new file mode 100644 index 0000000..da52d45 Binary files /dev/null and b/CLEAR ALL.exe differ diff --git a/ThorUpdater/FoxBin2Prg.zip b/ThorUpdater/FoxBin2Prg.zip index 7464514..fa104f7 100644 Binary files a/ThorUpdater/FoxBin2Prg.zip and b/ThorUpdater/FoxBin2Prg.zip differ diff --git a/ThorUpdater/FoxBin2PrgVersion.txt b/ThorUpdater/FoxBin2PrgVersion.txt index 2840fe9..8f1687a 100644 --- a/ThorUpdater/FoxBin2PrgVersion.txt +++ b/ThorUpdater/FoxBin2PrgVersion.txt @@ -10,8 +10,8 @@ local; lcappName = "FoxBin2Prg" *Set following two numbers on version -ldDate = date(2022,01,18) -lcmajorVersion = "1.19.68" +ldDate = date(2022,02,25) +lcmajorVersion = "1.19.69" *lnJulian = val(sys(11, m.ldDate)) - val(sys(11, {^2000-01-01})) *lcJulian = padl(transform(lnJulian), 4, '0') diff --git a/ThorUpdater/Project.txt b/ThorUpdater/Project.txt index bfbf79d..187c3d2 100644 --- a/ThorUpdater/Project.txt +++ b/ThorUpdater/Project.txt @@ -1,5 +1,5 @@ appName = FoxBin2Prg appID = FoxBin2Prg -majorVersion = 1.19.68 +majorVersion = 1.19.69 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., .gitignore, *.pui. *.prj* excludeFolders = *.plastic*,*ThorUpdater*,*Documentacion*,*foxunit*,*foxunit_*,*pruebas varias*,*versiones*,*datos_test* diff --git a/docs/FoxBin2Prg_Changes.md b/docs/FoxBin2Prg_Changes.md index 25c0b50..fa6f7ea 100644 --- a/docs/FoxBin2Prg_Changes.md +++ b/docs/FoxBin2Prg_Changes.md @@ -30,6 +30,7 @@ _**Note:** you can click on the version number for downloading this version from | 2022/02/25 | LScheffler | [v1.19.69](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.19.69) | **Bug Fix**: Missing class when building text file from corrupted VCX (bjornhoeksel) | | 2022/02/23 | LScheffler | [v1.19.69](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.19.69) | **Bug Fix**: Recreating a class while an object with same name exists in VCX fails (bjornhoeksel) | | | | | **Enhancement**: Template configuration files FOXBIN2PRG.DBF.TXT and FOXBIN2PRG.DBF.CFG.TXT in English | +| | | | **Enhancement**: Examples and template for config files enhanced | | | | | **Enhancement**: Notice in contribution file to creating files above in English | | | | | **Enhancement**: Started reworking double documentation | | 2022/01/18 | LScheffler | [v1.19.68](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.19.68) | **Bug Fix**: Converting MN2 to MNX ignores the programmer-defined "Pad Name" found in "Prompt Options" screen (Jimrnelson) | @@ -404,4 +405,4 @@ _**Note:** you can click on the version number for downloading this version from This project is part of [VFPX](https://vfpx.github.io/). ---- -Last changed: _2022/02/23_ ![Picture](./pictures/vfpxpoweredby_alternative.gif) \ No newline at end of file +Last changed: _2022/02/25_ ![Picture](./pictures/vfpxpoweredby_alternative.gif) \ No newline at end of file diff --git a/foxbin2prg.cfg.txt b/foxbin2prg.cfg.txt index 6f5035c..bc80bc9 100644 --- a/foxbin2prg.cfg.txt +++ b/foxbin2prg.cfg.txt @@ -3,6 +3,17 @@ *Version: v1.19.69 ***************************************************************************************************************** +* Note, configuration files will follow an inheritance. +* 1. Default values +* 2., optional FOXBIN2PRG.CFG in folder of FOXBIN2PRG.EXE +* 3., optional FOXBIN2PRG.CFG in root of working directory +* 4., optional FOXBIN2PRG.CFG in every folder up to the working directory +* 5., optional Special settings per aingle DBF's Syntax: .dbf.cfg in tables folder) +* 6., Parameter calling FOXBIN2PRG.EXE. + +* Some Parameter calling FOXBIN2PRG.EXE overturn this settings (except Defaults) +***************************************************************************************************************** + *-- Settings for internal work, not processing *Language: (auto) && Language of shown messages and LOGs. EN=English, FR=French, ES=Espaņol, DE=German, Not defined = AUTOMATIC [DEFAULT] *ShowProgressbar: 1 && 0=Don't show, 1=Allways show, 2= Show only for multi-file processing diff --git a/foxbin2prg.dbf.cfg.txt b/foxbin2prg.dbf.cfg.txt index 45e24b1..b1dc043 100644 --- a/foxbin2prg.dbf.cfg.txt +++ b/foxbin2prg.dbf.cfg.txt @@ -1,103 +1,12 @@ *################################################################################################################ +*-- Individual DBF configuration file (syntax: filename.dbf.cfg) Defaults see FoxBin2prg.cfg +*Version: v1.19.69 ***************************************************************************************************************** -*-- Settings for internal work, not processing -*Language: (auto) && Language of shown messages and LOGs. EN=English, FR=French, ES=Espaņol, DE=German, Not defined = AUTOMATIC [DEFAULT] -*ShowProgressbar: 1 && 0=Don't show, 1=Allways show, 2= Show only for multi-file processing -*DontShowErrors: 0 && Show message errors by default -*ExtraBackupLevels: 1 && By default 1 BAK is created. With this you can make more .N.BAK, or none -*Debug: 0 && Don't Activate individual .Log by default -*BackgroundImage: && Backgroundimage for process form. Empty for empty Background. File not found uses default. -*HomeDir: 1 && Home Directory in PJX -* && 0 don't save HomeDir in PJ2 -* && 1 save HomeDir in PJ2 -*---------------------------------------------------------------------------------------------------------------- - -*-- Conversion operation by type -*PJX_Conversion_Support: 2 && 0=No support, 1=Generate TXT only (Diff), 2=Generate TXT and BIN (Merge) -*VCX_Conversion_Support: 2 && 0=No support, 1=Generate TXT only (Diff), 2=Generate TXT and BIN (Merge) -*SCX_Conversion_Support: 2 && 0=No support, 1=Generate TXT only (Diff), 2=Generate TXT and BIN (Merge) -*FRX_Conversion_Support: 2 && 0=No support, 1=Generate TXT only (Diff), 2=Generate TXT and BIN (Merge) -*LBX_Conversion_Support: 2 && 0=No support, 1=Generate TXT only (Diff), 2=Generate TXT and BIN (Merge) -*MNX_Conversion_Support: 2 && 0=No support, 1=Generate TXT only (Diff), 2=Generate TXT and BIN (Merge) -*DBC_Conversion_Support: 2 && 0=No support, 1=Generate TXT only (Diff), 2=Generate TXT and BIN (Merge) -*DBF_Conversion_Support: 1 && 0=No support, 1=Generate Header TXT only (Diff), 2=Generate Header TXT and BIN (Merge/Only Structure!), 4=Generate TXT with DATA (Diff), 8=Export and Import DATA (Merge/Structure & Data) -*FKY_Conversion_Support: 1 && 0=No support, 1=Generate TXT only (Diff) -*MEM_Conversion_Support: 1 && 0=No support, 1=Generate TXT only (Diff) -*---------------------------------------------------------------------------------------------------------------- - -*Setting for container files (not pjx) -*-- CLASS and FORM options (tx2 is to read as vc2 or sc2, VCX might be SCX) -*- Class per file options (UseClassPerFile: 1) -*UseClassPerFile: 0 && Determines how a library (or form) will handle included class (or, for forms, objects) -* && 0 One library.tx2 file -* && 1 Multiple file.class.tx2 files -* && 2 Multiple file.baseclass.class.tx2 files -*RedirectClassPerFileToMain: 0 && When regenerating binary files, determine target file -* && 0 Don't redirect to file.tx2 -* && 1 Redirect to file.tx2 when selecting file[.baseclass].class.tx2 -* && RedirectClassType: 1 has precedence -*RedirectClassType: 0 && For classes created with UseClassPerFile>0 in the form file[.baseclass].class.tx2 -* && Those files could be imported like file.tx2::Class::import or like file[.baseclass].class.tx2 -* && For the second form: -* && 0 Redirect file[.baseclass].class.tx2 to file.VCX and add / replace all other classes of this library -* && 1 Redirect file[.baseclass].class.tx2 to file[.baseclass].class.VCX and do not touch file.VCX -* && 2 Redirect file[.baseclass].class.tx2 to file.VCX and do not touch other classes of file.VCX -*ClassPerFileCheck: 0 && Check, if files listed in the main file of a library or form will be included -* && 0 Don't check file inclusion -* && 1 Check file[.baseclass].class.tx2 inclusion -* && Only used if import file is in file[.baseclass].class.tx2 syntax -* && Ignored for RedirectClassType: 2 -*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*-- DBC options -*- File per DBC options (UseFilesPerDBC: 1) -*OldFilesPerDBC: 0 && 1=Turns the File per DBC options on, 0 uses the old UseClassPerFile etc settings. -* && Options below will only read if OldFilesPerDBC is set 1 before! -* && If OldFilesPerDBC is set 0 later, alle setting will be lost -*UseFilesPerDBC: 0 && 0=One database dc2 file, 1=Multiple file.*.*.dc2 files -* && 0 creates only a file.dc2 with all DBC (file) data -* && 1 creates a file.dc2 with DBC properties -* && and additional DBC files per DBC item (stored-proc, table, ..) -* && Note: recration only if RedirectFilePerDBCToMain is 1 -*RedirectFilePerDBCToMain: 0 && 0=Don't redirect to file.dc2, 1=Redirect to file.tx2 when selecting file.item.*.dc2 -*ItemPerDBCCheck: 0 && 0=Don't check file.item.*.dc2 inclusion, 1=Check file.item.*.dc2 inclusion -*---------------------------------------------------------------------------------------------------------------- - -*-- General files -*NoTimestamps: 1 && Clear timestamps of several file types by default for minimize text-file differences -*ClearUniqueID: 1 && 0=Keep UniqueID in text files, 1=Clear Unique ID. Useful for Diff and Merge -*OptimizeByFilestamp: 0 && 1=Optimize file regeneration depending on file timestamp. Dangerous while working with branches! -*RemoveNullCharsFromCode: 1 && 1=Drop NULL chars from source code -*RemoveZOrderSetFromProps: 0 && 0=Do not remove ZOrderSet property from object, 1=Remove ZOrderSet property from object -*PRG_Compat_Level: 0 && 0=Legacy, 1=Use HELPSTRING as Class Procedure comment -*---------------------------------------------------------------------------------------------------------------- - -*-- PJX special -*BodyDevInfo: 0 && 0=Don't keep DevInfo for body pjx records, 1=Keep DevInfo -*---------------------------------------------------------------------------------------------------------------- - -*-- DBF special -*ClearDBFLastUpdate: 1 && 0=Keep DBF LastUpdate, 1=Clear DBF LastUpdate. Useful for Diff. -*ExcludeDBFAutoincNextval: 0 && 0=Do not exclude this value from db2, 1=Exclude this value from db2 -*DBF_Conversion_Included: * && If DBF_Conversion_Support:4, you can specify multiple filemasks: www,fb2p_free.dbf -*DBF_Conversion_Excluded: && If DBF_Conversion_Support:4, you can specify multiple filemasks: www,fb2p_free.dbf -*DBF_BinChar_Base64: 1 && For character type fields, if NoCPTrans 0=do not transform, 1=use Base64 transform (default) -*DBF_IncludeDeleted: 0 && 0=Do not include deleted records (default), 1=Include deleted records -*---------------------------------------------------------------------------------------------------------------- - -*-- Text file extensions -*extension: tx2=newext && Specify extensions to use. Default FoxBin2Prg extensions ends in '2' (see at the bottom) -*-- Example configuration for SourceSafe compatibility: -*extension: pj2=pja && Text file to PJX -*extension: vc2=vca && Text file to VCX -*extension: sc2=sca && Text file to SCX -*extension: fr2=fra && Text file to FRX -*extension: lb2=lba && Text file to LBX -*extension: mn2=mna && Text file to MNX -*extension: db2=dba && Text file to DBF -*extension: dc2=dca && Text file to DBC -*-- Additional extensions -*extension: fk2=fkx && Text file to FKY -*extension: me2=fkx && Text file to MEM +*DBF_Conversion_Support: <0,1,2,4,8> && 0=No support, 1=Generate Header TXT only (Diff), 2=Generate Header TXT and BIN (Merge/Only Structure!), 4=Generate TXT with DATA (Diff), 8=Export and Import DATA (Merge/Structure & Data) +*DBF_Conversion_Order: && Field expresion. ie: name+str(age,3) +*DBF_Conversion_Condition: && Logical expression. ie: age > 10 AND NOT DELETED() +*DBF_IndexList: && comma delimited list of additonal non structural index files, cdx or idx +*DBF_BinChar_Base64: <0,1> && For character type fields, if NoCPTrans 0=do not transform, 1=use Base64 transform +*DBF_IncludeDeleted: <0,1> && 0=Do not include deleted records, 1=Include deleted records * \ No newline at end of file diff --git a/foxbin2prg.exe b/foxbin2prg.exe index ef75ab0..6851f0d 100644 Binary files a/foxbin2prg.exe and b/foxbin2prg.exe differ diff --git a/foxbin2prg.pjt b/foxbin2prg.pjt index 63b30b9..220db0b 100644 Binary files a/foxbin2prg.pjt and b/foxbin2prg.pjt differ diff --git a/foxbin2prg.pjx b/foxbin2prg.pjx index 609eb5b..d6459e9 100644 Binary files a/foxbin2prg.pjx and b/foxbin2prg.pjx differ diff --git a/foxbin2prg.prg b/foxbin2prg.prg index 6fdcb61..0bfdf12 100644 --- a/foxbin2prg.prg +++ b/foxbin2prg.prg @@ -284,6 +284,7 @@ * 23/02/2022 LScheffler v1.19.69 Docu: examples and template for config files reworked to English, Contribution.md reworked * 25/02/2022 LScheffler v1.19.69 Bug Fix: Missing class when building text file from corrupted VCX (bjornhoeksel) * 25/02/2022 LScheffler v1.19.69 github: added tags to bring links in docu to work +* 25/02/2022 LScheffler v1.19.69 Docu: examples and template for config files enhanced * * *--------------------------------------------------------------------------------------------------- @@ -30379,6 +30380,17 @@ Define Class CL_LANG As Custom <<>>################################################################################################################ <<>>FOXBIN2PRG.CFG configuration options: (If no values given, these are the DEFAULTS) <<>>Version: <<_Screen.c_FB2PRG_EXE_Version>> + <<>>**************************************************************************************************************** + <<>> + <<>> Note, configuration files will follow an inheritance. + <<>> 1. Default values + <<>> 2., optional FOXBIN2PRG.CFG in folder of FOXBIN2PRG.EXE + <<>> 3., optional FOXBIN2PRG.CFG in root of working directory + <<>> 4., optional FOXBIN2PRG.CFG in every folder up to the working directory + <<>> 5., optional Special settings per aingle DBF's Syntax: .dbf.cfg in tables folder) + <<>> 6., Parameter calling FOXBIN2PRG.EXE. + <<>> + <<>> Some Parameter calling FOXBIN2PRG.EXE overturn this settings (except Defaults) <<>>**************************************************************************************************************** <<>> <<>>-- Settings for internal work, not processing @@ -30642,6 +30654,17 @@ Define Class CL_LANG As Custom <<>>################################################################################################################ <<>>FOXBIN2PRG.CFG configuration options: (If no values given, these are the DEFAULTS) <<>>Version: <<_Screen.c_FB2PRG_EXE_Version>> + <<>>**************************************************************************************************************** + <<>> + <<>> Note, configuration files will follow an inheritance. + <<>> 1. Default values + <<>> 2., optional FOXBIN2PRG.CFG in folder of FOXBIN2PRG.EXE + <<>> 3., optional FOXBIN2PRG.CFG in root of working directory + <<>> 4., optional FOXBIN2PRG.CFG in every folder up to the working directory + <<>> 5., optional Special settings per aingle DBF's Syntax: .dbf.cfg in tables folder) + <<>> 6., Parameter calling FOXBIN2PRG.EXE. + <<>> + <<>> Some Parameter calling FOXBIN2PRG.EXE overturn this settings (except Defaults) <<>>**************************************************************************************************************** <<>> <<>>-- Settings for internal work, not processing @@ -31203,6 +31226,17 @@ Define Class CL_LANG As Custom <<>>################################################################################################################ <<>>FOXBIN2PRG.CFG configuration options: (If no values given, these are the DEFAULTS) <<>>Version: <<_Screen.c_FB2PRG_EXE_Version>> + <<>>**************************************************************************************************************** + <<>> + <<>> Note, configuration files will follow an inheritance. + <<>> 1. Default values + <<>> 2., optional FOXBIN2PRG.CFG in folder of FOXBIN2PRG.EXE + <<>> 3., optional FOXBIN2PRG.CFG in root of working directory + <<>> 4., optional FOXBIN2PRG.CFG in every folder up to the working directory + <<>> 5., optional Special settings per aingle DBF's Syntax: .dbf.cfg in tables folder) + <<>> 6., Parameter calling FOXBIN2PRG.EXE. + <<>> + <<>> Some Parameter calling FOXBIN2PRG.EXE overturn this settings (except Defaults) <<>>**************************************************************************************************************** <<>> <<>>-- Settings for internal work, not processing