Vendor JuliaSyntax via deps directory

c42f · c42f · commit e703d0ba4253 · 2022-10-06T13:35:42.000+10:00
diff --git a/Makefile b/Makefile
@@ -325,6 +325,10 @@ endif
 	# Remove various files which should not be installed
 	-rm -f $(DESTDIR)$(datarootdir)/julia/base/version_git.sh
 	-rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile
+	-rm -f $(DESTDIR)$(datarootdir)/julia/base/*/source-extracted
+	-rm -f $(DESTDIR)$(datarootdir)/julia/base/*/build-configured
+	-rm -f $(DESTDIR)$(datarootdir)/julia/base/*/build-compiled
+	-rm -f $(DESTDIR)$(datarootdir)/julia/base/*/build-checked
 	-rm -f $(DESTDIR)$(datarootdir)/julia/stdlib/$(VERSDIR)/*/source-extracted
 	-rm -f $(DESTDIR)$(datarootdir)/julia/stdlib/$(VERSDIR)/*/build-configured
 	-rm -f $(DESTDIR)$(datarootdir)/julia/stdlib/$(VERSDIR)/*/build-compiled
diff --git a/base/.gitignore b/base/.gitignore
@@ -8,3 +8,4 @@
 /version_git.jl
 /version_git.jl.phony
 /userimg.jl
+/JuliaSyntax
diff --git a/base/Base.jl b/base/Base.jl
@@ -439,6 +439,10 @@ end
 include(mod::Module, _path::AbstractString) = _include(identity, mod, _path)
 include(mapexpr::Function, mod::Module, _path::AbstractString) = _include(mapexpr, mod, _path)
 
+# External libraries vendored into Base
+Core.println("JuliaSyntax/src/JuliaSyntax.jl")
+include(@__MODULE__, "JuliaSyntax/src/JuliaSyntax.jl")
+
 end_base_include = time_ns()
 
 const _sysimage_modules = PkgId[]
@@ -513,8 +517,6 @@ function __init__()
         MAX_NUM_PRECOMPILE_FILES[] = parse(Int, ENV["JULIA_MAX_NUM_PRECOMPILE_FILES"])
     end
     if get(ENV, "JULIA_USE_NEW_PARSER", "false") == "true"
-        JuliaSyntax = require(PkgId(
-            UUID((0x70703baa_626e_46a2, 0xa12c_08ffd08c73b4)), "JuliaSyntax"))
         JuliaSyntax.enable_in_core!()
     end
     nothing
diff --git a/base/sysimg.jl b/base/sysimg.jl
@@ -38,7 +38,6 @@ let
         :Unicode,
 
         # 1-depth packages
-        :JuliaSyntax,
         :LinearAlgebra,
         :Markdown,
         :Printf,
diff --git a/contrib/generate_precompile.jl b/contrib/generate_precompile.jl
@@ -156,13 +156,12 @@ if Artifacts !== nothing
     """
 end
 
-JuliaSyntax = get(Base.loaded_modules,
-          Base.PkgId(Base.UUID("70703baa-626e-46a2-a12c-08ffd08c73b4"), "JuliaSyntax"),
-          nothing)
-if JuliaSyntax !== nothing
-    precompile_script *= read(joinpath(pkgdir(JuliaSyntax),
-                                       "sysimage", "precompile_exec.jl"), String) * "\n"
-end
+juliasyntax_path = joinpath(Sys.BINDIR, "..", "share", "julia", "base", "JuliaSyntax")
+precompile_script *= """
+    using Base: JuliaSyntax
+    $(read(joinpath(juliasyntax_path, "sysimage", "precompile.jl"), String))
+    precompile_JuliaSyntax(@__MODULE__(), $(repr(juliasyntax_path)))
+    """
 
 Pkg = get(Base.loaded_modules,
           Base.PkgId(Base.UUID("44cfe95a-1eb2-52ea-b672-e2afdf69b78f"), "Pkg"),
diff --git a/deps/JuliaSyntax.mk b/deps/JuliaSyntax.mk
@@ -0,0 +1,16 @@
+$(eval $(call git-external,JuliaSyntax,JULIASYNTAX,,,$(BUILDDIR)))
+
+$(BUILDDIR)/$(JULIASYNTAX_SRC_DIR)/build-compiled: $(BUILDDIR)/$(JULIASYNTAX_SRC_DIR)/source-extracted
+	@# no build steps
+	echo 1 > $@
+
+$(eval $(call symlink_install,JuliaSyntax,$$(JULIASYNTAX_SRC_DIR),$$(JULIAHOME)/base))
+
+clean-JuliaSyntax:
+	-rm -f $(BUILDDIR)/$(JULIASYNTAX_SRC_DIR)/build-compiled
+get-JuliaSyntax: $(JULIASYNTAX_SRC_FILE)
+extract-JuliaSyntax: $(BUILDDIR)/$(JULIASYNTAX_SRC_DIR)/source-extracted
+configure-JuliaSyntax: extract-JuliaSyntax
+compile-JuliaSyntax: $(BUILDDIR)/$(JULIASYNTAX_SRC_DIR)/build-compiled
+fastcheck-JuliSyntax: check-JuliSyntax
+check-JuliSyntax: compile-JuliSyntax
diff --git a/deps/JuliaSyntax.version b/deps/JuliaSyntax.version
@@ -1,4 +1,4 @@
 JULIASYNTAX_BRANCH = main
-JULIASYNTAX_SHA1 = d3d8fdeaea37bcae05191cad50a326e608035d97
+JULIASYNTAX_SHA1 = 7b2353280f480ba199e056bba4f3385d218b6fe8
 JULIASYNTAX_GIT_URL := https://github.com/JuliaLang/JuliaSyntax.jl.git
 JULIASYNTAX_TAR_URL = https://api.github.com/repos/JuliaLang/JuliaSyntax.jl/tarball/$1
diff --git a/deps/Makefile b/deps/Makefile
@@ -36,7 +36,7 @@ BUILDDIR := $(BUILDDIR)$(MAYBE_HOST)
 # prevent installing libs into usr/lib64 on opensuse
 unexport CONFIG_SITE
 
-DEP_LIBS :=
+DEP_LIBS := JuliaSyntax
 
 ifeq ($(USE_SYSTEM_LIBBLASTRAMPOLINE), 0)
 DEP_LIBS += blastrampoline
@@ -168,7 +168,7 @@ endif
 DEP_LIBS_STAGED_ALL := llvm llvm-tools clang llvmunwind unwind libuv pcre \
 	openlibm dsfmt blastrampoline openblas lapack gmp mpfr patchelf utf8proc \
 	objconv mbedtls libssh2 nghttp2 curl libgit2 libwhich zlib p7zip csl \
-	libsuitesparse
+	libsuitesparse JuliaSyntax
 DEP_LIBS_ALL := $(DEP_LIBS_STAGED_ALL)
 
 ifneq ($(USE_BINARYBUILDER_OPENBLAS),0)
@@ -226,4 +226,7 @@ include $(SRCDIR)/libgit2.mk
 include $(SRCDIR)/libwhich.mk
 include $(SRCDIR)/p7zip.mk
 
+# vendored Julia libs
+include $(SRCDIR)/JuliaSyntax.mk
+
 include $(SRCDIR)/tools/uninstallers.mk
diff --git a/deps/checksums/JuliaSyntax-7b2353280f480ba199e056bba4f3385d218b6fe8.tar.gz/md5 b/deps/checksums/JuliaSyntax-7b2353280f480ba199e056bba4f3385d218b6fe8.tar.gz/md5
@@ -0,0 +1 @@
+66c5e7f81c438b7d77d888c34806496e
diff --git a/deps/checksums/JuliaSyntax-7b2353280f480ba199e056bba4f3385d218b6fe8.tar.gz/sha512 b/deps/checksums/JuliaSyntax-7b2353280f480ba199e056bba4f3385d218b6fe8.tar.gz/sha512
@@ -0,0 +1 @@
+662bad0bb1a083e0a1743cf575b106ba121fd11ad618d356ab418ccb7025232b0af7320ae457dc1dad0e50eb141e75f1c06961ddb66b2a3d12577231a9980ae3
diff --git a/deps/checksums/JuliaSyntax-d3d8fdeaea37bcae05191cad50a326e608035d97.tar.gz/md5 b/deps/checksums/JuliaSyntax-d3d8fdeaea37bcae05191cad50a326e608035d97.tar.gz/md5
diff --git a/deps/checksums/JuliaSyntax-d3d8fdeaea37bcae05191cad50a326e608035d97.tar.gz/sha512 b/deps/checksums/JuliaSyntax-d3d8fdeaea37bcae05191cad50a326e608035d97.tar.gz/sha512
diff --git a/stdlib/.gitignore b/stdlib/.gitignore
@@ -19,7 +19,5 @@
 /SparseArrays
 /SHA-*
 /SHA
-/JuliaSyntax-*
-/JuliaSyntax
 /*_jll/StdlibArtifacts.toml
 /*/Manifest.toml
diff --git a/stdlib/Makefile b/stdlib/Makefile
@@ -47,7 +47,7 @@ STDLIBS = Artifacts Base64 CRC32c Dates Distributed FileWatching \
           SharedArrays Sockets SparseArrays SuiteSparse Test TOML Unicode UUIDs \
           $(JLL_NAMES)
 
-STDLIBS_EXT = Pkg Statistics LibCURL Downloads ArgTools Tar NetworkOptions SuiteSparse SparseArrays SHA JuliaSyntax
+STDLIBS_EXT = Pkg Statistics LibCURL Downloads ArgTools Tar NetworkOptions SuiteSparse SparseArrays SHA
 
 $(foreach module, $(STDLIBS_EXT), $(eval $(call stdlib-external,$(module),$(shell echo $(module) | tr a-z A-Z))))
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+662bad0bb1a083e0a1743cf575b106ba121fd11ad618d356ab418ccb7025232b0af7320ae457dc1dad0e50eb141e75f1c06961ddb66b2a3d12577231a9980ae3`