teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2025-02-18 10:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #225 from smcv/reproducible-date

Browse source 
Pick up date from SOURCE_DATE_EPOCH, for reproducible builds
This commit is contained in:
Tim Angus 2016-09-27 21:05:24 +01:00 committed by GitHub
commit cce24668f7
5 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -1098,6 +1098,11 @@ else
STRIP_FLAG = -s STRIP_FLAG = -s
endif endif
# https://reproducible-builds.org/specs/source-date-epoch/
ifdef SOURCE_DATE_EPOCH
BASE_CFLAGS += -DPRODUCT_DATE=\\\"$(shell date --date="@$$SOURCE_DATE_EPOCH" "+%b %_d %Y" | sed -e 's/ /\\\ /'g)\\\"
endif
BASE_CFLAGS += -DPRODUCT_VERSION=\\\"$(VERSION)\\\" BASE_CFLAGS += -DPRODUCT_VERSION=\\\"$(VERSION)\\\"
BASE_CFLAGS += -Wformat=2 -Wno-format-zero-length -Wformat-security -Wno-format-nonliteral BASE_CFLAGS += -Wformat=2 -Wno-format-zero-length -Wformat-security -Wno-format-nonliteral
BASE_CFLAGS += -Wstrict-aliasing=2 -Wmissing-format-attribute BASE_CFLAGS += -Wstrict-aliasing=2 -Wmissing-format-attribute

4
code/game/g_main.c
View file

@ -101,7 +101,7 @@ static cvarTable_t gameCvarTable[] = {
// noset vars // noset vars
{ NULL, "gamename", GAMEVERSION , CVAR_SERVERINFO | CVAR_ROM, 0, qfalse }, { NULL, "gamename", GAMEVERSION , CVAR_SERVERINFO | CVAR_ROM, 0, qfalse },
{ NULL, "gamedate", __DATE__ , CVAR_ROM, 0, qfalse }, { NULL, "gamedate", PRODUCT_DATE , CVAR_ROM, 0, qfalse },
{ &g_restarted, "g_restarted", "0", CVAR_ROM, 0, qfalse }, { &g_restarted, "g_restarted", "0", CVAR_ROM, 0, qfalse },
// latched vars // latched vars
@ -408,7 +408,7 @@ void G_InitGame( int levelTime, int randomSeed, int restart ) {
G_Printf ("------- Game Initialization -------\n"); G_Printf ("------- Game Initialization -------\n");
G_Printf ("gamename: %s\n", GAMEVERSION); G_Printf ("gamename: %s\n", GAMEVERSION);
G_Printf ("gamedate: %s\n", __DATE__); G_Printf ("gamedate: %s\n", PRODUCT_DATE);
srand( randomSeed ); srand( randomSeed );

4
code/qcommon/common.c
View file

@ -2639,7 +2639,7 @@ void Com_Init( char *commandLine ) {
char *s; char *s;
int qport; int qport;
Com_Printf( "%s %s %s\n", Q3_VERSION, PLATFORM_STRING, __DATE__ ); Com_Printf( "%s %s %s\n", Q3_VERSION, PLATFORM_STRING, PRODUCT_DATE );
if ( setjmp (abortframe) ) { if ( setjmp (abortframe) ) {
Sys_Error ("Error during initialization"); Sys_Error ("Error during initialization");
@ -2760,7 +2760,7 @@ void Com_Init( char *commandLine ) {
com_introPlayed = Cvar_Get( "com_introplayed", "0", CVAR_ARCHIVE); com_introPlayed = Cvar_Get( "com_introplayed", "0", CVAR_ARCHIVE);
#endif #endif
s = va("%s %s %s", Q3_VERSION, PLATFORM_STRING, __DATE__ ); s = va("%s %s %s", Q3_VERSION, PLATFORM_STRING, PRODUCT_DATE );
com_version = Cvar_Get ("version", s, CVAR_ROM | CVAR_SERVERINFO ); com_version = Cvar_Get ("version", s, CVAR_ROM | CVAR_SERVERINFO );
com_gamename = Cvar_Get("com_gamename", GAMENAME_FOR_MASTER, CVAR_SERVERINFO | CVAR_INIT); com_gamename = Cvar_Get("com_gamename", GAMENAME_FOR_MASTER, CVAR_SERVERINFO | CVAR_INIT);
com_protocol = Cvar_Get("com_protocol", va("%i", PROTOCOL_VERSION), CVAR_SERVERINFO | CVAR_INIT); com_protocol = Cvar_Get("com_protocol", va("%i", PROTOCOL_VERSION), CVAR_SERVERINFO | CVAR_INIT);

4
code/qcommon/q_shared.h
View file

@ -70,6 +70,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define PRODUCT_VERSION "1.36" #define PRODUCT_VERSION "1.36"
#endif #endif
#ifndef PRODUCT_DATE
# define PRODUCT_DATE __DATE__
#endif
#define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION #define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION
#define MAX_TEAMNAME 32 #define MAX_TEAMNAME 32

2
code/sys/sys_main.c
View file

@ -553,7 +553,7 @@ void Sys_ParseArgs( int argc, char **argv )
if( !strcmp( argv[1], "--version" ) || if( !strcmp( argv[1], "--version" ) ||
!strcmp( argv[1], "-v" ) ) !strcmp( argv[1], "-v" ) )
{ {
const char* date = __DATE__; const char* date = PRODUCT_DATE;
#ifdef DEDICATED #ifdef DEDICATED
fprintf( stdout, Q3_VERSION " dedicated server (%s)\n", date ); fprintf( stdout, Q3_VERSION " dedicated server (%s)\n", date );
#else #else