mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
reintroduce datetime in deb version / deb filename, using the gre buildid this time, which won't change mid-step. bug 547903, r=mfinkle
This commit is contained in:
parent
2001820ab1
commit
4fb620282d
@ -49,9 +49,8 @@ ABS_OBJDIR=`cd $(DEPTH); pwd`
|
||||
ABS_TOPSRCDIR=$(shell cd $(topsrcdir); pwd)
|
||||
BASE64_ICON = dist/branding/fennec_maemo_icon26.txt
|
||||
MOZ_DEB_TIMESTAMP = "$(shell date +"%a, %d %b %Y %T %z" )"
|
||||
MOZ_APP_BUILDID = "$(shell date +"%Y%m%d%H%M%S" )"
|
||||
|
||||
DEB_PKG_VERSION = $(shell echo $(MOZ_APP_VERSION) | $(PERL) -pe 's/pre/~pre/; s/^([0-9.]+)([a-z][0-9]+)/$$1~$$2/')
|
||||
DEB_PKG_VERSION = $(shell echo $(MOZ_APP_VERSION) | $(PERL) -pe 's/pre/~$(GRE_BUILDID)/; s/^([0-9.]+)([a-z][0-9]+)/$$1~$$2/')
|
||||
|
||||
DEB_BUILD_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
|
||||
# package name should match mobile/installer/debian/changelog.in
|
||||
@ -63,7 +62,6 @@ DEFINES += \
|
||||
-Dinstalldir=$(installdir) \
|
||||
-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
|
||||
-DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) \
|
||||
-DMOZ_APP_BUILDID=$(MOZ_APP_BUILDID) \
|
||||
-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
|
||||
-DABS_OBJDIR=$(ABS_OBJDIR) \
|
||||
-DBASE64_ICON=$(BASE64_ICON) \
|
||||
@ -193,6 +191,7 @@ deb: $(PP_DEB_FILES) $(DIST)/branding/$(MOZ_APP_NAME)_scalable.png \
|
||||
$(NSINSTALL) -D $(DEBDESTDIR)$(regdir)
|
||||
$(SYSINSTALL) $(MOZILLA_VERSION).$(MOZ_APP_NAME).conf $(DEBDESTDIR)$(regdir)/
|
||||
dh_link; fakeroot dh_fixperms; fakeroot dh_installdeb; dh_shlibdeps; fakeroot dh_gencontrol; fakeroot dh_md5sums; dh_builddeb
|
||||
echo $(DEB_PKG_NAME) > deb_name.txt
|
||||
|
||||
installer: deb
|
||||
@echo Installer DEB created!
|
||||
|
Loading…
Reference in New Issue
Block a user