diff options
author | Siri Hansen <[email protected]> | 2016-11-29 17:26:54 +0100 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2016-11-29 17:26:54 +0100 |
commit | bfd2d44bdd64b6a95c9ee5b55f166994b3a386a2 (patch) | |
tree | cbd4557069470f5ee7bcbde22ec1d3ee9cc2e911 | |
parent | 45fee41645692678a18c9c1a4fb85aa1e437b2fa (diff) | |
parent | 306a293d8ba43443f908523c9aa2d6067b7e3847 (diff) | |
download | otp-bfd2d44bdd64b6a95c9ee5b55f166994b3a386a2.tar.gz otp-bfd2d44bdd64b6a95c9ee5b55f166994b3a386a2.tar.bz2 otp-bfd2d44bdd64b6a95c9ee5b55f166994b3a386a2.zip |
Merge branch 'siri/observer/remove-unused-files/OTP-14024' into maint
* siri/observer/remove-unused-files/OTP-14024:
[observer] Remove unused files
-rw-r--r-- | lib/observer/priv/crashdump_viewer.tool | 2 | ||||
-rw-r--r-- | lib/observer/priv/crashdump_viewer/collapsd.gif | bin | 141 -> 0 bytes | |||
-rw-r--r-- | lib/observer/priv/crashdump_viewer/exploded.gif | bin | 143 -> 0 bytes | |||
-rw-r--r-- | lib/observer/src/Makefile | 10 |
4 files changed, 2 insertions, 10 deletions
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 Binary files differdeleted file mode 100644 index 0b90c08a9a..0000000000 --- a/lib/observer/priv/crashdump_viewer/collapsd.gif +++ /dev/null diff --git a/lib/observer/priv/crashdump_viewer/exploded.gif b/lib/observer/priv/crashdump_viewer/exploded.gif Binary files differdeleted file mode 100644 index e3ab5ca2e9..0000000000 --- a/lib/observer/priv/crashdump_viewer/exploded.gif +++ /dev/null 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: |