Merge branch 'maint'

10 files changed, 117 insertions, 55 deletions

diff --git a/INSTALL-WIN32.md b/INSTALL-WIN32.md
index 1e5e1f45fa..93b7e3a1e1 100644
--- a/INSTALL-WIN32.md
+++ b/INSTALL-WIN32.md
@@ -600,32 +600,36 @@ OpenSSL. Well' here's the list:
     Windows command prompt (it should be on the same drive as where
     you are going to install it if everything is to work smothly).
 
-      `C:\> cd <some dir>`
+        C:\> cd <some dir>
 
     Add ActiveState (or some other windows perl, not cygwins) to your PATH:
 
-      `C:\...\> set PATH=C:\Perl\bin;%PATH%`
+        C:\...\> set PATH=C:\Perl\bin;%PATH%
+
+    Or if you installed the 64bit perl:
+    
+        C:\...\> set PATH=C:\Perl64\bin;%PATH%
 
     Configure OpenSSL for 32 bit:
 
-      `C:\...\> perl Configure VC-WIN32 --prefix=/OpenSSL`
+        C:\...\> perl Configure VC-WIN32 --prefix=/OpenSSL
 
     Or for 64 bit:
 
-      `C:\...\> perl Configure VC-WIN64A --prefix=/OpenSSL-Win64`
+        C:\...\> perl Configure VC-WIN64A --prefix=/OpenSSL-Win64
 
     Do some setup (for 32 bit):
 
-      `C:\...\> ms\do_win32`
+        C:\...\> ms\do_ms
 
     The same for 64 bit:
 
-      `C:\...\> ms\do_win64a`
+        C:\...\> ms\do_win64a
 
     Then build static libraries and install:
 
-      `C:\...\> nmake -f ms\nt.mak`
-      `C:\...\> nmake -f ms\nt.mak install`
+        C:\...\> nmake -f ms\nt.mak
+        C:\...\> nmake -f ms\nt.mak install
 
     That's it - you now have your perfectly consistent static build of
     openssl. If you want to get rid of any possibly patented
@@ -644,19 +648,21 @@ OpenSSL. Well' here's the list:
     edit:  `C:\cygwin\opt\local\pgm\wxMSW-2.8.11\include\wx\msw\setup.h`
     enable `wxUSE_GLCANVAS`, `wxUSE_POSTSCRIPT` and `wxUSE_GRAPHICS_CONTEXT`
 
-    build: From a command prompt with the VC tools available (usually started from a
-           shortcut installed by the SDK/Visual Studio):
+    build: From a command prompt with the VC tools available (See the
+    instructions for OpenSSL build above for help on starting the
+    proper command prompt in RELEASE mode):
 	   
-	   `cd C:\cygwin\opt\local\pgm\wxMSW-2.8.11\build\msw`
-	   `nmake BUILD=release SHARED=0 UNICODE=1 USE_OPENGL=1 USE_GDIPLUS=1 DIR_SUFFIX_CPU= -f makefile.vc`
-	   `cd C:\cygwin\opt\local\pgm\wxMSW-2.8.11\contrib\build\stc`
-	   `nmake BUILD=release SHARED=0 UNICODE=1 USE_OPENGL=1 USE_GDIPLUS=1 DIR_SUFFIX_CPU= -f makefile.vc`
+        C:\...\> cd C:\cygwin\opt\local\pgm\wxMSW-2.8.11\build\msw
+        C:\...\> nmake BUILD=release SHARED=0 UNICODE=1 USE_OPENGL=1 USE_GDIPLUS=1 DIR_SUFFIX_CPU= -f makefile.vc
+        C:\...\> cd C:\cygwin\opt\local\pgm\wxMSW-2.8.11\contrib\build\stc
+        C:\...\> nmake BUILD=release SHARED=0 UNICODE=1 USE_OPENGL=1 USE_GDIPLUS=1 DIR_SUFFIX_CPU= -f makefile.vc
     
     Or - if building a 64bit version:
