Skip to content
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.

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

drop clang32 #31

Merged
merged 2 commits into from
Dec 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: setup-msys2
uses: msys2/setup-msys2@v2
Expand All @@ -23,7 +23,7 @@ jobs:
make PREFIX=/opt/bin/x86_64-w64-mingw32-

- name: Upload
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: package
path: |
Expand Down
10 changes: 1 addition & 9 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PREFIX=

all: msys2.exe msys2.ini mingw32.exe mingw32.ini mingw64.exe mingw64.ini ucrt64.exe ucrt64.ini clang64.exe clang64.ini clang32.exe clang32.ini clangarm64.exe clangarm64.ini
all: msys2.exe msys2.ini mingw32.exe mingw32.ini mingw64.exe mingw64.ini ucrt64.exe ucrt64.ini clang64.exe clang64.ini clangarm64.exe clangarm64.ini

.PHONY: all

Expand Down Expand Up @@ -44,14 +44,6 @@ clang64.res: launcher.rc clang64.ico
clang64.exe: launcher.c clang64.res
$(PREFIX)gcc -std=c11 -Wall -Wextra -Werror -static -municode -mwindows -o $@ $^

clang32.ini: launcher.ini
cp -f $^ $@
echo MSYSTEM=CLANG32>> $@
clang32.res: launcher.rc clang32.ico
$(PREFIX)windres -O COFF -o $@ $< -DMSYSTEM=CLANG32 -DICONFILE=clang32.ico
clang32.exe: launcher.c clang32.res
$(PREFIX)gcc -std=c11 -Wall -Wextra -Werror -static -municode -mwindows -o $@ $^

