diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 94a01ca..f35d950 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -47,6 +47,8 @@ CD "path_to_FoxBin2Prg" DO ReCreate_FoxBin2Prg.prg ``` **Note: Do not run FoxBin2Prg.prg directly.** +**Note: There might be an FoxBin2Prg error around _tests\datos_readonly\vw_local_encuestas_. This is intended. +The file is in the test suit and is intended to create an error for testing purposes.** 3. Do your changes 4. On top of _FoxBin2Prg.prg_ there are two version numbers: ``` @@ -76,7 +78,10 @@ CD "path_to_FoxBin2Prg" DO Create_FoxBin2Prg.prg ``` **Note: Do not run FoxBin2Prg.prg directly.** -15. **The following steps are not neccesary, if you use *VPXDeployment* to create a new version that is applicable for Thor use.** +**Note: There might be an FoxBin2Prg error around _tests\datos_readonly\vw_local_encuestas.tbf_. This is intended. +The file is in the test suit and is intended to create an error for testing purposes. This does not create a problem. +If you do not see this, it's just your config.** +15. **The following steps are not neccesary, if you use [VPXDeployment](#using-vfpxdeployment) to create a new version that is applicable for Thor use.** 16. Compile to EXE **in VFP9 SP2** 17. Change Thor ([see below](#thor-conventions)) 18. commit @@ -97,10 +102,11 @@ The standard procedure to create the Thor files is runing VFPXDeployment via Tho 2. Run VFPXDeployment. It will set version number to EXE, compile, set several documentation and create the files for Thor. 3. commit 4. push to your fork -5. create a pull request +5. Create a pull request ### Without VFPXDeployment -If you do not use VFPXDeployment +If you do not use VFPXDeployment. + There are some considerations to make to add a new version to Thor. Please check [Supporting Thor Updater](https://vfpx.github.io/thorupdate/) In special: diff --git a/FOXBIN2PRG.DBF.CFG.TXT b/FOXBIN2PRG.DBF.CFG.TXT index d0f5029..5b90854 100644 --- a/FOXBIN2PRG.DBF.CFG.TXT +++ b/FOXBIN2PRG.DBF.CFG.TXT @@ -1,6 +1,6 @@ *################################################################################################################ *-- Individual DBF configuration file (syntax: filename.dbf.cfg) Defaults see FoxBin2prg.cfg -*Version: v1.21.04 +*Version: v1.21.05 ***************************************************************************************************************** *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) diff --git a/README.md b/README.md index 70fa61e..37c4e5f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # FoxBin2Prg -## Version 1.21.04 +## Version 1.21.05 **Binary/Text Converting program for Microsoft Visual FoxPro** ## Lutz Scheffler @@ -175,4 +175,4 @@ If you like to see Fernando's blog, or value his work: ---- -Last changed: _2024/08/26_ ![Picture](./docs/pictures/vfpxpoweredby_alternative.gif) +Last changed: _2026/06/18_ ![Picture](./docs/pictures/vfpxpoweredby_alternative.gif) diff --git a/TESTS/DATOS_READONLY/fb2p_dbc.dbc b/TESTS/DATOS_READONLY/fb2p_dbc.dbc index 4652a41..8c936c3 100644 Binary files a/TESTS/DATOS_READONLY/fb2p_dbc.dbc and b/TESTS/DATOS_READONLY/fb2p_dbc.dbc differ diff --git a/TESTS/DATOS_READONLY/fb2p_dbc.dct b/TESTS/DATOS_READONLY/fb2p_dbc.dct index 04387b8..f22f13d 100644 Binary files a/TESTS/DATOS_READONLY/fb2p_dbc.dct and b/TESTS/DATOS_READONLY/fb2p_dbc.dct differ diff --git a/ThorUpdater/FoxBin2Prg.zip b/ThorUpdater/FoxBin2Prg.zip index 14f8b5f..b8228a8 100644 Binary files a/ThorUpdater/FoxBin2Prg.zip and b/ThorUpdater/FoxBin2Prg.zip differ diff --git a/ThorUpdater/FoxBin2PrgVersion.txt b/ThorUpdater/FoxBin2PrgVersion.txt index 7cfcba8..f9747e6 100644 --- a/ThorUpdater/FoxBin2PrgVersion.txt +++ b/ThorUpdater/FoxBin2PrgVersion.txt @@ -3,8 +3,8 @@ lparameters toUpdateObject * Set the properties of the passed updater object. with toUpdateObject - .VersionNumber = '1.21.04 - 20240826' - .AvailableVersion = 'FoxBin2PRG-1.21.04-update-20240826' + .VersionNumber = '1.21.05 - 20260618' + .AvailableVersion = 'FoxBin2PRG-1.21.05-update-20260618' .Notes = GetNotes() .RegisterWithThor = GetRegisterWithThor() endwith @@ -63,4 +63,4 @@ text to lcCommand noshow endtext return lcCommand -*created by VFPX Deployment, 08/26/2024 2:08:42 PM \ No newline at end of file +*created by VFPX Deployment, 18.06.2026 19:36:46 \ No newline at end of file diff --git a/docs/ChangeLog.md b/docs/ChangeLog.md index ee1a48e..f61e2ec 100644 --- a/docs/ChangeLog.md +++ b/docs/ChangeLog.md @@ -27,14 +27,21 @@ _**Note:** you can click on the version number for downloading this version from | Rel.Date | Developer | Version | Details | | - | - | - | - | -| 2024/08/26 | DHennig | v1.21.04 | **Enhancement**: Added support for BodyDevInfo = 2 in CFG file to prevent both DevInfo and ObjRev from being written to PJ2 file | +| 2026/06/18 | LScheffler | [v1.21.05](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.21.05) | **Bug Fix**: Brute force fixed Datatype error for tcDontShowProgress, #114 (omirian) | +| | | | **Bug Fix**: Fixed missing link SCM documentation, #116 (ToniKoehler) | +| | | | **Bug Fix**: Fixed a problem that cDontShowProgress parameter will be ignored if ShowProgressbar property is used. #118 (LScheffler) | +| | | | **Enhancement**: Added documentation of properties of settings object | +| | | | **Enhancement**: Better documentation if a settings us ignored when a parameter is set. Voth in in docu and setting files generated via -Cc options. | +| | | | **Enhancement**: Some settings will not follow inheritence, documented in docu and setting files generated via -Cc options. | +| | | | **Enhancement**: Minor changes | +| 2024/08/26 | DHennig | [v1.21.04](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.21.04) | **Enhancement**: Added support for BodyDevInfo = 2 in CFG file to prevent both DevInfo and ObjRev from being written to PJ2 file | | 2024/04/24 | LScheffler | [v1.21.03](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.21.03) | **Bug Fix**: Text To Bin with Fieldcaption = "NULL" (misnomer. it's the field name); #106; #106 (griessbach14943) | | 2024/01/03 | LScheffler | [v1.21.02](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.21.02) | **Bug Fix**: Problems regenerating single classes and forms from text files in class-per-file form; #105 (LScheffler) | | 2023/11/19 | LScheffler | [v1.21.01](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.21.01) | **Enhancement**: Source files not longer included in Thor. The file you will found are old and will be removed with subsequent installs. (LScheffler) | -| 2023/11/19 | LScheffler | [v1.21.01](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.21.01) | **Bug Fix**: Problems regenerating databases with splited contents due to the removed Spanish characters in comment. (LScheffler) | +| | | | **Bug Fix**: Problems regenerating databases with splited contents due to the removed Spanish characters in comment. (LScheffler) | | 2023/10/20 | LScheffler | [v1.21.00](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.21.00) | **Bug Fix**: Problems with Spanish characters in comment. (ccantrell72) | | 2023/09/06 | LScheffler | [v1.20.07](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.20.07) | **Enhancement**: Option to block processing of directories. If file ".FoxBin2Prg_Ignore" is existing, this directories and all subdirectries will be ignored. (Mainly set up to ignore local GoFish settings) (LScheffler) | -| 2023/09/06 | LScheffler | [v1.20.06](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.20.06) | **Bug Fix**: Problems recreating tables (LScheffler) | +| | | | **Bug Fix**: Problems recreating tables (LScheffler) | | 2023/09/03 | LScheffler | [v1.20.05](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.20.05) | **Bug Fix**: Problems recreating menu files (introduced with codepage) (LScheffler) | | | | | **Enhancement:** Inserted options to allow splitting of SCX handling from VCX. | | 2023/09/01 | LScheffler | [v1.20.04](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.20.04) | **Enhancement**: New option "tcDebug" for get_DirSettings method. | @@ -450,4 +457,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: _2024/08/26_ ![Picture](./pictures/vfpxpoweredby_alternative.gif) \ No newline at end of file +Last changed: _2016/06/18_ ![Picture](./pictures/vfpxpoweredby_alternative.gif) \ No newline at end of file diff --git a/foxbin2prg.cfg.txt b/foxbin2prg.cfg.txt index 10de702..551b783 100644 --- a/foxbin2prg.cfg.txt +++ b/foxbin2prg.cfg.txt @@ -1,6 +1,6 @@ *################################################################################################################ *FOXBIN2PRG.CFG configuration options: (If no values given, these are the DEFAULTS) -*Version: v1.21.04 +*Version: v1.21.05 ***************************************************************************************************************** * Note, configuration files will follow an inheritance. @@ -10,7 +10,7 @@ * if used, the InhibitInheritance setting controls if other config files will be evaluated (default). See below. * 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 single DBF's Syntax: .dbf.cfg in tables folder) +* 5., optional Special settings per single DBF's (Syntax: .dbf.cfg in tables folder) * Some Parameter calling FOXBIN2PRG.EXE overturn this settings (except Defaults) ***************************************************************************************************************** @@ -18,12 +18,16 @@ *-- 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 +* && Note: This setting will be ignored, if cDontShowProgress parameter is set. *DontShowErrors: 0 && Show message errors by default +* && Note: This setting will be ignored, if cDontShowError parameter is set. +* && Note: There is no inheritance for this setting. First occurance wins. *ExtraBackupLevels: 1 && By default 1 BAK is created. With this you can make more .N.BAK, or none +* && Note: There is no inheritance for this setting. First occurance wins. *Debug: 0 && 0=Don't Activate individual .Log by default * && 1=Activate individual .Log by default * && 2=??? -* && Only valid if not controlled by parameter +* && Only valid if not controlled by parameter cDebug *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 @@ -129,8 +133,12 @@ *-- General files *NoTimestamps: 1 && Clear timestamps of several file types by default for minimize text-file differences +* && Note: This setting will be ignored, if cNoTimestamps parameter is set. +* && Note: There is no inheritance for this setting. First occurance wins. *ClearUniqueID: 1 && 0=Keep UniqueID in text files, 1=Clear Unique ID. Useful for Diff and Merge +* && Note: There is no inheritance for this setting. First occurance wins. *OptimizeByFilestamp: 0 && 1=Optimize file regeneration depending on file timestamp. Dangerous while working with branches! +* && Note: There is no inheritance for this setting. First occurance wins. *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 diff --git a/foxbin2prg.pj2 b/foxbin2prg.pj2 index e1ae4e7..02dba50 100644 --- a/foxbin2prg.pj2 +++ b/foxbin2prg.pj2 @@ -25,7 +25,7 @@ _LegalTrademark = "MIT License" _ProductName = "FOXBIN2PRG" _MajorVer = "1" _MinorVer = "21" -_Revision = "1" +_Revision = "05" _LanguageID = "1034" _AutoIncrement = "0" * diff --git a/foxbin2prg.prg b/foxbin2prg.prg index f73c4b5..9673af4 100644 --- a/foxbin2prg.prg +++ b/foxbin2prg.prg @@ -1,5 +1,5 @@ #DEFINE DN_FB2PRG_VERSION 1.21 -#DEFINE DC_FB2PRG_VERSION_REAL '1.21.04' +#DEFINE DC_FB2PRG_VERSION_REAL '1.21.05' *--------------------------------------------------------------------------------------------------- * Module.........: FOXBIN2PRG.PRG - FOR VISUAL FOXPRO 9.0 @@ -326,6 +326,13 @@ * 03/01/2024 LScheffler v1.21.02 Bug Fix: Problems regenerating single classes and forms from text files in class-per-file form; #105 (LScheffler) * 24/04/2024 LScheffler v1.21.03 Bug Fix: Text To Bin with Fieldcaption = "NULL" (misnomer. it's the field name); #106; #106 (griessbach14943) * 26/08/2024 DHennig v1.21.04 Added support for BodyDevInfo = 2 in CFG file to prevent both DevInfo and ObjRev from being written to PJ2 file +* 18/06/2026 LScheffler v1.21.05 Bug Fix: Brute force fixed Datatype error for tcDontShowProgress, #114 (omirian) +* 18/06/2026 LScheffler v1.21.05 Bug Fix: Fixed missing link SCM documentation, #116 (ToniKoehler) +* 18/06/2026 LScheffler v1.21.05 Bug Fix: Fixed a problem that cDontShowProgress parameter will be ignored if ShowProgressbar property is used. #118 (LScheffler) +* 18/06/2026 LScheffler v1.21.05 Docu: Added documentation of properties of settings object +* 18/06/2026 LScheffler v1.21.05 Docu: Better documentation if a settings us ignored when a parameter is set. Voth in in docu and setting files generated via -Cc options. +* 18/06/2026 LScheffler v1.21.05 Docu: Some settings will not follow inheritence, documented in docu and setting files generated via -Cc options. +* 18/06/2026 LScheffler v1.21.05 Docu: Minor changes * * *--------------------------------------------------------------------------------------------------- @@ -508,6 +515,9 @@ * 19/09/2023 LScheffler Bug REPORT v1.21.00 Splitted database file is not regenerated. Problem with removed Spanish comment. * 03/01/2024 LScheffler Bug REPORT v1.21.01 Problems regenerating single classes and forms from text files in class-per-file form; #105 * 25/03/2024 griessbach14943 Bug REPORT v1.21.02 Text To Bin with Fieldcaption = "NULL" (misnomer. it's the field name); #106 +* 25/02/2026 omirian Bug REPORT v1.21.05 Brute force fixed Datatype error for tcDontShowProgress, #114 +* 09/04/2026 ToniKoehler Bug REPORT v1.21.05 Fixed missing link SCM documentation, #116 +* 18/06/2026 LScheffler Bug REPORT v1.21.05 Fixed a problem that cDontShowProgress parameter will be ignored if ShowProgressbar property is used. #118 * * @@ -31731,7 +31741,7 @@ Define Class CL_LANG As Custom <<>> if used, the InhibitInheritance setting controls if other config files will be evaluated (default) <<>> 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 single DBF's Syntax: .dbf.cfg in tables folder) + <<>> 5., optional Special settings per single DBF's (Syntax: .dbf.cfg in tables folder) <<>> <<>> Some Parameter calling FOXBIN2PRG.EXE overturn this settings (except Defaults) <<>>**************************************************************************************************************** @@ -32090,7 +32100,7 @@ Define Class CL_LANG As Custom <<>> if used, the InhibitInheritance setting controls if other config files will be evaluated (default) <<>> 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 single DBF's Syntax: .dbf.cfg in tables folder) + <<>> 5., optional Special settings per single DBF's (Syntax: .dbf.cfg in tables folder) <<>> <<>> Some Parameter calling FOXBIN2PRG.EXE overturn this settings (except Defaults) <<>>**************************************************************************************************************** @@ -32834,7 +32844,7 @@ Define Class CL_LANG As Custom <<>> if used, the InhibitInheritance setting controls if other config files will be evaluated (default). See below. <<>> 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 single DBF's Syntax: .dbf.cfg in tables folder) + <<>> 5., optional Special settings per single DBF's (Syntax: .dbf.cfg in tables folder) <<>> <<>> Some Parameter calling FOXBIN2PRG.EXE overturn this settings (except Defaults) <<>>****************************************************************************************************************