romfast/foxbin2prg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Problem with version number in EXE

Browse Source 
fixed https://github.com/fdbozzo/foxbin2prg/issues/69
This commit is contained in:
Lutz
2021-08-30 09:24:02 +02:00
parent dbb225586d
commit 351b0576e8
23 changed files with 64 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
.github/CONTRIBUTING.md vendored
View File

@@ -25,21 +25,23 @@ Start reading our code and you'll get the hang of it. We optimize for readabilit
Please note, there are some tasks to set up a new version.
Stuff is a bit scattered, so this is where to look up.
1. Please create a fork at github
0. In _FoxBin2prg.prg_ there are two version numbers in properties:
0. In _FoxBin2Prg.prg_ there are two version numbers in properties:
`n_FB2PRG_Version = 1.19`
`c_FB2PRG_Version_Real = '1.19.60'`
1. Please set the **minor** part of _c_FB2PRG_Version_Real_ to a new number.
**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_.
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 * </HISTORIAL DE CAMBIOS Y NOTAS IMPORTANTES>
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

4
Documentacion/github/FoxBin2prg.md → Documentacion/github/FoxBin2Prg.prg
View File

@@ -58,8 +58,8 @@ for which a _Text_ version is generated with pj2, sc2, vc2, fr2, lb2, dc2, db2,
The extensions may be reconfigured to be compatible with SCCAPI (just tested with SourceSafe).
## Example
![FoxBin2prg_scctextx-vs-FoxBin2Prg_scx_EN.png](pictures/FoxBin2prg_scctextx-vs-FoxBin2Prg_scx_EN.png)
![FoxBin2prg_scctextx-vs-FoxBin2Prg_mnx_EN.png](pictures/FoxBin2prg_scctextx-vs-FoxBin2Prg_mnx_EN.png)
![FoxBin2Prg_scctextx-vs-FoxBin2Prg_scx_EN.png](pictures/FoxBin2prg_scctextx-vs-FoxBin2Prg_scx_EN.png)
![FoxBin2Prg_scctextx-vs-FoxBin2Prg_mnx_EN.png](pictures/FoxBin2prg_scctextx-vs-FoxBin2Prg_mnx_EN.png)
## Usage
FoxBin2Prg can be used in tree ways:

2
Documentacion/github/FoxBin2Prg_Changes.md
View File

