github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

rename version.c into version_pm3.c to avoid clash with mbedtls and other future clashes

Browse source
This commit is contained in:
Philippe Teuwen 2021-05-21 00:15:20 +02:00
commit 9a00ad0230
9 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -312,7 +312,7 @@ release:
# - Tagging temporarily... # - Tagging temporarily...
@git tag -a -m "Release $(VERSION) - $(RELEASE_NAME)" $(VERSION) @git tag -a -m "Release $(VERSION) - $(RELEASE_NAME)" $(VERSION)
# - Changing default version information based on new tag # - Changing default version information based on new tag
@$(SH) tools/mkversion.sh > common/default_version.c.tmp && $(MV) common/default_version.c.tmp common/default_version.c @$(SH) tools/mkversion.sh > common/default_version_pm3.c.tmp && $(MV) common/default_version_pm3.c.tmp common/default_version_pm3.c
# - Removing mkversion calls # - Removing mkversion calls
@sed -i 's#^.*\.\./tools/mkversion.sh.*|| #\t$$(Q)#' client/Makefile bootrom/Makefile armsrc/Makefile @sed -i 's#^.*\.\./tools/mkversion.sh.*|| #\t$$(Q)#' client/Makefile bootrom/Makefile armsrc/Makefile
@sed -i '/COMMAND/s/sh .*|| //' client/CMakeLists.txt @sed -i '/COMMAND/s/sh .*|| //' client/CMakeLists.txt

8
armsrc/Makefile
View file

@ -140,7 +140,7 @@ ARMSRC = fpgaloader.c \
usb_cdc.c \ usb_cdc.c \
cmd.c cmd.c
VERSIONSRC = version.c \ VERSIONSRC = version_pm3.c \
fpga_version_info.c fpga_version_info.c
# Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC # Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
@ -163,8 +163,8 @@ showinfo:
.DELETE_ON_ERROR: .DELETE_ON_ERROR:
# version.c should be remade on every time fullimage.stage1.elf should be remade # version_pm3.c should be remade on every time fullimage.stage1.elf should be remade
version.c: default_version.c $(OBJDIR)/fpga_version_info.o $(OBJDIR)/fpga_all.o $(THUMBOBJ) $(ARMOBJ) version_pm3.c: default_version_pm3.c $(OBJDIR)/fpga_version_info.o $(OBJDIR)/fpga_all.o $(THUMBOBJ) $(ARMOBJ)
$(info [-] GEN $@) $(info [-] GEN $@)
$(Q)$(SH) ../tools/mkversion.sh > $@ || $(PERL) ../tools/mkversion.pl > $@ || $(CP) $< $@ $(Q)$(SH) ../tools/mkversion.sh > $@ || $(PERL) ../tools/mkversion.pl > $@ || $(CP) $< $@
@ -237,7 +237,7 @@ clean:
$(Q)$(RM) $(OBJDIR)$(PATHSEP)*.d $(Q)$(RM) $(OBJDIR)$(PATHSEP)*.d
$(Q)$(RM) $(OBJDIR)$(PATHSEP)*.z $(Q)$(RM) $(OBJDIR)$(PATHSEP)*.z
$(Q)$(RM) $(OBJDIR)$(PATHSEP)*.bin $(Q)$(RM) $(OBJDIR)$(PATHSEP)*.bin
$(Q)$(RM) version.c $(Q)$(RM) version_pm3.c version.c
install: all install: all
$(info [@] Installing fullimage to $(DESTDIR)$(PREFIX)...) $(info [@] Installing fullimage to $(DESTDIR)$(PREFIX)...)

8
bootrom/Makefile
View file

