aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-11-19Merge branch 'do-not-export-templates' of https://github.com/rabbitmq/erlang.mkLoïc Hoguin
2015-11-19Do not export templates as environment variablesJean-Sébastien Pédron
We can write the file using the Makefile variables without going through environment variables.
2015-11-18Fix target dependencies and enable parallel again2.0.0-pre.2Loïc Hoguin
We can now use 'make -j 32' again. All tests pass. There might be some issues left with the areas that are not fully tested yet (some plugins). A few changes in behavior: * 'make app' will also do 'make deps' unless SKIP_DEPS is set. You can use 'make app-build' instead to just build the application. * 'make rel' will also do 'make app' (and therefore deps). There are no alternative target to keep the old behavior at this time.
2015-11-17Merge branch 'copy-build.config-after-checking-out-commit' of ↵Loïc Hoguin
https://github.com/rabbitmq/erlang.mk
2015-11-17make erlang-mk: Copy build.config after switching to $(ERLANG_MK_COMMIT)Jean-Sébastien Pédron
If the local build.config has changes compared to upstream's master branch, and $(ERLANG_MK_COMMIT) also brings changes to this file, copying the local file to the checkout before switching to $(ERLANG_MK_COMMIT) caused git-checkout(1) to abort with: error: Your local changes to the following files would be overwritten by checkout: build.config Please, commit your changes or stash them before you can switch branches. Aborting While here, fix `core-upgrade-custom-repo` test case: without switching back the alternate erlang.mk repository to its master branch, the clone always got the test-copyright branch by default, making the ERLANG_MK_COMMIT check ineffective.
2015-11-17Merge branch 'configurable-noop' of https://github.com/rabbitmq/erlang.mkLoïc Hoguin
2015-11-17Remove unneeded comment from docsLoïc Hoguin
2015-11-17Use `:` as a noop instead of `echo -n`Jean-Sébastien Pédron
The `-n` flag is not standard and not portable. It is supported by many Bourne shell to suppress the trailing newline character. But some old shells do not support this and "-n" is printed. This is the case for instance on some old versions of Mac OS X where `/bin/sh` is Bash 3.2.
2015-11-13Bullet repository has movedLoïc Hoguin
2015-10-27Fix small issue with c-src testsLoïc Hoguin
Main test Makefile expects "c_src" but for convenience I also allow "c-src" and use that one as the prefix for the tests.
2015-10-26Add new-nif target and related testsLoïc Hoguin
Pushing this now so I can figure out Windows.
2015-10-22Add shell chapter and testsLoïc Hoguin
2015-10-22Add the releases chapter contentsLoïc Hoguin
2015-10-22Add NIF chapter to the guideLoïc Hoguin
Not tested yet, figured it could still help people.
2015-10-22Return argument as a last resort in $(dep_name)Jean-Sébastien Pédron
Therefore, if neither $(dep_something) nor $(pkg_something_name) is defined, $(dep_name) will return the name specified in the various dependencies lists. This fixes `core-app-pt-erlc-opts` and `core-deps-fetch-fail-unknown` because now, the dependency is not "forgotten" anymore. Before, the dependency directory was missing from $(ALL_DEPS_DIRS) because $(dep_name) returned nothing.
2015-10-22Add git-submodule fetch methodLoïc Hoguin
Initially submitted by Daniel White.
2015-10-22Merge branch 'fix-test-core-plugins-one' of ↵Loïc Hoguin
https://github.com/rabbitmq/erlang.mk
2015-10-22Use relative path to erlang.mk file in autopatched depsLoïc Hoguin
2015-10-22Replace "if $(MAKE) then false" by "! $(MAKE)"Jean-Sébastien Pédron
2015-10-22Do not try to execute an empty shell script in core-plugins-one testJean-Sébastien Pédron
The previous code did: if `<code that prints nothing on stdout>`; then ... So the test failed but not for the good reason. The forked shell printed: /bin/sh: gmake[2]:: not found Now, both "Run 'make ...'" tests are simplified and do not rely on backticks and test(1) anymore. Either the output is inspected or the exit code is checked.
2015-10-22Move external plugins chapter in a plugins sectionLoïc Hoguin
2015-10-22Fix a small typoLoïc Hoguin
2015-10-22Add placeholders for missing chaptersLoïc Hoguin
2015-10-20Merge branch 'support-nongnu-date' of https://github.com/rabbitmq/erlang.mkLoïc Hoguin
2015-10-20Merge branch 'master' of https://github.com/kostyushkin/erlang.mkLoïc Hoguin
2015-10-20Rename couch package into opencouchLoïc Hoguin
Per request: https://github.com/ninenines/erlang.mk/issues/300 This commit also fixes issues with packages which have a different name than the application name.
2015-10-20Add package jamdb_sybase to the indexSergiy Kostyushkin
2015-10-20Add package octopus to the indexSergiy Kostyushkin
2015-10-19Force rebuilds on Makefile/.app.src changesLoïc Hoguin
Everything will be rebuilt when the Makefile or any included Makefile (like Erlang.mk or plugins) change. Only the .app will be rebuilt when the .app.src file changes.
2015-10-19Fix creating modules from templates when using apps/ onlyLoïc Hoguin
2015-10-19Remove mention of OTP_DEPS from the docsLoïc Hoguin
2015-10-15fix multiple patterns used on core_findDaniel Goertzen
'find', the underlying command of core_find, does not support multiple patterns after -name. This patch fixes multi-pattern use in c_src.mk by calling core_find once for each pattern.
2015-10-12Use '+%F %T%z' to format the timestampJean-Sébastien Pédron
Option `--rfc-3339` is specific to GNU Coreutils' date(1). This change fixes the use of `make summary` on other platforms such as FreeBSD. The underscore is integrated to the tiem format at the same time; no need for an additional $(subst).
2015-10-12Merge branch 'pkg-reload.mk' of https://github.com/bullno1/erlang.mkLoïc Hoguin
2015-10-12Add test for and fix DTL_FULL_PATHLoïc Hoguin
2015-10-12ErlyDTL files generate to beam directlyLoïc Hoguin
2015-10-12Cleanup ErlyDTL testLoïc Hoguin
2015-10-12Merge branch 'fix-plugin-erlydtl' of https://github.com/bullno1/erlang.mkLoïc Hoguin
2015-10-12Merge branch 'elbrujohalcon.table.display' of ↵Loïc Hoguin
https://github.com/elbrujohalcon/erlang.mk
2015-10-12Fix user guide PDF generatingLoïc Hoguin
2015-10-12Fix port compilation for rebar projectsLoïc Hoguin
2015-10-12Rework package testingLoïc Hoguin
Better error reporting and can now build everything in parallel. Failed builds are kept; others are deleted. The following command builds everything and then gives a diff of what got fixed/broken since last time ("> " is newly broken, "< " is newly fixed). make packages -j 32 -k; make summary
2015-10-11Ensure that modules generated from erlydtl are listed in .app filebullno1
2015-10-06Load rebar before autopatchingLoïc Hoguin
Some rebar.config.script files use the vsn key available only after rebar is loaded.
2015-10-04Add package reload_mk to the indexbullno1
2015-10-01Improved table display :)Brujo Benavides
2015-09-29Remove documented stuff from the README2.0.0-pre.1Loïc Hoguin
2015-09-29Add chapter Packages and dependencies to the guideLoïc Hoguin
2015-09-29Use ?= in APPS_DIR test, just like DEPS_DIRLoïc Hoguin
2015-09-29Add a test for SKIP_DEPSLoïc Hoguin
Also don't delete DEPS_DIR if SKIP_DEPS is set.