Skip to content

Commit

Permalink
- Adaptaciones para FoxBin2Prg v1.19.42
Browse files Browse the repository at this point in the history 
- Mejoras en manejo y visualización de errores
  • Loading branch information
fdbozzo committed Apr 5, 2015
1 parent 66c266d commit 3396110
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 20 deletions.
6 changes: 3 additions & 3 deletions PlasticSCM_VFP9_All_Files_Regenerate_Binary.vbs
View file
Expand Up @@ -43,7 +43,9 @@ If GetBit(nFlags, 4) Then
cConvCancelByUserMsg = oVFP9.Eval("_SCREEN.o_FoxBin2prg_Lang.C_CONVERSION_CANCELLED_BY_USER_LOC")
nProcessedFilesCount = oVFP9.Eval("oTarea.o_FoxBin2prg.n_ProcessedFilesCount")

If oVFP9.Eval("oTarea.o_FoxBin2prg.l_Error") Then
If oVFP9.Eval("oTarea.l_Error") Then
MsgBox cEndOfProcessMsg & "! (" & cWithErrorsMsg & ")" & Chr(13) & Chr(13) & oVFP9.Eval("oTarea.c_TextError"), 48+4096, WScript.ScriptName
ElseIf oVFP9.Eval("oTarea.o_FoxBin2prg.l_Error") Then
If nExitCode = 1799 Then
MsgBox cConvCancelByUserMsg & "!", 64+4096, WScript.ScriptName & " (" & oVFP9.Eval("oTarea.o_FoxBin2prg.c_FB2PRG_EXE_Version") & ")"
Else
Expand All @@ -52,8 +54,6 @@ If GetBit(nFlags, 4) Then
cErrFile = oVFP9.Eval("oTarea.o_FoxBin2prg.c_ErrorLogFile")
WSHShell.run cErrFile,3 'Show Error in Maximized Window
End If
ElseIf oVFP9.Eval("oTarea.l_Error") Then
MsgBox cEndOfProcessMsg & "! (" & cWithErrorsMsg & ")" & Chr(13) & Chr(13) & oVFP9.Eval("oTarea.c_TextError"), 48+4096, WScript.ScriptName
ElseIf oVFP9.Eval("oTarea.c_TextError") <> "" Then
MsgBox cEndOfProcessMsg & "!" & Chr(13) & Chr(13) & oVFP9.Eval("oTarea.c_TextError"), 64+4096, WScript.ScriptName
Else
Expand Down
6 changes: 3 additions & 3 deletions PlasticSCM_VFP9_All_Files_Regenerate_Text.vbs
View file
Expand Up @@ -43,7 +43,9 @@ If GetBit(nFlags, 4) Then
cConvCancelByUserMsg = oVFP9.Eval("_SCREEN.o_FoxBin2prg_Lang.C_CONVERSION_CANCELLED_BY_USER_LOC")
nProcessedFilesCount = oVFP9.Eval("oTarea.o_FoxBin2prg.n_ProcessedFilesCount")

If oVFP9.Eval("oTarea.o_FoxBin2prg.l_Error") Then
If oVFP9.Eval("oTarea.l_Error") Then
MsgBox cEndOfProcessMsg & "! (" & cWithErrorsMsg & ")" & Chr(13) & Chr(13) & oVFP9.Eval("oTarea.c_TextError"), 48+4096, WScript.ScriptName
ElseIf oVFP9.Eval("oTarea.o_FoxBin2prg.l_Error") Then
If nExitCode = 1799 Then
MsgBox cConvCancelByUserMsg & "!", 64+4096, WScript.ScriptName & " (" & oVFP9.Eval("oTarea.o_FoxBin2prg.c_FB2PRG_EXE_Version") & ")"
Else
Expand All @@ -52,8 +54,6 @@ If GetBit(nFlags, 4) Then
cErrFile = oVFP9.Eval("oTarea.o_FoxBin2prg.c_ErrorLogFile")
WSHShell.run cErrFile,3 'Show Error in Maximized Window
End If
ElseIf oVFP9.Eval("oTarea.l_Error") Then
MsgBox cEndOfProcessMsg & "! (" & cWithErrorsMsg & ")" & Chr(13) & Chr(13) & oVFP9.Eval("oTarea.c_TextError"), 48+4096, WScript.ScriptName
ElseIf oVFP9.Eval("oTarea.c_TextError") <> "" Then
MsgBox cEndOfProcessMsg & "!" & Chr(13) & Chr(13) & oVFP9.Eval("oTarea.c_TextError"), 64+4096, WScript.ScriptName
Else
Expand Down
13 changes: 6 additions & 7 deletions PlasticSCM_VFP9_FoxBin2Prg.vbs
View file
Expand Up @@ -108,17 +108,16 @@ Else
cConvCancelByUserMsg = oVFP9.Eval("_SCREEN.o_FoxBin2Prg_Lang.C_CONVERSION_CANCELLED_BY_USER_LOC")
nProcessedFilesCount = oVFP9.Eval("o_FoxBin2prg.n_ProcessedFilesCount")

