Skip to content

Commit 0ba9c91

Browse files
committed
Disable 'dist' and 'source-dist' make targets
Yet another step towards making 'dist' equivalent to 'light-source-dist', as in most projects. Also change mentions of old targets in docs. [av skip]
1 parent bfd9335 commit 0ba9c91

File tree

3 files changed

+17
-11
lines changed

3 files changed

+17
-11
lines changed

DISTRIBUTING.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ pregenerate the `base/version_git.jl` file with:
2929
Julia has lots of build dependencies where we use patched versions that has not
3030
yet been included by the popular package managers. These dependencies will usually
3131
be automatically downloaded when you build, but if you want to be able to build
32-
Julia on a computer without internet access you should create a source-dist archive
33-
with the special make target
32+
Julia on a computer without internet access you should create a full-source-dist
33+
archive with the special make target
3434

35-
make source-dist
35+
make full-source-dist
3636

3737
that creates a julia-version-commit.tar.gz archive with all required dependencies.
3838

@@ -66,9 +66,9 @@ The full list of CPU targets supported by LLVM can be obtained by running
6666
Linux
6767
-----
6868

69-
On Linux, `make dist` creates a tarball that contains a fully functional Julia
70-
installation. If you wish to create a distribution package such as a
71-
`.deb`, or `.rpm`, some extra effort is needed. See the
69+
On Linux, `make binary-dist` creates a tarball that contains a fully
70+
functional Julia installation. If you wish to create a distribution
71+
package such as a `.deb`, or `.rpm`, some extra effort is needed. See the
7272
[julia-debian](http://github.com/staticfloat/julia-debian) repository
7373
for an example of what metadata is needed for creating `.deb` packages
7474
for Debian and Ubuntu-based systems. See the
@@ -118,7 +118,7 @@ is to cross-compile from a Linux distribution such as Ubuntu. In-depth
118118
compilation instructions [are
119119
available](https://github.com/JuliaLang/julia/blob/master/README.windows.md).
120120
However the important steps for redistribution are to ensure to `make
121-
win-extras` in between `make` and `make dist`. After that process is
121+
win-extras` in between `make` and `make binary-dist`. After that process is
122122
completed, the `.zip` file created in the head Julia directory will
123123
hold a completely self-contained Julia.
124124

Makefile

+8-2
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,10 @@ endif
371371
distclean dist-clean:
372372
rm -fr julia-*.tar.gz julia*.exe julia-*.7z julia-$(JULIA_COMMIT)
373373

374-
binary-dist dist: distclean
374+
dist:
375+
@echo \'dist\' target is deprecated: use \'binary-dist\' instead.
376+
377+
binary-dist: distclean
375378
ifeq ($(USE_SYSTEM_BLAS),0)
376379
ifneq ($(OPENBLAS_DYNAMIC_ARCH),1)
377380
@echo OpenBLAS must be rebuilt with OPENBLAS_DYNAMIC_ARCH=1 to use binary-dist target
@@ -451,8 +454,11 @@ light-source-dist: light-source-dist.tmp
451454
sed -e "s_.*_$$DIRNAME/&_" light-source-dist.tmp > light-source-dist.tmp1; \
452455
cd ../ && tar -cz -T $$DIRNAME/light-source-dist.tmp1 --no-recursion -f $$DIRNAME/julia-$(JULIA_VERSION)_$(JULIA_COMMIT).tar.gz
453456

457+
source-dist:
458+
@echo \'source-dist\' target is deprecated: use \'full-source-dist\' instead.
459+
454460
# Make tarball with Julia code plus all dependencies
455-
full-source-dist source-dist: light-source-dist.tmp
461+
full-source-dist: light-source-dist.tmp
456462
# Get all the dependencies downloaded
457463
@$(MAKE) -C deps getall NO_GIT=1
458464

README.windows.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,8 @@ Finally, the build and install process for Julia:
279279
1. `git clone https://github.com/JuliaLang/julia.git julia-win32`
280280
2. `echo override XC_HOST = i686-w64-mingw32 >> Make.user`
281281
3. `make`
282-
4. `make win-extras` (Necessary before running `make dist`p)
283-
5. `make dist`
282+
4. `make win-extras` (Necessary before running `make binary-dist`p)
283+
5. `make binary-dist`
284284
6. move the julia-* directory / zip file to the target machine
285285

286286
If you are building for 64-bit windows, the steps are essentially the same. Just replace i686 in XC_HOST with x86_64. (note: on Mac, wine only runs in 32-bit mode)

0 commit comments

Comments
 (0)