diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index c29b7b9..9b59745 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -32,14 +32,16 @@ Stuff is a bit scattered, so this is where to look up. **Do not** alter the **1.19** part. This is written to the text files. Alteration might force that the files must be newly commited, what is not everybodies taste. 3. Add a meaningfull description of the change in the changes list on top of _FoxBin2Prg.prg_. + The most recent entries met in the middle of this section around * 4. Add a description to _FoxBin2Prg_Changes.md_ 4. If a change to the config files is made please add the description to the various properties (multi lang) - _C_FOXBIN2PRG_SYNTAX_INFO_EXAMPLE_LOC_cfg:_ for general settings - _C_FOXBIN2PRG_SYNTAX_INFO_EXAMPLE_LOC_tab_cfg:_ for settings per table - - Create a template _foxbin2prg.cfg.txt_ for general settings or _foxbin2prg.dbf.cfg.txt_ for the settings per table. +4. Create a template _foxbin2prg.cfg.txt_ for general settings or _foxbin2prg.dbf.cfg.txt_ for the settings per table. + - Do this even if no change to the setting to change the version number inside this files. + - Or change version number in those files manually 5. If a change to the parameters is made, change _C_FOXBIN2PRG_SYNTAX_INFO_EXAMPLE_LOC_ properties. 4. For changed functionality, add descriptive text on the appropriate _.md_ file. -4. Highlight the change on _README.md_ in projects root 2. Alter the version number for the EXE to the version used above. 0. Compile to EXE 1. Change Thor (see below) @@ -50,8 +52,11 @@ 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: - Update _Project.txt_, in special the version number -- Run the script included, or - - add files to _FoxBin2Prg.zip_, namly FoxBin2Prg.prg, FoxBin2Prg.exe and the config files templates +- and run the script included, or + - add files to _FoxBin2Prg.zip_, namely + - FoxBin2Prg.prg, + - FoxBin2Prg.exe, + - the config files templates - Update the version number in _FoxBin2PrgVersion.txt_ Thanks \ No newline at end of file diff --git a/README.md b/README.md index e09f01e..8c247d1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# FoxBin2Prg v1.19.57 +# FoxBin2Prg v1.19.66 **Binary/Text Converting program for Microsoft Visual FoxPro** ## Lutz Scheffler diff --git a/ThorUpdater/FoxBin2Prg.zip b/ThorUpdater/FoxBin2Prg.zip index fa0c204..4e32350 100644 Binary files a/ThorUpdater/FoxBin2Prg.zip and b/ThorUpdater/FoxBin2Prg.zip differ diff --git a/ThorUpdater/FoxBin2PrgVersion.txt b/ThorUpdater/FoxBin2PrgVersion.txt index 44f73ee..50c2acc 100644 --- a/ThorUpdater/FoxBin2PrgVersion.txt +++ b/ThorUpdater/FoxBin2PrgVersion.txt @@ -10,8 +10,8 @@ local; lcappName = "FoxBin2Prg" *Set following two numbers on version -ldDate = date(2021,05,20) -lcmajorVersion = "1.19.65" +ldDate = date(2021,08,30) +lcmajorVersion = "1.19.66" *lnJulian = val(sys(11, m.ldDate)) - val(sys(11, {^2000-01-01})) *lcJulian = padl(transform(lnJulian), 4, '0') @@ -39,6 +39,9 @@ Demo video using FoxBin2Prg with PlasticSCM: http://youtu.be/sE4wQ50Itqg +++++++++++++++++++++++ Change History +++++++++++++++++++++++ +2021-08-30 v1.19.66 +- Bug Fix: Incorrect version showing for v1.19.65 (siara-cc) + 2021-05-20 v1.19.65 - Bug Fix: Parameters -cCt not working from command line. (LScheffler) diff --git a/ThorUpdater/Project.txt b/ThorUpdater/Project.txt index 0772a84..9456150 100644 --- a/ThorUpdater/Project.txt +++ b/ThorUpdater/Project.txt @@ -1,5 +1,5 @@ appName = FoxBin2Prg appID = FoxBin2Prg -majorVersion = 1.19.61 +majorVersion = 1.19.66 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 4067b9f..7cfed53 100644 --- a/docs/FoxBin2Prg_Changes.md +++ b/docs/FoxBin2Prg_Changes.md @@ -15,9 +15,6 @@ As far as possible these are the original documents. Changes are added where fun - [Remark](#remark) - [Full Change History](#full-change-history) -## Remark -The older links point to Fernandos repository. - For recent verisons see ![Picture](./pictures/FoxBin2Prg_Full_Change_History_vfpxreleasesmall.png) [FoxBin2PRG](https://github.com/fdbozzo/foxbin2prg) @@ -30,6 +27,8 @@ _**Note:** you can click on the version number for downloading this version from | Rel.Date | Developer | Version | Details | | - | - | - | - | +| 2021/08/20 | LScheffler | [v1.19.66](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.19.66) | **Bug Fix**: Incorrect version showing for v1.19.65 (siara-cc) | +| 2021/08/20 | LScheffler | [v1.19.66](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.19.66) | **Enhancement**: Incorrect links on documentation (siara-cc) | | 2021/05/20 | LScheffler | [v1.19.65](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.19.65) | **Bug Fix**: Parameters -cCt not working from command line. (LScheffler) | | 2021/04/22 | LScheffler | [v1.19.64](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.19.64) | **Bug Fix**: onverting MN2 to MNX ignores the programmer-defined bar # found in "Prompt Options" screen. (Jimrnelson) | | | | | **Bug Fix**: Converting MN2 to MNX ignores the programmer-defined Pad Name found in "Prompt Options" screen. (LScheffler) | diff --git a/foxbin2prg.cfg.txt b/foxbin2prg.cfg.txt index 20a3775..75792ce 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.19.65 +*Version: v1.19.66 ***************************************************************************************************************** *-- Settings for internal work, not processing diff --git a/foxbin2prg.dbf.cfg.txt b/foxbin2prg.dbf.cfg.txt index ca28c2e..db658e1 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.19.65 +*Version: v1.19.66 ***************************************************************************************************************** *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/foxbin2prg.exe b/foxbin2prg.exe index d81d01d..e4cd96e 100644 Binary files a/foxbin2prg.exe and b/foxbin2prg.exe differ diff --git a/foxbin2prg.pjt b/foxbin2prg.pjt index 95fe590..5920949 100644 Binary files a/foxbin2prg.pjt and b/foxbin2prg.pjt differ diff --git a/foxbin2prg.pjx b/foxbin2prg.pjx index 7055b57..b9473f0 100644 Binary files a/foxbin2prg.pjx and b/foxbin2prg.pjx differ diff --git a/foxbin2prg.prg b/foxbin2prg.prg index bce4702..53635d1 100644 --- a/foxbin2prg.prg +++ b/foxbin2prg.prg @@ -274,10 +274,15 @@ * 22/04/2021 LScheffler v1.19.64 Bug Fix: Converting MN2 to MNX ignores the programmer-defined bar # found in "Prompt Options" screen (Jimrnelson) * 22/04/2021 LScheffler v1.19.64 Bug Fix: Converting MN2 to MNX ignores the programmer-defined Pad Name found in "Prompt Options" screen (LScheffler) * 20/05/2021 LScheffler v1.19.65 Bug Fix: Options "-cCt" are not usable on command line base EXE. "cCt" are allowed too now +* 30/08/2021 LScheffler v1.19.66 Bug Fix: Incorrect version showing for v1.19.65 (siara-cc) +* This creates wrong version in generated config files too * * *--------------------------------------------------------------------------------------------------- * +* 05/08/2021 siara-cc BUG REPORT v1.19.65 Incorrect version number shown. +* 05/08/2021 siara-cc BUG REPORT v1.19.65 Tags missing on github. +* 05/08/2021 siara-cc BUG REPORT v1.19.65 Incorrect links on documentation. * 17/05/2021 LScheffler BUG REPORT v1.19.64 Options "-cCt" are not usable on command line base EXE. * 22/04/2021 LScheffler BUG REPORT v1.19.63 Converting MN2 to MNX ignores the programmer-defined Pad Name found in "Prompt Options" screen * 21/04/2021 Jimrnelson BUG REPORT v1.19.63 Converting MN2 to MNX ignores the programmer-defined bar # found in "Prompt Options" screen @@ -942,7 +947,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.65' + c_FB2PRG_Version_Real = '1.19.66' *-- c_Language = '' && EN, FR, ES, DE c_Language_In = '(auto)' @@ -1119,7 +1124,19 @@ Define Class c_foxbin2prg As Session This.c_Foxbin2prg_ConfigFile = Evl( tcCFG_File, Forceext( This.c_Foxbin2prg_FullPath, 'CFG' ) ) This.c_BackgroundImage = This.get_AbsolutePath( Addbs(Justpath(This.c_Foxbin2prg_FullPath)) + 'foxbin2prg.jpg' ) lc_Foxbin2prg_EXE = Forceext( This.c_Foxbin2prg_FullPath, 'EXE' ) - This.c_FB2PRG_EXE_Version = 'v' + Iif( Agetfileversion( laValues, lc_Foxbin2prg_EXE ) = 0, Transform(This.c_FB2PRG_Version_Real), laValues(11) ) +*!* Changed by: SF 30.8.2021 +*!* +*!* Changed by: SF
+*!* https://github.com/fdbozzo/foxbin2prg/issues/69 / Incorrect version showing for v1.19.65 +*!* Set version number to This.c_FB2PRG_Version_Real and ignore Exe +*!* +*!* + +* This.c_FB2PRG_EXE_Version = 'v' + Iif( Agetfileversion( laValues, lc_Foxbin2prg_EXE ) = 0, Transform(This.c_FB2PRG_Version_Real), laValues(11) ) + This.c_FB2PRG_EXE_Version = 'v' + Transform(This.c_FB2PRG_Version_Real) + +*!* /Changed by SF 30.8.2021 + AddProperty(_Screen, 'c_FB2PRG_EXE_Version', This.c_FB2PRG_EXE_Version) AddProperty(_Screen, 'ExitCode', 0)