If nExitCode = 1799 Then
MsgBox cConvCancelByUserMsg & "!", 64+4096, WScript.ScriptName & " (" & oVFP9.Eval("o_FoxBin2prg.c_FB2PRG_EXE_Version") & ")"
oVFP9.DoCmd("o_FoxBin2prg.writeErrorLog_Flush()")
cErrFile = oVFP9.Eval("o_FoxBin2prg.c_ErrorLogFile")
WSHShell.run cErrFile,3

ElseIf oVFP9.Eval("o_FoxBin2prg.l_Error") Then
If oVFP9.Eval("o_FoxBin2prg.l_Error") Then
MsgBox cEndOfProcessMsg & "! (" & cWithErrorsMsg & ")", 48+4096, WScript.ScriptName & " (" & oVFP9.Eval("o_FoxBin2prg.c_FB2PRG_EXE_Version") & ")"
oVFP9.DoCmd("o_FoxBin2prg.writeErrorLog_Flush()")
cErrFile = oVFP9.Eval("o_FoxBin2prg.c_ErrorLogFile")
WSHShell.run cErrFile,3 'Show Error in Maximized Window
ElseIf nExitCode = 1799 Then
MsgBox cConvCancelByUserMsg & "!", 64+4096, WScript.ScriptName & " (" & oVFP9.Eval("o_FoxBin2prg.c_FB2PRG_EXE_Version") & ")"
oVFP9.DoCmd("o_FoxBin2prg.writeErrorLog_Flush()")
cErrFile = oVFP9.Eval("o_FoxBin2prg.c_ErrorLogFile")
WSHShell.run cErrFile,3
Else
MsgBox cEndOfProcessMsg & "!", 64+4096, WScript.ScriptName & " (" & oVFP9.Eval("o_FoxBin2prg.c_FB2PRG_EXE_Version") & ")"
End If
Expand Down
6 changes: 3 additions & 3 deletions PlasticSCM_VFP9_Pending_Changes_Regenerate_Binary.vbs
View file
Expand Up @@ -43,7 +43,9 @@ If GetBit(nFlags, 4) Then
cConvCancelByUserMsg = oVFP9.Eval("_SCREEN.o_FoxBin2prg_Lang.C_CONVERSION_CANCELLED_BY_USER_LOC")
nProcessedFilesCount = oVFP9.Eval("oTarea.o_FoxBin2prg.n_ProcessedFilesCount")

If oVFP9.Eval("oTarea.o_FoxBin2prg.l_Error") Then
If oVFP9.Eval("oTarea.l_Error") Then
MsgBox cEndOfProcessMsg & "! (" & cWithErrorsMsg & ")" & Chr(13) & Chr(13) & oVFP9.Eval("oTarea.c_TextError"), 48+4096, WScript.ScriptName
ElseIf oVFP9.Eval("oTarea.o_FoxBin2prg.l_Error") Then
If nExitCode = 1799 Then
MsgBox cConvCancelByUserMsg & "!", 64+4096, WScript.ScriptName & " (" & oVFP9.Eval("oTarea.o_FoxBin2prg.c_FB2PRG_EXE_Version") & ")"
Else
Expand All @@ -52,8 +54,6 @@ If GetBit(nFlags, 4) Then
cErrFile = oVFP9.Eval("oTarea.o_FoxBin2prg.c_ErrorLogFile")
WSHShell.run cErrFile,3 'Show Error in Maximized Window
End If
ElseIf oVFP9.Eval("oTarea.l_Error") Then
MsgBox cEndOfProcessMsg & "! (" & cWithErrorsMsg & ")" & Chr(13) & Chr(13) & oVFP9.Eval("oTarea.c_TextError"), 48+4096, WScript.ScriptName
ElseIf oVFP9.Eval("oTarea.c_TextError") <> "" Then
MsgBox cEndOfProcessMsg & "!" & Chr(13) & Chr(13) & oVFP9.Eval("oTarea.c_TextError"), 64+4096, WScript.ScriptName
Else
Expand Down
6 changes: 3 additions & 3 deletions PlasticSCM_VFP9_Pending_Changes_Regenerate_Text.vbs
View file
Expand Up @@ -43,7 +43,9 @@ If GetBit(nFlags, 4) Then
cConvCancelByUserMsg = oVFP9.Eval("_SCREEN.o_FoxBin2prg_Lang.C_CONVERSION_CANCELLED_BY_USER_LOC")
nProcessedFilesCount = oVFP9.Eval("oTarea.o_FoxBin2prg.n_ProcessedFilesCount")

