Fix #include path issue

MacOS uses case-insensitive filenames and warns about conflict between "jerryscript.h" and "Jerryscript.h" Refactor to isolate jerryscript paths which aren't required by applications
slaff · Jun 16, 2024 · 756874a · 756874a
1 parent 6b0b07a
commit 756874a
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 16 deletions.
diff --git a/component.mk b/component.mk
@@ -10,6 +10,9 @@ COMPONENT_SRCDIRS := \
 
 COMPONENT_INCDIRS := \
 	src/include \
+	$(JERRYSCRIPT_ROOT)
+
+EXTRA_INCDIR := \
 	$(JERRYSCRIPT_ROOT)/jerry-core \
 	$(JERRYSCRIPT_SRCDIRS)
 

diff --git a/src/Context.cpp b/src/Context.cpp
@@ -11,7 +11,6 @@
  */
 
 #include "include/Jerryscript/Context.h"
-#include <jerryscript.h>
 
 namespace Jerryscript
 {

diff --git a/src/Debug.cpp b/src/Debug.cpp
@@ -8,7 +8,6 @@
  */
 
 #include "include/Jerryscript/Debug.h"
-#include <jerryscript.h>
 #include <debug_progmem.h>
 
 namespace Jerryscript

diff --git a/src/Types.cpp b/src/Types.cpp
@@ -15,7 +15,7 @@
 #include <debug_progmem.h>
 
 extern "C" {
-#include <ecma/base/ecma-helpers.h>
+#include <jerry-core/ecma/base/ecma-helpers.h>
 }
 
 // Check Ecma values are correct

diff --git a/src/include/Jerryscript.h b/src/include/Jerryscript.h
@@ -1,15 +1,7 @@
 #pragma once
 
-#ifdef __cplusplus
-
 #include "Jerryscript/Task.h"
 #include "Jerryscript/Debug.h"
 #include "Jerryscript/Function.h"
 #include "Jerryscript/Except.h"
 #include "Jerryscript/Context.h"
-
-#else
-
-#include_next <jerryscript.h>
-
-#endif
diff --git a/src/include/Jerryscript/Debug.h b/src/include/Jerryscript/Debug.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <include/jerryscript.h>
+#include <jerry-core/include/jerryscript.h>
 
 namespace Jerryscript
 {

diff --git a/src/include/Jerryscript/Types.h b/src/include/Jerryscript/Types.h
@@ -12,7 +12,7 @@
 
 #pragma once
 
-#include <include/jerryscript.h>
+#include <jerry-core/include/jerryscript.h>
 #include ".typemaps.h"
 #include <WString.h>
 #include <WVector.h>

diff --git a/src/jerry-port.cpp b/src/jerry-port.cpp
@@ -14,8 +14,8 @@
 
 #include "include/Jerryscript/Except.h"
 #include "include/Jerryscript/Context.h"
-#include <include/jerryscript-port.h>
-#include <include/jerryscript-core.h>
+#include <jerry-core/include/jerryscript-port.h>
+#include <jerry-core/include/jerryscript-core.h>
 #include "include/jerry_port_vm.h"
 #include <debug_progmem.h>
 #include <Platform/RTC.h>

diff --git a/test/modules/types.cpp b/test/modules/types.cpp
@@ -1,5 +1,4 @@
 #include <JerryTest.h>
-#include <jcontext.h>
 
 namespace
 {