BugFix: Added variable declaration (DH)
BugFix: Fixed incorrectly named variable (DH) BugFix: Added missing assignment (DH) Enhancement: Put double quotes around path in case in contains single quote (DH) BugFix: Added "+16" to Debug flags to maintain internal defaults to not generate timestamps on xx2 files
This commit is contained in:
@@ -16,6 +16,8 @@ Const ForReading = 1
|
|||||||
Dim WSHShell, FileSystemObject, cEndOfProcessMsg, cWithErrorsMsg, cConvCancelByUserMsg, nProcessedFilesCount
|
Dim WSHShell, FileSystemObject, cEndOfProcessMsg, cWithErrorsMsg, cConvCancelByUserMsg, nProcessedFilesCount
|
||||||
Dim oVFP9, nExitCode, cEXETool, cCMD, nDebug, lcExt, foxbin2prg_cfg, aFiles(), nFile_Count
|
Dim oVFP9, nExitCode, cEXETool, cCMD, nDebug, lcExt, foxbin2prg_cfg, aFiles(), nFile_Count
|
||||||
Dim i, x, str_cfg, aConf, cErrMsg, cFlagGenerateLog, cFlagDontShowErrMsg, cFlagJustShowCall, cFlagRecompile, cFlagNoTimestamps, cErrFile
|
Dim i, x, str_cfg, aConf, cErrMsg, cFlagGenerateLog, cFlagDontShowErrMsg, cFlagJustShowCall, cFlagRecompile, cFlagNoTimestamps, cErrFile
|
||||||
|
'' 2016.04.05 DH: added next line
|
||||||
|
dim fileToProcess
|
||||||
Set WSHShell = WScript.CreateObject("WScript.Shell")
|
Set WSHShell = WScript.CreateObject("WScript.Shell")
|
||||||
Set FileSystemObject = WScript.CreateObject("Scripting.FileSystemObject")
|
Set FileSystemObject = WScript.CreateObject("Scripting.FileSystemObject")
|
||||||
Set oVFP9 = CreateObject("VisualFoxPro.Application.9")
|
Set oVFP9 = CreateObject("VisualFoxPro.Application.9")
|
||||||
@@ -29,7 +31,7 @@ nExitCode = 0
|
|||||||
' 4=Don't show FoxBin2prg error modal messages
|
' 4=Don't show FoxBin2prg error modal messages
|
||||||
' 8=Show end of process message
|
' 8=Show end of process message
|
||||||
' 16=Empty timestamps
|
' 16=Empty timestamps
|
||||||
nDebug = 1+0+4+8
|
nDebug = 1+0+4+8+16
|
||||||
'---------------------------------------------------------------------------------------------------
|
'---------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
If WScript.Arguments.Count = 0 Then
|
If WScript.Arguments.Count = 0 Then
|
||||||
@@ -68,8 +70,11 @@ Else
|
|||||||
|
|
||||||
cFlagGenerateLog = "'0'"
|
cFlagGenerateLog = "'0'"
|
||||||
cFlagDontShowErrMsg = "'0'"
|
cFlagDontShowErrMsg = "'0'"
|
||||||
cFlagShowCall = "'0'"
|
'' 2016.04.05 DH: fixed incorrectly named variable
|
||||||
|
cFlagJustShowCall = "'0'"
|
||||||
cFlagRecompile = "'1'"
|
cFlagRecompile = "'1'"
|
||||||
|
'' 2016.04.05 DH: added missing assignment
|
||||||
|
cFlagNoTimestamps = "'0'"
|
||||||
|
|
||||||
If GetBit(nDebug, 1) Then
|
If GetBit(nDebug, 1) Then
|
||||||
cFlagGenerateLog = "'1'"
|
cFlagGenerateLog = "'1'"
|
||||||
@@ -87,13 +92,17 @@ Else
|
|||||||
oVFP9.DoCmd( "oFoxBin2prg.o_frm_avance.Caption = '" & FileSystemObject.GetBaseName( WScript.ScriptName ) & " - ' + oFoxBin2Prg.c_loc_process_progress + ' (Press Esc to Cancel)'" )
|
oVFP9.DoCmd( "oFoxBin2prg.o_frm_avance.Caption = '" & FileSystemObject.GetBaseName( WScript.ScriptName ) & " - ' + oFoxBin2Prg.c_loc_process_progress + ' (Press Esc to Cancel)'" )
|
||||||
|
|
||||||
For i = 1 To nFile_Count
|
For i = 1 To nFile_Count
|
||||||
oVFP9.DoCmd( "oFoxBin2Prg.updateProgressbar(oFoxBin2Prg.c_loc_processing_file + ' " & aFiles(i) & "...', " & i & ", " & nFile_Count & ", 0)" )
|
'' 2016.04.05 DH: put double quotes around path in case in contains single quote
|
||||||
cFlagRecompile = "'" & FileSystemObject.GetParentFolderName( aFiles(i) ) & "'"
|
fileToProcess = Chr(34) + aFiles(i) + Chr(34)
|
||||||
|
oVFP9.DoCmd( "oFoxBin2Prg.updateProgressbar(oFoxBin2Prg.c_loc_processing_file + " & fileToProcess & ", " & i & ", " & nFile_Count & ", 0)" )
|
||||||
|
cFlagRecompile = Chr(34) + FileSystemObject.GetParentFolderName( aFiles(i) ) + Chr(34)
|
||||||
|
'' 2016.04.05 DH: end of change
|
||||||
If nDebug = 0 Or nDebug = 2 Then
|
If nDebug = 0 Or nDebug = 2 Then
|
||||||
cCMD = "oFoxBin2prg.execute( '" & aFiles(i) & "' )"
|
'' 2016.04.05 DH: use new variable
|
||||||
|
cCMD = "oFoxBin2prg.execute(" & fileToProcess & ")"
|
||||||
Else
|
Else
|
||||||
cCMD = "oFoxBin2prg.execute( '" & aFiles(i) & "','BIN2PRG','0','0'," _
|
'' 2016.04.05 DH: use new variable
|
||||||
|
cCMD = "oFoxBin2prg.execute(" & fileToProcess & ",'BIN2PRG','0','0'," _
|
||||||
& cFlagDontShowErrMsg & "," & cFlagGenerateLog & ",'1','','',.F.,''," _
|
& cFlagDontShowErrMsg & "," & cFlagGenerateLog & ",'1','','',.F.,''," _
|
||||||
& cFlagRecompile & "," & cFlagNoTimestamps & " )"
|
& cFlagRecompile & "," & cFlagNoTimestamps & " )"
|
||||||
End If
|
End If
|
||||||
|
|||||||
@@ -16,6 +16,8 @@ Const ForReading = 1
|
|||||||
Dim WSHShell, FileSystemObject, cEndOfProcessMsg, cWithErrorsMsg, cConvCancelByUserMsg, nProcessedFilesCount
|
Dim WSHShell, FileSystemObject, cEndOfProcessMsg, cWithErrorsMsg, cConvCancelByUserMsg, nProcessedFilesCount
|
||||||
Dim oVFP9, nExitCode, cEXETool, cCMD, nDebug, lcExt, foxbin2prg_cfg, aFiles(), nFile_Count
|
Dim oVFP9, nExitCode, cEXETool, cCMD, nDebug, lcExt, foxbin2prg_cfg, aFiles(), nFile_Count
|
||||||
Dim i, x, str_cfg, aConf, cErrMsg, cFlagGenerateLog, cFlagDontShowErrMsg, cFlagJustShowCall, cFlagRecompile, cFlagNoTimestamps, cErrFile
|
Dim i, x, str_cfg, aConf, cErrMsg, cFlagGenerateLog, cFlagDontShowErrMsg, cFlagJustShowCall, cFlagRecompile, cFlagNoTimestamps, cErrFile
|
||||||
|
'' 2016.04.05 DH: added next line
|
||||||
|
dim fileToProcess
|
||||||
Set WSHShell = WScript.CreateObject("WScript.Shell")
|
Set WSHShell = WScript.CreateObject("WScript.Shell")
|
||||||
Set FileSystemObject = WScript.CreateObject("Scripting.FileSystemObject")
|
Set FileSystemObject = WScript.CreateObject("Scripting.FileSystemObject")
|
||||||
Set oVFP9 = CreateObject("VisualFoxPro.Application.9")
|
Set oVFP9 = CreateObject("VisualFoxPro.Application.9")
|
||||||
@@ -29,7 +31,7 @@ nExitCode = 0
|
|||||||
' 4=Don't show FoxBin2prg error modal messages
|
' 4=Don't show FoxBin2prg error modal messages
|
||||||
' 8=Show end of process message
|
' 8=Show end of process message
|
||||||
' 16=Empty timestamps
|
' 16=Empty timestamps
|
||||||
nDebug = 1+0+4+8
|
nDebug = 1+0+4+8+16
|
||||||
'---------------------------------------------------------------------------------------------------
|
'---------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
If WScript.Arguments.Count = 0 Then
|
If WScript.Arguments.Count = 0 Then
|
||||||
@@ -75,7 +77,10 @@ Else
|
|||||||
|
|
||||||
cFlagGenerateLog = "'0'"
|
cFlagGenerateLog = "'0'"
|
||||||
cFlagDontShowErrMsg = "'0'"
|
cFlagDontShowErrMsg = "'0'"
|
||||||
cFlagShowCall = "'0'"
|
'' 2016.04.05 DH: fixed incorrectly named variable
|
||||||
|
cFlagJustShowCall = "'0'"
|
||||||
|
'' 2016.04.05 DH: added missing assignment
|
||||||
|
cFlagNoTimestamps = "'0'"
|
||||||
|
|
||||||
If GetBit(nDebug, 1) Then
|
If GetBit(nDebug, 1) Then
|
||||||
cFlagGenerateLog = "'1'"
|
cFlagGenerateLog = "'1'"
|
||||||
@@ -93,13 +98,18 @@ Else
|
|||||||
oVFP9.DoCmd( "oFoxBin2prg.o_frm_avance.Caption = '" & FileSystemObject.GetBaseName( WScript.ScriptName ) & " - ' + oFoxBin2Prg.c_loc_process_progress + ' (Press Esc to Cancel)'" )
|
oVFP9.DoCmd( "oFoxBin2prg.o_frm_avance.Caption = '" & FileSystemObject.GetBaseName( WScript.ScriptName ) & " - ' + oFoxBin2Prg.c_loc_process_progress + ' (Press Esc to Cancel)'" )
|
||||||
|
|
||||||
For i = 1 To nFile_Count
|
For i = 1 To nFile_Count
|
||||||
oVFP9.DoCmd( "oFoxBin2Prg.updateProgressbar(oFoxBin2Prg.c_loc_processing_file + ' " & aFiles(i) & "...', " & i & ", " & nFile_Count & ", 0)" )
|
'' 2016.04.05 DH: put double quotes around path in case in contains single quote
|
||||||
cFlagRecompile = "'" & FileSystemObject.GetParentFolderName( aFiles(i) ) & "'"
|
fileToProcess = Chr(34) + aFiles(i) + Chr(34)
|
||||||
|
oVFP9.DoCmd( "oFoxBin2Prg.updateProgressbar(oFoxBin2Prg.c_loc_processing_file + " & fileToProcess & ", " & i & ", " & nFile_Count & ", 0)" )
|
||||||
|
cFlagRecompile = Chr(34) + FileSystemObject.GetParentFolderName( aFiles(i) ) + Chr(34)
|
||||||
|
'' 2016.04.05 DH: end of change
|
||||||
|
|
||||||
If nDebug = 0 Or nDebug = 2 Then
|
If nDebug = 0 Or nDebug = 2 Then
|
||||||
cCMD = "oFoxBin2prg.execute( '" & aFiles(i) & "' )"
|
'' 2016.04.05 DH: use new variable
|
||||||
|
cCMD = "oFoxBin2prg.execute(" & fileToProcess & ")"
|
||||||
Else
|
Else
|
||||||
cCMD = "oFoxBin2prg.execute( '" & aFiles(i) & "','PRG2BIN','0','0'," _
|
'' 2016.04.05 DH: use new variable
|
||||||
|
cCMD = "oFoxBin2prg.execute(" & fileToProcess & ",'PRG2BIN','0','0'," _
|
||||||
& cFlagDontShowErrMsg & "," & cFlagGenerateLog & ",'1','','',.F.,''," _
|
& cFlagDontShowErrMsg & "," & cFlagGenerateLog & ",'1','','',.F.,''," _
|
||||||
& cFlagRecompile & "," & cFlagNoTimestamps & " )"
|
& cFlagRecompile & "," & cFlagNoTimestamps & " )"
|
||||||
End If
|
End If
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ Lparameters toUpdateInfo
|
|||||||
Local lcNote
|
Local lcNote
|
||||||
With toUpdateInfo
|
With toUpdateInfo
|
||||||
.VersionNumber = 'v1.19.47'
|
.VersionNumber = 'v1.19.47'
|
||||||
.VersionDate = Date(2016,02,10)
|
.VersionDate = Date(2016,05,24)
|
||||||
.SourceFileUrl = 'http://vfpxrepository.com/dl/thorupdate/Projects/FoxBin2Prg/FoxBin2Prg.Zip'
|
.SourceFileUrl = 'http://vfpxrepository.com/dl/thorupdate/Projects/FoxBin2Prg/FoxBin2Prg.Zip'
|
||||||
|
|
||||||
.Link = 'http://vfpx.codeplex.com/wikipage?title=FoxBin2PRG'
|
.Link = 'http://vfpx.codeplex.com/wikipage?title=FoxBin2PRG'
|
||||||
@@ -17,8 +17,13 @@ Demo video using FoxBin2Prg with PlasticSCM: http://youtu.be/sE4wQ50Itqg
|
|||||||
|
|
||||||
Change History -------------------------------------------------------------
|
Change History -------------------------------------------------------------
|
||||||
|
|
||||||
2016/02/10 v1.19.47
|
2016/05/24 v1.19.47
|
||||||
- Bug Fix: When a filename "*" is specified with a type "*", an automatic regeneration of all binary files is made from text files (Alejandro Sosa)
|
- Bug Fix: When a filename "*" is specified with a type "*", an automatic regeneration of all binary files is made from text files (Alejandro Sosa)
|
||||||
|
- BugFix: Added variable declaration (Doug Hennig)
|
||||||
|
- BugFix: Fixed incorrectly named variable (Doug Hennig)
|
||||||
|
- BugFix: Added missing assignment (Doug Hennig)
|
||||||
|
- Enhancement: Put double quotes around path in case in contains single quote (Doug Hennig)
|
||||||
|
- BugFix: Added "+16" to Debug flags to maintain internal defaults
|
||||||
|
|
||||||
2016/02/06 v1.19.46
|
2016/02/06 v1.19.46
|
||||||
- Bug Fix: set_UserValue() method causes error when trying to get information about another error and the VFP binary table can not be opened (ie, because corrupted memo)
|
- Bug Fix: set_UserValue() method causes error when trying to get information about another error and the VFP binary table can not be opened (ie, because corrupted memo)
|
||||||
|
|||||||
Reference in New Issue
Block a user