-	   `cd C:\cygwin\opt\local\pgm\wxMSW-2.8.11\build\msw`
-	   `nmake TARGET_CPU=amd64 BUILD=release SHARED=0 UNICODE=1 USE_OPENGL=1 USE_GDIPLUS=1 DIR_SUFFIX_CPU= -f makefile.vc`
-	   `cd C:\cygwin\opt\local\pgm\wxMSW-2.8.11\contrib\build\stc`
-	   `nmake TARGET_CPU=amd64 BUILD=release SHARED=0 UNICODE=1 USE_OPENGL=1 USE_GDIPLUS=1 DIR_SUFFIX_CPU= -f makefile.vc`
+
+        C:\...\> cd C:\cygwin\opt\local\pgm\wxMSW-2.8.11\build\msw
+        C:\...\> nmake TARGET_CPU=amd64 BUILD=release SHARED=0 UNICODE=1 USE_OPENGL=1 USE_GDIPLUS=1 DIR_SUFFIX_CPU= -f makefile.vc
+        C:\...\> cd C:\cygwin\opt\local\pgm\wxMSW-2.8.11\contrib\build\stc
+        C:\...\> nmake TARGET_CPU=amd64 BUILD=release SHARED=0 UNICODE=1 USE_OPENGL=1 USE_GDIPLUS=1 DIR_SUFFIX_CPU= -f makefile.vc
     	   
 *   The Erlang source distribution (from <http://www.erlang.org/download.html>).
     The same as for Unix platforms. Preferably use tar from within Cygwin to
diff --git a/lib/ic/test/c_client_erl_server_SUITE_data/Makefile.src b/lib/ic/test/c_client_erl_server_SUITE_data/Makefile.src
index d5277eb256..53543a5bf0 100644
--- a/lib/ic/test/c_client_erl_server_SUITE_data/Makefile.src
+++ b/lib/ic/test/c_client_erl_server_SUITE_data/Makefile.src
@@ -122,24 +122,33 @@ EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
 
 all: $(PGMS) $(EBINS)
 
+$(GEN_ERL_FILES) $(GEN_HRL_FILES):  c_erl_test.built_erl
+$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.built_c
+$(OBJS): $(GEN_C_FILES) $(GEN_H_FILES)
+$(EBINS): $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+
 clean:	
 	-rm -f $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
+		c_erl_test.built_erl c_erl_test.built_c
 	-del /F /Q $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
+		c_erl_test.built_erl c_erl_test.built_c
 
 $(PGMS): $(OBJS)
 	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
-$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.idl
+c_erl_test.built_c: c_erl_test.idl
 	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,c_client}" c_erl_test.idl
+	echo done > c_erl_test.built_c
 
-$(GEN_ERL_FILES) $(GEN_HRL_FILES): c_erl_test.idl
+c_erl_test.built_erl: c_erl_test.idl
 	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" c_erl_test.idl
+	echo done > c_erl_test.built_erl
 
-.c@obj@:
+.c@obj@: 
 	$(CC) -c -o $*@obj@ $(CFLAGS) $<
 
-.erl.@EMULATOR@:
+.erl.@EMULATOR@: 
 	$(ERLC) -I $(IC_INCLUDE_PATH) $<
 
diff --git a/lib/ic/test/c_client_erl_server_proto_SUITE_data/Makefile.src b/lib/ic/test/c_client_erl_server_proto_SUITE_data/Makefile.src
index 8bc1a907a7..7d32ee4e87 100644
--- a/lib/ic/test/c_client_erl_server_proto_SUITE_data/Makefile.src
+++ b/lib/ic/test/c_client_erl_server_proto_SUITE_data/Makefile.src
@@ -122,25 +122,34 @@ EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
 
 all: $(PGMS) $(EBINS)
 
+$(GEN_ERL_FILES) $(GEN_HRL_FILES):  c_erl_test.built_erl
+$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.built_c
+$(OBJS): $(GEN_C_FILES) $(GEN_H_FILES)
+$(EBINS): $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+
 clean:	
 	-rm -f $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
+		c_erl_test.built_erl c_erl_test.built_c
 	-del /F /Q $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
+		c_erl_test.built_erl c_erl_test.built_c
 
 $(PGMS): $(OBJS)
 	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
-$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.idl
+c_erl_test.built_c: c_erl_test.idl
 	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,c_client}" \
 		"+{user_protocol,my}" c_erl_test.idl
+	echo done > c_erl_test.built_c
 
-$(GEN_ERL_FILES) $(GEN_HRL_FILES): c_erl_test.idl
+c_erl_test.built_erl: c_erl_test.idl
 	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" c_erl_test.idl
+	echo done > c_erl_test.built_erl
 
-.c@obj@:
+.c@obj@: 
 	$(CC) -c -o $*@obj@ $(CFLAGS) $<
 
-.erl.@EMULATOR@:
+.erl.@EMULATOR@: 
 	$(ERLC) -I $(IC_INCLUDE_PATH) $<
 
