Skip to content

Commit b70c269

Browse files
Jake-CarterJake-Carter
committed
Update installer package for v1.6.1
1 parent 46e5f85 commit b70c269

File tree

8 files changed

+43
-69
lines changed

8 files changed

+43
-69
lines changed

‎MaximSDK/New_Project/.vscode/workaround.h

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎installer/com.maximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/Inject/.vscode/settings.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
"RV_OCD_target_file":"${config:target}_riscv.cfg",
2929

3030
"v_Arm_GCC":"10.3",
31-
"v_xPack_GCC":"10.2.0-1.2",
31+
"v_xPack_GCC":"12.2.0-3.1",
3232

3333
"OCD_path":"${config:MAXIM_PATH}/Tools/OpenOCD",
3434
"ARM_GCC_path":"${config:MAXIM_PATH}/Tools/GNUTools/${config:v_Arm_GCC}",
35-
"xPack_GCC_path":"${config:MAXIM_PATH}/Tools/xPack/riscv-none-embed-gcc/${config:v_xPack_GCC}",
35+
"xPack_GCC_path":"${config:MAXIM_PATH}/Tools/xPack/riscv-none-elf-gcc/${config:v_xPack_GCC}",
3636
"Make_path":"${config:MAXIM_PATH}/Tools/MSYS2/usr/bin",
3737

3838
"C_Cpp.default.includePath": [
@@ -67,9 +67,9 @@
6767
"${config:MAXIM_PATH}/Libraries/MiscDrivers"
6868
],
6969
"C_Cpp.default.defines": [
70-
"${config:board}",
71-
"TARGET=${config:target}",
72-
"TARGET_REV=0x4131",
73-
"__GNUC__"
70+
71+
],
72+
"C_Cpp.default.forcedInclude": [
73+
"${workspaceFolder}/build/project_defines.h"
7474
]
7575
}

‎installer/com.maximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/Inject/.vscode/tasks.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,29 @@
55
"label": "build",
66
"type": "shell",
77
"command": "make -r -j 8 --output-sync=target --no-print-directory TARGET=${config:target} BOARD=${config:board} MAXIM_PATH=${config:MAXIM_PATH} MAKE=make PROJECT=${config:project_name}",
8+
"osx":{
9+
"command": "source ~/.zshrc && make -r -j 8 --output-sync=target --no-print-directory TARGET=${config:target} BOARD=${config:board} MAXIM_PATH=${config:MAXIM_PATH} MAKE=make PROJECT=${config:project_name}"
10+
},
811
"group": "build",
912
"problemMatcher": []
1013
},
1114
{
1215
"label": "clean",
1316
"type": "shell",
1417
"command": "make -j 8 clean --output-sync=target --no-print-directory TARGET=${config:target} BOARD=${config:board} MAXIM_PATH=${config:MAXIM_PATH} MAKE=make PROJECT=${config:project_name}",
18+
"osx":{
19+
"command": "source ~/.zshrc && make -j 8 clean --output-sync=target --no-print-directory TARGET=${config:target} BOARD=${config:board} MAXIM_PATH=${config:MAXIM_PATH} MAKE=make PROJECT=${config:project_name}"
20+
},
1521
"group": "build",
1622
"problemMatcher": []
1723
},
1824
{
1925
"label": "clean-periph",
2026
"type": "shell",
2127
"command": "make -j 8 distclean --output-sync=target --no-print-directory TARGET=${config:target} BOARD=${config:board} MAXIM_PATH=${config:MAXIM_PATH} MAKE=make PROJECT=${config:project_name}",
28+
"osx":{
29+
"command": "source ~/.zshrc && make -j 8 distclean --output-sync=target --no-print-directory TARGET=${config:target} BOARD=${config:board} MAXIM_PATH=${config:MAXIM_PATH} MAKE=make PROJECT=${config:project_name}"
30+
},
2231
"group": "build",
2332
"problemMatcher": []
2433
},

‎installer/com.maximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/Inject/Makefile

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,10 @@ endif
101101
# the variables below.
102102

103103

104-
include ./project.mk
104+
PROJECTMK ?= $(abspath ./project.mk)
105+
include $(PROJECTMK)
105106
$(info Loaded project.mk)
107+
# PROJECTMK is also used by implicit rules and other libraries to add project.mk as a watch file
106108

