From 9f9841eb7327c9fe73e84e197fd2965a97b639cf Mon Sep 17 00:00:00 2001 From: Alexey Lebedeff Date: Wed, 15 Jun 2016 10:40:36 +0300 Subject: Don't make assumptions about build tools paths One more followup to https://github.com/erlang/otp/pull/1056 and https://github.com/erlang/otp/pull/1023 This time it's about `/usr/bin/env` and `/bin/cp`: - `/usr/bin/env` in `diameterc` was used to find the bootstrapped `escript` executable. Changed it to exlpicit call to `escript` in Makefile. - `/usr/bin/env` and `/bin/cp` were referenced in documentation build/install process. Now full paths to this tools are injected using autoconf magic. --- make/emd2exml.in | 2 +- make/otp.mk.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 100755 make/emd2exml.in (limited to 'make') diff --git a/make/emd2exml.in b/make/emd2exml.in old mode 100644 new mode 100755 index 903d707716..b4e052fef5 --- a/make/emd2exml.in +++ b/make/emd2exml.in @@ -1,4 +1,4 @@ -#!/usr/bin/env escript +#!@ENV@ escript %% -*- erlang -*- %%! -smp disable diff --git a/make/otp.mk.in b/make/otp.mk.in index c05c499d66..45eda71127 100644 --- a/make/otp.mk.in +++ b/make/otp.mk.in @@ -260,6 +260,7 @@ DEFAULT_GIF_FILES = $(HTMLDIR)/min_head.gif XSLTPROC = @XSLTPROC@ FOP = @FOP@ XMLLINT = @XMLLINT@ +CP = @CP@ DOCGEN=$(ERL_TOP)/lib/erl_docgen FOP_CONFIG = $(DOCGEN)/priv/fop.xconf -- cgit v1.2.3 From 0e00f80fb74f8f449eacf237e84a698a5555e7bd Mon Sep 17 00:00:00 2001 From: Alexey Lebedeff Date: Tue, 21 Jun 2016 18:01:54 +0300 Subject: Use perl discovered by configure --- make/make_emakefile | 66 -------------------------------------------------- make/make_emakefile.in | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 66 deletions(-) delete mode 100755 make/make_emakefile create mode 100755 make/make_emakefile.in (limited to 'make') diff --git a/make/make_emakefile b/make/make_emakefile deleted file mode 100755 index 56440d9bf0..0000000000 --- a/make/make_emakefile +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/env perl -# -*- cperl -*- - -use strict; - -my $key; -my @opts; -my @modules; -my $m; -my $o; - -foreach (@ARGV) { - if (/^\-I(.+)/) { - push(@opts,"{i,\"$1\"}"); - $key=0; - } - elsif (/^\-o(.+)/) { - push(@opts,"{outdir,\"$1\"}"); - $key=0; - } - elsif (/^\-D(.+)=(.+)/) { - push(@opts,"{d,\'$1\',$2}"); - $key=0; - } - elsif (/^\-D(.+)/) { - push(@opts,"{d,\'$1\'}"); - $key=0; - } - elsif (/^\+(.+)/) { - push(@opts,$1), - $key=0; - } - elsif (/^(\-(.+))$/) { - $key = $1; - } - elsif ($key eq "\-I") { - push(@opts,"{i,\"$_\"}"); - $key=0; - } - elsif ($key eq "\-o") { - push(@opts,"{outdir,\"$_\"}"); - $key=0; - } - elsif ($key) { - print "Warning: Ignoring invalid option \"$key $_\"\n"; - $key=0; - } - else { - push(@modules,"\'$_\'"), - $key=0; - } -}; - -$m = pop(@modules); -print "{[$m"; -foreach (@modules) { - print ",$_"; -}; - -$o = pop(@opts); -print "],[$o"; -foreach (@opts) { - print ",$_"; -}; - -print "]}.\n"; diff --git a/make/make_emakefile.in b/make/make_emakefile.in new file mode 100755 index 0000000000..fbca77887a --- /dev/null +++ b/make/make_emakefile.in @@ -0,0 +1,66 @@ +#!@PERL@ +# -*- cperl -*- + +use strict; + +my $key; +my @opts; +my @modules; +my $m; +my $o; + +foreach (@ARGV) { + if (/^\-I(.+)/) { + push(@opts,"{i,\"$1\"}"); + $key=0; + } + elsif (/^\-o(.+)/) { + push(@opts,"{outdir,\"$1\"}"); + $key=0; + } + elsif (/^\-D(.+)=(.+)/) { + push(@opts,"{d,\'$1\',$2}"); + $key=0; + } + elsif (/^\-D(.+)/) { + push(@opts,"{d,\'$1\'}"); + $key=0; + } + elsif (/^\+(.+)/) { + push(@opts,$1), + $key=0; + } + elsif (/^(\-(.+))$/) { + $key = $1; + } + elsif ($key eq "\-I") { + push(@opts,"{i,\"$_\"}"); + $key=0; + } + elsif ($key eq "\-o") { + push(@opts,"{outdir,\"$_\"}"); + $key=0; + } + elsif ($key) { + print "Warning: Ignoring invalid option \"$key $_\"\n"; + $key=0; + } + else { + push(@modules,"\'$_\'"), + $key=0; + } +}; + +$m = pop(@modules); +print "{[$m"; +foreach (@modules) { + print ",$_"; +}; + +$o = pop(@opts); +print "],[$o"; +foreach (@opts) { + print ",$_"; +}; + +print "]}.\n"; -- cgit v1.2.3 From 531708281a3a2cf336dc92651ede8d9d95f331cb Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Mon, 4 Jul 2016 17:00:11 +0200 Subject: wx: Prepare for using Erlang types and specs Create correct links to datatypes outside of the wx application. The added time for generating the doc/specs/specs_* files is unwelcome (they are currently not used). --- make/otp.mk.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'make') diff --git a/make/otp.mk.in b/make/otp.mk.in index c05c499d66..3b2e1a5bba 100644 --- a/make/otp.mk.in +++ b/make/otp.mk.in @@ -4,7 +4,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1997-2013. All Rights Reserved. +# Copyright Ericsson AB 1997-2016. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -271,6 +271,8 @@ SPECS_EXTRACTOR=$(DOCGEN)/priv/bin/specs_gen.escript # Extract specifications and types from Erlang source files (-spec, -type) $(SPECDIR)/specs_%.xml: $(SPECS_ESRC)/%.erl escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) -o$(dir $@) $< +$(SPECDIR)/specs_%.xml: $(SPECS_ESRC)/gen/%.erl + escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) -o$(dir $@) $< $(MAN1DIR)/%.1: %.xml -- cgit v1.2.3 From f30d131bd979e29b68fb7d9ff515c61a246201f4 Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Tue, 21 Mar 2017 13:40:08 +0100 Subject: erts: Deprecate the non-smp emulators --- make/emd2exml.in | 2 +- make/otp.mk.in | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'make') diff --git a/make/emd2exml.in b/make/emd2exml.in index b4e052fef5..13bd6700d9 100755 --- a/make/emd2exml.in +++ b/make/emd2exml.in @@ -1,6 +1,6 @@ #!@ENV@ escript %% -*- erlang -*- -%%! -smp disable +%%! %% %% %CopyrightBegin% diff --git a/make/otp.mk.in b/make/otp.mk.in index 7e2945b561..cd4572d81b 100644 --- a/make/otp.mk.in +++ b/make/otp.mk.in @@ -47,6 +47,9 @@ CROSS_COMPILING = @CROSS_COMPILING@ # ---------------------------------------------------- DEFAULT_TARGETS = opt debug release release_docs clean docs +DEFAULT_FLAVOR=@DEFAULT_FLAVOR@ +FLAVORS=@FLAVORS@ + # Slash separated list of return values from $(origin VAR) # that are untrusted - set default in this file instead. # The list is not space separated since some return values -- cgit v1.2.3 From 4b216f70be3403bb7c102e7ac1a91b1ee4805c33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Fri, 12 May 2017 13:54:32 +0200 Subject: Let --enable-lock-counter build an additional emulator "./configure --enable-lock-counter" would modify the behavior of the default emulator (usually SMP). To make lock counting more accessible, change --enable-lock-counter to build an additional emulator in the same way as: (cd erts/emulator && make lcnt) (The next commit will make it easier to start the built lock-counter emulator.) --- make/otp.mk.in | 1 + make/otp_subdir.mk | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'make') diff --git a/make/otp.mk.in b/make/otp.mk.in index cd4572d81b..83bab7065d 100644 --- a/make/otp.mk.in +++ b/make/otp.mk.in @@ -49,6 +49,7 @@ DEFAULT_TARGETS = opt debug release release_docs clean docs DEFAULT_FLAVOR=@DEFAULT_FLAVOR@ FLAVORS=@FLAVORS@ +TYPES=@TYPES@ # Slash separated list of return values from $(origin VAR) # that are untrusted - set default in this file instead. diff --git a/make/otp_subdir.mk b/make/otp_subdir.mk index fa6470ddd7..5734970298 100644 --- a/make/otp_subdir.mk +++ b/make/otp_subdir.mk @@ -19,13 +19,13 @@ # # Make include file for otp -.PHONY: debug opt release docs release_docs tests release_tests \ +.PHONY: debug opt lcnt release docs release_docs tests release_tests \ clean depend valgrind static_lib # # Targets that don't affect documentation directories # -opt debug release docs release_docs tests release_tests clean depend valgrind static_lib: +opt debug lcnt release docs release_docs tests release_tests clean depend valgrind static_lib: @set -e ; \ app_pwd=`pwd` ; \ if test -f vsn.mk; then \ -- cgit v1.2.3