Permalink
Browse files

Bump to 2.2.2 (really)

  • Loading branch information...
rasa committed Mar 17, 2016
1 parent 2dc6bf4 commit 0fb22697894daba9a144b13268794b20aaf16073
Showing with 29 additions and 17 deletions.
  1. +5 −0 CHANGELOG.md
  2. +6 −6 Makefile
  3. +12 −9 make.sh
  4. +6 −2 vlc_installer.nsh
View
@@ -1,3 +1,8 @@
## 2.2.2 (reissue) (16-Mar-2016)
* Fixed URL to use mirrors.syringanetworks.net mirror
* Tweaked build scripts to publish both win32 and win64 versions
## 2.2.2 (21-Feb-2016)
* Updated VLC to version 2.2.2
View
@@ -1,4 +1,4 @@
# Copyright (c) 2002-2015, Ross Smith II. MIT licensed.
# Copyright (c) 2002-2016, Ross Smith II. MIT licensed.
## dependencies:
## Cygwin
@@ -32,7 +32,8 @@ VER?=$(strip $(shell sed -rne 's/^\s*\#define\s+(VER_STRING2|PACKAGE_VERSION)\s+
APP?=$(strip $(shell sed -rne 's/^\s*\#define\s+(VER_INTERNAL_NAME|PACKAGE)\s+"([^"]*)".*/\2/p' version.h))
endif
APP_EXE:=$(APP).exe
FLAVOR?=win32
APP_EXE:=$(APP)-$(FLAVOR).exe
APP_FILES:=\
$(APP_EXE) \
@@ -41,7 +42,6 @@ $(wildcard *.md)
#######################################################################
FLAVOR?=win32
REPO?=$(notdir $(PWD))
APP_DESC?=$(APP)
@@ -302,10 +302,10 @@ TAGGED:=.$(TAG).tagged
$(TAGGED): $(APP_ZIP)
if ! git tag | grep -q -P "\b$(TAG)\b"; then \
git tag -a $(TAG) -m "Version $(VER)" ;\
git push origin --tags ;\
touch $@ ;\
echo Tag $(TAG) created on Github ;\
fi
git push origin --tags
touch $@
@-echo Tag $(TAG) created on Github
.PHONY: tag
tag: $(TAGGED)
View
21 make.sh
@@ -1,22 +1,25 @@
#!/usr/bin/env bash
# Copyright (c) 2002-2015, Ross Smith II. MIT licensed.
# Copyright (c) 2002-2016, Ross Smith II. MIT licensed.
set -e
set -xv
if [[ -n "$1" ]]; then
target="$*"
target="$1"
else
target=publish
fi
# build the 32-bit version: vlc_installer-x.y-win32.zip:
make ${target}
# remove Release/vlc_installer.exe as it uses the same name as the 64-bit installer
make clean
if [[ -n "$2" ]]; then
FLAVOR=win64
MAKENSIS_OPTS="/DINSTALL_IN_PROGRAMFILES64=1"
else
FLAVOR=win32
MAKENSIS_OPTS=""
fi
# build the 64-bit version: vlc_installer-x.y-win64.zip:
make FLAVOR=win64 MAKENSIS_OPTS="/DINSTALL_IN_PROGRAMFILES64=1" ${target}
# FLAVOR=win64 MAKENSIS_OPTS="/DINSTALL_IN_PROGRAMFILES64=1"
make ${target} FLAVOR=${FLAVOR} MAKENSIS_OPTS="${MAKENSIS_OPTS}"
View
@@ -4,12 +4,16 @@
# http://get.videolan.org/vlc/2.2.2/win64/vlc-2.2.2-win64.exe
!insertmacro DownloadEXE "1" "VLC ${VLC_VER} 64-Bit Installer" "http://get.videolan.org/vlc/${VLC_VER}/win64/vlc-${VLC_VER}-win64.exe" "" ''
#!insertmacro DownloadEXE "1" "VLC ${VLC_VER} 64-Bit Installer" "http://get.videolan.org/vlc/${VLC_VER}/win64/vlc-${VLC_VER}-win64.exe" "" "http://www.videolan.org/vlc/download-windows.html"
!insertmacro DownloadEXE "1" "VLC ${VLC_VER} 64-Bit Installer" "http://mirrors.syringanetworks.net/videolan/vlc/${VLC_VER}/win64/vlc-${VLC_VER}-win64.exe" "" "http://www.videolan.org/vlc/download-windows.html"
!insertmacro DownloadAny "1" "libaacs.dll - AACS dynamic library (64 bit)" "http://vlc-bluray.whoknowsmy.name/files/win64/libaacs.dll" "" ''
!else
!insertmacro DownloadEXE "1" "VLC ${VLC_VER} 32-Bit Installer" "http://get.videolan.org/vlc/${VLC_VER}/win32/vlc-${VLC_VER}-win32.exe" "" ''
#!insertmacro DownloadEXE "1" "VLC ${VLC_VER} 32-Bit Installer" "http://get.videolan.org/vlc/${VLC_VER}/win32/vlc-${VLC_VER}-win32.exe" "" "http://www.videolan.org/vlc/download-windows.html"
!insertmacro DownloadEXE "1" "VLC ${VLC_VER} 32-Bit Installer" "http://mirrors.syringanetworks.net/videolan/vlc/${VLC_VER}/win32/vlc-${VLC_VER}-win32.exe" "" "http://www.videolan.org/vlc/download-windows.html"
!insertmacro DownloadAny "1" "libaacs.dll - AACS dynamic library (32 bit)" "http://vlc-bluray.whoknowsmy.name/files/win32/libaacs.dll" "" ''
!endif

0 comments on commit 0fb2269

Please sign in to comment.