@ -13,7 +13,7 @@ THUMBSRC = usb_cdc.c \
bootrom.c bootrom.c
ASMSRC = ram-reset.s flash-reset.s ASMSRC = ram-reset.s flash-reset.s
VERSIONSRC = version.c VERSIONSRC = version_pm3.c
## There is a strange bug with the linker: Sometimes it will not emit the glue to call ## There is a strange bug with the linker: Sometimes it will not emit the glue to call
## BootROM from ARM mode. The symbol is emitted, but the section will be filled with ## BootROM from ARM mode. The symbol is emitted, but the section will be filled with
@ -36,8 +36,8 @@ INSTALLFW = $(OBJDIR)/bootrom.elf
OBJS = $(OBJDIR)/bootrom.s19 OBJS = $(OBJDIR)/bootrom.s19
# version.c should be remade on every compilation # version_pm3.c should be remade on every compilation
version.c: default_version.c version_pm3.c: default_version_pm3.c
$(info [=] GEN $@) $(info [=] GEN $@)
$(Q)$(SH) ../tools/mkversion.sh > $@ || $(PERL) ../tools/mkversion.pl > $@ || $(CP) $< $@ $(Q)$(SH) ../tools/mkversion.sh > $@ || $(PERL) ../tools/mkversion.pl > $@ || $(CP) $< $@
@ -60,7 +60,7 @@ clean:
$(Q)$(RM) $(OBJDIR)$(PATHSEP)*.s19 $(Q)$(RM) $(OBJDIR)$(PATHSEP)*.s19
$(Q)$(RM) $(OBJDIR)$(PATHSEP)*.map $(Q)$(RM) $(OBJDIR)$(PATHSEP)*.map
$(Q)$(RM) $(OBJDIR)$(PATHSEP)*.d $(Q)$(RM) $(OBJDIR)$(PATHSEP)*.d
$(Q)$(RM) version.c $(Q)$(RM) version_pm3.c version.c
install: all install: all
$(info [@] Installing bootrom to $(DESTDIR)$(PREFIX)...) $(info [@] Installing bootrom to $(DESTDIR)$(PREFIX)...)

8
client/CMakeLists.txt
View file

@ -314,13 +314,13 @@ set (TARGET_SOURCES
${PM3_ROOT}/client/src/util.c ${PM3_ROOT}/client/src/util.c
${PM3_ROOT}/client/src/wiegand_formats.c ${PM3_ROOT}/client/src/wiegand_formats.c
${PM3_ROOT}/client/src/wiegand_formatutils.c ${PM3_ROOT}/client/src/wiegand_formatutils.c
${CMAKE_BINARY_DIR}/version.c ${CMAKE_BINARY_DIR}/version_pm3.c
) )
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/version.c OUTPUT ${CMAKE_BINARY_DIR}/version_pm3.c
COMMAND sh ${PM3_ROOT}/tools/mkversion.sh > ${CMAKE_BINARY_DIR}/version.c || perl ${PM3_ROOT}/tools/mkversion.pl > ${CMAKE_BINARY_DIR}/version.c || ${CMAKE_COMMAND} -E copy ${PM3_ROOT}/common/default_version.c ${CMAKE_BINARY_DIR}/version.c COMMAND sh ${PM3_ROOT}/tools/mkversion.sh > ${CMAKE_BINARY_DIR}/version_pm3.c || perl ${PM3_ROOT}/tools/mkversion.pl > ${CMAKE_BINARY_DIR}/version_pm3.c || ${CMAKE_COMMAND} -E copy ${PM3_ROOT}/common/default_version_pm3.c ${CMAKE_BINARY_DIR}/version_pm3.c
DEPENDS ${PM3_ROOT}/common/default_version.c DEPENDS ${PM3_ROOT}/common/default_version_pm3.c
) )
set(ADDITIONAL_SRC "") set(ADDITIONAL_SRC "")

8
client/Makefile
View file

