Skip to content

Commit 7bcffee

Browse files
kolyshkinkolyshkin
authored
Merge pull request moby#39901 from thaJeztah/remove_docker_cli_autogen
hack/make: remove autogen resources for Docker CLI
2 parents 921b269 + a9aeda8 commit 7bcffee

11 files changed

Lines changed: 7 additions & 21 deletions

File tree

‎daemon/daemon_windows.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ func verifyDaemonSettings(config *config.Config) error {
218218

219219
// checkSystem validates platform-specific requirements
220220
func checkSystem() error {
221-
// Validate the OS version. Note that docker.exe must be manifested for this
221+
// Validate the OS version. Note that dockerd.exe must be manifested for this
222222
// call to return the correct version.
223223
osv := system.GetOSVersion()
224224
if osv.MajorVersion < 10 {

‎hack/make/.go-autogen‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ DVEOF
4444

4545
# Compile the Windows resources into the sources
4646
if [ "$(go env GOOS)" = "windows" ]; then
47-
mkdir -p autogen/winresources/tmp autogen/winresources/docker autogen/winresources/dockerd
48-
cp hack/make/.resources-windows/resources.go autogen/winresources/docker/
47+
mkdir -p autogen/winresources/tmp autogen/winresources/dockerd
4948
cp hack/make/.resources-windows/resources.go autogen/winresources/dockerd/
5049

5150
if [ "$(go env GOHOSTOS)" == "windows" ]; then
@@ -81,8 +80,6 @@ if [ "$(go env GOOS)" = "windows" ]; then
8180
-h autogen/winresources/tmp \
8281
-r autogen/winresources/tmp
8382

84-
makeres docker.rc pe-x86-64 autogen/winresources/docker/rsrc_amd64.syso
85-
makeres docker.rc pe-i386 autogen/winresources/docker/rsrc_386.syso
8683
makeres dockerd.rc pe-x86-64 autogen/winresources/dockerd/rsrc_amd64.syso
8784

8885
rm -r autogen/winresources/tmp

‎hack/make/.go-autogen.ps1‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@ const (
6060
[System.IO.File]::WriteAllText($outputFile, $fileContents, (New-Object System.Text.UTF8Encoding($False)))
6161

6262
New-Item -ItemType Directory -Path "autogen\winresources\tmp" | Out-Null
63-
New-Item -ItemType Directory -Path "autogen\winresources\docker" | Out-Null
6463
New-Item -ItemType Directory -Path "autogen\winresources\dockerd" | Out-Null
65-
Copy-Item "hack\make\.resources-windows\resources.go" "autogen\winresources\docker"
6664
Copy-Item "hack\make\.resources-windows\resources.go" "autogen\winresources\dockerd"
6765

6866
# Generate a version in the form major,minor,patch,build
@@ -77,12 +75,6 @@ const (
7775
$env:_ag_dockerVersion=$DockerVersion
7876
$env:_ag_gitCommit=$CommitString
7977

80-
windres -i hack/make/.resources-windows/docker.rc -o autogen/winresources/docker/rsrc_amd64.syso -F pe-x86-64 --use-temp-file -I autogen/winresources/tmp -D DOCKER_VERSION_QUAD=$versionQuad --% -D DOCKER_VERSION=\"%_ag_dockerVersion%\" -D DOCKER_COMMIT=\"%_ag_gitCommit%\"
81-
if ($LASTEXITCODE -ne 0) { Throw "Failed to compile client 64-bit resources" }
82-
83-
windres -i hack/make/.resources-windows/docker.rc -o autogen/winresources/docker/rsrc_386.syso -F pe-i386 --use-temp-file -I autogen/winresources/tmp -D DOCKER_VERSION_QUAD=$versionQuad --% -D DOCKER_VERSION=\"%_ag_dockerVersion%\" -D DOCKER_COMMIT=\"%_ag_gitCommit%\"
84-
if ($LASTEXITCODE -ne 0) { Throw "Failed to compile client 32-bit resources" }
85-
8678
windres -i hack/make/.resources-windows/dockerd.rc -o autogen/winresources/dockerd/rsrc_amd64.syso -F pe-x86-64 --use-temp-file -I autogen/winresources/tmp -D DOCKER_VERSION_QUAD=$versionQuad --% -D DOCKER_VERSION=\"%_ag_dockerVersion%\" -D DOCKER_COMMIT=\"%_ag_gitCommit%\"
8779
if ($LASTEXITCODE -ne 0) { Throw "Failed to compile daemon resources" }
8880
}

‎hack/make/.resources-windows/common.rc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Application icon
2-
1 ICON "docker.ico"
2+
1 ICON "dockerd.ico"
33

44
// Windows executable manifest
5-
1 24 /* RT_MANIFEST */ "docker.exe.manifest"
5+
1 24 /* RT_MANIFEST */ "dockerd.exe.manifest"
66

77
// Version information
88
1 VERSIONINFO

‎hack/make/.resources-windows/docker.rc‎

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

hack/make/.resources-windows/docker.exe.manifest renamed to hack/make/.resources-windows/dockerd.exe.manifest

File renamed without changes.

hack/make/.resources-windows/docker.ico renamed to hack/make/.resources-windows/dockerd.ico

File renamed without changes.

hack/make/.resources-windows/docker.png renamed to hack/make/.resources-windows/dockerd.png

File renamed without changes.

‎hack/make/.resources-windows/resources.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
3-
Package winresources is used to embed Windows resources into docker.exe.
3+
Package winresources is used to embed Windows resources into dockerd.exe.
44
These resources are used to provide
55
66
* Version information

‎pkg/parsers/kernel/kernel_windows.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func GetKernelVersion() (*VersionInfo, error) {
3636
}
3737
KVI.kvi = blex
3838

39-
// Important - docker.exe MUST be manifested for this API to return
39+
// Important - dockerd.exe MUST be manifested for this API to return
4040
// the correct information.
4141
dwVersion, err := windows.GetVersion()
4242
if err != nil {

0 commit comments

Comments
 (0)