Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename mongoose_custom as mongoose_config #2707

Merged
merged 1 commit into from
Apr 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,12 @@ mongoose.h: $(HDRS) Makefile
(cat src/license.h; echo; echo '#ifndef MONGOOSE_H'; echo '#define MONGOOSE_H'; echo; cat src/version.h ; echo; echo '#ifdef __cplusplus'; echo 'extern "C" {'; echo '#endif'; cat src/arch.h src/arch_*.h src/net_ft.h src/net_lwip.h src/net_rl.h src/config.h src/str.h src/queue.h src/fmt.h src/printf.h src/log.h src/timer.h src/fs.h src/util.h src/url.h src/iobuf.h src/base64.h src/md5.h src/sha1.h src/sha256.h src/tls_x25519.h src/tls_aes128.h src/tls_uecc.h src/event.h src/net.h src/http.h src/ssi.h src/tls.h src/tls_mbed.h src/tls_openssl.h src/ws.h src/sntp.h src/mqtt.h src/dns.h src/json.h src/rpc.h src/ota.h src/device.h src/net_builtin.h src/profile.h src/drivers/*.h | sed -e '/keep/! s,#include ".*,,' -e 's,^#pragma once,,'; echo; echo '#ifdef __cplusplus'; echo '}'; echo '#endif'; echo '#endif // MONGOOSE_H')> $@


clean: clean_examples clean_embedded
clean: clean_examples clean_examples_embedded
rm -rf $(PROG) *.exe *.o *.dSYM *_test* ut fuzzer *.gcov *.gcno *.gcda *.obj *.exe *.ilk *.pdb slow-unit* _CL_* infer-out data.txt crash-* test/packed_fs.c pack
#find examples -maxdepth 3 -name zephyr -prune -o -name Makefile -print | xargs dirname | xargs -n1 make clean -C

clean_embedded:
examples_embedded:
@for X in $(EXAMPLES_EMBEDDED); do test -f $$X/Makefile || continue; $(MAKE) -C $$X build || exit 1; done
clean_examples_embedded:
for X in $(EXAMPLES_EMBEDDED); do test -f $$X/Makefile || continue; $(MAKE) -C $$X clean || exit 1; done

2 changes: 1 addition & 1 deletion examples/nxp/rt1020-evk-make-baremetal-builtin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SOURCES = main.c syscalls.c sysinit.c
SOURCES += cmsis_mcu/devices/MIMXRT1021/gcc/startup_MIMXRT1021.S # NXP startup file. Compiler-dependent!
CFLAGS += -D__ATOLLIC__ -D__STARTUP_CLEAR_BSS # Make startup code work as expected

# Mongoose options are defined in mongoose_custom.h
# Mongoose options are defined in mongoose_config.h
SOURCES += mongoose.c net.c packed_fs.c

# Example specific build options. See README.md
Expand Down
4 changes: 2 additions & 2 deletions examples/nxp/rt1020-evk-make-freertos-builtin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ SOURCES += FreeRTOS-Kernel/portable/GCC/ARM_CM4F/port.c
CFLAGS += -IFreeRTOS-Kernel/include
CFLAGS += -IFreeRTOS-Kernel/portable/GCC/ARM_CM4F -Wno-conversion

# Mongoose options are defined in mongoose_custom.h
# Mongoose options are defined in mongoose_config.h
SOURCES += mongoose.c net.c packed_fs.c

# Example specific build options. See README.md
Expand All @@ -38,7 +38,7 @@ ram: firmware.bin
firmware.bin: firmware.elf
arm-none-eabi-objcopy -O binary $< $@

firmware.elf: FreeRTOS-Kernel cmsis_core cmsis_mcu $(SOURCES) hal.h link_ram.ld link.ld mongoose_custom.h
firmware.elf: FreeRTOS-Kernel cmsis_core cmsis_mcu $(SOURCES) hal.h link_ram.ld link.ld mongoose_config.h
arm-none-eabi-gcc $(SOURCES) $(wildcard FreeRTOS-Kernel/*.c) $(CFLAGS) $(LDFLAGS) -o $@

flash: firmware.bin
Expand Down
2 changes: 1 addition & 1 deletion examples/nxp/rt1060-evk-make-baremetal-builtin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SOURCES = main.c syscalls.c sysinit.c
SOURCES += cmsis_mcu/devices/MIMXRT1062/gcc/startup_MIMXRT1062.S # NXP startup file. Compiler-dependent!
CFLAGS += -D__ATOLLIC__ -D__STARTUP_CLEAR_BSS # Make startup code work as expected

# Mongoose options are defined in mongoose_custom.h
# Mongoose options are defined in mongoose_config.h
SOURCES += mongoose.c net.c packed_fs.c

# Example specific build options. See README.md
Expand Down
4 changes: 2 additions & 2 deletions examples/nxp/rt1060-evk-make-freertos-builtin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ SOURCES += FreeRTOS-Kernel/portable/GCC/ARM_CM4F/port.c
CFLAGS += -IFreeRTOS-Kernel/include
CFLAGS += -IFreeRTOS-Kernel/portable/GCC/ARM_CM4F -Wno-conversion

# Mongoose options are defined in mongoose_custom.h
# Mongoose options are defined in mongoose_config.h
SOURCES += mongoose.c net.c packed_fs.c

# Example specific build options. See README.md
Expand All @@ -38,7 +38,7 @@ ram: firmware.bin
firmware.bin: firmware.elf
arm-none-eabi-objcopy -O binary $< $@

firmware.elf: FreeRTOS-Kernel cmsis_core cmsis_mcu $(SOURCES) hal.h link_ram.ld link.ld mongoose_custom.h
firmware.elf: FreeRTOS-Kernel cmsis_core cmsis_mcu $(SOURCES) hal.h link_ram.ld link.ld mongoose_config.h
arm-none-eabi-gcc $(SOURCES) $(wildcard FreeRTOS-Kernel/*.c) $(CFLAGS) $(LDFLAGS) -o $@

flash: firmware.bin
Expand Down
2 changes: 1 addition & 1 deletion examples/nxp/rt1170-evk-make-baremetal-builtin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SOURCES += cmsis_mcu/devices/MIMXRT1176/gcc/startup_MIMXRT1176_cm7.S # NXP start
SOURCES += cmsis_mcu/devices/MIMXRT1176/drivers/fsl_clock.c cmsis_mcu/devices/MIMXRT1176/drivers/fsl_anatop_ai.c cmsis_mcu/devices/MIMXRT1176/drivers/fsl_pmu.c cmsis_mcu/devices/MIMXRT1176/drivers/fsl_dcdc.c cmsis_mcu/devices/MIMXRT1176/drivers/fsl_common_arm.c # NXP support files
CFLAGS += -D__ATOLLIC__ -D__STARTUP_CLEAR_BSS # Make startup code work as expected

# Mongoose options are defined in mongoose_custom.h
# Mongoose options are defined in mongoose_config.h
SOURCES += mongoose.c net.c packed_fs.c

# Example specific build options. See README.md
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3641,7 +3641,7 @@
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>.\mongoose_custom.h</Name>
<Name>.\mongoose_config.h</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>1</TopLine>
<CurrentLine>1</CurrentLine>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -533,8 +533,8 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\mongoose_custom.h</PathWithFileName>
<FilenameWithoutPath>mongoose_custom.h</FilenameWithoutPath>
<PathWithFileName>.\mongoose_config.h</PathWithFileName>
<FilenameWithoutPath>mongoose_config.h</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -414,9 +414,9 @@
<FilePath>.\mongoose.c</FilePath>
</File>
<File>
<FileName>mongoose_custom.h</FileName>
<FileName>mongoose_config.h</FileName>
<FileType>5</FileType>
<FilePath>.\mongoose_custom.h</FilePath>
<FilePath>.\mongoose_config.h</FilePath>
</File>
</Files>
</Group>
Expand Down Expand Up @@ -859,9 +859,9 @@
<FilePath>.\mongoose.c</FilePath>
</File>
<File>
<FileName>mongoose_custom.h</FileName>
<FileName>mongoose_config.h</FileName>
<FileType>5</FileType>
<FilePath>.\mongoose_custom.h</FilePath>
<FilePath>.\mongoose_config.h</FilePath>
</File>
</Files>
</Group>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3641,7 +3641,7 @@
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>.\mongoose_custom.h</Name>
<Name>.\mongoose_config.h</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>1</TopLine>
<CurrentLine>1</CurrentLine>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -521,8 +521,8 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\mongoose_custom.h</PathWithFileName>
<FilenameWithoutPath>mongoose_custom.h</FilenameWithoutPath>
<PathWithFileName>.\mongoose_config.h</PathWithFileName>
<FilenameWithoutPath>mongoose_config.h</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -414,9 +414,9 @@
<FilePath>.\mongoose.c</FilePath>
</File>
<File>
<FileName>mongoose_custom.h</FileName>
<FileName>mongoose_config.h</FileName>
<FileType>5</FileType>
<FilePath>.\mongoose_custom.h</FilePath>
<FilePath>.\mongoose_config.h</FilePath>
</File>
</Files>
</Group>
Expand Down Expand Up @@ -862,9 +862,9 @@
<FilePath>.\mongoose.c</FilePath>
</File>
<File>
<FileName>mongoose_custom.h</FileName>
<FileName>mongoose_config.h</FileName>
<FileType>5</FileType>
<FilePath>.\mongoose_custom.h</FilePath>
<FilePath>.\mongoose_config.h</FilePath>
</File>
</Files>
</Group>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ CFLAGS += -Itinyusb/src -Itinyusb/lib/networking
CFLAGS += -DSTM32F429xx
CFLAGS += -Wno-conversion -Wno-sign-conversion

# Mongoose options are defined in mongoose_custom.h
# Mongoose options are defined in mongoose_config.h
SOURCES += mongoose.c

ifeq ($(OS),Windows_NT)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ LDFLAGS ?= -Tlink.ld -nostdlib -nostartfiles --specs nano.specs -lc -lgcc -Wl,--
SOURCES = main.c syscalls.c sysinit.c
SOURCES += cmsis_f4/Source/Templates/gcc/startup_stm32f429xx.s # ST startup file. Compiler-dependent!

# Mongoose options are defined in mongoose_custom.h
# Mongoose options are defined in mongoose_config.h
SOURCES += mongoose.c net.c packed_fs.c

# Example specific build options. See README.md
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ SOURCES += FreeRTOS-Kernel/portable/GCC/ARM_CM4F/port.c
CFLAGS += -IFreeRTOS-Kernel/include
CFLAGS += -IFreeRTOS-Kernel/portable/GCC/ARM_CM4F -Wno-conversion

# Mongoose options are defined in mongoose_custom.h
# Mongoose options are defined in mongoose_config.h
SOURCES += mongoose.c net.c packed_fs.c

# Example specific build options. See README.md
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3641,7 +3641,7 @@
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>C:\Users\scaprile\mongoose\examples\stm32\nucleo-f746zg-keil-baremetal\mongoose_custom.h</Name>
<Name>C:\Users\scaprile\mongoose\examples\stm32\nucleo-f746zg-keil-baremetal\mongoose_config.h</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>1</TopLine>
<CurrentLine>15</CurrentLine>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3688,7 +3688,7 @@
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>.\mongoose_custom.h</Name>
<Name>.\mongoose_config.h</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>1</TopLine>
<CurrentLine>1</CurrentLine>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -536,8 +536,8 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\mongoose_custom.h</PathWithFileName>
<FilenameWithoutPath>mongoose_custom.h</FilenameWithoutPath>
<PathWithFileName>.\mongoose_config.h</PathWithFileName>
<FilenameWithoutPath>mongoose_config.h</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -414,9 +414,9 @@
<FilePath>.\mongoose.c</FilePath>
</File>
<File>
<FileName>mongoose_custom.h</FileName>
<FileName>mongoose_config.h</FileName>
<FileType>5</FileType>
<FilePath>.\mongoose_custom.h</FilePath>
<FilePath>.\mongoose_config.h</FilePath>
</File>
</Files>
</Group>
Expand Down Expand Up @@ -868,9 +868,9 @@
<FilePath>.\mongoose.c</FilePath>
</File>
<File>
<FileName>mongoose_custom.h</FileName>
<FileName>mongoose_config.h</FileName>
<FileType>5</FileType>
<FilePath>.\mongoose_custom.h</FilePath>
<FilePath>.\mongoose_config.h</FilePath>
</File>
</Files>
</Group>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3677,7 +3677,7 @@
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>.\mongoose_custom.h</Name>
<Name>.\mongoose_config.h</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>1</TopLine>
<CurrentLine>1</CurrentLine>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -530,8 +530,8 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\mongoose_custom.h</PathWithFileName>
<FilenameWithoutPath>mongoose_custom.h</FilenameWithoutPath>
<PathWithFileName>.\mongoose_config.h</PathWithFileName>
<FilenameWithoutPath>mongoose_config.h</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -424,9 +424,9 @@
<FilePath>.\mongoose.c</FilePath>
</File>
<File>
<FileName>mongoose_custom.h</FileName>
<FileName>mongoose_config.h</FileName>
<FileType>5</FileType>
<FilePath>.\mongoose_custom.h</FilePath>
<FilePath>.\mongoose_config.h</FilePath>
</File>
</Files>
</Group>
Expand Down Expand Up @@ -885,9 +885,9 @@
<FilePath>.\mongoose.c</FilePath>
</File>
<File>
<FileName>mongoose_custom.h</FileName>
<FileName>mongoose_config.h</FileName>
<FileType>5</FileType>
<FilePath>.\mongoose_custom.h</FilePath>
<FilePath>.\mongoose_config.h</FilePath>
</File>
</Files>
</Group>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3659,7 +3659,7 @@
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>.\mongoose_custom.h</Name>
<Name>.\mongoose_config.h</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>1</TopLine>
<CurrentLine>1</CurrentLine>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -550,8 +550,8 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\mongoose_custom.h</PathWithFileName>
<FilenameWithoutPath>mongoose_custom.h</FilenameWithoutPath>
<PathWithFileName>.\mongoose_config.h</PathWithFileName>
<FilenameWithoutPath>mongoose_config.h</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -414,9 +414,9 @@
<FilePath>.\mongoose.c</FilePath>
</File>
<File>
<FileName>mongoose_custom.h</FileName>
<FileName>mongoose_config.h</FileName>
<FileType>5</FileType>
<FilePath>.\mongoose_custom.h</FilePath>
<FilePath>.\mongoose_config.h</FilePath>
</File>
</Files>
</Group>
Expand Down Expand Up @@ -862,9 +862,9 @@
<FilePath>.\mongoose.c</FilePath>
</File>
<File>
<FileName>mongoose_custom.h</FileName>
<FileName>mongoose_config.h</FileName>
<FileType>5</FileType>
<FilePath>.\mongoose_custom.h</FilePath>
<FilePath>.\mongoose_config.h</FilePath>
</File>
</Files>
</Group>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3688,7 +3688,7 @@
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>.\mongoose_custom.h</Name>
<Name>.\mongoose_config.h</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>1</TopLine>
<CurrentLine>1</CurrentLine>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -536,8 +536,8 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\mongoose_custom.h</PathWithFileName>
<FilenameWithoutPath>mongoose_custom.h</FilenameWithoutPath>
<PathWithFileName>.\mongoose_config.h</PathWithFileName>
<FilenameWithoutPath>mongoose_config.h</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -414,9 +414,9 @@
<FilePath>.\mongoose.c</FilePath>
</File>
<File>
<FileName>mongoose_custom.h</FileName>
<FileName>mongoose_config.h</FileName>
<FileType>5</FileType>
<FilePath>.\mongoose_custom.h</FilePath>
<FilePath>.\mongoose_config.h</FilePath>
</File>
</Files>
</Group>
Expand Down Expand Up @@ -868,9 +868,9 @@
<FilePath>.\mongoose.c</FilePath>
</File>
<File>
<FileName>mongoose_custom.h</FileName>
<FileName>mongoose_config.h</FileName>
<FileType>5</FileType>
<FilePath>.\mongoose_custom.h</FilePath>
<FilePath>.\mongoose_config.h</FilePath>
</File>
</Files>
</Group>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3648,7 +3648,7 @@
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>.\mongoose_custom.h</Name>
<Name>.\mongoose_config.h</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>1</TopLine>
<CurrentLine>1</CurrentLine>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -492,8 +492,8 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\mongoose_custom.h</PathWithFileName>
<FilenameWithoutPath>mongoose_custom.h</FilenameWithoutPath>
<PathWithFileName>.\mongoose_config.h</PathWithFileName>
<FilenameWithoutPath>mongoose_config.h</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
Expand Down
Loading
Loading