mirrors
/
rufus
mirror of https://github.com/pbatard/rufus.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[misc] move appx generation to Makefile

This commit is contained in:
Pete Batard 2017-05-09 10:54:13 +01:00
parent 7ec8db5602
commit a4b19ddf1a
4 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.am
View File

@ -1,5 +1,7 @@
SUBDIRS = src
TARGET = rufus
TAGVER = $(shell git log --oneline | wc -l)
SEDCMD = s/^\([ \t]*\)Version="\([0-9]*\)\.\([0-9]*\)\.[0-9]*\.\([0-9]*\)"\(.*\)/\1Version="\2.\3.@@TAGVER@@.\4"\5/
# This step produces the UPX compressed and signed releases that are made available for public download
# NB: UPX v3.09 or later is needed for LZMA compression (http://upx.sourceforge.net/)
@ -10,3 +12,10 @@ release: all
@upx --lzma $(TARGET)$(EXEEXT)
@mv $(TARGET)$(EXEEXT) $(TARGET)-$(VERSION)$(SUFFIX)$(EXEEXT)
@cmd.exe //c _sign.cmd $(TARGET)-$(VERSION)$(SUFFIX)$(EXEEXT)
appx: $(TARGET)-$(VERSION)$(SUFFIX)$(EXEEXT)
$(file > cmd.sed,$(SEDCMD))
@sed -i -e "s/@@TAGVER@@/$(TAGVER)/g" cmd.sed
@sed -b -i -f cmd.sed res/appstore/AppxManifest.xml
@rm cmd.sed
@cd res/appstore; cmd.exe //c packme.cmd

9
Makefile.in
View File

@ -235,6 +235,8 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = src
TARGET = rufus
TAGVER = $(shell git log --oneline | wc -l)
SEDCMD = s/^\([ \t]*\)Version="\([0-9]*\)\.\([0-9]*\)\.[0-9]*\.\([0-9]*\)"\(.*\)/\1Version="\2.\3.@@TAGVER@@.\4"\5/
all: all-recursive
.SUFFIXES:
@ -508,6 +510,13 @@ release: all
@mv $(TARGET)$(EXEEXT) $(TARGET)-$(VERSION)$(SUFFIX)$(EXEEXT)
@cmd.exe //c _sign.cmd $(TARGET)-$(VERSION)$(SUFFIX)$(EXEEXT)
appx: $(TARGET)-$(VERSION)$(SUFFIX)$(EXEEXT)
$(file > cmd.sed,$(SEDCMD))
@sed -i -e "s/@@TAGVER@@/$(TAGVER)/g" cmd.sed
@sed -b -i -f cmd.sed res/appstore/AppxManifest.xml
@rm cmd.sed
@cd res/appstore; cmd.exe //c packme.cmd
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

9
_release.sh
View File

@ -3,12 +3,3 @@ rm -f rufus*.exe
./configure --disable-debug "$@"
make -j12 clean
make -j12 release
# Update AppxManifest.xml with the build number
TAGVER=`git log --oneline | wc -l`
cat > cmd.sed <<\_EOF
s/^\([ \t]*\)Version="\([0-9]*\)\.\([0-9]*\)\.[0-9]*\.\([0-9]*\)"\(.*\)/\1Version="\2.\3.@@TAGVER@@.\4"\5/
_EOF
sed -i -e "s/@@TAGVER@@/$TAGVER/g" cmd.sed
sed -b -i -f cmd.sed res/appstore/AppxManifest.xml
rm cmd.sed

10
src/rufus.rc
View File

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 2.15.1110"
CAPTION "Rufus 2.15.1111"
FONT 8, "Segoe UI Symbol", 400, 0, 0x0
BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -334,8 +334,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,15,1110,0
PRODUCTVERSION 2,15,1110,0
FILEVERSION 2,15,1111,0
PRODUCTVERSION 2,15,1111,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -352,13 +352,13 @@ BEGIN
BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "2.15.1110"
VALUE "FileVersion", "2.15.1111"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2017 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "2.15.1110"
VALUE "ProductVersion", "2.15.1111"
END
END
BLOCK "VarFileInfo"