Download as
Browse Code »

Commit d15da6e1a6d1e30489f8207110085da6ab287199

Authored by Perry Werneck
Committed by GitHub
2 parents 20286076 1ca196da
Exists in v5.2

Merge pull request #2 from bmwiedemann/master 

Allow to override build date with SOURCE_DATE_EPOCH
Showing 2 changed files with 9 additions and 2 deletions   Show diff stats
branding/Makefile.in
  Diff comments   View file @d15da6e
@@ -60,7 +60,7 @@ $(BINDIR)/%.png: \ @@ -60,7 +60,7 @@ $(BINDIR)/%.png: \
60 60
61 @echo $@ ... 61 @echo $@ ...
62 @$(MKDIR) `dirname $@` 62 @$(MKDIR) `dirname $@`
63 - @$(CONVERT) -background transparent $< $@ 63 + @$(CONVERT) -strip -background transparent $< $@
64 @$(OPTIPNG) -o7 $@ 64 @$(OPTIPNG) -o7 $@
65 65
66 $(BINDIR)/%.ico: \ 66 $(BINDIR)/%.ico: \
src/libpw3270cpp/Makefile.in
  Diff comments   View file @d15da6e
@@ -61,6 +61,13 @@ VALGRIND=@VALGRIND@ @@ -61,6 +61,13 @@ VALGRIND=@VALGRIND@
61 INSTALL_DATA=@INSTALL_DATA@ 61 INSTALL_DATA=@INSTALL_DATA@
62 INSTALL_PROGRAM=@INSTALL_PROGRAM@ 62 INSTALL_PROGRAM=@INSTALL_PROGRAM@
63 63
  64 +DATE_FMT = +%Y%m%d
  65 +ifdef SOURCE_DATE_EPOCH
  66 + BUILD_DATE ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "$(DATE_FMT)" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "$(DATE_FMT)" 2>/dev/null || date -u "$(DATE_FMT)")
  67 +else
  68 + BUILD_DATE ?= $(shell date "$(DATE_FMT)")
  69 +endif
  70 +
64 CFLAGS= \ 71 CFLAGS= \
65 @CFLAGS@ \ 72 @CFLAGS@ \
66 -Wno-deprecated-declarations \ 73 -Wno-deprecated-declarations \
@@ -102,7 +109,7 @@ $(OBJRLS)/%.o: \ @@ -102,7 +109,7 @@ $(OBJRLS)/%.o: \
102 @$(MKDIR) `dirname $@` 109 @$(MKDIR) `dirname $@`
103 @$(CC) $(CFLAGS) \ 110 @$(CC) $(CFLAGS) \
104 @RLS_CFLAGS@ \ 111 @RLS_CFLAGS@ \
105 - -DBUILD_DATE=`date +"%Y%m%d"` \ 112 + -DBUILD_DATE=$(BUILD_DATE) \
106 -o $@ -c $< 113 -o $@ -c $<
107 114
108 $(POTDIR)/%.pot: %.c 115 $(POTDIR)/%.pot: %.c