From f9f068f754339ce72010c91ac4a2565b5a776c1f Mon Sep 17 00:00:00 2001 From: Karl Heyes Date: Mon, 8 May 2023 02:50:55 +0100 Subject: [PATCH] push for a pre-release This is to check for a win32 installer works as expected. --- conf/i686-w64-mingw32.nsis.in | 8 +++++++- conf/x86_64-w64-mingw32.nsis.in | 8 +++++++- configure | 20 ++++++++++---------- configure.ac | 2 +- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/conf/i686-w64-mingw32.nsis.in b/conf/i686-w64-mingw32.nsis.in index b1e77398..456ba8ba 100644 --- a/conf/i686-w64-mingw32.nsis.in +++ b/conf/i686-w64-mingw32.nsis.in @@ -12,6 +12,8 @@ # which will generate the output file 'installer.exe' which is a Windows # installer containing your program. +!include WinVer.nsh + Name "Icecast KH" OutFile "icecast-@PACKAGE_VERSION@_win32_setup.exe" @@ -31,7 +33,7 @@ XPStyle on ;Version Information -VIProductVersion "2.4.0.21" +VIProductVersion "2.4.0.22" VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Icecast KH" VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "2.4.0" VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Karl Heyes @2000-2023" @@ -58,6 +60,10 @@ Section "Icecast Installation" SetOutPath "$INSTDIR" File /r "x32/*.dll" + ${If} ${AtMostWin7} + FILE /r "x32/extra/*.dll" + ${EndIf} + WriteUninstaller "$INSTDIR\Uninstall.exe" File "x32/icecast.exe" diff --git a/conf/x86_64-w64-mingw32.nsis.in b/conf/x86_64-w64-mingw32.nsis.in index a3589cfe..d14f5740 100644 --- a/conf/x86_64-w64-mingw32.nsis.in +++ b/conf/x86_64-w64-mingw32.nsis.in @@ -12,6 +12,8 @@ # which will generate the output file 'installer.exe' which is a Windows # installer containing your program. +!include WinVer.nsh + Name "Icecast KH" OutFile "icecast-@PACKAGE_VERSION@_win64_setup.exe" @@ -31,7 +33,7 @@ XPStyle on ;Version Information -VIProductVersion "2.4.0.21" +VIProductVersion "2.4.0.22" VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Icecast KH" VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "2.4.0" VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Karl Heyes @2000-2023" @@ -58,6 +60,10 @@ Section "Icecast Installation" SetOutPath "$INSTDIR" File /r "x64/*.dll" + ${If} ${AtMostWin7} + FILE /r "x64/extra/*.dll" + ${EndIf} + WriteUninstaller "$INSTDIR\Uninstall.exe" File "x64/icecast.exe" diff --git a/configure b/configure index 3067d1b6..a3b1fb58 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for Icecast 2.4.0-kh21. +# Generated by GNU Autoconf 2.71 for Icecast 2.4.0-kh21.2. # # Report bugs to . # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Icecast' PACKAGE_TARNAME='icecast' -PACKAGE_VERSION='2.4.0-kh21' -PACKAGE_STRING='Icecast 2.4.0-kh21' +PACKAGE_VERSION='2.4.0-kh21.2' +PACKAGE_STRING='Icecast 2.4.0-kh21.2' PACKAGE_BUGREPORT='karl@kheyes.plus.com' PACKAGE_URL='' @@ -1434,7 +1434,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Icecast 2.4.0-kh21 to adapt to many kinds of systems. +\`configure' configures Icecast 2.4.0-kh21.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1505,7 +1505,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Icecast 2.4.0-kh21:";; + short | recursive ) echo "Configuration of Icecast 2.4.0-kh21.2:";; esac cat <<\_ACEOF @@ -1639,7 +1639,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Icecast configure 2.4.0-kh21 +Icecast configure 2.4.0-kh21.2 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2193,7 +2193,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Icecast $as_me 2.4.0-kh21, which was +It was created by Icecast $as_me 2.4.0-kh21.2, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3680,7 +3680,7 @@ fi # Define the identity of the package. PACKAGE='icecast' - VERSION='2.4.0-kh21' + VERSION='2.4.0-kh21.2' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -21645,7 +21645,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Icecast $as_me 2.4.0-kh21, which was +This file was extended by Icecast $as_me 2.4.0-kh21.2, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21713,7 +21713,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -Icecast config.status 2.4.0-kh21 +Icecast config.status 2.4.0-kh21.2 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 062d1d38..68d35a2b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([Icecast], [2.4.0-kh21], [karl@kheyes.plus.com]) +AC_INIT([Icecast], [2.4.0-kh21.2], [karl@kheyes.plus.com]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([foreign])