Skip to content

Drop vestigial -1.0 suffix from vendor/DirectX-Headers-1.0 #1451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benhillis wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Drop vestigial -1.0 suffix from vendor/DirectX-Headers-1.0 #1451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ The WSLg system distro is built using docker build. We essentially start from a
git clone https://github.com/microsoft/FreeRDP-mirror wslg/vendor/FreeRDP -b working
git clone https://github.com/microsoft/weston-mirror wslg/vendor/weston -b working
git clone https://github.com/microsoft/PulseAudio-mirror wslg/vendor/pulseaudio -b working
git clone https://github.com/microsoft/DirectX-Headers.git wslg/vendor/DirectX-Headers-1.0 -b v1.608.0
git clone https://github.com/microsoft/DirectX-Headers.git wslg/vendor/DirectX-Headers -b v1.608.0
git clone https://gitlab.freedesktop.org/mesa/mesa.git wslg/vendor/mesa -b mesa-23.1.0
```

Expand All @@ -63,7 +63,7 @@ The WSLg system distro is built using docker build. We essentially start from a
--build-arg WSLG_VERSION="$(cd wslg && ./devops/get-nuget-version.sh -Beta)" \
--build-arg WSLG_COMMIT="$(git -C wslg rev-parse HEAD)" \
--build-arg WSLG_ARCH=x86_64 \
--build-arg DIRECTX_HEADERS_VERSION="$(git -C wslg/vendor/DirectX-Headers-1.0 rev-parse HEAD)" \
--build-arg DIRECTX_HEADERS_VERSION="$(git -C wslg/vendor/DirectX-Headers rev-parse HEAD)" \
--build-arg FREERDP_COMMIT="$(git -C wslg/vendor/FreeRDP rev-parse HEAD)" \
--build-arg MESA_VERSION="$(git -C wslg/vendor/mesa rev-parse HEAD)" \
--build-arg PULSEAUDIO_COMMIT="$(git -C wslg/vendor/pulseaudio rev-parse HEAD)" \
Expand Down Expand Up @@ -107,7 +107,7 @@ To build a debug version of the system distro, append `--build-arg SYSTEMDISTRO_
--build-arg WSLG_VERSION="$(cd wslg && ./devops/get-nuget-version.sh -Beta)" \
--build-arg WSLG_COMMIT="$(git -C wslg rev-parse HEAD)" \
--build-arg WSLG_ARCH=x86_64 \
--build-arg DIRECTX_HEADERS_VERSION="$(git -C wslg/vendor/DirectX-Headers-1.0 rev-parse HEAD)" \
--build-arg DIRECTX_HEADERS_VERSION="$(git -C wslg/vendor/DirectX-Headers rev-parse HEAD)" \
--build-arg FREERDP_COMMIT="$(git -C wslg/vendor/FreeRDP rev-parse HEAD)" \
--build-arg MESA_VERSION="$(git -C wslg/vendor/mesa rev-parse HEAD)" \
--build-arg PULSEAUDIO_COMMIT="$(git -C wslg/vendor/pulseaudio rev-parse HEAD)" \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,8 @@ COPY debuginfo /work/debuginfo
RUN chmod +x /work/debuginfo/*.sh

# Build DirectX-Headers
COPY vendor/DirectX-Headers-1.0 /work/vendor/DirectX-Headers-1.0
WORKDIR /work/vendor/DirectX-Headers-1.0
COPY vendor/DirectX-Headers /work/vendor/DirectX-Headers
WORKDIR /work/vendor/DirectX-Headers
RUN /usr/bin/meson --prefix=${PREFIX} build \
--buildtype=${BUILDTYPE_NODEBUGSTRIP} \
-Dbuild-test=false && \
Expand Down
2 changes: 1 addition & 1 deletion build-and-export.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ WSLG_COMMIT=$(git rev-parse HEAD 2>/dev/null || echo "dev")
# Vendor components: use rev-parse for the git-sourced ones, fall back
# to the "dev" sentinel if a vendor dir was sourced from a tarball locally.
vendor_commit() { git -C "$1" rev-parse HEAD 2>/dev/null || echo "dev"; }
DIRECTX_HEADERS_VERSION=$(vendor_commit vendor/DirectX-Headers-1.0)
DIRECTX_HEADERS_VERSION=$(vendor_commit vendor/DirectX-Headers)
FREERDP_COMMIT=$(vendor_commit vendor/FreeRDP)
MESA_VERSION=$(vendor_commit vendor/mesa)
PULSEAUDIO_COMMIT=$(vendor_commit vendor/pulseaudio)
Expand Down
2 changes: 1 addition & 1 deletion config/BUILD.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ For self-hosting WSLG check use this instructions https://github.com/microsoft/w

wget https://github.com/microsoft/DirectX-Headers/archive/refs/tags/v1.608.0.tar.gz
tar -xvf v1.608.0.tar.gz -C vendor
mv vendor/DirectX-Headers-1.608.0 vendor/DirectX-Headers-1.0
mv vendor/DirectX-Headers-1.608.0 vendor/DirectX-Headers
```

3. Create the VHD:
Expand Down