Removed rc moniker for the 0.100.0 stable release. Added docs/html back so it may be packaged in the release tarball.

pull/51/head
Micah Snyder 7 years ago
parent 9ad37622ae
commit f1f31c6acf
  1. 26
      configure
  2. 2
      configure.ac
  3. 2
      docs/Makefile.am
  4. 2
      docs/Makefile.in
  5. 0
      docs/html/Placeholder
  6. 2
      m4/reorganization/version.m4
  7. 7
      win32/ClamAV-Installer.iss
  8. 6
      win32/clamav-config.h
  9. 2
      win32/res/common.rc

26
configure vendored

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for ClamAV 0.101.0-rc.
# Generated by GNU Autoconf 2.69 for ClamAV 0.101.0.
#
# Report bugs to <https://bugzilla.clamav.net/>.
#
@ -592,8 +592,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ClamAV'
PACKAGE_TARNAME='clamav'
PACKAGE_VERSION='0.101.0-rc'
PACKAGE_STRING='ClamAV 0.101.0-rc'
PACKAGE_VERSION='0.101.0'
PACKAGE_STRING='ClamAV 0.101.0'
PACKAGE_BUGREPORT='https://bugzilla.clamav.net/'
PACKAGE_URL='https://www.clamav.net/'
@ -1543,7 +1543,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 ClamAV 0.101.0-rc to adapt to many kinds of systems.
\`configure' configures ClamAV 0.101.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1614,7 +1614,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of ClamAV 0.101.0-rc:";;
short | recursive ) echo "Configuration of ClamAV 0.101.0:";;
esac
cat <<\_ACEOF
@ -1838,7 +1838,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
ClamAV configure 0.101.0-rc
ClamAV configure 0.101.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -2428,7 +2428,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 ClamAV $as_me 0.101.0-rc, which was
It was created by ClamAV $as_me 0.101.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -4185,7 +4185,7 @@ fi
# Define the identity of the package.
PACKAGE='clamav'
VERSION='0.101.0-rc'
VERSION='0.101.0'
# Some tools Automake needs.
@ -5913,7 +5913,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
VERSION="0.101.0-rc"
VERSION="0.101.0"
LC_CURRENT=9
LC_REVISION=0
@ -29787,7 +29787,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 ClamAV $as_me 0.101.0-rc, which was
This file was extended by ClamAV $as_me 0.101.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -29854,7 +29854,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
ClamAV config.status 0.101.0-rc
ClamAV config.status 0.101.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@ -32670,7 +32670,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 ClamAV $as_me 0.101.0-rc, which was
This file was extended by ClamAV $as_me 0.101.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -32737,7 +32737,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
ClamAV config.status 0.101.0-rc
ClamAV config.status 0.101.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

@ -20,7 +20,7 @@ dnl MA 02110-1301, USA.
AC_PREREQ([2.59])
dnl For a release change [devel] to the real version [0.xy]
dnl also change VERSION below
AC_INIT([ClamAV], [0.101.0-rc], [https://bugzilla.clamav.net/], [clamav], [https://www.clamav.net/])
AC_INIT([ClamAV], [0.101.0], [https://bugzilla.clamav.net/], [clamav], [https://www.clamav.net/])
dnl enable C++
AC_PROG_CXX()

@ -16,7 +16,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301, USA.
EXTRA_DIST = UserManual UserManual.md $(top_srcdir)/docs/man/*.in
EXTRA_DIST = html UserManual UserManual.md $(top_srcdir)/docs/man/*.in
man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamd.conf.5 man/clamdscan.1 man/clamav-milter.8 man/clamav-milter.conf.5 man/freshclam.conf.5 man/clamconf.1 man/clamdtop.1 man/clambc.1
if ENABLE_CLAMSUBMIT

@ -464,7 +464,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = UserManual UserManual.md $(top_srcdir)/docs/man/*.in
EXTRA_DIST = html UserManual UserManual.md $(top_srcdir)/docs/man/*.in
man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 \
man/clamd.conf.5 man/clamdscan.1 man/clamav-milter.8 \
man/clamav-milter.conf.5 man/freshclam.conf.5 man/clamconf.1 \

@ -1,6 +1,6 @@
dnl change this on a release
dnl VERSION="devel-`date +%Y%m%d`"
VERSION="0.101.0-rc"
VERSION="0.101.0"
LC_CURRENT=9
LC_REVISION=0

@ -20,7 +20,7 @@ UninstallDisplayName=ClamAV
Compression=lzma2
SolidCompression=yes
OutputDir=.
OutputBaseFilename=ClamAV-0.101.0-rc
OutputBaseFilename=ClamAV-0.101.0
WizardImageFile=demon.bmp
WizardSmallImageFile=talos.bmp
@ -87,8 +87,7 @@ Source: "..\COPYING.zlib"; DestDir: "{app}\COPYING"; DestName: "COPYING.zlib"
Source: "..\ChangeLog.md"; DestDir: "{app}\docs"; DestName: "ChangeLog.md"
Source: "..\NEWS.md"; DestDir: "{app}\docs"; DestName: "NEWS.md"
Source: "..\README.md"; DestDir: "{app}"; DestName: "README.md"
Source: "..\docs\UserManual.md"; DestDir: "{app}\docs"; DestName: "UserManual.md"
Source: "..\docs\UserManual\*"; DestDir: "{app}\docs\UserManual"; Flags: recursesubdirs
Source: "..\docs\html\*"; DestDir: "{app}\docs"; Flags: recursesubdirs
[Dirs]
Name: "{app}\database"
@ -99,7 +98,7 @@ Name: "{app}\database"
[Run]
Filename: "{tmp}\vc_redist.x86.exe"; Parameters: "/q /norestart"; Check: not Is64BitInstallMode and VCRedistNeedsInstall; WorkingDir: {app}\redist; StatusMsg: Installing VC++ 2015 Redistributables...; Flags: shellexec
Filename: "{tmp}\vc_redist.x64.exe"; Parameters: "/q /norestart"; Check: Is64BitInstallMode and VCRedistNeedsInstall; WorkingDir: {app}\redist; StatusMsg: Installing VC++ 2015 Redistributables...; Flags: shellexec
Filename: https://github.com/Cisco-Talos/clamav-devel/blob/dev/0.101/README.md; Description: "View Readme on GitHub"; Flags: postinstall shellexec
Filename: file://{app}/docs/UserManual.html; Description: "Open the User Manual in the default browser"; Flags: postinstall shellexec
[Code]
#IFDEF UNICODE

@ -469,7 +469,7 @@
#define PACKAGE_NAME "ClamAV"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "ClamAV 0.101.0-rc"
#define PACKAGE_STRING "ClamAV 0.101.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "clamav"
@ -478,7 +478,7 @@
#define PACKAGE_URL "https://www.clamav.net/"
/* Define to the version of this package. */
#define PACKAGE_VERSION "0.101.0-rc"
#define PACKAGE_VERSION "0.101.0"
/* scan buffer size */
#define SCANBUFF 131072
@ -514,7 +514,7 @@
/* #undef USE_SYSLOG */
/* Version number of package */
#define VERSION "0.101.0-rc"
#define VERSION "0.101.0"
/* Version suffix for package */
#define VERSION_SUFFIX ""

@ -7,7 +7,7 @@
#endif
#define RES_VER_Q 0,101,0,0
#define RES_VER_S "ClamAV 0.101.0-rc"
#define RES_VER_S "ClamAV 0.101.0"
VS_VERSION_INFO VERSIONINFO
FILEVERSION RES_VER_Q

Loading…
Cancel
Save