diff --git a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/Makefile.src b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/Makefile.src
index 2585341791..19c67734ca 100644
--- a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/Makefile.src
+++ b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/Makefile.src
@@ -122,25 +122,33 @@ EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
 
 all: $(PGMS) $(EBINS)
 
+$(GEN_ERL_FILES) $(GEN_HRL_FILES):  c_erl_test.built_erl
+$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.built_c
+$(OBJS): $(GEN_C_FILES) $(GEN_H_FILES)
+$(EBINS): $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+
 clean:	
 	-rm -f $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
+		c_erl_test.built_erl c_erl_test.built_c
 	-del /F /Q $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
+		c_erl_test.built_erl c_erl_test.built_c
 
 $(PGMS): $(OBJS)
 	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
-$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.idl
-	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,c_client}" \
-		"+{user_protocol,my}" "+{c_timeout,{5000,5000}}" c_erl_test.idl
+c_erl_test.built_c: c_erl_test.idl
+	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,c_client}" c_erl_test.idl
+	echo done > c_erl_test.built_c
 
-$(GEN_ERL_FILES) $(GEN_HRL_FILES): c_erl_test.idl
+c_erl_test.built_erl: c_erl_test.idl
 	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" c_erl_test.idl
+	echo done > c_erl_test.built_erl
 
-.c@obj@:
+.c@obj@: 
 	$(CC) -c -o $*@obj@ $(CFLAGS) $<
 
-.erl.@EMULATOR@:
+.erl.@EMULATOR@: 
 	$(ERLC) -I $(IC_INCLUDE_PATH) $<
 
diff --git a/lib/ic/test/erl_client_c_server_SUITE_data/Makefile.src b/lib/ic/test/erl_client_c_server_SUITE_data/Makefile.src
index 50cf9d4445..ac53d0a657 100644
--- a/lib/ic/test/erl_client_c_server_SUITE_data/Makefile.src
+++ b/lib/ic/test/erl_client_c_server_SUITE_data/Makefile.src
@@ -122,25 +122,34 @@ EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
 
 all: $(PGMS) $(EBINS)
 
+$(GEN_ERL_FILES) $(GEN_HRL_FILES):  c_erl_test.built_erl
+$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.built_c
+$(OBJS): $(GEN_C_FILES) $(GEN_H_FILES)
+$(EBINS): $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+
 clean:	
 	-rm -f $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
+		c_erl_test.built_erl c_erl_test.built_c
 	-del /F /Q $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
+		c_erl_test.built_erl c_erl_test.built_c
 
 $(PGMS): $(OBJS)
 	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
-$(GEN_C_FILES) $(GEN_H_FILES): erl_c_test.idl
+c_erl_test.built_c: erl_c_test.idl
 	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,c_server}" \
 	"+{scoped_op_calls,true}" erl_c_test.idl
+	echo done > c_erl_test.built_c
 
 # If we have scoped operation calls for C, we must have that for
 # Erlang as well, if we use the m_i.erl file for calling the server.
 
-$(GEN_ERL_FILES) $(GEN_HRL_FILES): erl_c_test.idl
+c_erl_test.built_erl: erl_c_test.idl
 	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" \
 	"+{scoped_op_calls,true}"  "+{timeout,true}" erl_c_test.idl
+	echo done > c_erl_test.built_erl
 
 .c@obj@:
 	$(CC) -c -o $*@obj@ $(CFLAGS) $<
diff --git a/lib/ic/test/erl_client_c_server_proto_SUITE_data/Makefile.src b/lib/ic/test/erl_client_c_server_proto_SUITE_data/Makefile.src
index 6c7701ca50..d23de04944 100644
--- a/lib/ic/test/erl_client_c_server_proto_SUITE_data/Makefile.src
+++ b/lib/ic/test/erl_client_c_server_proto_SUITE_data/Makefile.src
@@ -122,25 +122,34 @@ EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
 
 all: $(PGMS) $(EBINS)
 
+$(GEN_ERL_FILES) $(GEN_HRL_FILES):  c_erl_test.built_erl
+$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.built_c
+$(OBJS): $(GEN_C_FILES) $(GEN_H_FILES)
+$(EBINS): $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+
 clean:	
 	-rm -f $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
+		c_erl_test.built_erl c_erl_test.built_c
 	-del /F /Q $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
+		c_erl_test.built_erl c_erl_test.built_c
 
 $(PGMS): $(OBJS)
 	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
-$(GEN_C_FILES) $(GEN_H_FILES): erl_c_test.idl
+c_erl_test.built_c: erl_c_test.idl
 	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,c_server}" \
 	"+{scoped_op_calls,true}" erl_c_test.idl
