diff --git a/FileName_Caps/Filename_caps.pj2 b/FileName_Caps/Filename_caps.pj2
index 083628f..2f69969 100644
--- a/FileName_Caps/Filename_caps.pj2
+++ b/FileName_Caps/Filename_caps.pj2
@@ -21,8 +21,8 @@ _Country = ""
_Comments = "Capitalization for files"
_CompanyName = "Fernando D. Bozzo"
_FileDescription = "Capitalization for files"
-_LegalCopyright = "Creative Commons 4: Reconocimiento - CompartirIgual (by-sa): http://creativecommons.org/licenses/by/4.0/"
-_LegalTrademark = "Creative Commons 4: Reconocimiento - CompartirIgual (by-sa): http://creativecommons.org/licenses/by/4.0/"
+_LegalCopyright = "MIT License"
+_LegalTrademark = "MIT License"
_ProductName = "FILENAME_CAPS"
_MajorVer = "2"
_MinorVer = "4"
@@ -33,7 +33,7 @@ _AutoIncrement = "0"
*
-*<.HomeDir = 'c:\desa\foxbin2prg\filename_caps' />
+*<.HomeDir = 'g:\desa\foxbin2prg\filename_caps' />
FOR EACH loProject IN _VFP.Projects FOXOBJECT
loProject.Close()
@@ -50,8 +50,8 @@ MODIFY PROJECT 'Filename_caps.pjx' NOWAIT NOSHOW NOPROJECTHOOK
loProject = _VFP.Projects('Filename_caps.pjx')
WITH loProject.FILES
- .ADD('config\config.fpw') && *< FileMetadata: Type="T" Cpid="1252" Timestamp="0" ID="0" ObjRev="0" />
- .ADD('filename_caps.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="544" />
+ .ADD('config\config.fpw') && *< FileMetadata: Type="T" Cpid="1252" Timestamp="0" ID="0" ObjRev="0" User="" DevInfo="" />
+ .ADD('filename_caps.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="544" User="" DevInfo="" />
*
.ITEM('__newproject.f2b').Remove()
@@ -75,6 +75,7 @@ WITH loProject
*<.CmntStyle = 1 />
*<.NoLogo = .F. />
*<.SaveCode = .T. />
+ *<.User = '' />
.ProjectHookLibrary = ''
.ProjectHookClass = ''
*
diff --git a/FileName_Caps/Filename_caps.pjt b/FileName_Caps/Filename_caps.pjt
index 59df1e2..6a338a7 100644
Binary files a/FileName_Caps/Filename_caps.pjt and b/FileName_Caps/Filename_caps.pjt differ
diff --git a/FileName_Caps/Filename_caps.pjx b/FileName_Caps/Filename_caps.pjx
index b47c25d..20fc762 100644
Binary files a/FileName_Caps/Filename_caps.pjx and b/FileName_Caps/Filename_caps.pjx differ
diff --git a/FoxBin2PRGVersionFile.txt b/FoxBin2PRGVersionFile.txt
index 216ace1..45b202c 100644
--- a/FoxBin2PRGVersionFile.txt
+++ b/FoxBin2PRGVersionFile.txt
@@ -2,8 +2,8 @@ Lparameters toUpdateInfo
Local lcNote
With toUpdateInfo
- .VersionNumber = 'v1.19.49'
- .VersionDate = Date(2017,04,26)
+ .VersionNumber = 'v1.19.49.4'
+ .VersionDate = Date(2017,12,04)
.SourceFileUrl = 'http://vfpxrepository.com/dl/thorupdate/Projects/FoxBin2Prg/FoxBin2Prg.Zip'
.Link = 'http://vfpx.codeplex.com/wikipage?title=FoxBin2PRG'
@@ -21,7 +21,13 @@ Demo video using FoxBin2Prg with PlasticSCM: http://youtu.be/sE4wQ50Itqg
Change History -------------------------------------------------------------
-2017/12/02 v1.19.49.2
+2017/12/04 v1.19.49.4
+- Bug Fix VCX: When using ClassPerFile in API Mode and importing single classes, sometimes their names get unquoted, throwing errors / Reported by Lutz Scheffler (https://github.com/fdbozzo/foxbin2prg/issues/11)
+
+2017/12/03 v1.19.49.3
+- Bug Fix: "Double" field types are explicitly defined with 0 decimals when no decimals are defined (Jerry Stager)
+
+2017/12/03 v1.19.49.2
- Bug Fix: ClassPerFile export didn't work correctly starting from v1.19.49 / Reported by Lutz Scheffler (https://github.com/fdbozzo/foxbin2prg/issues/9)
2017/06/25 v1.19.49.1
diff --git a/fb2p_diff.exe b/fb2p_diff.exe
index 7b0afff..3f88b82 100644
Binary files a/fb2p_diff.exe and b/fb2p_diff.exe differ
diff --git a/fb2p_diff.pj2 b/fb2p_diff.pj2
index 3ca89fc..a427afc 100644
--- a/fb2p_diff.pj2
+++ b/fb2p_diff.pj2
@@ -21,8 +21,8 @@ _Country = "Spain"
_Comments = "Comparador de binarios FoxPro 9 (scx,vcx,pjx,pjm,mnx,frx,lbx,dbf,dbc) para FoxBin2Prg"
_CompanyName = "Fernand D. Bozzo"
_FileDescription = "Comparador de binarios FoxPro 9 (scx,vcx,pjx,pjm,mnx,frx,lbx,dbf,dbc) para FoxBin2Prg"
-_LegalCopyright = "Creative Commons 4: Reconocimiento - CompartirIgual (by-sa): http://creativecommons.org/licenses/by/4.0/"
-_LegalTrademark = "Creative Commons 4: Reconocimiento - CompartirIgual (by-sa): http://creativecommons.org/licenses/by/4.0/"
+_LegalCopyright = "MIT License"
+_LegalTrademark = "MIT License"
_ProductName = "FB2P_DIFF"
_MajorVer = "1"
_MinorVer = "1"
@@ -33,7 +33,7 @@ _AutoIncrement = "0"
*
-*<.HomeDir = 'c:\desa\foxbin2prg' />
+*<.HomeDir = 'g:\desa\foxbin2prg' />
FOR EACH loProject IN _VFP.Projects FOXOBJECT
loProject.Close()
@@ -50,10 +50,10 @@ MODIFY PROJECT 'fb2p_diff.pjx' NOWAIT NOSHOW NOPROJECTHOOK
loProject = _VFP.Projects('fb2p_diff.pjx')
WITH loProject.FILES
- .ADD('config\config.fpw') && *< FileMetadata: Type="T" Cpid="1252" Timestamp="0" ID="0" ObjRev="0" />
- .ADD('fb2p_diff.ico') && *< FileMetadata: Type="x" Cpid="0" Timestamp="0" ID="0" ObjRev="0" />
- .ADD('fb2p_diff.scx') && *< FileMetadata: Type="K" Cpid="1252" Timestamp="0" ID="0" ObjRev="544" />
- .ADD('main_fb2p_diff.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="544" />
+ .ADD('config\config.fpw') && *< FileMetadata: Type="T" Cpid="1252" Timestamp="0" ID="0" ObjRev="0" User="" DevInfo="" />
+ .ADD('fb2p_diff.ico') && *< FileMetadata: Type="x" Cpid="0" Timestamp="0" ID="0" ObjRev="0" User="" DevInfo="" />
+ .ADD('fb2p_diff.scx') && *< FileMetadata: Type="K" Cpid="1252" Timestamp="0" ID="0" ObjRev="544" User="" DevInfo="" />
+ .ADD('main_fb2p_diff.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="544" User="" DevInfo="" />
*
.ITEM('__newproject.f2b').Remove()
@@ -78,6 +78,7 @@ WITH loProject
*<.CmntStyle = 1 />
*<.NoLogo = .F. />
*<.SaveCode = .T. />
+ *<.User = '' />
.ProjectHookLibrary = ''
.ProjectHookClass = ''
*
diff --git a/fb2p_diff.pjt b/fb2p_diff.pjt
index 6d13fe6..b8c9922 100644
Binary files a/fb2p_diff.pjt and b/fb2p_diff.pjt differ
diff --git a/fb2p_diff.pjx b/fb2p_diff.pjx
index 563464e..b2f1194 100644
Binary files a/fb2p_diff.pjx and b/fb2p_diff.pjx differ
diff --git a/foxbin2prg.exe b/foxbin2prg.exe
index 2f0834f..a4c606b 100644
Binary files a/foxbin2prg.exe and b/foxbin2prg.exe differ
diff --git a/foxbin2prg.pj2 b/foxbin2prg.pj2
index 7597683..2753869 100644
--- a/foxbin2prg.pj2
+++ b/foxbin2prg.pj2
@@ -21,8 +21,8 @@ _Country = "Spain"
_Comments = "Conversor bidireccional de binarios FoxPro 9 (scx,vcx,pjx,pjm,mnx,frx,lbx,dbf,dbc) a texto para sustituir al scctext :-)"
_CompanyName = "Fernando D. Bozzo"
_FileDescription = "Conversor bidireccional de binarios FoxPro 9 (scx,vcx,pjx,pjm,mnx,frx,lbx,dbf,dbc) a texto para sustituir al scctext :-)"
-_LegalCopyright = "Creative Commons 4: Reconocimiento - CompartirIgual (by-sa): http://creativecommons.org/licenses/by/4.0/"
-_LegalTrademark = "Creative Commons 4: Reconocimiento - CompartirIgual (by-sa): http://creativecommons.org/licenses/by/4.0/"
+_LegalCopyright = "MIT License"
+_LegalTrademark = "MIT License"
_ProductName = "FOXBIN2PRG"
_MajorVer = "1"
_MinorVer = "19"
diff --git a/foxbin2prg.pjt b/foxbin2prg.pjt
index c4b271f..fdf98c1 100644
Binary files a/foxbin2prg.pjt and b/foxbin2prg.pjt differ
diff --git a/foxbin2prg.pjx b/foxbin2prg.pjx
index be6b53f..0a1a3f4 100644
Binary files a/foxbin2prg.pjx and b/foxbin2prg.pjx differ
diff --git a/foxbin2prg.prg b/foxbin2prg.prg
index f20b1fb..b3681ef 100644
--- a/foxbin2prg.prg
+++ b/foxbin2prg.prg
@@ -199,8 +199,10 @@
* 11/04/2017 FDBOZZO v1.19.49 Bug Fix frx: Cuando dentro de una expresión se usa "&&", se corrompe el registro del FRX generado (Alejandro A Sosa)
* 11/04/2017 FDBOZZO v1.19.49 Mejora cfg : En modo objeto permitir indicar un objeto CFG en lugar de un archivo CFG (Lutz Scheffler)
* 12/04/2017 DH&FDBOZZO v1.19.49 Bug Fix & Report pjx: No se estaba guardando el campo User en los archivos PJX (Doug Hennig)
+* 25/06/2017 FDBOZZO v1.19.49.1 Bug Fix tx2 v1.19.49: El campo DEVINFO usado en los PJX se estaba usando en los demás binarios, dando errores
* 02/12/2017 FDBOZZO v1.19.49.2 Bug Fix tx2 v1.19.49: No exporta los objetos a TX2 cuando se usa ClassPerFile (Lutz Scheffler)
-* 31/08/2017 JS&FDBOZZO v1.19.50 Bug Fix db2: Los campos "Double" asumen 2 decimales cuando se definen con 0 decimales (Jerry Stager)
+* 03/12/2017 JS&FDBOZZO v1.19.49.3 Bug Fix db2: Los campos "Double" asumen 2 decimales cuando se definen con 0 decimales (Jerry Stager)
+* 04/12/2017 FDBOZZO v1.19.49.4 Cuando se usa ClassPerFile an Modo API y se importan clases simples, a veces sus nombres se toman sin comillas, provocando errores (Lutz Scheffler)
*
*
*---------------------------------------------------------------------------------------------------
@@ -314,8 +316,9 @@
* 30/03/2017 Alejandro A Sosa Reporte bug frx v1.19.48: Cuando dentro de una expresión se usa "&&", se corrompe el registro del FRX generado (Arreglado en v1.19.49)
* 28/03/2017 Lutz Scheffler Mejora cfg v1.19.48: En modo objeto permitir indicar un objeto CFG en lugar de un archivo CFG (Agragado en v1.19.49)
* 06/04/2017 Doug Hennig Reporte Bug y arreglo parcial PJX v1.19.48: No se estaba guardando el campo User en los archivos PJX (Agregado en v1.19.49)
-* 28/11/2017 Lutz Scheffler Reporte Bug tx2 v1.19.49: No exporta los objetos a TX2 cuando se usa ClassPerFile (Arreglado en v1.19.49.2)
-* 31/08/2017 Jerry Stager Reporte bug db2 v1.19.48: Los campos "Double" asumen 2 decimales cuando se definen con 0 decimales (Agregado en v1.19.50)
+* 28/11/2017 Lutz Scheffler Reporte Bug vx2 v1.19.49: No exporta los objetos a VX2 cuando se usa ClassPerFile (Arreglado en v1.19.49.2)
+* 31/08/2017 Jerry Stager Reporte bug db2 v1.19.48: Los campos "Double" asumen 2 decimales cuando se definen con 0 decimales (Agregado en v1.19.49.3)
+* 03/12/2017 Lutz Scheffler Reporte Bug vx2 v1.19.49: Cuando se usa ClassPerFile an Modo API y se importan clases simples, a veces sus nombres se toman sin comillas, provocando errores (Arreglado en v1.19.49.4)
*
*
*---------------------------------------------------------------------------------------------------
@@ -10253,7 +10256,7 @@ DEFINE CLASS c_conversor_prg_a_vcx AS c_conversor_prg_a_bin
* Reemplazo la propiedad Name
lnRow = ASCAN(loClase._Props, 'Name', 1, -1, 1, 2+4+8)
IF lnRow > 0
- loClase._Props(lnRow,2) = toFoxBin2Prg.c_ClassToConvert
+ loClase._Props(lnRow,2) = ["] + toFoxBin2Prg.c_ClassToConvert + ["]
ENDIF
* Y finalmente actualizo el memo
loClase._PROPERTIES = .classProps2Memo( @loClase, @toFoxBin2Prg )
@@ -10388,7 +10391,7 @@ DEFINE CLASS c_conversor_prg_a_vcx AS c_conversor_prg_a_bin
IF tlReplaceClass
I = 1
loClase = toModulo._Clases(I)
- LOCATE FOR PLATFORM == PADR('WINDOWS', FSIZE('PLATFORM')) AND OBJNAME == loClase._ObjName
+ LOCATE FOR PLATFORM == PADR('WINDOWS', FSIZE('PLATFORM')) AND LOWER(OBJNAME) == loClase._ObjName
llReplace = FOUND()
ENDIF
@@ -10424,6 +10427,9 @@ DEFINE CLASS c_conversor_prg_a_vcx AS c_conversor_prg_a_bin
, RESERVED8 WITH loClase._RESERVED8 ;
, USER WITH loClase._User
+ * Si tiene objetos asociados, antes debo eliminar los existentes para no duplicarlos
+ DELETE ALL FOR PLATFORM == PADR('WINDOWS', FSIZE('PLATFORM')) AND LOWER(PARENT) == loClase._ObjName
+
.insert_AllObjects( @loClase, @toFoxBin2Prg )
ELSE