Skip to content

Commit 261e637

Browse files
committed
Remove support of plug-in mechanism.
This API is obsolete and can be fully replaced with existing `api.h`. JerryScript-DCO-1.0-Signed-off-by: Evgeny Gavrin [email protected]
1 parent 4836d3b commit 261e637

26 files changed

+5
-1832
lines changed

CMakeLists.txt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -306,15 +306,11 @@ project (Jerry CXX C ASM)
306306
# Jerry's Core
307307
add_subdirectory(jerry-core)
308308

309-
# Plugins
310-
add_subdirectory(plugins)
311-
312309
# Targets declaration
313310
string(TOLOWER "${PLATFORM_EXT}" PLATFORM_L)
314311

315312
function(declare_targets_for_build_mode BUILD_MODE)
316313
set(TARGET_NAME ${BUILD_MODE_PREFIX_${BUILD_MODE}}.${PLATFORM_L})
317-
set(PLUGINS_TARGET_NAME ${BUILD_MODE_PREFIX_${BUILD_MODE}}.plugins.${PLATFORM_L}.lib)
318314
set(LIBC_TARGET_NAME ${BUILD_MODE_PREFIX_${BUILD_MODE}}.jerry-libc.${PLATFORM_L}.lib)
319315

320316
function(declare_target_with_modifiers ) # modifiers are passed in ARGN implicit argument
@@ -353,7 +349,7 @@ project (Jerry CXX C ASM)
353349
target_include_directories(${TARGET_NAME} PRIVATE ${INCLUDE_CORE_INTERFACE})
354350
target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${INCLUDE_LIBC_INTERFACE})
355351
target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${INCLUDE_EXTERNAL_LIBS_INTERFACE})
356-
target_link_libraries(${TARGET_NAME} ${PLUGINS_TARGET_NAME} ${CORE_TARGET_NAME} ${LIBC_TARGET_NAME}
352+
target_link_libraries(${TARGET_NAME} ${CORE_TARGET_NAME} ${LIBC_TARGET_NAME}
357353
${FDLIBM_TARGET_NAME} ${PREFIX_IMPORTED_LIB}libgcc ${PREFIX_IMPORTED_LIB}libgcc_eh)
358354

359355
add_cppcheck_target(${TARGET_NAME})
@@ -386,15 +382,14 @@ project (Jerry CXX C ASM)
386382
target_include_directories(${MAIN_MODULE_TARGET_NAME} SYSTEM PRIVATE ${INCLUDE_EXTERNAL_LIBS_INTERFACE})
387383

388384
add_custom_target(${TARGET_NAME} ALL)
389-
add_dependencies(${TARGET_NAME} ${MAIN_MODULE_TARGET_NAME} ${FDLIBM_TARGET_NAME} ${PLUGINS_TARGET_NAME} ${CORE_TARGET_NAME})
385+
add_dependencies(${TARGET_NAME} ${MAIN_MODULE_TARGET_NAME} ${FDLIBM_TARGET_NAME}${CORE_TARGET_NAME})
390386

391387
add_custom_command(TARGET ${TARGET_NAME}
392388
POST_BUILD
393389
COMMAND mkdir -p ${CMAKE_BINARY_DIR}/${TARGET_NAME}
394390
COMMAND echo
395391
$<TARGET_FILE:${MAIN_MODULE_TARGET_NAME}>
396392
$<TARGET_FILE:${FDLIBM_TARGET_NAME}>
397-
$<TARGET_FILE:${PLUGINS_TARGET_NAME}>
398393
$<TARGET_FILE:${CORE_TARGET_NAME}> > ${CMAKE_BINARY_DIR}/${TARGET_NAME}/list)
399394

400395
if(${USE_JERRY_LIBC})

Makefile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,6 @@ $(BUILD_ALL)_native: $(BUILD_DIRS_NATIVE)
215215
(echo "Build failed. See $(OUT_DIR)/$@/make.log for details."; exit 1;)
216216
@ $(MAKE) -C $(BUILD_DIR)/native jerry-fdlibm-all VERBOSE=1 &>$(OUT_DIR)/$@/make.log || \
217217
(echo "Build failed. See $(OUT_DIR)/$@/make.log for details."; exit 1;)
218-
@ $(MAKE) -C $(BUILD_DIR)/native plugins-all VERBOSE=1 &>$(OUT_DIR)/$@/make.log || \
219-
(echo "Build failed. See $(OUT_DIR)/$@/make.log for details."; exit 1;)
220218
@ $(MAKE) -C $(BUILD_DIR)/native $(JERRY_LINUX_TARGETS) unittests VERBOSE=1 &>$(OUT_DIR)/$@/make.log || \
221219
(echo "Build failed. See $(OUT_DIR)/$@/make.log for details."; exit 1;)
222220

@@ -230,8 +228,6 @@ $(JERRY_NUTTX_TARGETS): $(BUILD_DIR)/nuttx
230228

231229
$(BUILD_ALL)_nuttx: $(BUILD_DIRS_NUTTX)
232230
@ mkdir -p $(OUT_DIR)/$@
233-
@ $(MAKE) -C $(BUILD_DIR)/nuttx plugins-all VERBOSE=1 &>$(OUT_DIR)/$@/make.log || \
234-
(echo "Build failed. See $(OUT_DIR)/$@/make.log for details."; exit 1;)
235231
@ $(MAKE) -C $(BUILD_DIR)/nuttx $(JERRY_NUTTX_TARGETS) VERBOSE=1 &>$(OUT_DIR)/$@/make.log || \
236232
(echo "Build failed. See $(OUT_DIR)/$@/make.log for details."; exit 1;)
237233

@@ -248,8 +244,6 @@ $(BUILD_ALL)_stm32f3: $(BUILD_DIRS_STM32F3)
248244
@ mkdir -p $(OUT_DIR)/$@
249245
@ $(MAKE) -C $(BUILD_DIR)/stm32f3 jerry-libc-all VERBOSE=1 &>$(OUT_DIR)/$@/make.log || \
250246
(echo "Build failed. See $(OUT_DIR)/$@/make.log for details."; exit 1;)
251-
@ $(MAKE) -C $(BUILD_DIR)/stm32f3 plugins-all VERBOSE=1 &>$(OUT_DIR)/$@/make.log || \
252-
(echo "Build failed. See $(OUT_DIR)/$@/make.log for details."; exit 1;)
253247
@ $(MAKE) -C $(BUILD_DIR)/stm32f3 $(JERRY_STM32F3_TARGETS) VERBOSE=1 &>$(OUT_DIR)/$@/make.log || \
254248
(echo "Build failed. See $(OUT_DIR)/$@/make.log for details."; exit 1;)
255249

@@ -266,8 +260,6 @@ $(BUILD_ALL)_stm32f4: $(BUILD_DIRS_STM32F4)
266260
@ mkdir -p $(OUT_DIR)/$@
267261
@ $(MAKE) -C $(BUILD_DIR)/stm32f4 jerry-libc-all VERBOSE=1 &>$(OUT_DIR)/$@/make.log || \
268262
(echo "Build failed. See $(OUT_DIR)/$@/make.log for details."; exit 1;)
269-
@ $(MAKE) -C $(BUILD_DIR)/stm32f4 plugins-all VERBOSE=1 &>$(OUT_DIR)/$@/make.log || \
270-
(echo "Build failed. See $(OUT_DIR)/$@/make.log for details."; exit 1;)
271263
@ $(MAKE) -C $(BUILD_DIR)/stm32f4 $(JERRY_STM32F4_TARGETS) VERBOSE=1 &>$(OUT_DIR)/$@/make.log || \
272264
(echo "Build failed. See $(OUT_DIR)/$@/make.log for details."; exit 1;)
273265

jerry-core/config.h

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -160,26 +160,6 @@
160160
// #define CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN
161161
#endif /* CONFIG_ECMA_COMPACT_PROFILE */
162162

163-
/**
164-
* Size of character buffer used to exchange character data between core and extensions' routine
165-
*/
166-
#define CONFIG_EXTENSION_CHAR_BUFFER_SIZE 2048
167-
168-
/**
169-
* Maximum number of registered extensions
170-
*/
171-
#define CONFIG_EXTENSION_MAX_NUMBER_OF_EXTENSIONS 32
172-
173-
/**
174-
* Maximum number of functions in an extension
175-
*/
176-
#define CONFIG_EXTENSION_MAX_FUNCTIONS_IN_EXTENSION 1024
177-
178-
/**
179-
* Maximum number of arguments in a function
180-
*/
181-
#define CONFIG_EXTENSION_MAX_ARGUMENTS_IN_FUNCTION 16
182-
183163
/**
184164
* Run GC after execution of each opcode
185165
*/

jerry-core/ecma/base/ecma-globals.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -396,9 +396,7 @@ typedef enum
396396
ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION, /** One of built-in functions described in section 15
397397
of ECMA-262 v5 specification */
398398
ECMA_OBJECT_TYPE_ARGUMENTS, /**< Arguments object (10.6) */
399-
ECMA_OBJECT_TYPE_ARRAY, /**< Array object (15.4) */
400-
ECMA_OBJECT_TYPE_EXTENSION, /**< Extension (implementation-defined) object
401-
* See also: ecma_extension_instantiate */
399+
ECMA_OBJECT_TYPE_ARRAY /**< Array object (15.4) */
402400
// ECMA_OBJECT_TYPE_HOST /**< Host object */
403401
} ecma_object_type_t;
404402

jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,6 @@ OBJECT_VALUE (ECMA_MAGIC_STRING_DATE_UL,
133133
ECMA_PROPERTY_CONFIGURABLE)
134134
#endif /* CONFIG_ECMA_COMPACT_PROFILE_DISABLE_DATE_BUILTIN */
135135

136-
// Implementation-defined property for accessing the engine's extensions */
137-
OBJECT_VALUE (ECMA_MAGIC_STRING_JERRY_UL,
138-
ecma_builtin_get (ECMA_BUILTIN_ID_JERRY),
139-
ECMA_PROPERTY_NOT_WRITABLE,
140-
ECMA_PROPERTY_NOT_ENUMERABLE,
141-
ECMA_PROPERTY_NOT_CONFIGURABLE)
142-
143136
// ECMA-262 v5, 15.1.4.8
144137
CP_UNIMPLEMENTED_VALUE (ECMA_MAGIC_STRING_REG_EXP_UL,
145138
ecma_builtin_get (ECMA_BUILTIN_ID_REGEXP),

0 commit comments

Comments
 (0)