@ -582,7 +582,7 @@ SRCS = aiddesfire.c \
tea.c \ tea.c \
ui.c \ ui.c \
util.c \ util.c \
version.c \ version_pm3.c \
wiegand_formats.c \ wiegand_formats.c \
wiegand_formatutils.c wiegand_formatutils.c
@ -631,7 +631,7 @@ OBJS += $(OBJCSRCS:%.m=$(OBJDIR)/%.o)
BINS = proxmark3 BINS = proxmark3
CLEAN = $(BINS) src/version.c src/*.moc.cpp src/ui/ui_overlays.h lualibs/pm3_cmd.lua lualibs/mfc_default_keys.lua CLEAN = $(BINS) src/version_pm3.c src/*.moc.cpp src/ui/ui_overlays.h lualibs/pm3_cmd.lua lualibs/mfc_default_keys.lua
# transition: cleaning also old path stuff # transition: cleaning also old path stuff
CLEAN += flasher *.moc.cpp ui/ui_overlays.h CLEAN += flasher *.moc.cpp ui/ui_overlays.h
@ -771,8 +771,8 @@ src/pm3_pywrap.c: pm3.i
.PHONY: all clean install uninstall tarbin .FORCE .PHONY: all clean install uninstall tarbin .FORCE
# version.c should be remade on every compilation # version_pm3.c should be remade on every compilation
src/version.c: default_version.c src/version_pm3.c: default_version_pm3.c
$(info [=] GEN $@) $(info [=] GEN $@)
$(Q)$(SH) ../tools/mkversion.sh > $@ || $(PERL) ../tools/mkversion.pl > $@ || $(CP) $< $@ $(Q)$(SH) ../tools/mkversion.sh > $@ || $(PERL) ../tools/mkversion.pl > $@ || $(CP) $< $@

8
client/experimental_lib/CMakeLists.txt
View file

@ -313,13 +313,13 @@ set (TARGET_SOURCES
${PM3_ROOT}/client/src/util.c ${PM3_ROOT}/client/src/util.c
${PM3_ROOT}/client/src/wiegand_formats.c ${PM3_ROOT}/client/src/wiegand_formats.c
${PM3_ROOT}/client/src/wiegand_formatutils.c ${PM3_ROOT}/client/src/wiegand_formatutils.c
${CMAKE_BINARY_DIR}/version.c ${CMAKE_BINARY_DIR}/version_pm3.c
) )
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/version.c OUTPUT ${CMAKE_BINARY_DIR}/version_pm3.c
COMMAND sh ${PM3_ROOT}/tools/mkversion.sh > ${CMAKE_BINARY_DIR}/version.c || perl ${PM3_ROOT}/tools/mkversion.pl > ${CMAKE_BINARY_DIR}/version.c || ${CMAKE_COMMAND} -E copy ${PM3_ROOT}/common/default_version.c ${CMAKE_BINARY_DIR}/version.c COMMAND sh ${PM3_ROOT}/tools/mkversion.sh > ${CMAKE_BINARY_DIR}/version_pm3.c || perl ${PM3_ROOT}/tools/mkversion.pl > ${CMAKE_BINARY_DIR}/version_pm3.c || ${CMAKE_COMMAND} -E copy ${PM3_ROOT}/common/default_version_pm3.c ${CMAKE_BINARY_DIR}/version_pm3.c
DEPENDS ${PM3_ROOT}/common/default_version.c DEPENDS ${PM3_ROOT}/common/default_version_pm3.c
) )
set(ADDITIONAL_SRC "") set(ADDITIONAL_SRC "")

2
common/default_version.c → common/default_version_pm3.c
View file

@ -1,5 +1,5 @@
#include "common.h" #include "common.h"
/* This is the default version.c file that Makefile.common falls back to if neither sh nor perl are available */ /* This is the default version_pm3.c file that Makefile.common falls back to if neither sh nor perl are available */
#ifndef ON_DEVICE #ifndef ON_DEVICE
#define SECTVERSINFO #define SECTVERSINFO
#else #else

4
tools/mkversion.pl
View file

@ -1,6 +1,6 @@
#!/usr/bin/env perl -w #!/usr/bin/env perl -w
# Output a version.c file that includes information about the current build # Output a version_pm3.c file that includes information about the current build
# Normally a couple of lines of bash would be enough (see openpcd project, original firmware by Harald Welte and Milosch Meriac) # Normally a couple of lines of bash would be enough (see openpcd project, original firmware by Harald Welte and Milosch Meriac)
# but this will, at least in theory, also work on Windows with our current compile environment. # but this will, at least in theory, also work on Windows with our current compile environment.
# -- Henryk Plötz <henryk@ploetzli.ch> 2009-09-28 # -- Henryk Plötz <henryk@ploetzli.ch> 2009-09-28
@ -23,7 +23,7 @@ my $undecided = (defined $ARGV[0]) && ($ARGV[0] =~ '--undecided');
####### #######
# solves some bug on macos i.e: # solves some bug on macos i.e:
## ##
# perl ../tools/mkversion.pl .. > version.c || cp ../common/default_version.c version.c # perl ../tools/mkversion.pl .. > version_pm3.c || cp ../common/default_version_pm3.c version_pm3.c
# /usr/bin/which: /usr/bin/which: cannot execute binary file # /usr/bin/which: /usr/bin/which: cannot execute binary file
# fatal: No names found, cannot describe anything. # fatal: No names found, cannot describe anything.
## ##

2
tools/mkversion.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Output a version.c file that includes information about the current build # Output a version_pm3.c file that includes information about the current build
# From mkversion.pl # From mkversion.pl
# pure sh POSIX as now even on Windows we use WSL or ProxSpace with sh available # pure sh POSIX as now even on Windows we use WSL or ProxSpace with sh available