Finally version libjulia with a proper filename (JuliaLang#16362)

* Finally version libjulia with a proper filename

* Exclude windows from the versioned shlib fun

* Link soversion to Julia version

* Ensure libjulia symlinks are relative

* Install libjulia to `$(libdir)` not `$(private_libdir)`

* Use Major.Minor as <v1.0.0 SOMAJOR

* Modify libdl test now that libjulia is not in the private libdir anymore

Make.inc

@@ -125,7 +125,33 @@ else
 NO_GIT := 1
 endif
 
+# Julia's Semantic Versioning system labels the three decimal places in a version number as
+# the major, minor and patch versions. Typically the major version would be incremented
+# whenever a backwards-incompatible change is made, the minor version would be incremented
+# whenever major backwards-compatible changes are made, and the patch version would be
+# incremented whenever smaller changes are made. However, before v1.0.0, the major
+# version number is always zero and the meanings shift down a place; the minor version
+# number becomes the major version number, the patch version number becomes the minor
+# version number, and there is no patch version number to speak of. In this case, the
+# version v0.4.1 has major backwards-compatible changes as compared to v0.4.0, and the
+# version v0.5.0 has major backwards-incompatible changes as compared to v0.4.X.
 JULIA_VERSION := $(shell cat $(JULIAHOME)/VERSION)
+JULIA_MAJOR_VERSION := $(shell echo $(JULIA_VERSION) | cut -d'-' -f 1 | cut -d'.' -f 1)
+JULIA_MINOR_VERSION := $(shell echo $(JULIA_VERSION) | cut -d'-' -f 1 | cut -d'.' -f 2)
+JULIA_PATCH_VERSION := $(shell echo $(JULIA_VERSION) | cut -d'-' -f 1 | cut -d'.' -f 3)
+
+# libjulia's SONAME will follow the format libjulia.so.$(SOMAJOR). Before v1.0.0,
+# SOMAJOR will be a two-decimal value, e.g. libjulia.so.0.5, whereas at and beyond
+# v1.0.0, SOMAJOR will be simply the major version number, e.g. libjulia.so.1
+# The file itself will ultimately symlink to libjulia.so.$(SOMAJOR).$(SOMINOR)
+ifeq ($(JULIA_MAJOR_VERSION),0)
+SOMAJOR := $(JULIA_MAJOR_VERSION).$(JULIA_MINOR_VERSION)
+SOMINOR := $(JULIA_PATCH_VERSION)
+else
+SOMAJOR := $(JULIA_MAJOR_VERSION)
+SOMINOR := $(JULIA_MINOR_VERSION)
+endif
+
 ifneq ($(NO_GIT), 1)
 JULIA_COMMIT := $(shell git rev-parse --short=10 HEAD)
 else

Makefile

@@ -153,14 +153,15 @@ release-candidate: release testall
  @echo 1. Remove deprecations in base/deprecated.jl
  @echo 2. Update references to the julia version in the source directories, such as in README.md
  @echo 3. Bump VERSION
- @echo 4. Create tag, push to github "\(git tag v\`cat VERSION\` && git push --tags\)" #"` # These comments deal with incompetent syntax highlighting rules
- @echo 5. Clean out old .tar.gz files living in deps/, "\`git clean -fdx\`" seems to work #"`
- @echo 6. Replace github release tarball with tarballs created from make light-source-dist and make full-source-dist
- @echo 7. Follow packaging instructions in DISTRIBUTING.md to create binary packages for all platforms
- @echo 8. Upload to AWS, update http:https://julialang.org/downloads and http:https://status.julialang.org/stable links
- @echo 9. Update checksums on AWS for tarball and packaged binaries
- @echo 10. Announce on mailing lists
- @echo 11. Change master to release-0.X in base/version.jl and base/version_git.sh as in 4cb1e20
+ @echo 4. Increase SOMAJOR and SOMINOR if needed.
+ @echo 5. Create tag, push to github "\(git tag v\`cat VERSION\` && git push --tags\)" #"` # These comments deal with incompetent syntax highlighting rules
+ @echo 6. Clean out old .tar.gz files living in deps/, "\`git clean -fdx\`" seems to work #"`
+ @echo 7. Replace github release tarball with tarballs created from make light-source-dist and make full-source-dist
+ @echo 8. Follow packaging instructions in DISTRIBUTING.md to create binary packages for all platforms
+ @echo 9. Upload to AWS, update http:https://julialang.org/downloads and http:https://status.julialang.org/stable links
+ @echo 10. Update checksums on AWS for tarball and packaged binaries
+ @echo 11. Announce on mailing lists
+ @echo 12. Change master to release-0.X in base/version.jl and base/version_git.sh as in 4cb1e20
  @echo
 
 $(build_man1dir)/julia.1: $(JULIAHOME)/doc/man/julia.1 | $(build_man1dir)
@@ -331,14 +332,14 @@ else
 
  # Copy over .dSYM directories directly
 ifeq ($(OS),Darwin)
- -cp -a $(build_libdir)/*.dSYM $(DESTDIR)$(private_libdir)
+ -cp -a $(build_libdir)/*.dSYM $(DESTDIR)$(libdir)
  -cp -a $(build_private_libdir)/*.dSYM $(DESTDIR)$(private_libdir)
 endif
 
  for suffix in $(JL_LIBS) ; do \
  for lib in $(build_libdir)/lib$${suffix}*.$(SHLIB_EXT)*; do \
  if [ "$${lib##*.}" != "dSYM" ]; then \
- $(INSTALL_M) $$lib $(DESTDIR)$(private_libdir) ; \
+ $(INSTALL_M) $$lib $(DESTDIR)$(libdir) ; \
  fi \
  done \
  done
@@ -410,8 +411,8 @@ else ifeq ($(OS), Linux)
 endif
 
  # Overwrite JL_SYSTEM_IMAGE_PATH in julia library
- $(call stringreplace,$(DESTDIR)$(private_libdir)/libjulia.$(SHLIB_EXT),sys.$(SHLIB_EXT)$$,$(private_libdir_rel)/sys.$(SHLIB_EXT))
- $(call stringreplace,$(DESTDIR)$(private_libdir)/libjulia-debug.$(SHLIB_EXT),sys-debug.$(SHLIB_EXT)$$,$(private_libdir_rel)/sys-debug.$(SHLIB_EXT))
+ $(call stringreplace,$(DESTDIR)$(libdir)/libjulia.$(SHLIB_EXT),sys.$(SHLIB_EXT)$$,$(private_libdir_rel)/sys.$(SHLIB_EXT))
+ $(call stringreplace,$(DESTDIR)$(libdir)/libjulia-debug.$(SHLIB_EXT),sys-debug.$(SHLIB_EXT)$$,$(private_libdir_rel)/sys-debug.$(SHLIB_EXT))
 endif
 
  mkdir -p $(DESTDIR)$(sysconfdir)

src/Makefile

@@ -160,29 +160,51 @@ else
 CXXLD = $(LD) -dll -export:jl_setjmp -export:jl_longjmp
 endif
 
-$(build_shlibdir)/libjulia-debug.$(SHLIB_EXT): $(SRCDIR)/julia.expmap $(DOBJS) $(BUILDDIR)/flisp/libflisp-debug.a $(BUILDDIR)/support/libsupport-debug.a $(LIBUV)
+# If we're on windows, don't do versioned shared libraries. If we're on OSX,
+# put the version number before the .dylib. Otherwise, put it after.
+ifeq ($(OS), WINNT)
+JL_MAJOR_MINOR_SHLIB_EXT := $(SHLIB_EXT)
+else
+ifeq ($(OS), Darwin)
+JL_MAJOR_MINOR_SHLIB_EXT := $(SOMAJOR).$(SOMINOR).$(SHLIB_EXT)
+JL_MAJOR_SHLIB_EXT := $(SOMAJOR).$(SHLIB_EXT)
+else
+JL_MAJOR_MINOR_SHLIB_EXT := $(SHLIB_EXT).$(SOMAJOR).$(SOMINOR)
+JL_MAJOR_SHLIB_EXT := $(SHLIB_EXT).$(SOMAJOR)
+endif
+endif
+
+$(build_shlibdir)/libjulia-debug.$(JL_MAJOR_MINOR_SHLIB_EXT): $(SRCDIR)/julia.expmap $(DOBJS) $(BUILDDIR)/flisp/libflisp-debug.a $(BUILDDIR)/support/libsupport-debug.a $(LIBUV)
  @$(call PRINT_LINK, $(CXXLD) $(CXXFLAGS) $(CXXLDFLAGS) $(DEBUGFLAGS) $(DOBJS) $(RPATH_ORIGIN) -o $@ $(LDFLAGS) $(JLIBLDFLAGS) $(DEBUG_LIBS))
  $(INSTALL_NAME_CMD)libjulia-debug.$(SHLIB_EXT) $@
+ifneq ($(OS), WINNT)
+ @ln -sf libjulia-debug.$(JL_MAJOR_MINOR_SHLIB_EXT) $(build_shlibdir)/libjulia-debug.$(JL_MAJOR_SHLIB_EXT)
+ @ln -sf libjulia-debug.$(JL_MAJOR_MINOR_SHLIB_EXT) $(build_shlibdir)/libjulia-debug.$(SHLIB_EXT)
+endif
  $(DSYMUTIL) $@
 $(BUILDDIR)/libjulia-debug.a: $(SRCDIR)/julia.expmap $(DOBJS) $(BUILDDIR)/flisp/libflisp-debug.a $(BUILDDIR)/support/libsupport-debug.a
  rm -f $@
  @$(call PRINT_LINK, ar -rcs $@ $(DOBJS))
-libjulia-debug: $(build_shlibdir)/libjulia-debug.$(SHLIB_EXT)
+libjulia-debug: $(build_shlibdir)/libjulia-debug.$(JL_MAJOR_MINOR_SHLIB_EXT)
 
 ifeq ($(SHLIB_EXT), so)
- SONAME := -Wl,-soname=libjulia.so
+ SONAME := -Wl,-soname=libjulia.$(JL_MAJOR_SHLIB_EXT)
 else
  SONAME :=
 endif
 
-$(build_shlibdir)/libjulia.$(SHLIB_EXT): $(SRCDIR)/julia.expmap $(OBJS) $(BUILDDIR)/flisp/libflisp.a $(BUILDDIR)/support/libsupport.a $(LIBUV)
+$(build_shlibdir)/libjulia.$(JL_MAJOR_MINOR_SHLIB_EXT): $(SRCDIR)/julia.expmap $(OBJS) $(BUILDDIR)/flisp/libflisp.a $(BUILDDIR)/support/libsupport.a $(LIBUV)
  @$(call PRINT_LINK, $(CXXLD) $(CXXFLAGS) $(CXXLDFLAGS) $(SHIPFLAGS) $(OBJS) $(RPATH_ORIGIN) -o $@ $(LDFLAGS) $(JLIBLDFLAGS) $(RELEASE_LIBS) $(SONAME)) $(CXXLDFLAGS)
  $(INSTALL_NAME_CMD)libjulia.$(SHLIB_EXT) $@
+ifneq ($(OS), WINNT)
+ @ln -sf libjulia.$(JL_MAJOR_MINOR_SHLIB_EXT) $(build_shlibdir)/libjulia.$(JL_MAJOR_SHLIB_EXT)
+ @ln -sf libjulia.$(JL_MAJOR_MINOR_SHLIB_EXT) $(build_shlibdir)/libjulia.$(SHLIB_EXT)
+endif
  $(DSYMUTIL) $@
 $(BUILDDIR)/libjulia.a: julia.expmap $(OBJS) $(BUILDDIR)/flisp/libflisp.a $(BUILDDIR)/support/libsupport.a
  rm -f $@
  @$(call PRINT_LINK, ar -rcs $@ $(OBJS))
-libjulia-release: $(build_shlibdir)/libjulia.$(SHLIB_EXT)
+libjulia-release: $(build_shlibdir)/libjulia.$(JL_MAJOR_MINOR_SHLIB_EXT)
 
 clean:
  -rm -fr $(build_shlibdir)/libjulia* $(build_shlibdir)/libccalltest*

test/libdl.jl

@@ -22,13 +22,19 @@ end
 
 cd(dirname(@__FILE__)) do
 
-# Find the private library directory by finding the path of libjulia (or libjulia-debug, as the case may be)
+# Find the library directory by finding the path of libjulia (or libjulia-debug, as the case may be)
+# and then adding on /julia to that directory path to get the private library directory, if we need
+# to (where "need to" is defined as private_libdir/julia/libccalltest.dlext exists
 private_libdir = if ccall(:jl_is_debugbuild, Cint, ()) != 0
  dirname(abspath(Libdl.dlpath("libjulia-debug")))
 else
  dirname(abspath(Libdl.dlpath("libjulia")))
 end
 
+if isfile(joinpath(private_libdir,"julia","libccalltest."*Libdl.dlext))
+ private_libdir = joinpath(private_libdir, "julia")
+end
+
 @test !isempty(Libdl.find_library(["libccalltest"], [private_libdir]))
 @test !isempty(Libdl.find_library("libccalltest", [private_libdir]))
 @test !isempty(Libdl.find_library(:libccalltest, [private_libdir]))