Skip to content

Commit 3bb35aa

Browse files
committed
Moved package.version.h.in to the Configs folder.
1 parent 8fe1c24 commit 3bb35aa

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
- name: Create Configs archive
7070
shell: cmd
7171
run: |
72-
powershell -Command "Compress-Archive -Path 'ColorProfiles','Configs','Installer','OpenCL','PerlMagick','nasm.exe','package.version.h.in' -DestinationPath 'files.zip'"
72+
powershell -Command "Compress-Archive -Path 'ColorProfiles','Configs','Installer','OpenCL','PerlMagick','nasm.exe' -DestinationPath 'files.zip'"
7373
7474
- name: Set release number
7575
shell: bash

Configs/Magick++/ImageMagick.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "winver.h"
22
#define __WINDOWS__
3-
#include "..\\..\\package.version.h"
3+
#include ..\\package.version.h"
44

55
/////////////////////////////////////////////////////////////////////////////
66
//

Configs/MagickCore/ImageMagick.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "winver.h"
22
#define __WINDOWS__
3-
#include "..\\..\\package.version.h"
3+
#include ..\\package.version.h"
44

55
/////////////////////////////////////////////////////////////////////////////
66
//

Configs/MagickWand/ImageMagick.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "winver.h"
22
#define WIN32
3-
#include "..\\..\\package.version.h"
3+
#include ..\\package.version.h"
44

55
/////////////////////////////////////////////////////////////////////////////
66
//

Configs/coders/ImageMagick.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "winver.h"
22
#define __WINDOWS__
3-
#include "..\\..\\package.version.h"
3+
#include "..\\package.version.h"
44

55
/////////////////////////////////////////////////////////////////////////////
66
//

Configs/utilities/ImageMagick.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "winver.h"
22
#define __WINDOWS__
3-
#include "..\\..\\package.version.h"
3+
#include ..\\package.version.h"
44

55
/////////////////////////////////////////////////////////////////////////////
66
//

Configs/wand/ImageMagick.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "winver.h"
22
#define WIN32
3-
#include "..\\..\\package.version.h"
3+
#include ..\\package.version.h"
44

55
/////////////////////////////////////////////////////////////////////////////
66
//

src/VersionInfo.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ const wstring VersionInfo::quantumDepthBits() const
6262
switch (_options.quantumDepth)
6363
{
6464
case QuantumDepth::Q8: return(L"8");
65-
case QuantumDepth::Q16: return(L"16");
66-
case QuantumDepth::Q32: return(L"32");
67-
case QuantumDepth::Q64: return(L"64");
65+
case QuantumDepth::Q16: return(L"16");
66+
case QuantumDepth::Q32: return(L"32");
67+
case QuantumDepth::Q64: return(L"64");
6868
default: throw;
6969
}
7070
}
@@ -136,7 +136,7 @@ const wstring VersionInfo::executeCommand(const wstring &command) const
136136

137137
CloseHandle(pi.hProcess);
138138
CloseHandle(pi.hThread);
139-
139+
140140
if (exitCode != 0)
141141
return L"";
142142

@@ -304,7 +304,7 @@ void VersionInfo::write() const
304304
{
305305
const auto versionFile=L"ImageMagick\\" + _options.magickCoreName() + L"\\version.h";
306306

307-
write(L"Configure\\package.version.h.in",L"Configure\\package.version.h");
307+
write(L"Configure\\Configs\\package.version.h.in",L"Configure\\Configs\\package.version.h");
308308
write(L"ImageMagick\\" + _options.magickCoreName() + L"\\version.h.in",versionFile);
309309
write(L"ImageMagick\\config\\configure.xml.in",L"Artifacts\\bin\\configure.xml");
310310

@@ -320,7 +320,7 @@ void VersionInfo::write(wstring inputFile,wstring outputFile) const
320320
wofstream output(_options.rootDirectory + outputFile);
321321
if (!output)
322322
throwException(L"Unable to open: " + outputFile);
323-
323+
324324
wstring line;
325325
while (getline(input,line))
326326
{

0 commit comments

Comments
 (0)