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

remove git submodules #10743

Merged
merged 3 commits into from
Apr 14, 2015
Merged

remove git submodules #10743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14840d6
replace git submodules with git "external"
vtjnash Apr 13, 2015
ebe6189
rename uv -> libuv in Makefile rules, for consistency. move distclean…
vtjnash Apr 5, 2015
27a823d
switch openblas to a git-external resource
vtjnash Apr 5, 2015
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
12 changes: 0 additions & 12 deletions .gitmodules
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions Make.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,6 +883,8 @@ ifndef VERBOSE
VERBOSE = 0
endif

WARNCOLOR="\033[33;1m"

ifeq ($(VERBOSE), 0)

QUIET_MAKE = -s
Expand Down
18 changes: 5 additions & 13 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,6 @@ $(build_docdir):
@cp -R examples/*.jl $@/examples/
@cp -R examples/clustermanager $@/examples/

git-submodules:
ifneq ($(NO_GIT), 1)
@-git submodule update --init
else
$(warn "Submodules could not be updated because git is unavailable")
endif

julia-symlink-debug: julia-ui-debug
ifneq ($(OS),WINNT)
ifndef JULIA_VAGRANT_BUILD
Expand All @@ -63,7 +56,7 @@ ifndef JULIA_VAGRANT_BUILD
endif
endif

julia-deps: git-submodules | $(DIRS) $(build_datarootdir)/julia/base $(build_datarootdir)/julia/test $(build_docdir) $(build_sysconfdir)/julia/juliarc.jl $(build_man1dir)/julia.1
julia-deps: | $(DIRS) $(build_datarootdir)/julia/base $(build_datarootdir)/julia/test $(build_docdir) $(build_sysconfdir)/julia/juliarc.jl $(build_man1dir)/julia.1
@$(MAKE) $(QUIET_MAKE) -C deps

julia-base: julia-deps
Expand Down Expand Up @@ -439,14 +432,13 @@ light-source-dist: light-source-dist.tmp
cd ../ && tar -cz -T $$DIRNAME/light-source-dist.tmp1 --no-recursion -f $$DIRNAME/julia-$(JULIA_VERSION)_$(JULIA_COMMIT).tar.gz

# Make tarball with Julia code plus all dependencies
full-source-dist source-dist: git-submodules light-source-dist.tmp
full-source-dist source-dist: light-source-dist.tmp
# Get all the dependencies downloaded
@$(MAKE) -C deps getall
@$(MAKE) -C deps getall NO_GIT=1

# Create file full-source-dist.tmp to hold all the filenames that go into the tarball
cp light-source-dist.tmp full-source-dist.tmp
-ls deps/*.tar.gz deps/*.tar.bz2 deps/*.tar.xz deps/*.tgz deps/*.zip >> full-source-dist.tmp
git submodule --quiet foreach 'git ls-files | sed "s&^&$$path/&"' >> full-source-dist.tmp

# Prefix everything with the current directory name (usually "julia"), then create tarball
DIRNAME=$$(basename $$(pwd)); \
Expand Down Expand Up @@ -474,7 +466,7 @@ cleanall: clean
ifeq ($(OS),WINNT)
@rm -rf $(build_prefix)/lib
endif
@$(MAKE) -C deps clean-uv
@$(MAKE) -C deps clean-libuv

distcleanall: cleanall
@$(MAKE) -C deps distcleanall
Expand All @@ -487,7 +479,7 @@ distcleanall: cleanall
test testall testall1 test-* clean distcleanall cleanall \
run-julia run-julia-debug run-julia-release run \
install binary-dist light-source-dist.tmp light-source-dist \
dist full-source-dist source-dist git-submodules
dist full-source-dist source-dist

test: check-whitespace release
@$(MAKE) $(QUIET_MAKE) -C test default
Expand Down
6 changes: 3 additions & 3 deletions contrib/windows/msys_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,10 @@ echo 'override LIBLAPACKNAME = $(LIBBLASNAME)' >> Make.user
# libuv since its static lib is no longer included in the binaries
# openlibm since we need it as a static library to work properly
# utf8proc since its headers are not in the binary download
echo 'override STAGE1_DEPS = uv' >> Make.user
echo 'override STAGE1_DEPS = libuv' >> Make.user
echo 'override STAGE2_DEPS = utf8proc' >> Make.user
echo 'override STAGE3_DEPS = ' >> Make.user
make -C deps get-uv
make -C deps get-libuv

if [ -n "$USEMSVC" ]; then
# Create a modified version of compile for wrapping link
Expand All @@ -198,7 +198,7 @@ if [ -n "$USEMSVC" ]; then
echo 'override UNTRUSTED_SYSTEM_LIBM = 0' >> Make.user

# Compile libuv and utf8proc without -TP first, then add -TP
make -C deps install-uv install-utf8proc
make -C deps install-libuv install-utf8proc
cp usr/lib/uv.lib usr/lib/libuv.a
echo 'override CC += -TP' >> Make.user
else
Expand Down
14 changes: 12 additions & 2 deletions deps/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,26 @@
/llvm-*
/lldb-*
/mpfr-*
/openblas-*
/patchelf-*
/pcre-*
!pcre-gcc49-compile.patch
/root
/SuiteSparse-*
/zlib-*
/utf8proc-*
/librandom.*
/virtualenv-*
/julia-env
/objconv*
/Rmath-julia*

# git-externals:
/libuv
/libuv-*
/openblas
/openblas-*
/openlibm
/openlibm-*
/openspecfun
/openspecfun-*
/utf8proc
/utf8proc-*
Loading