clangarm64.ini: launcher.ini
cp -f $^ $@
echo MSYSTEM=CLANGARM64>> $@
Expand Down
29 changes: 14 additions & 15 deletions PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,19 @@ provides=("${_realname}")
conflicts=("${_realname}")
depends=("mintty>=2.2.1")
makedepends=('mingw-w64-cross-gcc')
source=(launcher.{c,ini,rc} {macros,version}.h Makefile {msys2,mingw32,mingw64,ucrt64,clang64,clang32,clangarm64}.ico)
sha512sums=('ed2937084cc7d176bb9f06af96121dbf4433a05cfc8fa260918a5f96ed5e8c4201fa2b45aa196a858ece0c8a86f7ffc617a8330b57b7231a4ea4ab23d75920b0'
'5ed8a2e9997d9d2c1e17940292d68542f897e2716b274741d8a3ba7c8f46235c175b7e0a1252a879ba3c79b571504d25de2a8d6b004aedd117d263195bc2b185'
'cf257f1f5b7fc69a32c63fe5bf5299db078621850b1e12358654d71da7777a94a0668d657c1834be308db099cad9d48a42fa7877ad58dfdbd576248150913a12'
'6019ca0d67375c1261dda0d54d45fc411b02244c51b71d5c57d2613e9edfb4e8f9000754e5c7d632ed0101005c01cd0a98c3961d5b5f51c94d83eceba4296d35'
'972d366b7e4bffeafbd624cea89c2f5d7cf7ee6f14b3534c39e42711b9257b76054578b23c41d6fe1d10d0d848fbc2c32b86ea611f98ffa22f60be7067a44edc'
'76fc9b0fc5931d748f02d8b726f2e461e04c8e31aaac309c8ed349f303f3c976cb2972c89913b0192ebfcfe13bf5b1c1ffd1ea11439e2a2c6d819207eead89ad'
'b0eb5a71d4611fd79a681e89ce1c915a12858c7be4d64740b9d127576d39cba352696a594cfb8392aaf00dad0f12c40c78e8fd2019b15c88507286efa0171e0d'
'24e05f79df6aa51ca85fee43f1d10eeace85739d60ab5b2bfc82b2b6edd3040e6ae0355fdd3f4455eb7adb83e3c6269457b2462552fd3b5d5a5e14c0771c3437'
'7749d962dd19b4e93bf74ca339fd1c06fd457dd92ea501d4a19b34973ce2b0ddd9c9ed09921c26bea3adc7dfbbd821042b467ffc6d4050b6301c025d4f0c844d'
'e77d67d33fb364d84416a727d24a5fabdedc4b42ddccffd296ac6c2049cbdc8b7df700a492f386a812867924c8dc2a34b0c858bc1a252957db06e9f1869d7ff2'
'a1fcffd0b7fe7f3e2c18d03206909aba830e983925a85ef69dc165606e543e53eb17164a089d84a40cc53d6a626cce2302071aec8519b7e44f001b2d4602d5e2'
'13118938dc6a084a005d723f329fffa3364284254d9167fe04e93c0ca870b7b3bef1e9a5f0b5b2a7df14f3f1af9a589fc2709d1593231fa3615174b062e62d70'
'29f607099a6f1aab35bec2e4a78701ba2b7c4adf2385e5a2da4167b89b1f46cde2070a01182271a8fbde03c4bb8c7e29a6cb4c4d8308c3be9c503ad84f986ba3')
source=(launcher.{c,ini,rc} {macros,version}.h Makefile {msys2,mingw32,mingw64,ucrt64,clang64,clangarm64}.ico)
sha256sums=('8e3912d38ba631a525caec2be982b462181125c8767b0b5d7271d13df8ad85be'
'232eaa3de03c5c2cde8106a229b4df768d26f2343ea5df88e22e0e8c088f017e'
'0b118e093f514fdabfabf69dd6148d56a3a282b77add1d53ef31f50635c21d7a'
'ca88f2e77322c0d2a7930b84a981723897eb720131026356f4e14d2be8a35291'
'30b6807a39d8bf0857767daa0dfe0227fd3583c1ee099a496c35a7f9e75dbdac'
'd1e1298433ee116b0a61bfe738aa736422742acd6208f7999fb2ca3dad818578'
'793b9450a1a59a6c294e51fd0c2a47090d68c68ff2f33a25a11b45f6408c3917'
'f8f1b5943d385e8a7e3b5a4a2c7d64004108c94c17b2f936016e2ae50bdb65af'
'91b4a790aad38a102565f0cfcba6c0e6d274f6cda0b37b128d9cc43c5ad6b24d'
'733e97cbb823773e1a08a91a41035a7692bc0ff270d3c894224911b4b091db44'
'56d4080c15dff89a6263f3d5f9aa68849b2062179cabd6d78edfe0e3af6bf64a'
'3b7af99516768485383b34d606749e6f98a250372a8191bc8d3a962d66bdfe35')

pkgver() {
local _major=$(cat version.h | grep -F 'VER_MAJOR' | head -1 | sed -e 's/.* //')
Expand All @@ -36,5 +35,5 @@ build() {
}

package() {
cp {msys2,mingw32,mingw64,ucrt64,clang64,clang32,clangarm64}.{exe,ini} "${pkgdir}"
cp {msys2,mingw32,mingw64,ucrt64,clang64,clangarm64}.{exe,ini} "${pkgdir}"
}
Binary file removed clang32.ico
Binary file not shown.
5 changes: 1 addition & 4 deletions icons/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
all: ../msys2.ico ../mingw32.ico ../mingw64.ico ../ucrt64.ico ../clang64.ico ../clang32.ico ../clangarm64.ico
all: ../msys2.ico ../mingw32.ico ../mingw64.ico ../ucrt64.ico ../clang64.ico ../clangarm64.ico

sources=icon-large.svg icon-medium.svg icon-small.svg

Expand All @@ -17,8 +17,5 @@ sources=icon-large.svg icon-medium.svg icon-small.svg
../clang64.ico: $(sources)
./build.sh '#be643e' $@

../clang32.ico: $(sources)
./build.sh '#d49b63' $@

../clangarm64.ico: $(sources)
./build.sh '#238423' $@