From 44c627a3028cddc031b8bb2a2ea596ac9642a6cf Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)> Date: Tue, 6 Apr 2010 09:57:32 +0000 Subject: [PATCH] Change handling of VERSION in Windows (and the setversion script) --- build.vc9/config.core2 | 3 --- build.vc9/config.gc | 3 --- build.vc9/config.k10 | 3 --- build.vc9/config.k8 | 3 --- build.vc9/config.nehalem | 3 --- build.vc9/config.p0 | 3 --- build.vc9/config.p3 | 3 --- build.vc9/config.p4 | 3 --- build.vc9/mpir.sln | 46 ++++++++++++++++++++++++++++++++++++++++ build.vc9/readme.txt | 15 +++++++------ gmp-h.in | 3 +++ setversion | 3 ++- 12 files changed, 60 insertions(+), 31 deletions(-) diff --git a/build.vc9/config.core2 b/build.vc9/config.core2 index 19e24f3e..35d1df17 100644 --- a/build.vc9/config.core2 +++ b/build.vc9/config.core2 @@ -389,9 +389,6 @@ MA 02111-1307, USA. */ /* Maximum size the tune program can test for KARATSUBA_SQR_THRESHOLD */ #define TUNE_KARATSUBA_SQR_MAX 67 -/* Version number of package */ -#define VERSION "2.0.0" - /* ./configure --enable-assert option, to enable some ASSERT()s */ #undef WANT_ASSERT diff --git a/build.vc9/config.gc b/build.vc9/config.gc index 590b83c6..5f74bfb5 100644 --- a/build.vc9/config.gc +++ b/build.vc9/config.gc @@ -466,9 +466,6 @@ MA 02111-1307, USA. */ /* Maximum size the tune program can test for KARATSUBA_SQR_THRESHOLD */ #define TUNE_KARATSUBA_SQR_MAX 67 -/* Version number of package */ -#define VERSION "2.0.0" - /* ./configure --enable-assert option, to enable some ASSERT()s */ #undef WANT_ASSERT diff --git a/build.vc9/config.k10 b/build.vc9/config.k10 index 53a9cf12..093a5189 100644 --- a/build.vc9/config.k10 +++ b/build.vc9/config.k10 @@ -402,9 +402,6 @@ MA 02111-1307, USA. */ /* Maximum size the tune program can test for KARATSUBA_SQR_THRESHOLD */ #define TUNE_KARATSUBA_SQR_MAX 67 -/* Version number of package */ -#define VERSION "2.0.0" - /* ./configure --enable-assert option, to enable some ASSERT()s */ #undef WANT_ASSERT diff --git a/build.vc9/config.k8 b/build.vc9/config.k8 index ab30fed5..69ee75e0 100644 --- a/build.vc9/config.k8 +++ b/build.vc9/config.k8 @@ -402,9 +402,6 @@ MA 02111-1307, USA. */ /* Maximum size the tune program can test for KARATSUBA_SQR_THRESHOLD */ #define TUNE_KARATSUBA_SQR_MAX 67 -/* Version number of package */ -#define VERSION "2.0.0" - /* ./configure --enable-assert option, to enable some ASSERT()s */ #undef WANT_ASSERT diff --git a/build.vc9/config.nehalem b/build.vc9/config.nehalem index 5e2eb69f..ddeee2d5 100644 --- a/build.vc9/config.nehalem +++ b/build.vc9/config.nehalem @@ -387,9 +387,6 @@ MA 02111-1307, USA. */ /* Maximum size the tune program can test for KARATSUBA_SQR_THRESHOLD */ #define TUNE_KARATSUBA_SQR_MAX 67 -/* Version number of package */ -#define VERSION "2.0.0" - /* ./configure --enable-assert option, to enable some ASSERT()s */ #undef WANT_ASSERT diff --git a/build.vc9/config.p0 b/build.vc9/config.p0 index b64b6ace..a515134e 100644 --- a/build.vc9/config.p0 +++ b/build.vc9/config.p0 @@ -491,9 +491,6 @@ MA 02111-1307, USA. */ /* Maximum size the tune program can test for KARATSUBA_SQR_THRESHOLD */ #define TUNE_KARATSUBA_SQR_MAX 67 -/* Version number of package */ -#define VERSION "2.0.0" - /* ./configure --enable-assert option, to enable some ASSERT()s */ #undef WANT_ASSERT diff --git a/build.vc9/config.p3 b/build.vc9/config.p3 index 77837e48..a2dcaec9 100644 --- a/build.vc9/config.p3 +++ b/build.vc9/config.p3 @@ -497,9 +497,6 @@ MA 02111-1307, USA. */ /* Maximum size the tune program can test for KARATSUBA_SQR_THRESHOLD */ #define TUNE_KARATSUBA_SQR_MAX 67 -/* Version number of package */ -#define VERSION "2.0.0" - /* ./configure --enable-assert option, to enable some ASSERT()s */ #undef WANT_ASSERT diff --git a/build.vc9/config.p4 b/build.vc9/config.p4 index 7931a037..fc491151 100644 --- a/build.vc9/config.p4 +++ b/build.vc9/config.p4 @@ -501,9 +501,6 @@ MA 02111-1307, USA. */ /* Maximum size the tune program can test for KARATSUBA_SQR_THRESHOLD */ #define TUNE_KARATSUBA_SQR_MAX 67 -/* Version number of package */ -#define VERSION "2.0.0" - /* ./configure --enable-assert option, to enable some ASSERT()s */ #undef WANT_ASSERT diff --git a/build.vc9/mpir.sln b/build.vc9/mpir.sln index 88185f2d..49d8d87a 100644 --- a/build.vc9/mpir.sln +++ b/build.vc9/mpir.sln @@ -177,93 +177,139 @@ Global EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {7DA5BAD1-B5CF-4F53-8560-E96C07DE023D}.Debug|Win32.ActiveCfg = Debug|Win32 + {7DA5BAD1-B5CF-4F53-8560-E96C07DE023D}.Debug|Win32.Build.0 = Debug|Win32 {7DA5BAD1-B5CF-4F53-8560-E96C07DE023D}.Debug|x64.ActiveCfg = Debug|x64 + {7DA5BAD1-B5CF-4F53-8560-E96C07DE023D}.Debug|x64.Build.0 = Debug|x64 {7DA5BAD1-B5CF-4F53-8560-E96C07DE023D}.Release|Win32.ActiveCfg = Release|Win32 {7DA5BAD1-B5CF-4F53-8560-E96C07DE023D}.Release|x64.ActiveCfg = Release|x64 + {7DA5BAD1-B5CF-4F53-8560-E96C07DE023D}.Release|x64.Build.0 = Release|x64 {4AF4FD03-C169-456A-966A-081DE6BB71C7}.Debug|Win32.ActiveCfg = Debug|Win32 + {4AF4FD03-C169-456A-966A-081DE6BB71C7}.Debug|Win32.Build.0 = Debug|Win32 {4AF4FD03-C169-456A-966A-081DE6BB71C7}.Debug|x64.ActiveCfg = Debug|x64 + {4AF4FD03-C169-456A-966A-081DE6BB71C7}.Debug|x64.Build.0 = Debug|x64 {4AF4FD03-C169-456A-966A-081DE6BB71C7}.Release|Win32.ActiveCfg = Release|Win32 {4AF4FD03-C169-456A-966A-081DE6BB71C7}.Release|x64.ActiveCfg = Release|x64 + {4AF4FD03-C169-456A-966A-081DE6BB71C7}.Release|x64.Build.0 = Release|x64 {AF57F91F-EB17-4989-B98F-FD59409FA4EC}.Debug|Win32.ActiveCfg = Debug|Win32 + {AF57F91F-EB17-4989-B98F-FD59409FA4EC}.Debug|Win32.Build.0 = Debug|Win32 {AF57F91F-EB17-4989-B98F-FD59409FA4EC}.Debug|x64.ActiveCfg = Debug|Win32 {AF57F91F-EB17-4989-B98F-FD59409FA4EC}.Release|Win32.ActiveCfg = Release|Win32 {AF57F91F-EB17-4989-B98F-FD59409FA4EC}.Release|x64.ActiveCfg = Release|Win32 {8A2E028B-6E13-4E8A-B0F5-9A58C30BFB11}.Debug|Win32.ActiveCfg = Debug|Win32 + {8A2E028B-6E13-4E8A-B0F5-9A58C30BFB11}.Debug|Win32.Build.0 = Debug|Win32 {8A2E028B-6E13-4E8A-B0F5-9A58C30BFB11}.Debug|x64.ActiveCfg = Debug|Win32 {8A2E028B-6E13-4E8A-B0F5-9A58C30BFB11}.Release|Win32.ActiveCfg = Release|Win32 {8A2E028B-6E13-4E8A-B0F5-9A58C30BFB11}.Release|x64.ActiveCfg = Release|Win32 {51A9B98F-FBB4-43B7-9029-2DCC3D9BD0E6}.Debug|Win32.ActiveCfg = Debug|Win32 + {51A9B98F-FBB4-43B7-9029-2DCC3D9BD0E6}.Debug|Win32.Build.0 = Debug|Win32 {51A9B98F-FBB4-43B7-9029-2DCC3D9BD0E6}.Debug|x64.ActiveCfg = Debug|Win32 {51A9B98F-FBB4-43B7-9029-2DCC3D9BD0E6}.Release|Win32.ActiveCfg = Release|Win32 {51A9B98F-FBB4-43B7-9029-2DCC3D9BD0E6}.Release|x64.ActiveCfg = Release|Win32 {E1695434-494C-4FCD-804D-F2409528DC1F}.Debug|Win32.ActiveCfg = Debug|Win32 + {E1695434-494C-4FCD-804D-F2409528DC1F}.Debug|Win32.Build.0 = Debug|Win32 {E1695434-494C-4FCD-804D-F2409528DC1F}.Debug|x64.ActiveCfg = Debug|Win32 {E1695434-494C-4FCD-804D-F2409528DC1F}.Release|Win32.ActiveCfg = Release|Win32 {E1695434-494C-4FCD-804D-F2409528DC1F}.Release|x64.ActiveCfg = Release|Win32 {B5917427-4096-4AE9-833C-D9129C08C2B7}.Debug|Win32.ActiveCfg = Debug|Win32 + {B5917427-4096-4AE9-833C-D9129C08C2B7}.Debug|Win32.Build.0 = Debug|Win32 {B5917427-4096-4AE9-833C-D9129C08C2B7}.Debug|x64.ActiveCfg = Debug|Win32 {B5917427-4096-4AE9-833C-D9129C08C2B7}.Release|Win32.ActiveCfg = Release|Win32 {B5917427-4096-4AE9-833C-D9129C08C2B7}.Release|x64.ActiveCfg = Release|Win32 {9A3A242F-1472-4776-9839-CC62474B7F54}.Debug|Win32.ActiveCfg = Debug|Win32 + {9A3A242F-1472-4776-9839-CC62474B7F54}.Debug|Win32.Build.0 = Debug|Win32 {9A3A242F-1472-4776-9839-CC62474B7F54}.Debug|x64.ActiveCfg = Debug|Win32 {9A3A242F-1472-4776-9839-CC62474B7F54}.Release|Win32.ActiveCfg = Release|Win32 {9A3A242F-1472-4776-9839-CC62474B7F54}.Release|x64.ActiveCfg = Release|Win32 {2297FA81-6D9D-4DC3-BA42-04E93F397047}.Debug|Win32.ActiveCfg = Debug|Win32 + {2297FA81-6D9D-4DC3-BA42-04E93F397047}.Debug|Win32.Build.0 = Debug|Win32 {2297FA81-6D9D-4DC3-BA42-04E93F397047}.Debug|x64.ActiveCfg = Debug|Win32 + {2297FA81-6D9D-4DC3-BA42-04E93F397047}.Debug|x64.Build.0 = Debug|Win32 {2297FA81-6D9D-4DC3-BA42-04E93F397047}.Release|Win32.ActiveCfg = Release|Win32 {2297FA81-6D9D-4DC3-BA42-04E93F397047}.Release|x64.ActiveCfg = Release|Win32 + {2297FA81-6D9D-4DC3-BA42-04E93F397047}.Release|x64.Build.0 = Release|Win32 {001E0D42-4AF4-44B8-A8B2-3CD46D537DBE}.Debug|Win32.ActiveCfg = Debug|Win32 + {001E0D42-4AF4-44B8-A8B2-3CD46D537DBE}.Debug|Win32.Build.0 = Debug|Win32 {001E0D42-4AF4-44B8-A8B2-3CD46D537DBE}.Debug|x64.ActiveCfg = Debug|Win32 + {001E0D42-4AF4-44B8-A8B2-3CD46D537DBE}.Debug|x64.Build.0 = Debug|Win32 {001E0D42-4AF4-44B8-A8B2-3CD46D537DBE}.Release|Win32.ActiveCfg = Release|Win32 {001E0D42-4AF4-44B8-A8B2-3CD46D537DBE}.Release|x64.ActiveCfg = Release|Win32 + {001E0D42-4AF4-44B8-A8B2-3CD46D537DBE}.Release|x64.Build.0 = Release|Win32 {D3C6D6B7-CD38-4D49-9BA7-1FBB35F77223}.Debug|Win32.ActiveCfg = Debug|Win32 + {D3C6D6B7-CD38-4D49-9BA7-1FBB35F77223}.Debug|Win32.Build.0 = Debug|Win32 {D3C6D6B7-CD38-4D49-9BA7-1FBB35F77223}.Debug|x64.ActiveCfg = Debug|Win32 + {D3C6D6B7-CD38-4D49-9BA7-1FBB35F77223}.Debug|x64.Build.0 = Debug|Win32 {D3C6D6B7-CD38-4D49-9BA7-1FBB35F77223}.Release|Win32.ActiveCfg = Release|Win32 {D3C6D6B7-CD38-4D49-9BA7-1FBB35F77223}.Release|x64.ActiveCfg = Release|Win32 + {D3C6D6B7-CD38-4D49-9BA7-1FBB35F77223}.Release|x64.Build.0 = Release|Win32 {0412953E-06CE-4A60-9DCD-CA5CAC3A46CC}.Debug|Win32.ActiveCfg = Debug|Win32 + {0412953E-06CE-4A60-9DCD-CA5CAC3A46CC}.Debug|Win32.Build.0 = Debug|Win32 {0412953E-06CE-4A60-9DCD-CA5CAC3A46CC}.Debug|x64.ActiveCfg = Debug|Win32 + {0412953E-06CE-4A60-9DCD-CA5CAC3A46CC}.Debug|x64.Build.0 = Debug|Win32 {0412953E-06CE-4A60-9DCD-CA5CAC3A46CC}.Release|Win32.ActiveCfg = Release|Win32 {0412953E-06CE-4A60-9DCD-CA5CAC3A46CC}.Release|x64.ActiveCfg = Release|Win32 + {0412953E-06CE-4A60-9DCD-CA5CAC3A46CC}.Release|x64.Build.0 = Release|Win32 {EAFA3E0D-5B34-43A3-A08A-B5E3839BF66A}.Debug|Win32.ActiveCfg = Debug|Win32 + {EAFA3E0D-5B34-43A3-A08A-B5E3839BF66A}.Debug|Win32.Build.0 = Debug|Win32 {EAFA3E0D-5B34-43A3-A08A-B5E3839BF66A}.Debug|x64.ActiveCfg = Debug|Win32 + {EAFA3E0D-5B34-43A3-A08A-B5E3839BF66A}.Debug|x64.Build.0 = Debug|Win32 {EAFA3E0D-5B34-43A3-A08A-B5E3839BF66A}.Release|Win32.ActiveCfg = Release|Win32 {EAFA3E0D-5B34-43A3-A08A-B5E3839BF66A}.Release|x64.ActiveCfg = Release|Win32 + {EAFA3E0D-5B34-43A3-A08A-B5E3839BF66A}.Release|x64.Build.0 = Release|Win32 {FE938593-CD55-4C68-A4E5-738C6081B14C}.Debug|Win32.ActiveCfg = Debug|x64 {FE938593-CD55-4C68-A4E5-738C6081B14C}.Debug|x64.ActiveCfg = Debug|x64 + {FE938593-CD55-4C68-A4E5-738C6081B14C}.Debug|x64.Build.0 = Debug|x64 {FE938593-CD55-4C68-A4E5-738C6081B14C}.Release|Win32.ActiveCfg = Release|x64 {FE938593-CD55-4C68-A4E5-738C6081B14C}.Release|x64.ActiveCfg = Release|x64 + {FE938593-CD55-4C68-A4E5-738C6081B14C}.Release|x64.Build.0 = Release|x64 {B6433872-ECF9-4AE5-93B9-B3FC40EE2F6A}.Debug|Win32.ActiveCfg = Debug|x64 {B6433872-ECF9-4AE5-93B9-B3FC40EE2F6A}.Debug|x64.ActiveCfg = Debug|x64 + {B6433872-ECF9-4AE5-93B9-B3FC40EE2F6A}.Debug|x64.Build.0 = Debug|x64 {B6433872-ECF9-4AE5-93B9-B3FC40EE2F6A}.Release|Win32.ActiveCfg = Release|x64 {B6433872-ECF9-4AE5-93B9-B3FC40EE2F6A}.Release|x64.ActiveCfg = Release|x64 + {B6433872-ECF9-4AE5-93B9-B3FC40EE2F6A}.Release|x64.Build.0 = Release|x64 {C82A62DB-DDB4-4072-832F-6DD841C6D80E}.Debug|Win32.ActiveCfg = Debug|Win32 + {C82A62DB-DDB4-4072-832F-6DD841C6D80E}.Debug|Win32.Build.0 = Debug|Win32 {C82A62DB-DDB4-4072-832F-6DD841C6D80E}.Debug|x64.ActiveCfg = Debug|x64 + {C82A62DB-DDB4-4072-832F-6DD841C6D80E}.Debug|x64.Build.0 = Debug|x64 {C82A62DB-DDB4-4072-832F-6DD841C6D80E}.Release|Win32.ActiveCfg = Release|Win32 {C82A62DB-DDB4-4072-832F-6DD841C6D80E}.Release|x64.ActiveCfg = Release|x64 + {C82A62DB-DDB4-4072-832F-6DD841C6D80E}.Release|x64.Build.0 = Release|x64 {FA95FE09-BCE7-4217-8473-F574B58E3A7B}.Debug|Win32.ActiveCfg = Debug|x64 {FA95FE09-BCE7-4217-8473-F574B58E3A7B}.Debug|x64.ActiveCfg = Debug|x64 + {FA95FE09-BCE7-4217-8473-F574B58E3A7B}.Debug|x64.Build.0 = Debug|x64 {FA95FE09-BCE7-4217-8473-F574B58E3A7B}.Release|Win32.ActiveCfg = Release|x64 {FA95FE09-BCE7-4217-8473-F574B58E3A7B}.Release|x64.ActiveCfg = Release|x64 + {FA95FE09-BCE7-4217-8473-F574B58E3A7B}.Release|x64.Build.0 = Release|x64 {AD4D498B-ACAB-42A9-9414-335B44BB2F8D}.Debug|Win32.ActiveCfg = Debug|x64 {AD4D498B-ACAB-42A9-9414-335B44BB2F8D}.Debug|x64.ActiveCfg = Debug|x64 + {AD4D498B-ACAB-42A9-9414-335B44BB2F8D}.Debug|x64.Build.0 = Debug|x64 {AD4D498B-ACAB-42A9-9414-335B44BB2F8D}.Release|Win32.ActiveCfg = Release|x64 {AD4D498B-ACAB-42A9-9414-335B44BB2F8D}.Release|x64.ActiveCfg = Release|x64 + {AD4D498B-ACAB-42A9-9414-335B44BB2F8D}.Release|x64.Build.0 = Release|x64 {B55FEC95-9847-4508-BAD7-7C9088C51746}.Debug|Win32.ActiveCfg = Debug|x64 {B55FEC95-9847-4508-BAD7-7C9088C51746}.Debug|x64.ActiveCfg = Debug|x64 + {B55FEC95-9847-4508-BAD7-7C9088C51746}.Debug|x64.Build.0 = Debug|x64 {B55FEC95-9847-4508-BAD7-7C9088C51746}.Release|Win32.ActiveCfg = Release|x64 {B55FEC95-9847-4508-BAD7-7C9088C51746}.Release|x64.ActiveCfg = Release|x64 + {B55FEC95-9847-4508-BAD7-7C9088C51746}.Release|x64.Build.0 = Release|x64 {114DB1D9-8CE4-43C9-AF6B-6A6F954DA79A}.Debug|Win32.ActiveCfg = Debug|x64 {114DB1D9-8CE4-43C9-AF6B-6A6F954DA79A}.Debug|x64.ActiveCfg = Debug|x64 + {114DB1D9-8CE4-43C9-AF6B-6A6F954DA79A}.Debug|x64.Build.0 = Debug|x64 {114DB1D9-8CE4-43C9-AF6B-6A6F954DA79A}.Release|Win32.ActiveCfg = Release|x64 {114DB1D9-8CE4-43C9-AF6B-6A6F954DA79A}.Release|x64.ActiveCfg = Release|x64 + {114DB1D9-8CE4-43C9-AF6B-6A6F954DA79A}.Release|x64.Build.0 = Release|x64 {5A733CA3-BBBE-4CF4-9357-FD876FC92C4D}.Debug|Win32.ActiveCfg = Debug|x64 {5A733CA3-BBBE-4CF4-9357-FD876FC92C4D}.Debug|x64.ActiveCfg = Debug|x64 + {5A733CA3-BBBE-4CF4-9357-FD876FC92C4D}.Debug|x64.Build.0 = Debug|x64 {5A733CA3-BBBE-4CF4-9357-FD876FC92C4D}.Release|Win32.ActiveCfg = Release|x64 {5A733CA3-BBBE-4CF4-9357-FD876FC92C4D}.Release|x64.ActiveCfg = Release|x64 + {5A733CA3-BBBE-4CF4-9357-FD876FC92C4D}.Release|x64.Build.0 = Release|x64 {71372F61-C80C-4E6A-80E6-CB03CB7D2A43}.Debug|Win32.ActiveCfg = Debug|x64 {71372F61-C80C-4E6A-80E6-CB03CB7D2A43}.Debug|x64.ActiveCfg = Debug|x64 + {71372F61-C80C-4E6A-80E6-CB03CB7D2A43}.Debug|x64.Build.0 = Debug|x64 {71372F61-C80C-4E6A-80E6-CB03CB7D2A43}.Release|Win32.ActiveCfg = Release|x64 {71372F61-C80C-4E6A-80E6-CB03CB7D2A43}.Release|x64.ActiveCfg = Release|x64 + {71372F61-C80C-4E6A-80E6-CB03CB7D2A43}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build.vc9/readme.txt b/build.vc9/readme.txt index 5f01e6bd..a6789ec0 100644 --- a/build.vc9/readme.txt +++ b/build.vc9/readme.txt @@ -118,7 +118,7 @@ The supported platforms and library formats are as follows: 1. Generic Build Projects (both 32 and 64 bit) lib_mpir_gc - MPIR library using generic C (win32 & x64) - lib_mpir_cxx - MPIR C++ library + lib_mpir_cxx - MPIR C++ library (win32 & x64) dll_mpir_gc - MPIR DLL using generic C (win32 & x64) 2. 32-bit Build Projects @@ -134,10 +134,12 @@ The supported platforms and library formats are as follows: lib_mpir_k8 - MPIR library using AMD k8 assembler (x64) lib_mpir_k10 - MPIR library using AMD k10 assembler (x64) - lib_mpir_core2 - MPIR library Intel Core2 assembler (x64) - dll_mpir_k8 - MPIR DLL using AMD k8 assembler (x64) - dll_mpir_k8 - MPIR DLL using AMD k10 assembler (x64) - dll_mpir_core2 - MPIR DLL using Intel Core2 assembler (x64) + lib_mpir_core2 - MPIR library Intel Core2 assembler (x64) + lib_mpir_nehalem - MPIR library Intel Core2 assembler (x64) + dll_mpir_k8 - MPIR DLL using AMD k8 assembler (x64) + dll_mpir_k8 - MPIR DLL using AMD k10 assembler (x64) + dll_mpir_core2 - MPIR DLL using Intel Core2 assembler (x64) + dll_mpir_nehalem - MPIR DLL using Intel Core2 assembler (x64) Before any of these libraries is built the appropriate MPIR configuration file is automatically copied into config.h. After a @@ -392,9 +394,10 @@ My thanks to: 1. The GMP team for their work on GMP and the MPFR team for their work on MPFR +2. The MPIR team 3. Patrick Pelissier, Vincent Lefèvre and Paul Zimmermann for helping to resolve VC++ issues in MPFR. 4. Jeff Gilchrist for his help in testing, debugging and improving the readme giving the VC++ build instructions - Brian Gladman, December 2009 + Brian Gladman, April 2010 diff --git a/gmp-h.in b/gmp-h.in index 43d5219e..a7db73a0 100644 --- a/gmp-h.in +++ b/gmp-h.in @@ -2365,6 +2365,9 @@ enum #define __MPIR_VERSION 2 #define __MPIR_VERSION_MINOR 0 #define __MPIR_VERSION_PATCHLEVEL 0 +#if defined( _MSC_VER ) +#define VERSION "2.0.0" +#endif /* These are for programs like MPFR to use the same CC and CFLAGS as MPIR */ diff --git a/setversion b/setversion index 62e8c54d..519d790c 100755 --- a/setversion +++ b/setversion @@ -41,7 +41,8 @@ TMPFILE=$(tempfile) cat gmp-h.in \ | sed s/"#define[[:space:]]\+__MPIR_VERSION[[:space:]]\+.*"/"#define __MPIR_VERSION "$VERSION/ \ | sed s/"#define[[:space:]]\+__MPIR_VERSION_MINOR[[:space:]]\+.*"/"#define __MPIR_VERSION_MINOR "$VERSION_MINOR/ \ -| sed s/"#define[[:space:]]\+__MPIR_VERSION_PATCHLEVEL[[:space:]]\+.*"/"#define __MPIR_VERSION_PATCHLEVEL "$VERSION_PATCHLEVEL/ > $TMPFILE +| sed s/"#define[[:space:]]\+__MPIR_VERSION_PATCHLEVEL[[:space:]]\+.*"/"#define __MPIR_VERSION_PATCHLEVEL "$VERSION_PATCHLEVEL/ \ +| sed s/"#define[[:space:]]\+VERSION[[:space:]]\+.*"/"#define VERSION "\"$VERSION_STR\"/ > $TMPFILE mv $TMPFILE gmp-h.in #update build.vc9/config.*