107109
# *******************************************************************************
108110
# Final path sanitization and re-calculation. No options here.
@@ -175,8 +177,9 @@ IPATH := $(IPATH)
175177

176178
AUTOSEARCH ?= 1
177179
ifeq ($(AUTOSEARCH), 1)
178-
# Auto-detect all C source files on VPATH
180+
# Auto-detect all C/C++ source files on VPATH
179181
SRCS += $(wildcard $(addsuffix /*.c, $(VPATH)))
182+
SRCS += $(wildcard $(addsuffix /*.cpp, $(VPATH)))
180183
endif
181184

182185
# Collapse SRCS before passing them on to the next stage
@@ -248,22 +251,6 @@ MFLOAT_ABI ?= softfp
248251
# MFLOAT_ABI must be exported to other Makefiles
249252
export MFLOAT_ABI
250253

251-
ifeq "$(RISCV_CORE)" ""
252-
# Default linkerfile is only specified for standard Arm-core projects.
253-
# Otherwise, gcc_riscv.mk sets the appropriate riscv linkerfile.
254-
LINKERFILE ?= $(TARGET_LC).ld
255-
LINKERPATH ?= $(CMSIS_ROOT)/Device/Maxim/$(TARGET_UC)/Source/GCC
256-
257-
# Check if linkerfile exists
258-
ifeq ("$(wildcard $(LINKERPATH)/$(LINKERFILE))","")
259-
# Doesn't exists, attempt to use root project folder.
260-
LINKERPATH:=.
261-
endif
262-
263-
# Form full path to linkerfile. Works around MSYS2 edge case from (see MSDK-903).
264-
LINKERFILE:=$(LINKERPATH)/$(LINKERFILE)
265-
endif
266-
267254
# This path contains system-level intialization files for the target micro. Add to the build.
268255
VPATH += $(CMSIS_ROOT)/Device/Maxim/$(TARGET_UC)/Source
269256

‎installer/com.maximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/New_Project/.vscode/settings.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
"RV_OCD_target_file":"${config:target}_riscv.cfg",
2929

3030
"v_Arm_GCC":"10.3",
31-
"v_xPack_GCC":"10.2.0-1.2",
31+
"v_xPack_GCC":"12.2.0-3.1",
3232

3333
"OCD_path":"${config:MAXIM_PATH}/Tools/OpenOCD",
3434
"ARM_GCC_path":"${config:MAXIM_PATH}/Tools/GNUTools/${config:v_Arm_GCC}",
35-
"xPack_GCC_path":"${config:MAXIM_PATH}/Tools/xPack/riscv-none-embed-gcc/${config:v_xPack_GCC}",
35+
"xPack_GCC_path":"${config:MAXIM_PATH}/Tools/xPack/riscv-none-elf-gcc/${config:v_xPack_GCC}",
3636
"Make_path":"${config:MAXIM_PATH}/Tools/MSYS2/usr/bin",
3737

3838
"C_Cpp.default.includePath": [
@@ -67,9 +67,9 @@
6767
"${config:MAXIM_PATH}/Libraries/MiscDrivers"
6868
],
6969
"C_Cpp.default.defines": [
70-
"${config:board}",
71-
"TARGET=${config:target}",
72-
"TARGET_REV=0x4131",
73-
"__GNUC__"
70+
71+
],
72+
"C_Cpp.default.forcedInclude": [
73+
"${workspaceFolder}/build/project_defines.h"
7474
]
7575
}

‎installer/com.maximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/New_Project/.vscode/tasks.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,29 @@
55
"label": "build",
66
"type": "shell",
77
"command": "make -r -j 8 --output-sync=target --no-print-directory TARGET=${config:target} BOARD=${config:board} MAXIM_PATH=${config:MAXIM_PATH} MAKE=make PROJECT=${config:project_name}",
8+
"osx":{
9+
"command": "source ~/.zshrc && make -r -j 8 --output-sync=target --no-print-directory TARGET=${config:target} BOARD=${config:board} MAXIM_PATH=${config:MAXIM_PATH} MAKE=make PROJECT=${config:project_name}"
10+
},
811
"group": "build",
912
"problemMatcher": []
1013
},
1114
{
1215
"label": "clean",
1316
"type": "shell",
1417
"command": "make -j 8 clean --output-sync=target --no-print-directory TARGET=${config:target} BOARD=${config:board} MAXIM_PATH=${config:MAXIM_PATH} MAKE=make PROJECT=${config:project_name}",
18+
"osx":{
19+
"command": "source ~/.zshrc && make -j 8 clean --output-sync=target --no-print-directory TARGET=${config:target} BOARD=${config:board} MAXIM_PATH=${config:MAXIM_PATH} MAKE=make PROJECT=${config:project_name}"
20+
},
1521
"group": "build",
1622
"problemMatcher": []
1723
},
1824
{
1925
"label": "clean-periph",
2026
"type": "shell",
2127
"command": "make -j 8 distclean --output-sync=target --no-print-directory TARGET=${config:target} BOARD=${config:board} MAXIM_PATH=${config:MAXIM_PATH} MAKE=make PROJECT=${config:project_name}",
28+
"osx":{
29+
"command": "source ~/.zshrc && make -j 8 distclean --output-sync=target --no-print-directory TARGET=${config:target} BOARD=${config:board} MAXIM_PATH=${config:MAXIM_PATH} MAKE=make PROJECT=${config:project_name}"
30+
},
2231
"group": "build",
2332
"problemMatcher": []
2433
},

‎installer/com.maximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/New_Project/Makefile

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,10 @@ endif
101101
# the variables below.
102102

103103

104-
include ./project.mk
104+
PROJECTMK ?= $(abspath ./project.mk)
105+
include $(PROJECTMK)
105106
$(info Loaded project.mk)
107+
# PROJECTMK is also used by implicit rules and other libraries to add project.mk as a watch file
106108

107109
# *******************************************************************************
108110
# Final path sanitization and re-calculation. No options here.
@@ -175,8 +177,9 @@ IPATH := $(IPATH)
175177

176178
AUTOSEARCH ?= 1
177179
ifeq ($(AUTOSEARCH), 1)
178-
# Auto-detect all C source files on VPATH
180+
# Auto-detect all C/C++ source files on VPATH
179181
SRCS += $(wildcard $(addsuffix /*.c, $(VPATH)))
182+
SRCS += $(wildcard $(addsuffix /*.cpp, $(VPATH)))
180183
endif
181184

182185
# Collapse SRCS before passing them on to the next stage
@@ -248,22 +251,6 @@ MFLOAT_ABI ?= softfp
248251
# MFLOAT_ABI must be exported to other Makefiles
249252
export MFLOAT_ABI
250253

251-
ifeq "$(RISCV_CORE)" ""
252-
# Default linkerfile is only specified for standard Arm-core projects.
253-
# Otherwise, gcc_riscv.mk sets the appropriate riscv linkerfile.
254-
LINKERFILE ?= $(TARGET_LC).ld
255-
LINKERPATH ?= $(CMSIS_ROOT)/Device/Maxim/$(TARGET_UC)/Source/GCC
256-
257-
# Check if linkerfile exists
258-
ifeq ("$(wildcard $(LINKERPATH)/$(LINKERFILE))","")
259-
# Doesn't exists, attempt to use root project folder.
260-
LINKERPATH:=.
261-
endif
262-
263-
# Form full path to linkerfile. Works around MSYS2 edge case from (see MSDK-903).
264-
LINKERFILE:=$(LINKERPATH)/$(LINKERFILE)
265-
endif
266-
267254
# This path contains system-level intialization files for the target micro. Add to the build.
268255
VPATH += $(CMSIS_ROOT)/Device/Maxim/$(TARGET_UC)/Source
269256

‎installer/com.maximintegrated.dist.vscodemaxim/meta/package.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<Package>
22
<DisplayName>Visual Studio Code Support</DisplayName>
33
<Description>Project files, templates, and documentation for integrating Visual Studio Code and the MaximSDK. Example projects come pre-populated with .vscode project folders, and this package contains information on how to use them. It installs to "Tools/VSCode-Maxim".</Description>
4-
<ReleaseDate>2023-03-27</ReleaseDate>
4+
<ReleaseDate>2023-06-29</ReleaseDate>
55
<Dependencies>net.sourceforge.openocd, net.launchpad.gcc.arm.embedded, net.launchpad.gcc.riscv.embedded, com.maximintegrated.libraries.periphdrivers</Dependencies>
66
<Script>installscript.js</Script>
7-
<Version>1.6.0</Version>
7+
<Version>1.6.1</Version>
88
<SortingPriority>1</SortingPriority>
9+
<Default>true</Default>
910
</Package>

0 commit comments

Comments
 (0)