Skip to content

Commit 2d5d32b

Browse files
committed
Adjusted for Git.
1 parent 5d0d17b commit 2d5d32b

File tree

7 files changed

+72
-80
lines changed

7 files changed

+72
-80
lines changed

.gitignore

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
**/Bin
2+
**/bin
3+
**/Debug
4+
**/obj
5+
**/TestResults
6+
7+
Binaries/**
8+
Releases/**
9+
Backup/**
10+
Temporary/**
11+
12+
*.bak
13+
*.csproj.user
14+
*.csproj.vspscc
15+
*.ldb
16+
*.mcs
17+
*.msi
18+
*.pdb
19+
*.rar
20+
*.SCC
21+
*.suo
22+
*.testsettings
23+
*.tmp
24+
*.vbproj.user
25+
*.vbproj.vspscc
26+
*.vbw
27+
*.vshost.exe
28+
*.vsmdi
29+
*.vspscc
30+
*.vssscc
31+
*.zip

.hgignore

Lines changed: 0 additions & 34 deletions
This file was deleted.

Build.text renamed to BUILD.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
1-
Building Project
2-
----------------
1+
### Building Project ###
32

43
First step would be to get current version of code from BitBucket.
54

65
After that you can download and install required tools.
76

87

9-
Required Tools
10-
--------------
8+
#### Required Tools ####
119

1210
* [Visual Studio Express 2013 for Windows Desktop](http://www.visualstudio.com/downloads/download-visual-studio-vs#d-express-windows-desktop)
1311
* [Inno setup](http://www.jrsoftware.org/isinfo.php)
1412
* [Sign tool](http://msdn.microsoft.com/en-us/library/windows/desktop/aa387764.aspx)
1513

1614

17-
Script Modifications
18-
--------------------
15+
#### Script Modifications ####
1916

2017
In `Publish.cmd` check location of Visual Studio (`COMPILE_TOOL` variable) and
2118
location of Sign Tool (`SIGN_TOOL` variable).

ReadMe.text renamed to LICENSE.md

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,4 @@
1-
MagiWOL
2-
=======
3-
4-
If you need to wake your computer or possibly few of them over the LAN, this is
5-
the program.
6-
7-
8-
Shortcut Keys
9-
-------------
10-
11-
* `F4` Change destination
12-
* `F5` Refresh
13-
* `F6` Wake selected
14-
* `F10` Selects toolbar menu.
15-
* `Del` Remove destination
16-
* `Ins` Add destination
17-
* `Shift+F6` Wake all
18-
* `Ctrl+A` Select All
19-
* `Ctrl+C` Copy
20-
* `Ctrl+N` New file
21-
* `Ctrl+O` Open file
22-
* `Ctrl+S` Save file
23-
* `Ctrl+V` Paste
24-
* `Ctrl+W` Quick wake
25-
* `Ctrl+X` Cut
26-
27-
28-
Licence (MIT)
29-
-------------
1+
### The MIT License ###
302

313
Copyright (c) 2009 Josip Medved <[email protected]>
324

README.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
### MagiWOL ###
2+
3+
If you need to wake your computer or possibly few of them over the LAN, this is
4+
the program.
5+
6+
7+
#### Shortcut Keys ####
8+
9+
* `F4` Change destination
10+
* `F5` Refresh
11+
* `F6` Wake selected
12+
* `F10` Selects toolbar menu.
13+
* `Del` Remove destination
14+
* `Ins` Add destination
15+
* `Shift+F6` Wake all
16+
* `Ctrl+A` Select All
17+
* `Ctrl+C` Copy
18+
* `Ctrl+N` New file
19+
* `Ctrl+O` Open file
20+
* `Ctrl+S` Save file
21+
* `Ctrl+V` Paste
22+
* `Ctrl+W` Quick wake
23+
* `Ctrl+X` Cut

Setup/MagiWol.iss

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#define AppSetupFile AppBase + StringChange(AppVersion, '.', '')
88

99
#define AppVersionEx StringChange(AppVersion, '0.00', '')
10-
#if "" != HgNode
11-
# define AppVersionEx AppVersionEx + " (" + HgNode + ")"
10+
#if "" != VersionHash
11+
# define AppVersionEx AppVersionEx + " (" + VersionHash + ")"
1212
#endif
1313

1414

@@ -42,15 +42,17 @@ ChangesAssociations=yes
4242
DisableWelcomePage=yes
4343
LicenseFile=..\Setup\License.rtf
4444

45+
4546
[Messages]
46-
SetupAppTitle=Setup {#AppName} {#AppVersion}
47-
SetupWindowTitle=Setup {#AppName} {#AppVersion}
47+
SetupAppTitle=Setup {#AppName} {#AppVersionEx}
48+
SetupWindowTitle=Setup {#AppName} {#AppVersionEx}
4849
BeveledLabel=jmedved.com
4950

5051
[Files]
5152
Source: "MagiWol.exe"; DestDir: "{app}"; Flags: ignoreversion;
5253
Source: "wol.exe"; DestDir: "{app}"; Flags: ignoreversion;
5354
Source: "ReadMe.txt"; DestDir: "{app}"; Attribs: readonly; Flags: overwritereadonly uninsremovereadonly;
55+
Source: "License.txt"; DestDir: "{app}"; Attribs: readonly; Flags: overwritereadonly uninsremovereadonly;
5456
Source: "Resources/MagiWolDocument.ico"; DestDir: "{app}"; Attribs: readonly; Flags: overwritereadonly uninsremovereadonly;
5557

5658
[Icons]

Setup/Publish.cmd

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SETLOCAL enabledelayedexpansion
44
SET FILE_SETUP=".\MagiWol.iss"
55
SET FILE_SOLUTION="..\Source\MagiWol.sln"
66
SET FILES_EXECUTABLE="..\Binaries\MagiWol.exe" "..\Binaries\wol.exe"
7-
SET FILES_OTHER="..\Binaries\ReadMe.txt"
7+
SET FILES_OTHER="..\Binaries\ReadMe.txt" "..\Binaries\License.txt"
88

99
SET COMPILE_TOOL_1="%PROGRAMFILES(X86)%\Microsoft Visual Studio 12.0\Common7\IDE\devenv.exe"
1010
SET COMPILE_TOOL_2="%PROGRAMFILES(X86)%\Microsoft Visual Studio 12.0\Common7\IDE\WDExpress.exe"
@@ -14,8 +14,8 @@ SET SIGN_TOOL="%PROGRAMFILES(X86)%\Windows Kits\8.0\bin\x86\signtool.exe
1414
SET SIGN_HASH="C02FF227D5EE9F555C13D4C622697DF15C6FF871"
1515
SET SIGN_TIMESTAMPURL="http://timestamp.comodoca.com/rfc3161"
1616

17-
FOR /F "delims=" %%N IN ('hg id -i 2^> NUL') DO @SET HG_NODE=%%N%
18-
FOR /F "delims=+" %%N IN ('hg id -n 2^> NUL') DO @SET HG_NODE_NUMBER=%%N%
17+
FOR /F "delims=" %%N IN ('git rev-list --count HEAD') DO @SET VERSION_NUMBER=%%N%
18+
FOR /F "delims=" %%N IN ('git log -n 1 --format^=%%h') DO @SET VERSION_HASH=%%N%
1919

2020

2121
ECHO --- BUILD SOLUTION
@@ -36,7 +36,8 @@ IF EXIST %COMPILE_TOOL_1% (
3636

3737
RMDIR /Q /S "..\Binaries" 2> NUL
3838
%COMPILE_TOOL% /Build "Release" %FILE_SOLUTION%
39-
COPY ..\ReadMe.text ..\Binaries\ReadMe.txt
39+
COPY ..\README.md ..\Binaries\ReadMe.txt
40+
COPY ..\LICENSE.md ..\Binaries\License.txt
4041
IF ERRORLEVEL 1 PAUSE && EXIT /B %ERRORLEVEL%
4142

4243
ECHO.
@@ -68,7 +69,7 @@ ECHO --- BUILD SETUP
6869
ECHO.
6970

7071
RMDIR /Q /S ".\Temp" 2> NUL
71-
CALL %SETUP_TOOL% /DHgNode=%HgNode% /O".\Temp" %FILE_SETUP%
72+
CALL %SETUP_TOOL% /DVersionHash=%VERSION_HASH% /O".\Temp" %FILE_SETUP%
7273
IF ERRORLEVEL 1 PAUSE && EXIT /B %ERRORLEVEL%
7374

7475
FOR /F %%I IN ('DIR ".\Temp\*.exe" /B') DO SET _SETUPEXE=%%I
@@ -82,8 +83,8 @@ ECHO --- RENAME BUILD
8283
ECHO.
8384

8485
SET _OLDSETUPEXE=%_SETUPEXE%
85-
IF NOT [%HG_NODE%]==[] (
86-
SET _SETUPEXE=!_SETUPEXE:000=~rev%HG_NODE_NUMBER%~%HG_NODE%!
86+
IF NOT [%VERSION_HASH%]==[] (
87+
SET _SETUPEXE=!_SETUPEXE:000=-rev%VERSION_NUMBER%-%VERSION_HASH%!
8788
)
8889
IF NOT "%_OLDSETUPEXE%"=="%_SETUPEXE%" (
8990
ECHO Renaming %_OLDSETUPEXE% to %_SETUPEXE%

0 commit comments

Comments
 (0)