From 8f345d49f421acf8364707c9727cef6bdb4638b4 Mon Sep 17 00:00:00 2001 From: fdbozzo <> Date: Mon, 12 Mar 2018 20:05:06 +0100 Subject: [PATCH] When using the CFG configuration "extension: pj2=pjm" treat the pjm as pj2 and not as SourceSafe-compatible pjm (Darko Kezic) --- FoxBin2PRGVersionFile.txt | 7 +++++-- foxbin2prg.prg | 15 +++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/FoxBin2PRGVersionFile.txt b/FoxBin2PRGVersionFile.txt index ac796a3..f09cf69 100644 --- a/FoxBin2PRGVersionFile.txt +++ b/FoxBin2PRGVersionFile.txt @@ -2,8 +2,8 @@ Lparameters toUpdateInfo Local lcNote With toUpdateInfo - .VersionNumber = 'v1.19.50' - .VersionDate = Date(2018,03,06) + .VersionNumber = 'v1.19.50.1' + .VersionDate = Date(2018,03,12) .SourceFileUrl = 'http://vfpxrepository.com/dl/thorupdate/Projects/FoxBin2Prg/FoxBin2Prg.Zip' .Link = 'http://vfpx.codeplex.com/wikipage?title=FoxBin2PRG' @@ -21,6 +21,9 @@ Demo video using FoxBin2Prg with PlasticSCM: http://youtu.be/sE4wQ50Itqg Change History ------------------------------------------------------------- +2018-03-12 v1.19.50.1 +- When using the CFG configuration "extension: pj2=pjm" treat the pjm as pj2 and not as SourceSafe-compatible pjm (Darko Kezic) + 2018-03-06 v1.19.50 - Added a new CFG "BodyDevInfo" switch to control the DevInfo body data of PJX. It is disabled by default because DevInfo normally have compiled data that can be regenerated and causes many differences on source control tools - New PRG_Compat_Level CFG value to make generated SC2/VC2 code more PRG compatible diff --git a/foxbin2prg.prg b/foxbin2prg.prg index 4ff9e83..07a84a1 100644 --- a/foxbin2prg.prg +++ b/foxbin2prg.prg @@ -211,6 +211,7 @@ * 03/03/2018 FDBOZZO v1.19.50 Mejora: La información DevInfo de los PJX estará inhabilitada por defecto y se podrá activar con el nuevo switch BodyDevInfo * 03/03/2018 FDBOZZO v1.19.50 Mejora: Nueva opción de configuración "PRG_Compat_Level": 0=Legacy, 1=Usar HELPSTRING para comentarios de métodos de clase en vez de "&&" * 03/03/2018 FDBOZZO v1.19.50 Mejora: Permitir exportar a texto la información de DBFs cuya apertura está protegida por eventos del DBC +* 12/03/2018 FDBOZZO v1.19.50.1 Bug Fix: Cuando se usa la equivalencia "extension: pj2=pjm" se debe manejar el pjm como un pj2 y no como un pjm de SourceSafe (Darko Kezic) * * *--------------------------------------------------------------------------------------------------- @@ -332,6 +333,7 @@ * 04/01/2018 Doug Hennnig Reporte Bug vcx/scx v1.19.49: Cuando se regenera la propiedad _MemberData se agregan CR/LF por cada miembro, pudiendo provocar un error de "valor muy largo" (Arreglado en v1.19.49.6) * 11/01/2018 Francisco Prieto Reporte Bug v1.19.49: Cuando se convierte la estructura de un DBF puede dar error si existe un campo llamado I o X (Arreglado en v1.19.49.7) * 30/01/2018 Kirides Reporte Bug v1.19.49: Cuando se convierte a texto una libreria corrupta con registros duplicados, se genera el error "The specified key already exists" (Arreglado en v1.19.49.9) +* 12/03/2018 Darko Kezic Reporte Bug v1.19.50: Cuando se usa la equivalencia "extension: pj2=pjm" se debe manejar el pjm como un pj2 y no como un pjm de SourceSafe (Arreglado en v1.19.50.1) * * *--------------------------------------------------------------------------------------------------- @@ -3820,7 +3822,7 @@ DEFINE CLASS c_foxbin2prg AS Session .c_OriginalFileName = EVL( tcOriginalFileName, .c_InputFile ) - IF UPPER( JUSTEXT(.c_OriginalFileName) ) = 'PJM' + IF UPPER( JUSTEXT(.c_OriginalFileName) ) = 'PJM' AND .c_PJ2 <> 'PJM' .c_OriginalFileName = FORCEEXT(.c_OriginalFileName,'pjx') ENDIF @@ -3868,7 +3870,7 @@ DEFINE CLASS c_foxbin2prg AS Session loConversor = CREATEOBJECT( 'c_conversor_pjx_a_prg' ) .changeFileAttribute( FORCEEXT( .c_InputFile, .c_PJ2 ), lcForceAttribs ) - CASE lcExtension = 'PJM' + CASE lcExtension = 'PJM' AND .c_PJ2 <> 'PJM' IF NOT INLIST(.PJX_Conversion_Support, 1, 2) ERROR (TEXTMERGE(loLang.C_FILE_NAME_IS_NOT_SUPPORTED_LOC)) ENDIF @@ -4499,7 +4501,7 @@ DEFINE CLASS c_foxbin2prg AS Session .c_OriginalFileName = EVL( tcOriginalFileName, .c_InputFile ) - IF UPPER( JUSTEXT(.c_OriginalFileName) ) = 'PJM' + IF UPPER( JUSTEXT(.c_OriginalFileName) ) = 'PJM' AND .c_PJ2 <> 'PJM' .c_OriginalFileName = FORCEEXT(.c_OriginalFileName,'pjx') ENDIF @@ -4522,7 +4524,7 @@ DEFINE CLASS c_foxbin2prg AS Session CASE lcExtension = 'PJX' loConversor = CREATEOBJECT( 'c_conversor_pjx_a_prg' ) - CASE lcExtension = 'PJM' + CASE lcExtension = 'PJM' AND .c_PJ2 <> 'PJM' loConversor = CREATEOBJECT( 'c_conversor_pjm_a_prg' ) CASE lcExtension = 'FRX' @@ -16820,6 +16822,7 @@ DEFINE CLASS c_conversor_pjm_a_prg AS c_conversor_bin_a_prg Timestamp="<>" ID="<>" ObjRev="<>" + User="" <> ENDTEXT loReg = NULL @@ -16909,7 +16912,7 @@ DEFINE CLASS c_conversor_pjm_a_prg AS c_conversor_bin_a_prg <<>> *<.CmntStyle = <> /> <<>> *<.NoLogo = <> /> <<>> *<.SaveCode = <> /> - <<>> *<.User = <> /> + <<>> *<.User = '<>' /> <<>> .ProjectHookLibrary = '<>' <<>> .ProjectHookClass = '<>' <<>> <> @@ -17023,7 +17026,7 @@ DEFINE CLASS c_conversor_frx_a_prg AS c_conversor_bin_a_prg DODEFAULT( @toModulo, @toEx, @toFoxBin2Prg ) TRY - WITH THIS AS c_conversor_pjm_a_prg OF 'FOXBIN2PRG.PRG' + WITH THIS AS c_conversor_frx_a_prg OF 'FOXBIN2PRG.PRG' IF toFoxBin2Prg.l_ProcessFiles THEN LOCAL lnCodError, loRegCab, loRegDataEnv, loRegCur, loRegObj, lnMethodCount, laMethods(1), laCode(1), laProtected(1), lnLen ; , laPropsAndValues(1), laPropsAndComments(1), lnLastClass, lnRecno, lcMethods, lcObjName, la_NombresObjsOle(1) ;