@@ -340,7 +340,7 @@ _**Note:** you can click on the version number for downloading this version from
|||| Added support for converting SourceSafe PJM to FoxBin PJ2 |
|||| Added validation for Menus when converting from older versions, so user can convert it to VFP 9 format first |
|||| Change in MN2 property: "Autor" was changed to "Author". You can add the missing letter to MN2 or regenerate |
| 2014/01/07 | FDBOZZO | [v1.18.1](https://github.com/fdbozzo/foxbin2prg/tree/v1.18.1) | Added a vbs script (NormalizeFileNames.vbs) for FileNames normalizing in batch mode, and updated FileNameCaps.exe and the call on FoxBin2prg |
| 2014/01/07 | FDBOZZO | [v1.18.1](https://github.com/fdbozzo/foxbin2prg/tree/v1.18.1) | Added a vbs script (NormalizeFileNames.vbs) for FileNames normalizing in batch mode, and updated FileNameCaps.exe and the call on FoxBin2Prg |
| 2014/01/06 | FDBOZZO | [v1.18](https://github.com/fdbozzo/foxbin2prg/tree/v1.18-pública) | **bug fix**: mnx Generation of DO Procedure or Command when no Procedure or Command available to call when empty option is created (Fidel Charny) |
|||| Added support for DBFs earlier than VFP 9 for generating DB2 text, but DBF regeneration is in VFP 9 version! |
|||| dbf bug fix: DBFs linked to a DBC that use long field names throw error when regenerating DBFs |

2
Documentacion/github/FoxBin2Prg_Internals.md
View File

@@ -282,7 +282,7 @@ and some tables with their data exported for easy diffing with previous versions
or even use **"DBF_Conversion_Support: 8"** (available since v1.19.47) for bidirectional support of data import/export.
### Order and range of records
**FoxBin2prg.cfg (Main CFG, Directory CFG or Table CFG)**
**FoxBin2Prg.cfg (Main CFG, Directory CFG or Table CFG)**
New foxbin2prg.cfg options for filtering tables from conversion using one or multiple conbinations of filemasks.
#### Syntax

8
Documentacion/github/FoxBin2Prg_git.md
View File

@@ -86,7 +86,7 @@ With thanks to Fernando **FoxBin2Prg** comes into play.
One might be reluctant to dropping the binaries - but I do for years and it works like a charm.
Do not play around with text-to-look-up-changes ideas storing both _Text_ and _Binary_.
Just merge, compare like a normal text based language.
The only thing one must learn (and remember, even after odd merges) is to run FoxBin2prg wrapping any git operation.
The only thing one must learn (and remember, even after odd merges) is to run FoxBin2Prg wrapping any git operation.
git would even allow to hook FoxBin2Prg to run after some git operations, but this might be a killer.
@@ -176,7 +176,7 @@ An example for _Text_ only use.
#header
!*.h
#libs (by FoxBin2prg)
#libs (by FoxBin2Prg)
#!*.vc[xt]
#!*.pj[xt]
#!*.fr[xt]
@@ -184,7 +184,7 @@ An example for _Text_ only use.
#!*.sc[xt]
#!*.lb[xt]
#FoxBin2prg
#FoxBin2Prg
!*.vc2
!*.pj2
!*.fr2
@@ -201,7 +201,7 @@ An example for _Text_ only use.
#diverse
!*.reg
!/FoxBin2prg.cfg
!/FoxBin2Prg.cfg
!README.md
#exclude special again

2
Documentacion/github/pictures/readme.md
View File

@@ -6,7 +6,7 @@ Project to generate text representations of VFP binary sources for source contro
This folder containes the pictures for the reworked documentation resources for use with github repo.
- [FoxBin2prg](../FoxBin2prg.md)
- [FoxBin2Prg](../FoxBin2Prg.md)
----
Last changed: _2021/03/03_ ![Picture](./pictures/vfpxpoweredby_alternative.gif)

2
Documentacion/github/readme.md
View File

@@ -8,7 +8,7 @@ This folder containes the reworked documentation resources for use with github r
Please Note: The spanish documents are removed, because the documents here represent the state of this fork,
and my spanish is good enough to order a beer.
- [FoxBin2prg](./FoxBin2prg.md)
- [FoxBin2Prg](./FoxBin2Prg.md)
----
Last changed: _2021/03/03_ ![Picture](./pictures/vfpxpoweredby_alternative.gif)

8
README.md
View File

@@ -1,4 +1,4 @@
# FoxBin2Prg v1.19.57
# FoxBin2Prg v1.19.66
**Binary/Text Converting program for Microsoft Visual FoxPro**
## Lutz Scheffler
@@ -11,7 +11,7 @@ On my [fork](https://github.com/lscheffler/foxbin2prg).
updates may be faster there, because of the merge process.
The spanish documentation is not longer maintained - it would fade.
For fast acces a quick run is [introduced](#use-foxbin2prg), more [complex](./docs/FoxBin2prg_Run.md#usage-1), and a large [documentation](./docs/FoxBin2prg.md) exists too.
For fast acces a quick run is [introduced](#use-foxbin2prg), more [complex](./docs/FoxBin2Prg_Run.md#usage-1), and a large [documentation](./docs/FoxBin2Prg.md) exists too.
Remember yourself to compile the exe first.
---
@@ -120,7 +120,7 @@ To view a copy of this license, visit http://creativecommons.org/licenses/by/4.0
---
---
## Changes
See [Changes](./docs/FoxBin2prg_Changes.md)
See [Changes](./docs/FoxBin2Prg_Changes.md)
### Changes to Settings
To get the new settings in config file, use the new create-a-template function:
@@ -131,7 +131,7 @@ DO FOXBIN2PRG.PRG WITH "-C","template.cfg" ==> Generates a template for Fox
DO FOXBIN2PRG.PRG WITH "-t","template.dbf.cfg" ==> Generates a template for table.dbf.cfg per table config file with newest settings
```
For usage see [documentation](./docs/FoxBin2prg.md)
For usage see [documentation](./docs/FoxBin2Prg.md)
----
## Usage

BIN
ThorUpdater/FoxBin2Prg.zip
View File

Binary file not shown.

7
ThorUpdater/FoxBin2PrgVersion.txt
View File

@@ -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)

2
ThorUpdater/Project.txt
View File

@@ -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*

4
docs/FoxBin2prg.md → docs/FoxBin2Prg.prg
View File

@@ -58,8 +58,8 @@ for which a _Text_ version is generated with pj2, sc2, vc2, fr2, lb2, dc2, db2,
The extensions may be reconfigured to be compatible with SCCAPI (just tested with SourceSafe).
## Example
![FoxBin2prg_scctextx-vs-FoxBin2Prg_scx_EN.png](pictures/FoxBin2prg_scctextx-vs-FoxBin2Prg_scx_EN.png)
![FoxBin2prg_scctextx-vs-FoxBin2Prg_mnx_EN.png](pictures/FoxBin2prg_scctextx-vs-FoxBin2Prg_mnx_EN.png)
![FoxBin2Prg_scctextx-vs-FoxBin2Prg_scx_EN.png](pictures/FoxBin2prg_scctextx-vs-FoxBin2Prg_scx_EN.png)
![FoxBin2Prg_scctextx-vs-FoxBin2Prg_mnx_EN.png](pictures/FoxBin2prg_scctextx-vs-FoxBin2Prg_mnx_EN.png)
## Usage
FoxBin2Prg can be used in tree ways:

7
docs/FoxBin2Prg_Changes.md
View File

@@ -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) |
@@ -357,7 +356,7 @@ _**Note:** you can click on the version number for downloading this version from
|||| Added support for converting SourceSafe PJM to FoxBin PJ2 |
|||| Added validation for Menus when converting from older versions, so user can convert it to VFP 9 format first |
|||| Change in MN2 property: "Autor" was changed to "Author". You can add the missing letter to MN2 or regenerate |
| 2014/01/07 | FDBOZZO | [v1.18.1](https://github.com/fdbozzo/foxbin2prg/tree/v1.18.1) | Added a vbs script (NormalizeFileNames.vbs) for FileNames normalizing in batch mode, and updated FileNameCaps.exe and the call on FoxBin2prg |
| 2014/01/07 | FDBOZZO | [v1.18.1](https://github.com/fdbozzo/foxbin2prg/tree/v1.18.1) | Added a vbs script (NormalizeFileNames.vbs) for FileNames normalizing in batch mode, and updated FileNameCaps.exe and the call on FoxBin2Prg |
| 2014/01/06 | FDBOZZO | [v1.18](https://github.com/fdbozzo/foxbin2prg/tree/v1.18-pública) | **bug fix**: mnx Generation of DO Procedure or Command when no Procedure or Command available to call when empty option is created (Fidel Charny) |
|||| Added support for DBFs earlier than VFP 9 for generating DB2 text, but DBF regeneration is in VFP 9 version! |
|||| dbf bug fix: DBFs linked to a DBC that use long field names throw error when regenerating DBFs |

2
docs/FoxBin2Prg_Internals.md
View File

@@ -326,7 +326,7 @@ and some tables with their data exported for easy diffing with previous versions
or even use **"DBF_Conversion_Support: 8"** (available since v1.19.47) for bidirectional support of data import/export.
### Order and range of records
**FoxBin2prg.cfg (Main CFG, Directory CFG or Table CFG)**
**FoxBin2Prg.cfg (Main CFG, Directory CFG or Table CFG)**
New foxbin2prg.cfg options for filtering tables from conversion using one or multiple conbinations of filemasks.
#### Syntax

8
docs/FoxBin2Prg_git.md
View File

@@ -88,7 +88,7 @@ With thanks to Fernando **FoxBin2Prg** comes into play.
One might be reluctant to dropping the binaries - but I do for years and it works like a charm.
Do not play around with text-to-look-up-changes ideas storing both _Text_ and _Binary_.
Just merge, compare like a normal text based language.
The only thing one must learn (and remember, even after odd merges) is to run FoxBin2prg wrapping any git operation.
The only thing one must learn (and remember, even after odd merges) is to run FoxBin2Prg wrapping any git operation.
git would even allow to hook FoxBin2Prg to run after some git operations, but this might be a killer.
@@ -215,7 +215,7 @@ An example for _Text_ only use.
#header
!*.h
#libs (by FoxBin2prg)
#libs (by FoxBin2Prg)
#!*.vc[xt]
#!*.pj[xt]
#!*.fr[xt]
@@ -223,7 +223,7 @@ An example for _Text_ only use.
#!*.sc[xt]
#!*.lb[xt]
#FoxBin2prg
#FoxBin2Prg
!*.vc2
!*.pj2
!*.fr2
@@ -240,7 +240,7 @@ An example for _Text_ only use.
#diverse
!*.reg
!/FoxBin2prg.cfg
!/FoxBin2Prg.cfg
!README.md
#exclude special again

2
docs/pictures/readme.md
View File

@@ -6,7 +6,7 @@ Project to generate text representations of VFP binary sources for source contro
This folder containes the pictures for the reworked documentation resources for use with github repo.
- [FoxBin2prg](../FoxBin2prg.md)
- [FoxBin2Prg](../FoxBin2Prg.md)
----
Last changed: _2021/03/03_ ![Picture](./pictures/vfpxpoweredby_alternative.gif)

2
docs/readme.md
View File

@@ -8,7 +8,7 @@ This folder containes the reworked documentation resources for use with github r
Please Note: The spanish documents are removed, because the documents here represent the state of the development,
and my spanish is good enough to order a beer.
- [FoxBin2prg](./FoxBin2prg.md)
- [FoxBin2Prg](./FoxBin2Prg.md)
----
Last changed: _2021/05/18_ ![Picture](./pictures/vfpxpoweredby_alternative.gif)

2
foxbin2prg.cfg.txt
View File

@@ -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

2
foxbin2prg.dbf.cfg.txt
View File

@@ -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)

BIN
foxbin2prg.exe
View File

Binary file not shown.

BIN
foxbin2prg.pjt
View File

Binary file not shown.

BIN
foxbin2prg.pjx
View File

Binary file not shown.

21
foxbin2prg.prg
View File

@@ -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
* </HISTORIAL DE CAMBIOS Y NOTAS IMPORTANTES>
*
*---------------------------------------------------------------------------------------------------
* <TESTEO, REPORTE DE BUGS Y MEJORAS (AGRADECIMIENTOS)>
* 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
*!* <pdm>
*!* <change date="{^2021-08-30,07:48:00}">Changed by: SF<br />
*!* 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
*!* </change>
*!* </pdm>
* 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)