diff options
author | Loïc Hoguin <[email protected]> | 2024-11-14 10:24:26 +0100 |
---|---|---|
committer | Loïc Hoguin <[email protected]> | 2024-11-14 11:47:22 +0100 |
commit | 72e17099bb59d2d429cf813d21c98bede590fc7c (patch) | |
tree | c264b700f2e813b6bdaab0791c1fb57281acc0d6 /test | |
parent | e903cc89c5cc389305ee8dc0b15a8db250de1b37 (diff) | |
download | erlang.mk-72e17099bb59d2d429cf813d21c98bede590fc7c.tar.gz erlang.mk-72e17099bb59d2d429cf813d21c98bede590fc7c.tar.bz2 erlang.mk-72e17099bb59d2d429cf813d21c98bede590fc7c.zip |
Remove most packages
Erlang.mk will no longer feature packages out of the box,
except for the applications that we implement plugins for
(such as erlydtl, proper or relx) and the projects I work
on that are also used to test Erlang.mk (cowboy and friends).
This is a breaking change. In most cases the fix is to add
a full dep_* line for the dependencies that were used as
packages before.
Diffstat (limited to 'test')
-rw-r--r-- | test/core_apps.mk | 4 | ||||
-rw-r--r-- | test/core_autopatch.mk | 8 | ||||
-rw-r--r-- | test/core_compat.mk | 2 | ||||
-rw-r--r-- | test/core_deps.mk | 6 | ||||
-rw-r--r-- | test/plugin_dialyzer.mk | 4 | ||||
-rw-r--r-- | test/plugin_edoc.mk | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/test/core_apps.mk b/test/core_apps.mk index 1b8ee21..8e2223e 100644 --- a/test/core_apps.mk +++ b/test/core_apps.mk @@ -444,7 +444,7 @@ core-apps-local-deps: init $t $(MAKE) -C $(APP) new-app in=my_app_1 $v $i "Add Lager to the list of dependencies of my_app_1, and add the lager parse_transform" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\nERLC_OPTS+=+{parse_transform,lager_transform}\n"}' $(APP)/apps/my_app_1/Makefile + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\ndep_lager = git https://github.com/erlang-lager/lager master\nERLC_OPTS+=+{parse_transform,lager_transform}\n"}' $(APP)/apps/my_app_1/Makefile $i "Add a lager:error/2 call to my_app_1_app.erl that will fail if the parse_transform doesn't run" $t perl -ni.bak -e 'print;if (/^-export/){print "\n-export([log/0]).\n"} if (eof) {print "\nlog() -> lager:error(\"test\", []).\n"}' $(APP)/apps/my_app_1/src/my_app_1_app.erl @@ -485,7 +485,7 @@ core-apps-local-deps: init $i "Add Lager to the list of dependencies of my_app_2, and add the lager parse_transform" $t mv $(APP)/apps/my_app_2/Makefile.bak $(APP)/apps/my_app_2/Makefile - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\nERLC_OPTS+=+{parse_transform,lager_transform}\n"}' $(APP)/apps/my_app_2/Makefile + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\ndep_lager = git https://github.com/erlang-lager/lager master\nERLC_OPTS+=+{parse_transform,lager_transform}\n"}' $(APP)/apps/my_app_2/Makefile $i "Build the application" $t $(MAKE) -C $(APP) $v diff --git a/test/core_autopatch.mk b/test/core_autopatch.mk index 5dab972..c961a78 100644 --- a/test/core_autopatch.mk +++ b/test/core_autopatch.mk @@ -34,7 +34,7 @@ core-autopatch-extended-erlc-opts: init $t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v $i "Add couchbeam to the list of dependencies" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = couchbeam\n"}' $(APP)/Makefile + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = couchbeam\ndep_couchbeam = git https://github.com/benoitc/couchbeam master\n"}' $(APP)/Makefile $i "Extend autopatch-couchbeam to add options to its ERLC_OPTS" $t echo "autopatch-couchbeam:: ; echo >> \$$(DEPS_DIR)/couchbeam/Makefile; echo 'ERLC_OPTS += -DWITH_JIFFY' >> \$$(DEPS_DIR)/couchbeam/Makefile" >> $(APP)/Makefile @@ -93,7 +93,7 @@ core-autopatch-no-autopatch-erlang-mk: init # $t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v # # $i "Add Lager to the list of dependencies and to the NO_AUTOPATCH list" -# $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\nNO_AUTOPATCH = lager\n"}' $(APP)/Makefile +# $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\ndep_lager = git https://github.com/erlang-lager/lager master\nNO_AUTOPATCH = lager\n"}' $(APP)/Makefile # # $i "Build the application" # $t $(MAKE) -C $(APP) $v @@ -151,7 +151,7 @@ core-autopatch-rebar: init $t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v $i "Add erlsha2 to the list of dependencies" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = erlsha2\n"}' $(APP)/Makefile + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = erlsha2\ndep_erlsha2 = git https://github.com/vinoski/erlsha2 master\n"}' $(APP)/Makefile $i "Build the application" $t $(MAKE) -C $(APP) $v @@ -172,7 +172,7 @@ core-autopatch-two-rebar: init $t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v $i "Add two Rebar projects to the list of dependencies" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = epgsql mochiweb\n"}' $(APP)/Makefile + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = epgsql mochiweb\ndep_epgsql = git https://github.com/epgsql/epgsql master\ndep_mochiweb = git https://github.com/mochi/mochiweb main\n"}' $(APP)/Makefile $i "Build the application" $t $(MAKE) -C $(APP) $v diff --git a/test/core_compat.mk b/test/core_compat.mk index b4223b5..e6316de 100644 --- a/test/core_compat.mk +++ b/test/core_compat.mk @@ -312,7 +312,7 @@ core-compat-rebar-pt: init $t echo "-module(girl)." > $(APP)/src/girl.erl $i "Add lager to the list of dependencies" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\n"}' $(APP)/Makefile + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\ndep_lager = git https://github.com/erlang-lager/lager master\n"}' $(APP)/Makefile $i "Add the lager_transform parse_transform to ERLC_OPTS" $t echo "ERLC_OPTS += +'{parse_transform, lager_transform}' +'{lager_truncation_size, 1234}'" >> $(APP)/Makefile diff --git a/test/core_deps.mk b/test/core_deps.mk index 5d65a42..da57c1d 100644 --- a/test/core_deps.mk +++ b/test/core_deps.mk @@ -467,7 +467,7 @@ core-deps-doc: init $t echo "-module(girl)." > $(APP)/src/girl.erl $i "Add Edown as a documentation building dependency" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DOC_DEPS = edown\nEDOC_OPTS = {doclet, edown_doclet}\n"}' $(APP)/Makefile + $t perl -ni.bak -e 'print;if ($$.==1) {print "DOC_DEPS = edown\ndep_edown = git https://github.com/uwiger/edown master\nEDOC_OPTS = {doclet, edown_doclet}\n"}' $(APP)/Makefile $i "Build the application" $t $(MAKE) -C $(APP) $v @@ -1223,7 +1223,7 @@ core-deps-mv-rebar: init $t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v $i "Add Lager to the list of dependencies" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\n"}' $(APP)/Makefile + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\ndep_lager = git https://github.com/erlang-lager/lager master\n"}' $(APP)/Makefile $i "Build the application" $t $(MAKE) -C $(APP) $v @@ -1401,7 +1401,7 @@ core-deps-rel: init $t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib bootstrap-rel $v $i "Add Recon to the list of release dependencies" - $t perl -ni.bak -e 'print;if ($$.==1) {print "REL_DEPS = recon\n"}' $(APP)/Makefile + $t perl -ni.bak -e 'print;if ($$.==1) {print "REL_DEPS = recon\ndep_recon = git https://github.com/ferd/recon master\n"}' $(APP)/Makefile $i "Add Recon to the relx.config file" $t $(ERL) -eval " \ diff --git a/test/plugin_dialyzer.mk b/test/plugin_dialyzer.mk index 48a2fd6..4e0557c 100644 --- a/test/plugin_dialyzer.mk +++ b/test/plugin_dialyzer.mk @@ -105,7 +105,7 @@ dialyzer-beam: init $t $(MAKE) -C $(APP) -f erlang.mk bootstrap $v $i "Add lager to the list of dependencies" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\n"}' $(APP)/Makefile + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\ndep_lager = git https://github.com/erlang-lager/lager master\n"}' $(APP)/Makefile $i "Add lager_transform to ERLC_OPTS" $t echo "ERLC_OPTS += +'{parse_transform, lager_transform}'" >> $(APP)/Makefile @@ -308,7 +308,7 @@ dialyzer-plt-swallow-warnings: init $t $(MAKE) -C $(APP) -f erlang.mk bootstrap $v $i "Add LFE version referring to a missing function to the list of dependencies" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lfe\ndep_lfe_commit = d656987dc5f5e08306531ad1ce13bf9ca9ec9e5a\n"}' $(APP)/Makefile + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lfe\ndep_lfe = git https://github.com/rvirding/lfe d656987dc5f5e08306531ad1ce13bf9ca9ec9e5a\n"}' $(APP)/Makefile $i "Create the PLT file" $t $(DIALYZER_MUTEX) $(MAKE) -C $(APP) plt $v diff --git a/test/plugin_edoc.mk b/test/plugin_edoc.mk index 6dc8252..ca2fce7 100644 --- a/test/plugin_edoc.mk +++ b/test/plugin_edoc.mk @@ -100,7 +100,7 @@ edoc-opts: init $t $(MAKE) -C $(APP) -f erlang.mk bootstrap $v $i "Add edown doclet for EDoc" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DOC_DEPS = edown\nEDOC_OPTS = {doclet, edown_doclet}\n"}' $(APP)/Makefile + $t perl -ni.bak -e 'print;if ($$.==1) {print "DOC_DEPS = edown\ndep_edown = git https://github.com/uwiger/edown master\nEDOC_OPTS = {doclet, edown_doclet}\n"}' $(APP)/Makefile $i "Run EDoc" $t $(MAKE) -C $(APP) edoc $v |