If oVFP9.Eval("oTarea.o_FoxBin2prg.l_Error") Then
If oVFP9.Eval("oTarea.l_Error") Then
MsgBox cEndOfProcessMsg & "! (" & cWithErrorsMsg & ")" & Chr(13) & Chr(13) & oVFP9.Eval("oTarea.c_TextError"), 48+4096, WScript.ScriptName
ElseIf oVFP9.Eval("oTarea.o_FoxBin2prg.l_Error") Then
If nExitCode = 1799 Then
MsgBox cConvCancelByUserMsg & "!", 64+4096, WScript.ScriptName & " (" & oVFP9.Eval("oTarea.o_FoxBin2prg.c_FB2PRG_EXE_Version") & ")"
Else
Expand All @@ -52,8 +54,6 @@ If GetBit(nFlags, 4) Then
cErrFile = oVFP9.Eval("oTarea.o_FoxBin2prg.c_ErrorLogFile")
WSHShell.run cErrFile,3 'Show Error in Maximized Window
End If
ElseIf oVFP9.Eval("oTarea.l_Error") Then
MsgBox cEndOfProcessMsg & "! (" & cWithErrorsMsg & ")" & Chr(13) & Chr(13) & oVFP9.Eval("oTarea.c_TextError"), 48+4096, WScript.ScriptName
ElseIf oVFP9.Eval("oTarea.c_TextError") <> "" Then
MsgBox cEndOfProcessMsg & "!" & Chr(13) & Chr(13) & oVFP9.Eval("oTarea.c_TextError"), 64+4096, WScript.ScriptName
Else
Expand Down
Binary file modified filename_caps.exe
View file
Binary file not shown.
Binary file modified foxbin2prg.exe
View file
Binary file not shown.
Binary file modified foxpro_plasticscm_bin2prg.exe
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions foxpro_plasticscm_bin2prg.prg
View file
Expand Up @@ -140,6 +140,9 @@ DEFINE CLASS CL_SCM_2_LIB AS CL_SCM_LIB OF 'FOXPRO_PLASTICSCM_DM.EXE'

CATCH TO toEx WHEN toEx.ErrorNo = 1799 && Conversion Cancelled

CATCH TO toEx WHEN NOT INLIST(toEx.ErrorNo, 1098, 2071) && Errores no controlados
THROW

CATCH TO toEx
THIS.l_Error = .T.
lcMenError = 'Error ' + TRANSFORM(toEx.ERRORNO) + ', ' + toEx.MESSAGE + CR_LF ;
Expand Down
Binary file modified foxpro_plasticscm_dm.exe
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion foxpro_plasticscm_dm.prg
View file
Expand Up @@ -324,7 +324,7 @@ DEFINE CLASS CL_SCM_LIB AS SESSION
*.o_FoxBin2Prg.EvaluarConfiguracion( '1', '1' )
.o_FoxBin2Prg.EvaluarConfiguracion( '1', '1', '', '', '', '', '', '', tcSourcePath )
.writeLog( 'Se evaluó la configuración para el archivo [' + TRANSFORM(tcSourcePath) + ']' )
.lDebug = .o_FoxBin2Prg.l_Debug && ( FILE( FORCEEXT( .cSys16, 'LOG' ) ) )
.lDebug = (.o_FoxBin2Prg.n_Debug > 0) && ( FILE( FORCEEXT( .cSys16, 'LOG' ) ) )
.writeLog( 'lDebug =' + TRANSFORM(.lDebug) )
lcScriptExeVersion = 'Unknown'
lcFoxBin2PrgExeVersion = 'Unknown'
Expand Down
Binary file modified foxpro_plasticscm_prg2bin.exe
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions foxpro_plasticscm_prg2bin.prg
View file
Expand Up @@ -138,6 +138,9 @@ DEFINE CLASS CL_SCM_2_LIB AS CL_SCM_LIB OF 'FOXPRO_PLASTICSCM_DM.EXE'

CATCH TO toEx WHEN toEx.ErrorNo = 1799 && Conversion Cancelled

CATCH TO toEx WHEN NOT INLIST(toEx.ErrorNo, 1098, 2071) && Errores no controlados
THROW

CATCH TO toEx
THIS.l_Error = .T.
lcMenError = 'CurDir: ' + SYS(5)+CURDIR() + CR_LF ;
Expand Down

0 comments on commit 3396110

Please sign in to comment.