Skip to content

Commit 39da556

Browse files
committed
updated copyright info
added distribution to deploy script fixed locale for datetime part of logging (en-us now)
1 parent 3472948 commit 39da556

File tree

7 files changed

+27
-6
lines changed

7 files changed

+27
-6
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,3 +348,6 @@ MigrationBackup/
348348

349349
# Ionide (cross platform F# VS Code tools) working folder
350350
.ionide/
351+
/Distribution
352+
/CmdLogAddinReleasePkg.zip
353+
/compare.WinMerge

Logger.vb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,9 @@ Public Class Logger
174174
"- Logger.LogInfo(msg) .. writes msg if debug level >= 4" & vbCrLf &
175175
"- Logger.LogWarn(msg) .. writes msg if debug level >= 2" & vbCrLf &
176176
"- Logger.LogError(msg) .. writes msg if debug level >= 1, additionally an error mail is sent to theMailRecipients" & vbCrLf &
177-
"- Logger.LogFatal(msg) .. writes msg if debug level >= 1, additionally to the error mail the host application is shut down",
177+
"- Logger.LogFatal(msg) .. writes msg if debug level >= 1, additionally to the error mail the host application is shut down" & vbCrLf & vbCrLf &
178+
"Author/Website: " & My.Application.Info.CompanyName.ToString & vbCrLf &
179+
"License: " & My.Application.Info.Copyright.ToString,
178180
MsgBoxStyle.Information + MsgBoxStyle.OkOnly, String.Format("CmdLogAddin Version {0} Buildtime {1}", My.Application.Info.Version.ToString, sModuleInfo))
179181
Exit Sub
180182
End If
@@ -223,7 +225,7 @@ setProperties_Err:
223225
FileMessage = ""
224226

225227
On Error GoTo LogWrite_Err
226-
1: Dim timestamp = Date.Now().ToString(timeStampFormat, System.Globalization.CultureInfo.InvariantCulture)
228+
1: Dim timestamp = Date.Now().ToString(timeStampFormat, System.Globalization.CultureInfo.CreateSpecificCulture("en-US"))
227229
Dim i As Integer
228230
2: For i = 0 To UBound(logentry)
229231
3: If LCase$(logentry(i)) = "timestamp" Then FileMessage = FileMessage & timestamp & vbTab

My Project/AssemblyInfo.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ Imports System.Runtime.InteropServices
1010

1111
<Assembly: AssemblyTitle("CmdLogAddin")>
1212
<Assembly: AssemblyDescription("")>
13-
<Assembly: AssemblyCompany("OEBFA")>
13+
<Assembly: AssemblyCompany("https://rkapl123.github.io/CmdLogAddin")>
1414
<Assembly: AssemblyProduct("CmdLogAddin")>
15-
<Assembly: AssemblyCopyright("Copyright © OEBFA 2019")>
15+
<Assembly: AssemblyCopyright("Copyright © 2020, MIT License")>
1616
<Assembly: AssemblyTrademark("")>
1717

1818
<Assembly: ComVisible(True)>

Test/TestExcelCmdArgFetching.xls

4 KB
Binary file not shown.

deployForTest.cmd

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set source=bin\Debug
33
If "%answr%"=="r" (
44
set source=bin\Release
55
)
6-
copy /Y Test\TestExcelAddin.xlam "%appdata%\Microsoft\Excel\XLSTART\"
6+
rem copy /Y Test\TestExcelAddin.xlam "%appdata%\Microsoft\Excel\XLSTART\"
77
if exist "C:\Program Files\Microsoft Office\root\" (
88
echo 64bit office
99
copy /Y %source%\CmdLogAddin-AddIn64-packed.xll "%appdata%\Microsoft\AddIns\CmdLogAddin.xll"
@@ -15,4 +15,16 @@ if exist "C:\Program Files\Microsoft Office\root\" (
1515
copy /Y %source%\CmdLogAddin.pdb "%appdata%\Microsoft\AddIns"
1616
rem copy /Y %source%\CmdLogAddin.dll.config "%appdata%\Microsoft\AddIns\CmdLogAddin.xll.config"
1717
)
18+
echo copying Distribution
19+
copy /Y %source%\CmdLogAddin-AddIn-packed.xll Distribution\CmdLogAddin32.xll
20+
copy /Y %source%\CmdLogAddin-AddIn64-packed.xll Distribution\CmdLogAddin64.xll
21+
copy /Y vbscriptLogger\testLog.vbs Distribution\
22+
copy /Y vbscriptLogger\Logger.vbs Distribution\
23+
copy /Y vbscriptLogger\mailsend.exe Distribution\
24+
copy /Y vbscriptLogger\mailsend-go.exe Distribution\
25+
copy /Y Test\TestExcelAddin.xlam Distribution\
26+
copy /Y Test\TestExcelCmdArgFetching.cmd Distribution\
27+
copy /Y Test\TestExcelCmdArgFetching.xls Distribution\
28+
copy /Y Test\TestExcelCmdArgFetchingExt.xls Distribution\
29+
"C:\Program Files\7-Zip\7z.exe" a -tzip CmdLogAddinReleasePkg.zip Distribution
1830
pause

docs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Default Subject, Sender, Intro and Greetings for error mails...
138138
`"defaultMailGreetings"="regards, your Errorlog..."`
139139

140140
Format for logentry timestamp (has to conform to [.NET Custom Date and Time Format Strings](https://docs.microsoft.com/en-us/dotnet/standard/base-types/custom-date-and-time-format-strings)) and is
141-
used with the [InvariantCulture Property](https://docs.microsoft.com/en-us/dotnet/api/system.globalization.cultureinfo.invariantculture)
141+
used with the "en-US" culture settings.
142142
`"timeStampFormat"="dd.MM.yyyy HH:mm:ss"`
143143

144144
Layout for logentries: first column logentry0, then logentry1, .. logentryN. The values (timestamp, loglevel, caller, logmessage) are fixed in the code but can be arranged differently, additional columns can be added as well.

vbscriptLogger/Logger.vbs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ Public Const LogWrn = 2
1010
Public Const LogInf = 4
1111
Public Const LogDbg = 8
1212

13+
' cscript based simple logger
14+
' Copyright © 2020, MIT License, Roland Kapl
15+
' https://rkapl123.github.io/CmdLogAddin
16+
1317
Public theLogger
1418
set theLogger = New Logger
1519

0 commit comments

Comments
 (0)