Skip to content

Commit 50a2c69

Browse files
staticfloatstaticfloat
authored
Merge pull request JuliaLang#18554 from JuliaLang/sf/consistent_distnames
[RFC] Normalize `make binary-dist` filenames
2 parents ad885d4 + d02f558 commit 50a2c69

4 files changed

Lines changed: 43 additions & 19 deletions

File tree

‎Make.inc‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -687,6 +687,32 @@ ifneq (,$(filter $(ARCH), powerpc64 ppc64))
687687
$(error Big-endian PPC64 is not supported, to ignore this error, set ARCH=ppc64le)
688688
endif
689689

690+
# File name of make binary-dist result
691+
ifeq ($(JULIA_BINARYDIST_FILENAME),)
692+
DIST_OS:=$(shell echo $(OS) | tr '[:upper:]' '[:lower:]')
693+
ifeq (WINNT,$(OS))
694+
DIST_OS:=win
695+
endif
696+
ifeq (Linux,$(OS))
697+
DIST_OS:=linux
698+
endif
699+
ifeq (Darwin,$(OS))
700+
DIST_OS:=mac
701+
endif
702+
DIST_ARCH:=$(ARCH)
703+
ifneq (,$(filter $(ARCH), powerpc64le ppc64le))
704+
DIST_ARCH:=ppc64le
705+
endif
706+
ifeq (1,$(ISX86))
707+
DIST_ARCH:=$(BINARY)
708+
endif
709+
ifneq (,$(findstring arm,$(ARCH)))
710+
DIST_ARCH:=arm
711+
endif
712+
713+
JULIA_BINARYDIST_FILENAME := julia-$(JULIA_COMMIT)-$(DIST_OS)$(DIST_ARCH)
714+
endif
715+
690716
# If we are running on ARM, set certain options automatically
691717
ifneq (,$(findstring arm,$(ARCH)))
692718
JCFLAGS += -fsigned-char

‎Makefile‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ include $(JULIAHOME)/Make.inc
1010
# third-party code).
1111
VERSDIR := v`cut -d. -f1-2 < $(JULIAHOME)/VERSION`
1212

13-
#file name of make binary-dist result
14-
ifeq ($(JULIA_BINARYDIST_TARNAME),)
15-
JULIA_BINARYDIST_TARNAME := julia-$(JULIA_COMMIT)-$(OS)-$(ARCH)
16-
endif
17-
1813
default: $(JULIA_BUILD_MODE) # contains either "debug" or "release"
1914
all: debug release
2015

@@ -463,13 +458,17 @@ endif
463458

464459
# compress nsis installer and combine with 7zip self-extracting header
465460
cd $(BUILDROOT) && $(JULIAHOME)/dist-extras/7z a -mx9 "julia-install-$(JULIA_COMMIT)-$(ARCH).7z" julia-installer.exe
466-
cd $(BUILDROOT) && cat $(JULIAHOME)/contrib/windows/7zS.sfx $(JULIAHOME)/contrib/windows/7zSFX-config.txt "julia-install-$(JULIA_COMMIT)-$(ARCH).7z" > "julia-${JULIA_VERSION}-${ARCH}.exe"
461+
cd $(BUILDROOT) && cat $(JULIAHOME)/contrib/windows/7zS.sfx $(JULIAHOME)/contrib/windows/7zSFX-config.txt "julia-install-$(JULIA_COMMIT)-$(ARCH).7z" > "$(JULIA_BINARYDIST_FILENAME).exe"
467462
-rm -f $(BUILDROOT)/julia-installer.exe
468463
else
469-
cd $(BUILDROOT) && $(TAR) zcvf $(JULIA_BINARYDIST_TARNAME).tar.gz julia-$(JULIA_COMMIT)
464+
cd $(BUILDROOT) && $(TAR) zcvf $(JULIA_BINARYDIST_FILENAME).tar.gz julia-$(JULIA_COMMIT)
470465
endif
471466
rm -fr $(BUILDROOT)/julia-$(JULIA_COMMIT)
472467

468+
app:
469+
$(MAKE) -C contrib/mac/app
470+
@mv contrib/mac/app/$(JULIA_BINARYDIST_FILENAME).dmg $(BUILDROOT)
471+
473472
light-source-dist.tmp: $(BUILDROOT)/doc/_build/html/en/index.html
474473
ifneq ($(BUILDROOT),$(JULIAHOME))
475474
$(error make light-source-dist does not work in out-of-tree builds)

