Browse code
hack/make: remove autogen resources for Docker CLI
the files used by the docker cli were moved to the docker/cli repository,
so are no longer needed here.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn authored on 2019/09/11 16:31:28Showing 11 changed files
- hack/make/.go-autogen
- hack/make/.go-autogen.ps1
- hack/make/.resources-windows/common.rc
- hack/make/.resources-windows/docker.exe.manifest
- hack/make/.resources-windows/docker.ico
- hack/make/.resources-windows/docker.png
- hack/make/.resources-windows/docker.rc
- hack/make/.resources-windows/dockerd.exe.manifest
- hack/make/.resources-windows/dockerd.ico
- hack/make/.resources-windows/dockerd.png
- hack/make/.resources-windows/resources.go
| ... | ... |
@@ -44,8 +44,7 @@ DVEOF |
| 44 | 44 |
|
| 45 | 45 |
# Compile the Windows resources into the sources |
| 46 | 46 |
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 |
|
| 49 | 48 |
cp hack/make/.resources-windows/resources.go autogen/winresources/dockerd/ |
| 50 | 49 |
|
| 51 | 50 |
if [ "$(go env GOHOSTOS)" == "windows" ]; then |
| ... | ... |
@@ -81,8 +80,6 @@ if [ "$(go env GOOS)" = "windows" ]; then |
| 81 | 81 |
-h autogen/winresources/tmp \ |
| 82 | 82 |
-r autogen/winresources/tmp |
| 83 | 83 |
|
| 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 |
|
| 86 | 84 |
makeres dockerd.rc pe-x86-64 autogen/winresources/dockerd/rsrc_amd64.syso |
| 87 | 85 |
|
| 88 | 86 |
rm -r autogen/winresources/tmp |
| ... | ... |
@@ -60,9 +60,7 @@ const ( |
| 60 | 60 |
[System.IO.File]::WriteAllText($outputFile, $fileContents, (New-Object System.Text.UTF8Encoding($False))) |
| 61 | 61 |
|
| 62 | 62 |
New-Item -ItemType Directory -Path "autogen\winresources\tmp" | Out-Null |
| 63 |
- New-Item -ItemType Directory -Path "autogen\winresources\docker" | Out-Null |
|
| 64 | 63 |
New-Item -ItemType Directory -Path "autogen\winresources\dockerd" | Out-Null |
| 65 |
- Copy-Item "hack\make\.resources-windows\resources.go" "autogen\winresources\docker" |
|
| 66 | 64 |
Copy-Item "hack\make\.resources-windows\resources.go" "autogen\winresources\dockerd" |
| 67 | 65 |
|
| 68 | 66 |
# Generate a version in the form major,minor,patch,build |
| ... | ... |
@@ -77,12 +75,6 @@ const ( |
| 77 | 77 |
$env:_ag_dockerVersion=$DockerVersion |
| 78 | 78 |
$env:_ag_gitCommit=$CommitString |
| 79 | 79 |
|
| 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 |
- |
|
| 86 | 80 |
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%\" |
| 87 | 81 |
if ($LASTEXITCODE -ne 0) { Throw "Failed to compile daemon resources" }
|
| 88 | 82 |
} |
| 9 | 9 |
deleted file mode 100644 |
| ... | ... |
@@ -1,18 +0,0 @@ |
| 1 |
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?> |
|
| 2 |
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> |
|
| 3 |
- <description>Docker</description> |
|
| 4 |
- <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> |
|
| 5 |
- <application> |
|
| 6 |
- <!-- Windows 10 --> |
|
| 7 |
- <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
|
|
| 8 |
- <!-- Windows 8.1 --> |
|
| 9 |
- <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
|
|
| 10 |
- <!-- Windows Vista --> |
|
| 11 |
- <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
|
|
| 12 |
- <!-- Windows 7 --> |
|
| 13 |
- <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
|
|
| 14 |
- <!-- Windows 8 --> |
|
| 15 |
- <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
|
|
| 16 |
- </application> |
|
| 17 |
- </compatibility> |
|
| 18 |
-</assembly> |
|
| 19 | 1 |
\ No newline at end of file |
| 4 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,18 @@ |
| 0 |
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?> |
|
| 1 |
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> |
|
| 2 |
+ <description>Docker</description> |
|
| 3 |
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> |
|
| 4 |
+ <application> |
|
| 5 |
+ <!-- Windows 10 --> |
|
| 6 |
+ <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
|
|
| 7 |
+ <!-- Windows 8.1 --> |
|
| 8 |
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
|
|
| 9 |
+ <!-- Windows Vista --> |
|
| 10 |
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
|
|
| 11 |
+ <!-- Windows 7 --> |
|
| 12 |
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
|
|
| 13 |
+ <!-- Windows 8 --> |
|
| 14 |
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
|
|
| 15 |
+ </application> |
|
| 16 |
+ </compatibility> |
|
| 17 |
+</assembly> |
|
| 0 | 18 |
\ No newline at end of file |
