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.

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

Jump to bottom

[deps] split Versions.make into standalone *.version file #45720

Merged
merged 31 commits into from
Jun 28, 2022
Merged

[deps] split Versions.make into standalone *.version file #45720

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
ba0d45d
deps: split `Versions.make` into standalone `*.version` file
inkydragon Jun 16, 2022
3920564
repo: update `julia.spdx.json`
inkydragon Jun 16, 2022
b33e5c2
deps: rm `Versions.make`
inkydragon Jun 16, 2022
9e14d10
deps: include `$(LibName).version`
inkydragon Jun 16, 2022
07c6f39
deps: split `unwind.version`, add new `llvmunwind.version`
inkydragon Jun 16, 2022
99a4538
deps: split `llvm.version` into `clang.version` + `llvm-tools.version`
inkydragon Jun 16, 2022
c1c0910
stdlib: Add new makefile `all_jlls.version` to include all `_jll` names
inkydragon Jun 16, 2022
2c12e0f
Makefile: use `LF` for all makefiles
inkydragon Jun 16, 2022
0d727d4
deps/llvm: include `llvm.version`
inkydragon Jun 17, 2022
bda346a
Merge branch 'master' into build-rm-Versions.make
inkydragon Jun 17, 2022
1850865
deps/llvm: adjust include sequence, include `.version` first
inkydragon Jun 17, 2022
741cd3a
Merge branch 'master' into build-rm-Versions.make
inkydragon Jun 18, 2022
809a97f
deps/llvm: update to 14.0.2
inkydragon Jun 18, 2022
badc75d
Update deps/unwind.version
inkydragon Jun 18, 2022
ba29534
Merge branch 'build-rm-Versions.make' of github.com:inkydragon/julia …
inkydragon Jun 18, 2022
bae11d8
deps/LibUnwind_jll: fix version mismatch (`Project.toml` and `checksum`)
inkydragon Jun 18, 2022
90b6055
Update deps/llvm-tools.version
inkydragon Jun 18, 2022
634ceca
Merge branch 'build-rm-Versions.make' of github.com:inkydragon/julia …
inkydragon Jun 18, 2022
fd42fe3
Update OPENBLAS_VER to 0.3.20
ViralBShah Jun 19, 2022
2b47176
Merge branch 'master' into build-rm-Versions.make
inkydragon Jun 20, 2022
3e4ffb0
deps: merge patches for `Versions.make`
inkydragon Jun 20, 2022
5051246
Update stdlib/all_jlls.version
inkydragon Jun 20, 2022
9e15c30
deps/mpfr: add comments for version mismatch
inkydragon Jun 20, 2022
212eab6
Update deps/objconv.version
inkydragon Jun 21, 2022
6d01064
Update stdlib/all_jlls.version
inkydragon Jun 21, 2022
9e7b058
deps: add a TODO in `all_jlls.version`
inkydragon Jun 21, 2022
306eb9f
Merge branch 'build-rm-Versions.make' of github.com:inkydragon/julia …
inkydragon Jun 21, 2022
677e476
Merge branch 'master' into build-rm-Versions.make
inkydragon Jun 21, 2022
44a22d2
Merge branch 'master' into build-rm-Versions.make
inkydragon Jun 22, 2022
fd69fab
deps: apply patches from `deps/Versions.make`
inkydragon Jun 22, 2022
fd1b4d0
Merge branch 'master' into build-rm-Versions.make
inkydragon Jun 24, 2022
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
2 changes: 1 addition & 1 deletion deps/objconv.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## jll artifact
# Objconv (we don't ship this, so no need for a fake JLL; therefore we specify the JLL_VER here)
# Objconv (we don't ship this, so no need for a fake JLL; therefore we specify the JLL_VER here instead of in a `stdlib/Objconv_jll/Project.toml` file)
OBJCONV_JLL_NAME := Objconv
OBJCONV_JLL_VER := 2.49.1+0

Expand Down
2 changes: 1 addition & 1 deletion stdlib/all_jlls.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- mode: make -*-
# -*- mode: makefile -*-
## All `_jll` names and versions
Copy link
Member

@ViralBShah ViralBShah Jun 19, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to do something automatic here - something like include *.version so that we don't have to update manually here in the future?

Copy link
Sponsor Member Author

@inkydragon inkydragon Jun 20, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like you can just use wildcards.

include foo *.mk $(bar)

Include (GNU make)

Maybe we could use one line include $(JULIAHOME)/deps/*.version to replace the whole file.

But I'd link to open a new pr for this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.

inkydragon marked this conversation as resolved.
Show resolved Hide resolved

## TODO: Automatic include of all `*.version` makefile
Expand Down