diff options
| author | David Allsopp <david.allsopp@metastack.com> | 2016-01-02 09:52:59 +0000 |
|---|---|---|
| committer | David Allsopp <david.allsopp@metastack.com> | 2016-01-15 17:07:01 +0000 |
| commit | a7b6083be3848d4d3d6734ac93082906ff443d20 (patch) | |
| tree | 542417428a07266582ce008001d23120d224cca4 | |
| parent | a9f5227d62c9c18c7ef1f632c91e46d258113f9b (diff) | |
| download | ocaml-a7b6083be3848d4d3d6734ac93082906ff443d20.tar.gz | |
Add FlexDLL as git submodule
Messages for obtaining flexdll sources updated in Makefile.nt
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Makefile.nt | 19 | ||||
| m--------- | flexdll | 0 |
5 files changed, 20 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index ca451d60a1..9c0da6d5f2 100644 --- a/.gitignore +++ b/.gitignore @@ -294,6 +294,3 @@ /yacc/ocamlyacc /yacc/version.h /yacc/.gdb_history - -# Bootstrapped FlexDLL -flexdll/ diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..938e0dbed2 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "flexdll"] + path = flexdll + url = https://github.com/alainfrisch/flexdll.git diff --git a/.travis.yml b/.travis.yml index b0a323af8b..b5b1acc663 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,8 @@ sudo: false language: c +git: + submodules: false script: bash -ex .travis-ci.sh matrix: include: diff --git a/Makefile.nt b/Makefile.nt index 468fed30ae..27f0da5731 100644 --- a/Makefile.nt +++ b/Makefile.nt @@ -18,11 +18,22 @@ include Makefile.shared defaultentry: @echo "Please refer to the installation instructions in file README.win32.adoc." -# FlexDLL sources missing error message -flexdll/Makefile: - @echo In order to bootstrap FlexDLL, you need to place the sources in flexdll. +# FlexDLL sources missing error messages +# Different git mechanism displayed depending on whether this source tree came +# from a git clone or a source tarball. + +# Displayed in all cases +flexdll-common-err: + @echo In order to bootstrap FlexDLL, you need to place the sources in flexdll @echo This can either be done by downloading a source tarball from @echo \ http://alain.frisch.fr/flexdll.html + +flexdll/Makefile: $(if $(wildcard flexdll/Makefile),,$(if $(wildcard .git),flexdll-common-err,flexdll-repo)) + @echo or by checking out the flexdll submodule with + @echo \ git submodule update --init + @false + +flexdll-repo: flexdll-common-err @echo or by cloning the git repository @echo \ git clone https://github.com/alainfrisch/flexdll.git @echo @@ -716,6 +727,6 @@ distclean: .PHONY: ocamltoolsopt.opt ocamlyacc opt-core opt opt.opt otherlibraries .PHONY: otherlibrariesopt promote promote-cross .PHONY: restore runtime runtimeopt makeruntimeopt world world.opt -.PHONY: flexdll flexlink_opt +.PHONY: flexdll flexlink_opt flexdll-common-err flexdll-repo include .depend diff --git a/flexdll b/flexdll new file mode 160000 +Subproject db1d82aa8662d146562067288d0331c4ec2e1bd |