Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Add configure option --without-$app

This is used to skip the specified app when building and releasing
  • Loading branch information...
commit 0ed2039a7bef0137c1c6723e0401f96b7bf71de3 1 parent 6fc94ba
@garazdawi garazdawi authored
Showing with 32 additions and 5 deletions.
  1. +1 −0  .gitignore
  2. +6 −0 HOWTO/INSTALL.md
  3. +21 −5 configure.in
  4. +4 −0 lib/Makefile
View
1  .gitignore
@@ -150,6 +150,7 @@ JAVADOC-GENERATED
/erts/epmd/test/Emakefile
/lib/*/SKIP
+/lib/SKIP-APPLICATIONS
/lib/*/doc/html/*.html
/lib/*/doc/html/*.css
View
6 HOWTO/INSTALL.md
@@ -296,6 +296,12 @@ Some of the available `configure` options are:
you can build using a fallback implementation based on mutexes or spinlocks.
Performance of the SMP runtime system will however suffer immensely without
an implementation for native atomic memory accesses.
+* `--without-$app` - By default all applications in Erlang/OTP will be included
+ in a release. If this is not wanted it is possible to specify that Erlang/OTP
+ should be compiled without that applications, i.e. `--without-wx`. There is
+ no automatic dependency handling inbetween applications. So if you disable
+ an application that another depends on, you also have to disable the
+ dependant application.
If you or your system has special requirements please read the `Makefile` for
additional configuration information.
View
26 configure.in
@@ -390,6 +390,15 @@ if test X${enable_native_libs} = Xyes -a X${enable_hipe} != Xno; then
fi
AC_SUBST(NATIVE_LIBS_ENABLED)
+
+rm -f $ERL_TOP/lib/SKIP-APPLICATIONS
+for app in `cd lib && ls -d *`; do
+ var="with_$app"
+ if test X${!var} == Xno; then
+ echo "$app" >> $ERL_TOP/lib/SKIP-APPLICATIONS
+ fi
+done
+
export ERL_TOP
AC_CONFIG_SUBDIRS(lib erts)
@@ -400,15 +409,22 @@ AC_OUTPUT
pattern="lib/*/SKIP"
files=`echo $pattern`
-if test "$files" != "$pattern"; then
+if test "$files" != "$pattern" || test -f $ERL_TOP/lib/SKIP-APPLICATIONS; then
echo '*********************************************************************'
echo '********************** APPLICATIONS DISABLED **********************'
echo '*********************************************************************'
echo
- for skipfile in $files; do
- app=`dirname $skipfile`; app=`basename $app`
- printf "%-15s: " $app; cat $skipfile
- done
+ if test "$files" != "$pattern"; then
+ for skipfile in $files; do
+ app=`dirname $skipfile`; app=`basename $app`
+ printf "%-15s: " $app; cat $skipfile
+ done
+ fi
+ if test -f $ERL_TOP/lib/SKIP-APPLICATIONS; then
+ for skipapp in `cat $ERL_TOP/lib/SKIP-APPLICATIONS`; do
+ printf "%-15s: User gave --without-%s option\n" $skipapp $skipapp
+ done
+ fi
echo
echo '*********************************************************************'
fi
View
4 lib/Makefile
@@ -52,6 +52,10 @@ else
endif
endif
+# Any applications listed in SKIP-APPLICATIONS should be skipped
+SKIP_FILE := $(wildcard SKIP-APPLICATIONS)
+SKIP_APPLICATIONS := $(if $(SKIP_FILE),$(shell cat $(SKIP_FILE)))
+SUB_DIRECTORIES := $(filter-out $(SKIP_APPLICATIONS),$(SUB_DIRECTORIES))
# ----------------------------------------------------------------------
include $(ERL_TOP)/make/otp_subdir.mk
Please sign in to comment.
Something went wrong with that request. Please try again.