piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Replace SVN strings by a VERS string (2.0)

Browse Source
This commit is contained in:
Bertrand Songis
2014-01-16 22:31:03 +01:00
parent bf54445c94
commit ddd8d137fc
3 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/Makefile
+28 -28
View File
@@ -256,7 +256,7 @@ MENUS_LOCK == NO
SHELL = sh
IMG2LBM = -python ../util/img2lbm.py
TRANSLATE = -python ../util/translate.py
SVNREV = $(shell sh -c "svnversion | egrep -o '[[:digit:]]+[[:alpha:]]*$$'")
VERSION = 2.0
SRC =
CPPSRC =
@@ -1063,43 +1063,43 @@ stamp_header:
@echo "//Automatically generated file (Makefile) - do not edit" > stamp-opentx.h
@echo "#define DATE_STR \"`date +%Y-%m-%d | tr -d '\r\n'`\"" >> stamp-opentx.h
@echo "#define TIME_STR \"`date +%H:%M:%S | tr -d '\r\n'`\"" >> stamp-opentx.h
@echo "#define SVN_STR \"opentx-r$(SVNREV)\"" >> stamp-opentx.h
@echo "#define VERS_STR \"$(VERSION)\"" >> stamp-opentx.h
@cat stamp-opentx.h
stock-stamp:
@echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-opentx-stock.txt
@echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-opentx-stock.txt
@echo "#define SVN_VERS \"opentx-r$(SVNREV)\"" >> stamp-opentx-stock.txt
@cat stamp-opentx-stock.txt
9x-stamp:
@echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-opentx-9x.txt
@echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-opentx-9x.txt
@echo "#define VERS_STR \"$(VERSION)\"" >> stamp-opentx-9x.txt
@cat stamp-opentx-9x.txt
stock128-stamp:
@echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-opentx-stock128.txt
@echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-opentx-stock128.txt
@echo "#define SVN_VERS \"opentx-r$(SVNREV)\"" >> stamp-opentx-stock128.txt
@cat stamp-opentx-stock128.txt
9x128-stamp:
@echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-opentx-9x128.txt
@echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-opentx-9x128.txt
@echo "#define VERS_STR \"$(VERSION)\"" >> stamp-opentx-9x128.txt
@cat stamp-opentx-9x128.txt
stock2561-stamp:
@echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-opentx-stock2561.txt
@echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-opentx-stock2561.txt
@echo "#define SVN_VERS \"opentx-r$(SVNREV)\"" >> stamp-opentx-stock2561.txt
@cat stamp-opentx-stock2561.txt
9x2561-stamp:
@echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-opentx-9x2561.txt
@echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-opentx-9x2561.txt
@echo "#define VERS_STR \"$(VERSION)\"" >> stamp-opentx-9x2561.txt
@cat stamp-opentx-9x2561.txt
v4-stamp:
@echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-opentx-v4.txt
@echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-opentx-v4.txt
@echo "#define SVN_VERS \"opentx-r$(SVNREV)\"" >> stamp-opentx-v4.txt
@cat stamp-opentx-v4.txt
gruvin9x-stamp:
@echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-opentx-gruvin9x.txt
@echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-opentx-gruvin9x.txt
@echo "#define VERS_STR \"$(VERSION)\"" >> stamp-opentx-gruvin9x.txt
@cat stamp-opentx-9x.txt
arm-stamp:
@echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-opentx-arm.txt
@echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-opentx-arm.txt
@echo "#define SVN_VERS \"opentx-r$(SVNREV)\"" >> stamp-opentx-arm.txt
@cat stamp-opentx-arm.txt
sky9x-stamp:
@echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-opentx-sky9x.txt
@echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-opentx-sky9x.txt
@echo "#define VERS_STR \"$(VERSION)\"" >> stamp-opentx-sky9x.txt
@cat stamp-opentx-sky9x.txt
taranis-stamp:
@echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-opentx-taranis.txt
@echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-opentx-taranis.txt
@echo "#define SVN_VERS \"opentx-r$(SVNREV)\"" >> stamp-opentx-taranis.txt
@echo "#define VERS_STR \"$(VERSION)\"" >> stamp-opentx-taranis.txt
@cat stamp-opentx-taranis.txt
translations/cz.h: translations/cz.h.txt
radio/src/simpgmspace.h
+2
View File
@@ -359,6 +359,8 @@ void eeprom_read_block (void *pointer_ram, const void *pointer_eeprom, size_t si
#define boardInit()
#define OS_MutexID pthread_mutex_t
extern OS_MutexID audioMutex;
#define OS_FlagID int
#define OS_TID int
#define OS_TCID int
radio/src/stamp.cpp
+1 -1
View File
@@ -40,7 +40,7 @@
#define STR2(s) #s
#define DEFNUMSTR(s) STR2(s)
const pm_char stamp1[] PROGMEM = " SVN: " SVN_STR;
const pm_char stamp1[] PROGMEM = "VERS: " VERS_STR;
const pm_char stamp2[] PROGMEM = "DATE: " DATE_STR;
const pm_char stamp3[] PROGMEM = "TIME: " TIME_STR;
#if defined(PCBSTD)