From ddace85b81def4749e7ccddc7311176c6ee04b24 Mon Sep 17 00:00:00 2001 From: Yuanle Song Date: Mon, 18 Nov 2019 01:58:56 +0800 Subject: [PATCH] v0.5.2.0 add README and COPYING file in msi. minor, update "make clean". update README to add some dev notes. --- Makefile | 1 + README.md | 31 +++++++++++++++++++++++++++++++ mbackup.fsproj | 2 +- mbackup.wxs | 31 +++++++++++++++++++++---------- 4 files changed, 54 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 71ab2b6..23586e8 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,7 @@ build: dotnet build --nologo mbackupw clean: dotnet clean --nologo + dotnet clean --nologo mbackupw cmd /C 'del *.wixobj *.wixpdb *.msi rsync-mingw64-files.wxs' %.wixobj: %.wxs $(CANDLE) -dVersion=$(VERSION) $< diff --git a/README.md b/README.md index 7e8c467..b1d3cb4 100644 --- a/README.md +++ b/README.md @@ -112,6 +112,37 @@ is the window will auto close after mbackup finishes. You can check mbackup run log in %localappdata%\mbackup\mbackup.log +Developer Notes +---------------- + +dotnet core 3 SDK and GNU make is required to build this project. + +mbackup-for-windows includes the following components + + mbackup a dotnet core console project written in F#, it parses command line arguments, parse mbackup config files and runs rsync. + mbackup-tests unit tests for mbackup. in F#. + mbackupw a winforms project written in C#, it is a winforms application just used to call mbackup, but do not show cmd.exe window. This is used in Windows Task Scheduler. + mbackup.wxs wix xml configuration to create msi installer + Makefile used to build the project + mbackup-config/ default mbackup config files + +See ./operational file for design notes, dev instructions and some development +history. + +mbackup-for-windows version is set in mbackup.fsproj file. + +To build the project: + + make build + +To run tests: + + make test + +To create a msi release: + + make dist + License -------- diff --git a/mbackup.fsproj b/mbackup.fsproj index cb8b3a3..53781c6 100644 --- a/mbackup.fsproj +++ b/mbackup.fsproj @@ -23,7 +23,7 @@ win10-x64 Mbackup true - 0.5.1.0 + 0.5.2.0 diff --git a/mbackup.wxs b/mbackup.wxs index 14d5fbb..cb51c89 100644 --- a/mbackup.wxs +++ b/mbackup.wxs @@ -35,6 +35,15 @@ + + + + + + + + + @@ -131,16 +140,18 @@ ExeCommand=""[SystemFolder]SCHTASKS.EXE" /Delete /TN "mbackup-interval" /F" /> - - - - - - - - - - + + + + + + + + + + + + -- GitLab