Discussion:
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2292-g04cbec5
Sandro Santilli
2017-01-30 07:53:47 UTC
Permalink
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
via 04cbec56c6070bef7bafd0763a05921dca1e1d12 (commit)
from ff92e0ae816440b81ecb46215717a376a77491be (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=04cbec56c6070bef7bafd0763a05921dca1e1d12


commit 04cbec56c6070bef7bafd0763a05921dca1e1d12
Author: Nutchanon Wetchasit <***@gmail.com>
Date: Mon Jan 30 08:49:23 2017 +0100

Use all-decimal comparison on MING_VERSION_CODE macro

This fixes comparison inconsistencies and testsuite build error introduced
by commit ff92e0ae816440b81ecb46215717a376a77491be

See bug #50174 <https://savannah.gnu.org/bugs/?50174>

diff --git a/macros/ming.m4 b/macros/ming.m4
index c66dd19..fe39695 100644
--- a/macros/ming.m4
+++ b/macros/ming.m4
@@ -1,6 +1,6 @@
dnl
dnl Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010,
-dnl 2011 Free Software Foundation, Inc.
+dnl 2011, 2017 Free Software Foundation, Inc.
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -28,8 +28,10 @@ dnl
#
# Provides:
# MING_VERSION - Ming version string (example: "0.4.1" or "0.4.0.beta2")
-# MING_VERSION_CODE - a 8digits number encoding Major, Minor, Patch and Beta numbers.
-# examples: 00040002 (0.4.0.beta2) 00040100 (0.4.1)
+# MING_VERSION_CODE - a number encoding Major, Minor, Patch and Beta numbers,
+# composed of two digits from each number,
+# with leading zeros stripped out from final result.
+# examples: 40002 (0.4.0.beta2) 40100 (0.4.1)
# MING_CFLAGS
# MING_LIBS
# MAKESWF
@@ -66,7 +68,7 @@ AC_DEFUN([AC_PATH_MING], [
beta=`eval expr $beta + 5`
fi
fi
- MING_VERSION_CODE=`printf %2.2d%2.2d%2.2d%2.2d $major $minor $micro $beta`
+ MING_VERSION_CODE=`printf %2.2d%2.2d%2.2d%2.2d $major $minor $micro $beta | sed 's/^0*\(.*.\)\$/\1/g'`
MING_CFLAGS=`$MING_CONFIG --cflags`
MING_LIBS=`$MING_CONFIG --libs`
MING_PATH=`$MING_CONFIG --bindir`
diff --git a/testsuite/actionscript.all/Matrix.as b/testsuite/actionscript.all/Matrix.as
index 8914f58..564e750 100644
--- a/testsuite/actionscript.all/Matrix.as
+++ b/testsuite/actionscript.all/Matrix.as
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009, 2010, 2011, 2017 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -131,7 +131,7 @@ check_equals(fakematrix.ty.toString(), 405);
m.scale(4798747e+98, 0.33874983);
// PP: (a=-6.75183253607854e+107, b=-0.419012258900892, c=2.46844592063091e+107, d=-0.505976396967328, tx=1.597982751e+107, ty=-96119.3225379726)
// I get one discrepancy in 'a' here.
-#if MING_VERSION_CODE > 00040005
+#if MING_VERSION_CODE > 40005
check(m.a < -6.7518325360784e+107 && m.a > -6.7518325360786e+107)
check_equals(m.c.toString(), "2.46844592063091e+107");
check_equals(m.tx.toString(), "1.597982751e+107");
@@ -143,7 +143,7 @@ check_equals(m.ty.toString(), "-96119.3225379726");
m.rotate(-1.2873874);
// PP: (a=-1.888016310255e+107, b=6.48248694618508e+107, c=6.9025203664787e+106, d=-2.36997413255563e+107, tx=4.46844242844096e+106, ty=-1.53423567131344e+107)
// tx is slightly different for me.
-#if MING_VERSION_CODE > 00040005
+#if MING_VERSION_CODE > 40005
check_equals(m.a.toString(), "-1.888016310255e+107");
check_equals(m.b.toString(), "6.48248694618508e+107");
check_equals(m.c.toString(), "6.9025203664787e+106");
@@ -419,7 +419,7 @@ check_equals(fakematrix.ty.toString(), undefined);
//-------------------------------------------------------------
// END OF TEST
//-------------------------------------------------------------
-#if MING_VERSION_CODE > 00040005
+#if MING_VERSION_CODE > 40005
totals(162);
#else
totals(153);
diff --git a/testsuite/actionscript.all/Try.as b/testsuite/actionscript.all/Try.as
index 642a364..5683dbf 100644
--- a/testsuite/actionscript.all/Try.as
+++ b/testsuite/actionscript.all/Try.as
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005, 2006, 2007, 2009, 2010 Free Software
+// Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011, 2017 Free Software
// Foundation, Inc
//
// This program is free software; you can redistribute it and/or modify
@@ -33,7 +33,7 @@ rcsid="Try.as";
// Try catch
// Try (throw) catch

-#if MING_VERSION_CODE >= 00040100
+#if MING_VERSION_CODE >= 40100

throwfunc = function()
{
diff --git a/testsuite/actionscript.all/check.as b/testsuite/actionscript.all/check.as
index 85f00ee..5223c71 100644
--- a/testsuite/actionscript.all/check.as
+++ b/testsuite/actionscript.all/check.as
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005, 2006, 2007, 2009, 2010 Free Software
+// Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011, 2017 Free Software
// Foundation, Inc
//
// This program is free software; you can redistribute it and/or modify
@@ -20,20 +20,20 @@
#ifndef _CHECK_AS_
#define _CHECK_AS_

-#if MING_VERSION_CODE >= 00040003
+#if MING_VERSION_CODE >= 40003
# define MING_SUPPORTS_ASM
-# if MING_VERSION_CODE >= 00040004
+# if MING_VERSION_CODE >= 40004
# define MING_SUPPORTS_ASM_EXTENDS
# define MING_SUPPORTS_ASM_GETPROPERTY
# define MING_SUPPORTS_ASM_SETPROPERTY
# define MING_SUPPORTS_ASM_TONUMBER
# define MING_SUPPORTS_ASM_TOSTRING
-# if MING_VERSION_CODE >= 00040005
+# if MING_VERSION_CODE >= 40005
# define MING_SUPPORTS_ASM_TARGETPATH
-# if MING_VERSION_CODE < 00040006
+# if MING_VERSION_CODE < 40006
# define MING_LOGICAL_ANDOR_BROKEN
# endif
-# if MING_VERSION_CODE >= 00040006
+# if MING_VERSION_CODE >= 40006
# define MING_SUPPORTS_ASM_IMPLEMENTS
# endif
# endif
diff --git a/testsuite/actionscript.all/delete.as b/testsuite/actionscript.all/delete.as
index f803df1..475e0c8 100644
--- a/testsuite/actionscript.all/delete.as
+++ b/testsuite/actionscript.all/delete.as
@@ -78,7 +78,7 @@ check(!delete unexistent.a);
// Check malformed delete calls. Most of these work anyway.
// --------------------------------------------------------

-#if MING_VERSION_CODE >= 00040300
+#if MING_VERSION_CODE >= 40300

/* Check normal deletes. The first probably uses delete, the second
probably delete2 */
diff --git a/testsuite/actionscript.all/enumerate.as b/testsuite/actionscript.all/enumerate.as
index 2f2f2c2..0510a97 100644
--- a/testsuite/actionscript.all/enumerate.as
+++ b/testsuite/actionscript.all/enumerate.as
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009, 2010, 2011, 2017 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modchecky
// it under the terms of the GNU General Public License as published by
@@ -208,7 +208,7 @@ extras = 0;
check_equals(r4, undefined);
#endif

-#if MING_VERSION_CODE >= 00040004
+#if MING_VERSION_CODE >= 40004
extras += 6;

// Do the same for enum2
diff --git a/testsuite/actionscript.all/targetPath.as b/testsuite/actionscript.all/targetPath.as
index 879ac77..956f2fb 100644
--- a/testsuite/actionscript.all/targetPath.as
+++ b/testsuite/actionscript.all/targetPath.as
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2009, 2010, 2011, 2017 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modchecky
// it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
rcsid="targetPath.as";
#include "check.as"

-#if MING_VERSION_CODE > 00040005
+#if MING_VERSION_CODE > 40005
# define TARGETPATH targetpath
#else
# define TARGETPATH targetPath
diff --git a/testsuite/misc-ming.all/attachMovieTest.c b/testsuite/misc-ming.all/attachMovieTest.c
index 95f251a..206c31c 100644
--- a/testsuite/misc-ming.all/attachMovieTest.c
+++ b/testsuite/misc-ming.all/attachMovieTest.c
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2005, 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
+ * Copyright (C) 2005, 2006, 2009, 2010, 2011, 2017 Free Software
+ * Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -67,7 +68,7 @@ main(int argc, char** argv)

SWFShape sh;
SWFButton but;
-#if MING_VERSION_CODE >= 00040400
+#if MING_VERSION_CODE >= 40400
SWFButtonRecord br;
#endif

@@ -107,7 +108,7 @@ main(int argc, char** argv)

addRedSquareExport(mo);

-#if MING_VERSION_CODE >= 00040400
+#if MING_VERSION_CODE >= 40400
but = newSWFButton();

sh = make_fill_square (100, 300, 60, 60, 255, 0, 0, 0, 255, 0);
@@ -204,7 +205,7 @@ main(int argc, char** argv)

SWFMovie_nextFrame(mo); /* showFrame */

-#if MING_VERSION_CODE >= 00040400
+#if MING_VERSION_CODE >= 40400

add_actions(mo,
"o = new Object();"
diff --git a/testsuite/misc-ming.all/duplicate_movie_clip_test.c b/testsuite/misc-ming.all/duplicate_movie_clip_test.c
index aaedc74..db619ab 100644
--- a/testsuite/misc-ming.all/duplicate_movie_clip_test.c
+++ b/testsuite/misc-ming.all/duplicate_movie_clip_test.c
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+ * Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011, 2017 Free Software
+ * Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -36,7 +37,7 @@ main(int argc, char** argv)
SWFShape sh_red;

/* For the button duplication test */
-#if MING_VERSION_CODE >= 00040400
+#if MING_VERSION_CODE >= 40400
SWFButton but;
SWFButtonRecord br;
#endif
@@ -125,7 +126,7 @@ main(int argc, char** argv)

SWFMovie_nextFrame(mo); /* 4th frame */

-#if MING_VERSION_CODE >= 00040400
+#if MING_VERSION_CODE >= 40400

/* Create a button, add it to mc1 */
but = newSWFButton();
diff --git a/testsuite/misc-ming.all/matrix_test.c b/testsuite/misc-ming.all/matrix_test.c
index 52ebc99..dc6cd9f 100644
--- a/testsuite/misc-ming.all/matrix_test.c
+++ b/testsuite/misc-ming.all/matrix_test.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+ * Copyright (C) 2007, 2009, 2010, 2011, 2017 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -849,7 +849,7 @@ main(int argc, char** argv)
check_equals(mo, "staticmc._y", "135");

// Ming 0.4.2 (aka 0.4.0-rc2) omits the scales rather then set them to zero
-#if MING_VERSION_CODE <= 00040200
+#if MING_VERSION_CODE <= 40200
check_equals(mo, "staticmc.transform.matrix.toString()", "'(a=1, b=-1, c=1.16796875, d=1, tx=-0.75, ty=135)'");
check_equals(mo, "Math.round(staticmc._xscale)", "141");
check_equals(mo, "Math.round(staticmc._yscale)", "154");
@@ -874,7 +874,7 @@ main(int argc, char** argv)
check_equals(mo, "staticmc._y", "214.80");

// Ming 0.4.2 (aka 0.4.0-rc2) omits the scales rather then set them to zero
-#if MING_VERSION_CODE <= 00040200
+#if MING_VERSION_CODE <= 40200
check_equals(mo, "staticmc.transform.matrix.toString()", "'(a=1, b=0.972518920898438, c=-1, d=1, tx=13.95, ty=214.8)'");
check_equals(mo, "Math.round(staticmc._xscale)", "139");
check_equals(mo, "Math.round(staticmc._yscale)", "141");
@@ -1765,7 +1765,7 @@ main(int argc, char** argv)
check_equals(mo, "staticmc._y", "214.80");

// Ming 0.4.2 (aka 0.4.0-rc2) omits the scales rather then set them to zero
-#if MING_VERSION_CODE <= 00040200
+#if MING_VERSION_CODE <= 40200
check_equals(mo, "printMatrix(staticmc.transform.matrix, 2)", "'(a=1, b=0.97, c=-1, d=1, tx=13.95, ty=214.8)'");
check_equals(mo, "Math.round(staticmc._xscale)", "139");
check_equals(mo, "Math.round(staticmc._yscale)", "141");
@@ -1785,7 +1785,7 @@ main(int argc, char** argv)
check_equals(mo, "staticmc._y", "214.80");

// Ming 0.4.2 (aka 0.4.0-rc2) omits the scales rather then set them to zero
-#if MING_VERSION_CODE <= 00040200
+#if MING_VERSION_CODE <= 40200
check_equals(mo, "printMatrix(staticmc.transform.matrix, 2)", "'(a=-1, b=-0.97, c=-1, d=1, tx=13.95, ty=214.8)'");
check_equals(mo, "Math.round(staticmc._xscale)", "-139");
check_equals(mo, "Math.round(staticmc._yscale)", "141");

-----------------------------------------------------------------------

Summary of changes:
macros/ming.m4 | 10 ++++++----
testsuite/actionscript.all/Matrix.as | 8 ++++----
testsuite/actionscript.all/Try.as | 4 ++--
testsuite/actionscript.all/check.as | 12 ++++++------
testsuite/actionscript.all/delete.as | 2 +-
testsuite/actionscript.all/enumerate.as | 4 ++--
testsuite/actionscript.all/targetPath.as | 4 ++--
testsuite/misc-ming.all/attachMovieTest.c | 9 +++++----
testsuite/misc-ming.all/duplicate_movie_clip_test.c | 7 ++++---
testsuite/misc-ming.all/matrix_test.c | 10 +++++-----
10 files changed, 37 insertions(+), 33 deletions(-)


hooks/post-receive
--
Gnash
Loading...