From 2ee6e6e9b2f0a67030387bf3aea2a309cc25e919 Mon Sep 17 00:00:00 2001 From: fernando Date: Sat, 1 Feb 2014 00:43:36 +0100 Subject: [PATCH] Changeset: 151 - Arreglo en compatibilidad con SourceSafe --- foxbin2prg.pj2 | 4 ++-- foxbin2prg.pjt | Bin 340608 -> 340608 bytes foxbin2prg.pjx | Bin 1583 -> 1583 bytes foxbin2prg.prg | 28 ++++++++++++++-------------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/foxbin2prg.pj2 b/foxbin2prg.pj2 index e481cdf..942d439 100644 --- a/foxbin2prg.pj2 +++ b/foxbin2prg.pj2 @@ -26,7 +26,7 @@ _LegalTrademark = "Open Source" _ProductName = " FOXBIN2PRG" _MajorVer = "1" _MinorVer = "19" -_Revision = " 219" +_Revision = " 220" _LanguageID = "1034" _AutoIncrement = "1" * @@ -51,7 +51,7 @@ loProject = _VFP.Projects('foxbin2prg.pjx') WITH loProject.FILES .ADD('config\config.fpw') && *< FileMetadata: Type="T" Cpid="1252" Timestamp="1132857145" ID="1131721714" ObjRev="0" /> - .ADD('foxbin2prg.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="1144982028" ID="1130644423" ObjRev="544" /> + .ADD('foxbin2prg.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="1144997514" ID="1130644423" ObjRev="544" /> * .ITEM('__newproject.f2b').Remove() diff --git a/foxbin2prg.pjt b/foxbin2prg.pjt index 674117c8b368c13591a07401ef448a0f9d9d2ac7..56a4f9bce016659dc4dd1ab78c15e2da2bb3730e 100644 GIT binary patch delta 5793 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 diff --git a/foxbin2prg.pjx b/foxbin2prg.pjx index 9ab4f1216734781b06d3ac8481888514df65ad82..5a3a0e708660c0ba22a3c8100e015709b548dadb 100644 GIT binary patch delta 27 gcmZ3_vz}+eUKUnMb5lc$$%k0}gIOk%kFjO~0D@f!DF6Tf delta 27 gcmZ3_vz}+eUKUmhBLgGL$%k0}gIN}nkFjO~0D*uB8UO$Q diff --git a/foxbin2prg.prg b/foxbin2prg.prg index bd011c6..10fc4d1 100644 --- a/foxbin2prg.prg +++ b/foxbin2prg.prg @@ -816,6 +816,20 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM ELSE + IF EVL(tcType,'0') <> '0' AND EVL(tcTextName,'0') <> '0' + *-- Compatibilidad con SourceSafe + + IF NOT tlGenText + *-- COMPATIBILIDAD CON SOURCESAFE. 30/01/2014 + *-- Create BINARIO desde versión TEXTO + *-- Como el archivo de entrada siempre es el binario cuando se usa SCCAPI, + *-- para se debe regenerar el binario (tlGenText=.F.) se debe usar como + *-- archivo de entrada tcTextName en su lugar. Aquí los intercambio. + tc_InputFile = tcTextName + THIS.l_Recompile = .T. + ENDIF + ENDIF + IF FILE(tc_InputFile) ERASE ( tc_InputFile + '.ERR' ) @@ -827,20 +841,6 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM THIS.c_LogFile = tc_InputFile + '.LOG' - IF EVL(tcType,'0') <> '0' AND EVL(tcTextName,'0') <> '0' - *-- Compatibilidad con SourceSafe - - IF NOT tlGenText - *-- COMPATIBILIDAD CON SOURCESAFE. 30/01/2014 - *-- Create BINARIO desde versión TEXTO - *-- Como el archivo de entrada siempre es el binario cuando se usa SCCAPI, - *-- para se debe regenerar el binario (tlGenText=.F.) se debe usar como - *-- archivo de entrada tcTextName en su lugar. Aquí los intercambio. - tc_InputFile = tcTextName - THIS.l_Recompile = .T. - ENDIF - ENDIF - IF THIS.l_Debug IF FILE( THIS.c_LogFile ) ERASE ( THIS.c_LogFile )