YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing 'dev.*' targets.

Browse Source
This commit is contained in:
Ruben Ayrapetyan
2014-07-24 21:19:34 +04:00
parent 6301cba0c3
commit 7f918612c1
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+2 -3
View File
@@ -15,10 +15,9 @@
# #
# Target naming scheme # Target naming scheme
# #
# Main targets: {dev,debug,release,debug_release}.{linux,stm32f{4}}[.{check,flash}] # Main targets: {debug,release,debug_release}.{linux,stm32f{4}}[.{check,flash}]
# #
# Target mode part (before dot): # Target mode part (before dot):
# dev: - JERRY_NDEBUG; - optimizations; + debug symbols; - -Werror | local development build
# debug: - JERRY_NDEBUG; - optimizations; + debug symbols; + -Werror | debug build # debug: - JERRY_NDEBUG; - optimizations; + debug symbols; + -Werror | debug build
# debug_release: - JERRY_NDEBUG; + optimizations; + debug symbols; + -Werror | checked release build # debug_release: - JERRY_NDEBUG; + optimizations; + debug symbols; + -Werror | checked release build
# release: + JERRY_NDEBUG; + optimizations; - debug symbols; + -Werror | release build # release: + JERRY_NDEBUG; + optimizations; - debug symbols; + -Werror | release build
@@ -35,7 +34,7 @@
# Unit test target: unittests # Unit test target: unittests
# #
export TARGET_MODES = dev debug debug_release release export TARGET_MODES = debug debug_release release
export TARGET_PC_SYSTEMS = linux export TARGET_PC_SYSTEMS = linux
export TARGET_MCU_SYSTEMS = $(addprefix stm32f,4) # now only stm32f4 is supported, to add, for example, to stm32f3, change to $(addprefix stm32f,3 4) export TARGET_MCU_SYSTEMS = $(addprefix stm32f,4) # now only stm32f4 is supported, to add, for example, to stm32f3, change to $(addprefix stm32f,3 4)
export TARGET_SYSTEMS = $(TARGET_PC_SYSTEMS) $(TARGET_MCU_SYSTEMS) export TARGET_SYSTEMS = $(TARGET_PC_SYSTEMS) $(TARGET_MCU_SYSTEMS)
Makefile.mak
+1 -12
View File
@@ -59,13 +59,6 @@ else
OPTION_OPTIMIZE = disable OPTION_OPTIMIZE = disable
endif endif
# -Werror
ifeq ($(TARGET_MODE),dev)
OPTION_WERROR = disable
else
OPTION_WERROR = enable
endif
# Is MCU target? # Is MCU target?
ifeq ($(filter-out $(TARGET_MCU_SYSTEMS),$(TARGET_SYSTEM)),) ifeq ($(filter-out $(TARGET_MCU_SYSTEMS),$(TARGET_SYSTEM)),)
OPTION_MCU = enable OPTION_MCU = enable
@@ -149,7 +142,7 @@ endif
# Jerry part sources, headers, includes, cflags, ldflags # Jerry part sources, headers, includes, cflags, ldflags
# #
CFLAGS_JERRY = $(CFLAGS_WARNINGS) CFLAGS_JERRY = $(CFLAGS_WARNINGS) $(CFLAGS_WERROR)
DEFINES_JERRY = -DMEM_HEAP_CHUNK_SIZE=256 -DMEM_HEAP_AREA_SIZE=32768 -DMEM_STATS DEFINES_JERRY = -DMEM_HEAP_CHUNK_SIZE=256 -DMEM_HEAP_AREA_SIZE=32768 -DMEM_STATS
# FIXME: # FIXME:
@@ -181,10 +174,6 @@ ifeq ($(OPTION_NDEBUG),enable)
DEFINES_JERRY += -DJERRY_NDEBUG DEFINES_JERRY += -DJERRY_NDEBUG
endif endif
ifeq ($(OPTION_WERROR),enable)
CFLAGS_JERRY += $(CFLAGS_WERROR)
endif
ifeq ($(OPTION_MCU),disable) ifeq ($(OPTION_MCU),disable)
DEFINES_JERRY += -D__HOST -DJERRY_SOURCE_BUFFER_SIZE=1048576 DEFINES_JERRY += -D__HOST -DJERRY_SOURCE_BUFFER_SIZE=1048576
else else