+	echo done > c_erl_test.built_c
 
 # If we have scoped operation calls for C, we must have that for
 # Erlang as well, if we use the m_i.erl file for calling the server.
 
-$(GEN_ERL_FILES) $(GEN_HRL_FILES): erl_c_test.idl
+c_erl_test.built_erl: erl_c_test.idl
 	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" \
 	"+{scoped_op_calls,true}"  "+{timeout,true}" erl_c_test.idl
+	echo done > c_erl_test.built_erl
 
 .c@obj@:
 	$(CC) -c -o $*@obj@ $(CFLAGS) $<
diff --git a/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src b/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src
index 5e190fe1a5..0d84a62270 100644
--- a/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src
+++ b/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src
@@ -69,20 +69,29 @@ EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
 
 all: $(CLASS_FILES) $(EBINS)
 
+$(GEN_ERL_FILES) $(GEN_HRL_FILES):  java_erl_test.built_erl
+$(GEN_JAVA_FILES): java_erl_test.built_java
+$(CLASS_FILES): $(GEN_JAVA_FILES)
+$(EBINS): $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+
 clean:	
 	-rm -f $(GEN_JAVA_FILES) $(CLASS_FILES) \
-		$(GEN_ERL_FILES) $(GEN_HRL_FILES) $(EBINS) 
+		$(GEN_ERL_FILES) $(GEN_HRL_FILES) $(EBINS) \
+		java_erl_test.built_erl java_erl_test.built_java
 	-del /F /Q $(GEN_JAVA_FILES) $(CLASS_FILES) \
-		$(GEN_ERL_FILES) $(GEN_HRL_FILES) $(EBINS) 
+		$(GEN_ERL_FILES) $(GEN_HRL_FILES) $(EBINS) \
+		java_erl_test.built_erl java_erl_test.built_java
 
-$(GEN_JAVA_FILES) : java_erl_test.idl
+java_erl_test.built_java: java_erl_test.idl
 	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,java}" java_erl_test.idl
+	echo done > java_erl_test.built_java
 
 $(CLASS_FILES) : $(JAVA_FILES)
 	$(JAVAC) -classpath $(CLASSPATH) $(JAVA_FILES)
 
-$(GEN_ERL_FILES) $(GEN_HRL_FILES): java_erl_test.idl
+java_erl_test.built_erl: java_erl_test.idl
 	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" java_erl_test.idl
+	echo done > java_erl_test.built_erl
 
 .erl.@EMULATOR@:
 	$(ERLC) -I $(IC_INCLUDE_PATH) $<
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index 99b0cd2ffb..4dfa92a755 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -1441,6 +1441,9 @@ filter_app("netconf",_) ->
 % Safe has the same kind of error in the .app file as ic
 filter_app("safe",_) ->
     false;
+% Comte cannot be started in the "usual" way
+filter_app("comte",_) ->
+    false;
 % OS_mon does not find it's port program when running cerl
 filter_app("os_mon",true) ->
     false;
diff --git a/lib/stdlib/test/edlin_expand_SUITE.erl b/lib/stdlib/test/edlin_expand_SUITE.erl
index a0e198ce09..f8d4fb4b6a 100644
--- a/lib/stdlib/test/edlin_expand_SUITE.erl
+++ b/lib/stdlib/test/edlin_expand_SUITE.erl
@@ -46,10 +46,10 @@ groups() ->
     [].
 
 init_per_suite(Config) ->
-    true = code:delete(expand_test),
-    true = code:delete(expand_test1),
-    true = code:delete('ExpandTestCaps'),
-    true = code:delete('ExpandTestCaps1'),
+    (catch code:delete(expand_test)),
+    (catch code:delete(expand_test1)),
+    (catch code:delete('ExpandTestCaps')),
+    (catch code:delete('ExpandTestCaps1')),
     Config.
 
 end_per_suite(_Config) ->
diff --git a/lib/stdlib/test/io_proto_SUITE.erl b/lib/stdlib/test/io_proto_SUITE.erl
index b69cd74edb..0b74d04b85 100644
--- a/lib/stdlib/test/io_proto_SUITE.erl
+++ b/lib/stdlib/test/io_proto_SUITE.erl
@@ -50,7 +50,7 @@
 -define(privdir(Conf), ?config(priv_dir, Conf)).
 -endif.
 
--define(debug, true).
+%%-define(debug, true).
 
 -ifdef(debug).
 -define(format(S, A), io:format(S, A)).