‎contrib/mac/app/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ JULIA_VERSION_OPT_COMMIT:=$(shell [ $$(git describe --tags --exact-match 2>/dev/
1212
JULIA_VERSION_MAJOR_MINOR:=$(shell echo $(JULIA_VERSION) | grep -o '^[0-9]\+.[0-9]\+')
1313
JULIA_VERSION_MAJOR_MINOR_PATCH:=$(shell echo $(JULIA_VERSION) | grep -o '^[0-9]\+.[0-9]\+.[0-9]\+')
1414

15-
DMG_NAME:=Julia-$(JULIA_VERSION_OPT_COMMIT).dmg
15+
DMG_NAME:=$(JULIA_BINARYDIST_FILENAME).dmg
1616
APP_NAME:=Julia-$(JULIA_VERSION_MAJOR_MINOR).app
1717
VOL_NAME:=Julia-$(JULIA_VERSION_OPT_COMMIT)
1818

@@ -48,7 +48,7 @@ dmg/$(APP_NAME): startup.applescript julia.icns
4848
plutil -insert NSHumanReadableCopyright -string "$(APP_COPYRIGHT)" $@/Contents/Info.plist
4949
-mkdir -p $@/Contents/Resources/julia
5050
make -C $(JULIAHOME) binary-dist
51-
tar zxf $(JULIAHOME)/julia-*.tar.gz -C $@/Contents/Resources/julia --strip-components 1
51+
tar zxf $(JULIAHOME)/$(JULIA_BINARYDIST_FILENAME).tar.gz -C $@/Contents/Resources/julia --strip-components 1
5252
-codesign -s "AFB379C0B4CBD9DB9A762797FC2AB5460A2B0DBE" --deep $@
5353

5454
ROOTFILES := $(shell ls -ld dmg/*.app *.dmg 2> /dev/null | awk '{print $$3}')

‎contrib/prepare_release.sh‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ curl -L -o julia-$version-linux-arm.tar.gz \
4444
$julianightlies/linux/arm/$majmin/julia-$majminpatch-$shashort-linuxarm.tar.gz
4545
cp julia-$version-linux-arm.tar.gz julia-$majmin-latest-linux-arm.tar.gz
4646
curl -L -o julia-$version-linux-ppc64le.tar.gz \
47-
$julianightlies/linux/ppc64le/$majmin/julia-$majminpatch-$shashort-linuxppc64.tar.gz
47+
$julianightlies/linux/ppc64le/$majmin/julia-$majminpatch-$shashort-linuxppc64le.tar.gz
4848
cp julia-$version-linux-ppc64le.tar.gz julia-$majmin-latest-linux-ppc64le.tar.gz
49-
curl -L -o "julia-$version-osx10.7 .dmg" \
50-
$julianightlies/osx/x64/$majmin/julia-$majminpatch-$shashort-osx.dmg
51-
cp "julia-$version-osx10.7 .dmg" "julia-$majmin-latest-osx10.7 .dmg"
49+
curl -L -o "julia-$version-mac64.dmg" \
50+
$julianightlies/mac/x64/$majmin/julia-$majminpatch-$shashort-mac64.dmg
51+
cp "julia-$version-mac64.dmg" "julia-$majmin-latest-mac64.dmg"
5252
curl -L -o julia-$version-win64.exe \
5353
$julianightlies/winnt/x64/$majmin/julia-$majminpatch-$shashort-win64.exe
5454
cp julia-$version-win64.exe julia-$majmin-latest-win64.exe
@@ -85,12 +85,11 @@ for plat in x86_64 i686 arm ppc64le; do
8585
s3://julialang/bin/linux/$platshort/$majmin/
8686
curl -X PURGE -L "https://julialang-s3.julialang.org/bin/linux/$platshort/$majmin/julia-$majmin-latest-linux-$plat.tar.gz"
8787
done
88-
aws s3 cp --acl public-read "julia-$version-osx10.7 .dmg" \
89-
s3://julialang/bin/osx/x64/$majmin/
90-
aws s3 cp --acl public-read "julia-$majmin-latest-osx10.7 .dmg" \
91-
s3://julialang/bin/osx/x64/$majmin/
92-
curl -X PURGE -L "https://julialang-s3.julialang.org/bin/osx/x64/$majmin/julia-$majmin-latest-osx10.7 .dmg"
93-
curl -X PURGE -L "https://julialang-s3.julialang.org/bin/osx/x64/$majmin/julia-$majmin-latest-osx10.7+.dmg"
88+
aws s3 cp --acl public-read "julia-$version-mac64 .dmg" \
89+
s3://julialang/bin/mac/x64/$majmin/
90+
aws s3 cp --acl public-read "julia-$majmin-latest-mac64.dmg" \
91+
s3://julialang/bin/mac/x64/$majmin/
92+
curl -X PURGE -L "https://julialang-s3.julialang.org/bin/mac/x64/$majmin/julia-$majmin-latest-mac64.dmg"
9493
aws s3 cp --acl public-read "julia-$version-win64.exe" \
9594
s3://julialang/bin/winnt/x64/$majmin/
9695
aws s3 cp --acl public-read "julia-$majmin-latest-win64.exe" \

0 commit comments

Comments
 (0)