From add60865e02fed6c8cffffc58180296a27584c85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20G=C3=A1l?= <pgal.u-szeged@partner.samsung.com>
Date: Wed, 7 Jun 2017 01:39:30 +0200
Subject: [PATCH] Rename files under jerry-code/debugger to avoid build fails
 (#1877)

Without the file renaming there are two jerry-debugger.c files.
Thus when the jerry-core archive is created there are two objects
in it with the same name. Generally this does not create any problems.
However if the archive is extracted then the second object file
will overwrite the first one which results in undefined reference
linkage error.

The jerry- prefix was removed from the file names and
fixed the include oreders where it was needed.

JerryScript-DCO-1.0-Signed-off-by: Peter Gal pgal.u-szeged@partner.samsung.com
---
 jerry-core/api/jerry-debugger.c                          | 2 +-
 jerry-core/api/jerry.c                                   | 2 +-
 jerry-core/debugger/{jerry-sha1.c => debugger-sha1.c}    | 2 +-
 .../debugger/{jerry-debugger-ws.c => debugger-ws.c}      | 2 +-
 .../debugger/{jerry-debugger-ws.h => debugger-ws.h}      | 6 +++---
 jerry-core/debugger/{jerry-debugger.c => debugger.c}     | 2 +-
 jerry-core/debugger/{jerry-debugger.h => debugger.h}     | 8 ++++----
 jerry-core/ecma/base/ecma-helpers.c                      | 9 +++++----
 jerry-core/jcontext/jcontext.h                           | 2 +-
 jerry-core/parser/js/js-parser-internal.h                | 2 +-
 jerry-core/parser/js/js-parser.c                         | 2 +-
 11 files changed, 20 insertions(+), 19 deletions(-)
 rename jerry-core/debugger/{jerry-sha1.c => debugger-sha1.c} (99%)
 rename jerry-core/debugger/{jerry-debugger-ws.c => debugger-ws.c} (99%)
 rename jerry-core/debugger/{jerry-debugger-ws.h => debugger-ws.h} (97%)
 rename jerry-core/debugger/{jerry-debugger.c => debugger.c} (99%)
 rename jerry-core/debugger/{jerry-debugger.h => debugger.h} (99%)

diff --git a/jerry-core/api/jerry-debugger.c b/jerry-core/api/jerry-debugger.c
index cf9f243e8..dfc92f288 100644
--- a/jerry-core/api/jerry-debugger.c
+++ b/jerry-core/api/jerry-debugger.c
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
+#include "debugger.h"
 #include "jcontext.h"
 #include "jerryscript.h"
-#include "jerry-debugger.h"
 
 /**
  * Checks whether the debugger is connected.
diff --git a/jerry-core/api/jerry.c b/jerry-core/api/jerry.c
index 5c69b6510..90d975e79 100644
--- a/jerry-core/api/jerry.c
+++ b/jerry-core/api/jerry.c
@@ -15,6 +15,7 @@
 
 #include <stdio.h>
 
+#include "debugger.h"
 #include "ecma-alloc.h"
 #include "ecma-array-object.h"
 #include "ecma-builtin-helpers.h"
@@ -32,7 +33,6 @@
 #include "ecma-promise-object.h"
 #include "jcontext.h"
 #include "jerryscript.h"
-#include "jerry-debugger.h"
 #include "js-parser.h"
 #include "re-compiler.h"
 
diff --git a/jerry-core/debugger/jerry-sha1.c b/jerry-core/debugger/debugger-sha1.c
similarity index 99%
rename from jerry-core/debugger/jerry-sha1.c
rename to jerry-core/debugger/debugger-sha1.c
index 997bc8c49..707842410 100644
--- a/jerry-core/debugger/jerry-sha1.c
+++ b/jerry-core/debugger/debugger-sha1.c
@@ -40,7 +40,7 @@
  *  http://www.itl.nist.gov/fipspubs/fip180-1.htm
  */
 
-#include "jerry-debugger.h"
+#include "debugger.h"
 
 #ifdef JERRY_DEBUGGER
 
diff --git a/jerry-core/debugger/jerry-debugger-ws.c b/jerry-core/debugger/debugger-ws.c
similarity index 99%
rename from jerry-core/debugger/jerry-debugger-ws.c
rename to jerry-core/debugger/debugger-ws.c
index a18ec7185..f9a2f3c64 100644
--- a/jerry-core/debugger/jerry-debugger-ws.c
+++ b/jerry-core/debugger/debugger-ws.c
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
+#include "debugger.h"
 #include "jcontext.h"
-#include "jerry-debugger.h"
 #include "jerryscript-port.h"
 
 #ifdef JERRY_DEBUGGER
diff --git a/jerry-core/debugger/jerry-debugger-ws.h b/jerry-core/debugger/debugger-ws.h
similarity index 97%
rename from jerry-core/debugger/jerry-debugger-ws.h
rename to jerry-core/debugger/debugger-ws.h
index ddcc67499..20b55c6c7 100644
--- a/jerry-core/debugger/jerry-debugger-ws.h
+++ b/jerry-core/debugger/debugger-ws.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef JERRY_DEBUGGER_WS_H
-#define JERRY_DEBUGGER_WS_H
+#ifndef DEBUGGER_WS_H
+#define DEBUGGER_WS_H
 
 #include "ecma-globals.h"
 
@@ -93,4 +93,4 @@ void jerry_debugger_compute_sha1 (const uint8_t *input1, size_t input1_len,
 
 #endif /* JERRY_DEBUGGER */
 
-#endif /* JERRY_DEBUGGER_WS_H */
+#endif /* DEBUGGER_WS_H */
diff --git a/jerry-core/debugger/jerry-debugger.c b/jerry-core/debugger/debugger.c
similarity index 99%
rename from jerry-core/debugger/jerry-debugger.c
rename to jerry-core/debugger/debugger.c
index 39c7353d5..4a202a10b 100644
--- a/jerry-core/debugger/jerry-debugger.c
+++ b/jerry-core/debugger/debugger.c
@@ -14,12 +14,12 @@
  */
 
 #include "byte-code.h"
+#include "debugger.h"
 #include "ecma-builtin-helpers.h"
 #include "ecma-conversion.h"
 #include "ecma-eval.h"
 #include "ecma-objects.h"
 #include "jcontext.h"
-#include "jerry-debugger.h"
 #include "jerryscript-port.h"
 #include "lit-char-helpers.h"
 
diff --git a/jerry-core/debugger/jerry-debugger.h b/jerry-core/debugger/debugger.h
similarity index 99%
rename from jerry-core/debugger/jerry-debugger.h
rename to jerry-core/debugger/debugger.h
index aa780038a..2072c8fb0 100644
--- a/jerry-core/debugger/jerry-debugger.h
+++ b/jerry-core/debugger/debugger.h
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-#ifndef JERRY_DEBUGGER_H
-#define JERRY_DEBUGGER_H
+#ifndef DEBUGGER_H
+#define DEBUGGER_H
 
-#include "jerry-debugger-ws.h"
+#include "debugger-ws.h"
 #include "ecma-globals.h"
 
 #ifdef JERRY_DEBUGGER
@@ -322,4 +322,4 @@ bool jerry_debugger_send_exception_string (ecma_value_t exception_value);
 
 #endif /* JERRY_DEBUGGER */
 
-#endif /* JERRY_DEBUGGER_H */
+#endif /* DEBUGGER_H */
diff --git a/jerry-core/ecma/base/ecma-helpers.c b/jerry-core/ecma/base/ecma-helpers.c
index f2e3382b8..cf5dd8bb5 100644
--- a/jerry-core/ecma/base/ecma-helpers.c
+++ b/jerry-core/ecma/base/ecma-helpers.c
@@ -19,15 +19,16 @@
 #include "ecma-helpers.h"
 #include "ecma-lcache.h"
 #include "ecma-property-hashmap.h"
-#ifdef JERRY_DEBUGGER
-#include "jcontext.h"
-#include "jerry-debugger.h"
-#endif /* JERRY_DEBUGGER */
 #include "jrt-bit-fields.h"
 #include "byte-code.h"
 #include "re-compiler.h"
 #include "ecma-builtins.h"
 
+#ifdef JERRY_DEBUGGER
+#include "debugger.h"
+#include "jcontext.h"
+#endif /* JERRY_DEBUGGER */
+
 /** \addtogroup ecma ECMA
  * @{
  *
diff --git a/jerry-core/jcontext/jcontext.h b/jerry-core/jcontext/jcontext.h
index 1f6317382..5cbdba8c6 100644
--- a/jerry-core/jcontext/jcontext.h
+++ b/jerry-core/jcontext/jcontext.h
@@ -19,10 +19,10 @@
 #ifndef JCONTEXT_H
 #define JCONTEXT_H
 
+#include "debugger.h"
 #include "ecma-builtins.h"
 #include "ecma-jobqueue.h"
 #include "jerryscript-port.h"
-#include "jerry-debugger.h"
 #include "jmem.h"
 #include "re-bytecode.h"
 #include "vm-defines.h"
diff --git a/jerry-core/parser/js/js-parser-internal.h b/jerry-core/parser/js/js-parser-internal.h
index fef667c7d..d06d36a3e 100644
--- a/jerry-core/parser/js/js-parser-internal.h
+++ b/jerry-core/parser/js/js-parser-internal.h
@@ -19,7 +19,7 @@
 #include "common.h"
 
 #include "byte-code.h"
-#include "jerry-debugger.h"
+#include "debugger.h"
 #include "js-parser.h"
 #include "js-parser-limits.h"
 #include "js-lexer.h"
diff --git a/jerry-core/parser/js/js-parser.c b/jerry-core/parser/js/js-parser.c
index b38ad15eb..5c8316b84 100644
--- a/jerry-core/parser/js/js-parser.c
+++ b/jerry-core/parser/js/js-parser.c
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
+#include "debugger.h"
 #include "ecma-exceptions.h"
 #include "ecma-helpers.h"
 #include "ecma-literal-storage.h"
 #include "jcontext.h"
-#include "jerry-debugger.h"
 #include "js-parser-internal.h"
 
 #if JERRY_JS_PARSER