From 399242cc00f6dfb32cfe391fc0172b89e93435fb Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Mon, 21 Nov 2016 11:23:03 +0100
Subject: [observer] Start crashdump_viewer in a non-distributed node

The shell script (priv/bin/cdv) and bat file (priv/bin/cdv.bat) which
can be used for starting crashdump_viewer both started a distributed
erlang node. This would cause any attempt at starting a second
instance of the crashdump_viewer to fail. To solve this problem, cdv
and cdv.bat now use non-distrubuted nodes when starting the
crashdump_viewer.
---
 lib/observer/priv/bin/cdv     | 2 +-
 lib/observer/priv/bin/cdv.bat | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/observer')

diff --git a/lib/observer/priv/bin/cdv b/lib/observer/priv/bin/cdv
index 1c44785ac2..d14fd47e41 100755
--- a/lib/observer/priv/bin/cdv
+++ b/lib/observer/priv/bin/cdv
@@ -1,4 +1,4 @@
 #!/bin/sh 
 
-erl -sname cdv -noinput -s crashdump_viewer script_start $@
+erl -noinput -s crashdump_viewer script_start $@
 
diff --git a/lib/observer/priv/bin/cdv.bat b/lib/observer/priv/bin/cdv.bat
index efa8bf8687..18136a30d6 100644
--- a/lib/observer/priv/bin/cdv.bat
+++ b/lib/observer/priv/bin/cdv.bat
@@ -1,2 +1,2 @@
 @ECHO OFF
-CALL werl -sname cdv -s crashdump_viewer script_start %*
+CALL werl -s crashdump_viewer script_start %*
-- 
cgit v1.2.3


From 306a293d8ba43443f908523c9aa2d6067b7e3847 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Mon, 21 Nov 2016 11:16:07 +0100
Subject: [observer] Remove unused files

deleted:    priv/crashdump_viewer.tool
deleted:    priv/crashdump_viewer/collapsd.gif
deleted:    priv/crashdump_viewer/exploded.gif
---
 lib/observer/priv/crashdump_viewer.tool         |   2 --
 lib/observer/priv/crashdump_viewer/collapsd.gif | Bin 141 -> 0 bytes
 lib/observer/priv/crashdump_viewer/exploded.gif | Bin 143 -> 0 bytes
 lib/observer/src/Makefile                       |  10 ++--------
 4 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 lib/observer/priv/crashdump_viewer.tool
 delete mode 100644 lib/observer/priv/crashdump_viewer/collapsd.gif
 delete mode 100644 lib/observer/priv/crashdump_viewer/exploded.gif

(limited to 'lib/observer')

diff --git a/lib/observer/priv/crashdump_viewer.tool b/lib/observer/priv/crashdump_viewer.tool
deleted file mode 100644
index b6bd6bbdef..0000000000
--- a/lib/observer/priv/crashdump_viewer.tool
+++ /dev/null
@@ -1,2 +0,0 @@
-{version,"1.2"}.
-[{config_func,{crashdump_viewer,configData,[]}}].
diff --git a/lib/observer/priv/crashdump_viewer/collapsd.gif b/lib/observer/priv/crashdump_viewer/collapsd.gif
deleted file mode 100644
index 0b90c08a9a..0000000000
Binary files a/lib/observer/priv/crashdump_viewer/collapsd.gif and /dev/null differ
diff --git a/lib/observer/priv/crashdump_viewer/exploded.gif b/lib/observer/priv/crashdump_viewer/exploded.gif
deleted file mode 100644
index e3ab5ca2e9..0000000000
Binary files a/lib/observer/priv/crashdump_viewer/exploded.gif and /dev/null differ
diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
index dd7831fa2b..ff2bcbdb99 100644
--- a/lib/observer/src/Makefile
+++ b/lib/observer/src/Makefile
@@ -92,7 +92,7 @@ EXAMPLE_FILES= multitrace.erl
 TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
 
 PRIVDIR= ../priv
-WEBTOOLFILES= $(PRIVDIR)/crashdump_viewer.tool $(PRIVDIR)/erlang_observer.png
+PNGFILES= $(PRIVDIR)/erlang_observer.png
 BINDIR= $(PRIVDIR)/bin
 ifeq ($(findstring win32,$(TARGET)),win32)
 WIN32_EXECUTABLES= $(BINDIR)/etop.bat $(BINDIR)/cdv.bat
@@ -103,10 +103,6 @@ EXECUTABLES= \
 	$(BINDIR)/etop \
 	$(BINDIR)/cdv \
 	$(WIN32_EXECUTABLES)
-CDVDIR= $(PRIVDIR)/crashdump_viewer
-GIF_FILES= \
-	$(CDVDIR)/collapsd.gif \
-	$(CDVDIR)/exploded.gif
 
 APP_FILE= observer.app
 
@@ -163,9 +159,7 @@ release_spec: opt
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"
 	$(INSTALL_SCRIPT) $(EXECUTABLES) "$(RELSYSDIR)/priv/bin"
-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/crashdump_viewer"
-	$(INSTALL_DATA) $(WEBTOOLFILES) "$(RELSYSDIR)/priv"
-	$(INSTALL_DATA) $(GIF_FILES) "$(RELSYSDIR)/priv/crashdump_viewer"
+	$(INSTALL_DATA) $(PNGFILES) "$(RELSYSDIR)/priv"
 
 release_docs_spec:
 
-- 
cgit v1.2.3