(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 5a6d4bf7ec5b77f2e724b4008c3d98340c02a4ee..90c2e957755a404458154d7e2564680b9733df40 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,13 +27,13 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2015 ImageMagick Studio LLC"
-#define MagickSVNRevision  "18476:18477"
+#define MagickSVNRevision  "18476:18479M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
-#define MagickLibVersionNumber  1,0,0
-#define MagickLibAddendum  "-0"
-#define MagickLibInterface  1
-#define MagickLibMinInterface  1
+#define MagickLibVersionNumber  0,0,0
+#define MagickLibAddendum  "-1"
+#define MagickLibInterface  0
+#define MagickLibMinInterface  0
 #if defined(_WINDOWS)
 #  if defined(_WIN64)
 #    define MagickPlatform "x64"
@@ -44,10 +44,10 @@ extern "C" {
 #define MagickPlatform  "x86_64"
 #endif
 #define MagickppLibVersionText  "7.0.0"
-#define MagickppLibVersionNumber  1:0:0
-#define MagickppLibAddendum  "-0"
-#define MagickppLibInterface  1
-#define MagickppLibMinInterface  1
+#define MagickppLibVersionNumber  0:0:0
+#define MagickppLibAddendum  "-1"
+#define MagickppLibInterface  0
+#define MagickppLibMinInterface  0
 #define MagickReleaseDate  "2015-05-03"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeLicense  \

diff --git a/configure b/configure
index 35d23266b1f4bf0e32bd70aff63024f80913ca50..a4bddea9066e744732a153828f456148bdaa1e7b 100755 (executable)
--- a/configure
+++ b/configure
@@ -1124,6 +1124,7 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_silent_rules
+enable_reproducible_build
 enable_dependency_tracking
 with_gnu_ld
 with_dmalloc
@@ -1867,6 +1868,8 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-reproducible-build
+                          enable reproducible build
   --enable-dependency-tracking
                           do not reject slow dependency extractors
   --disable-dependency-tracking
@@ -4281,6 +4284,14 @@ done
 CONFIGURE_ARGS="$0 ${ac_configure_args}"
 
 
+# Check whether --enable-reproducible-build was given.
+if test "${enable_reproducible_build+set}" = set; then :
+  enableval=$enable_reproducible_build; enable_reproducible_build=$enableval
+else
+  enable_reproducible_build='no'
+fi
+
+
 # Source file containing package/library versioning information.
 . ${srcdir}/version.sh
 
@@ -4322,7 +4333,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=18476:18477
+MAGICK_SVN_REVISION=18476:18479M
 
 
 # Substitute library versioning
@@ -4336,6 +4347,12 @@ MAGICKPP_LIBRARY_CURRENT_MIN=`expr $MAGICKPP_LIBRARY_CURRENT - $MAGICKPP_LIBRARY
 MAGICKPP_LIBRARY_VERSION_INFO=$MAGICKPP_LIBRARY_CURRENT:$MAGICKPP_LIBRARY_REVISION:$MAGICKPP_LIBRARY_AGE
 
 
+if test X$enable_reproducible_build = Xyes; then :
+  PACKAGE_RELEASE_DATE=$PACKAGE_RELEASE_DATE_REPRODUCIBLE
+elif PACKAGE_RELEASE_DATE=$PACKAGE_RELEASE_DATE_RAW; then :
+
+fi
+
 
 # Ensure that make can run correctly
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5

diff --git a/configure.ac b/configure.ac
index 4aa1a5dd3c2f929b022e71d7a807665407b0da4a..84e9b3f770f5cfd1c4f5b2913248f90e355e2a8a 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -63,6 +63,12 @@ AC_SUBST(DISTCHECK_CONFIG_FLAGS)
 CONFIGURE_ARGS="$0 ${ac_configure_args}"
 AC_SUBST(CONFIGURE_ARGS)
 
+AC_ARG_ENABLE([reproducible-build],
+    [AC_HELP_STRING([--enable-reproducible-build],
+                    [enable reproducible build])],
+    [enable_reproducible_build=$enableval],
+    [enable_reproducible_build='no'])
+
 # Source file containing package/library versioning information.
 . ${srcdir}/version.sh
 
@@ -113,7 +119,12 @@ AC_SUBST(PACKAGE_RELEASE)dnl
 AC_SUBST(PACKAGE_CHANGE_DATE)dnl
 AC_SUBST(PACKAGE_LIB_VERSION)dnl
 AC_SUBST(PACKAGE_LIB_VERSION_NUMBER)dnl
+AS_IF([test X$enable_reproducible_build = Xyes],
+ [PACKAGE_RELEASE_DATE=$PACKAGE_RELEASE_DATE_REPRODUCIBLE],
+ [PACKAGE_RELEASE_DATE=$PACKAGE_RELEASE_DATE_RAW],
+)
 AC_SUBST(PACKAGE_RELEASE_DATE)dnl
+
 AC_SUBST(PACKAGE_VERSION_ADDENDUM)dnl
 
 # Ensure that make can run correctly

diff --git a/version.sh b/version.sh
index 2f03e3309b649ce9a681c64e882ed10aa8c0aeff..af0011e290b6b3e6ec8c45a326c6d5c3d3fee9bc 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -7,21 +7,24 @@
 # Package base name
 PACKAGE_NAME='ImageMagick'
 
+#
+# Date of last ChangeLog update
+#
+PACKAGE_CHANGE_DATE=`awk '/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/ { print substr($1,1,4) substr($1,6,2) substr($1,9,2); exit; }' ${srcdir}/ChangeLog`
+
 #
 # Package version.  This is is the numeric version suffix applied to
 # PACKAGE_NAME (e.g. "1.0.0").
 PACKAGE_VERSION='7.0.0'
 PACKAGE_PERL_VERSION='7.00'
 PACKAGE_LIB_VERSION="0x700"
-PACKAGE_RELEASE="0"
+PACKAGE_RELEASE="1"
 PACKAGE_LIB_VERSION_NUMBER="7,0,0,${PACKAGE_RELEASE}"
-PACKAGE_RELEASE_DATE=`date +%F`
+PACKAGE_RELEASE_DATE_RAW=`date +%F`
+PACKAGE_RELEASE_DATE_REPRODUCIBLE=`date +%F -d "${PACKAGE_CHANGE_DATE}"`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"
 
-#
-# Date of last ChangeLog update
-#
-PACKAGE_CHANGE_DATE=`awk '/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/ { print substr($1,1,4) substr($1,6,2) substr($1,9,2); exit; }' ${srcdir}/ChangeLog`
+
 
 #
 # Package version addendum.  This is an arbitrary suffix (if any) appended
@@ -39,11 +42,11 @@ PACKAGE_VERSION_ADDENDUM="-${PACKAGE_RELEASE}"
 # PLEASE NOTE that doing a SO BUMP aka raising the CURRENT REVISION
 # could be avoided using libversioning aka map files.  You MUST change .map
 # files if you raise these versions.
-MAGICK_LIBRARY_CURRENT=1
+MAGICK_LIBRARY_CURRENT=0
 MAGICK_LIBRARY_REVISION=0
 MAGICK_LIBRARY_AGE=0
 
 # magick++
-MAGICKPP_LIBRARY_CURRENT=1
+MAGICKPP_LIBRARY_CURRENT=0
 MAGICKPP_LIBRARY_REVISION=0
 MAGICKPP_LIBRARY_AGE=0