[Mobies-commit] [commit] r4000 - in UDM/trunk: . InnoSetup Projects/Win32/VC10/src/UdmCli/Properties Projects/Win32/VC10/src/UdmDll Projects/Win32/VC9/src/UdmDll WiX include
ksmyth at redhat1.isis.vanderbilt.edu
ksmyth at redhat1.isis.vanderbilt.edu
Thu Feb 2 16:31:07 CST 2012
Author: ksmyth
Date: Thu Feb 2 16:31:07 2012
New Revision: 4000
Log:
Release 3.2.10
Modified:
UDM/trunk/InnoSetup/udm_innosetupVS2008.iss
UDM/trunk/Projects/Win32/VC10/src/UdmCli/Properties/AssemblyInfo.cs
UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc
UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.rc
UDM/trunk/WiX/Udm_inc.wxi
UDM/trunk/configure.ac
UDM/trunk/include/UdmBase.h
UDM/trunk/releaseinfo.txt
Modified: UDM/trunk/InnoSetup/udm_innosetupVS2008.iss
==============================================================================
--- UDM/trunk/InnoSetup/udm_innosetupVS2008.iss Thu Feb 2 16:30:41 2012 (r3999)
+++ UDM/trunk/InnoSetup/udm_innosetupVS2008.iss Thu Feb 2 16:31:07 2012 (r4000)
@@ -5,7 +5,7 @@
#pragma option -v+
#pragma verboselevel 9
-#define GMEVER "11.10.14"
+#define GMEVER "12.1.24"
#define UDMPATH GetEnv('UDM_PATH')
#define UDM3rdPartyPATH GetEnv('UDM_3RDPARTY_PATH')
@@ -18,7 +18,7 @@
#define UDMVER GetEnv('UDM_VERSION')
#if UDMVER == ""
-#define UDMVER "3.2.9"
+#define UDMVER "3.2.10"
#endif
#define OutputFileBase "Udm_setup"
@@ -108,7 +108,7 @@
Source: {#UDMPATH}\Build\Win32\VC9\Release\UdmSwig.dll; DestDir: {app}\bin; Components: Java; Flags: ignoreversion
Source: {#UDMPATH}\Build\Win32\VC10\Release\{#UDMDLLVS10}; DestDir: {app}\bin; Components: Core; Flags: ignoreversion
Source: {#UDMPATH}\Build\Win32\VC10\Debug\{#UDMDLLDVS10}; DestDir: {app}\bin; Components: Core; Flags: ignoreversion
-Source: {#UDMPATH}\Build\Win32\VC10\Release\UdmCli.dll; DestDir: {app}\bin; StrongAssemblyName: "UdmCli, Version=3.2.9.0, Culture=neutral, PublicKeyToken=9b61694741cb5693, ProcessorArchitecture=x86"; Flags: "gacinstall sharedfile uninsnosharedfileprompt"; Components: CS
+Source: {#UDMPATH}\Build\Win32\VC10\Release\UdmCli.dll; DestDir: {app}\bin; StrongAssemblyName: "UdmCli, Version=3.2.10.0, Culture=neutral, PublicKeyToken=9b61694741cb5693, ProcessorArchitecture=x86"; Flags: "gacinstall sharedfile uninsnosharedfileprompt"; Components: CS
Source: {#UDMPATH}\Build\Win32\VC10\Release\UdmCliBridge.dll; DestDir: {app}\bin; Components: CS; Flags: ignoreversion
Source: {#UDMPATH}\src\UdmCliGen\dist\UdmCliGen.exe; DestDir: {app}\bin; Components: CS; Flags: ignoreversion
Source: {#UDMPATH}\src\UdmCliGen\dist\python26.dll; DestDir: {app}\bin; Components: Python CS; Flags: ignoreversion
@@ -214,7 +214,7 @@
Root: HKCU; Subkey: Environment; ValueType: string; ValueName: UDM_3RDPARTY_PATH; ValueData: {app}\3rdparty; Flags: uninsdeletevalue deletevalue; Components: not System
Root: HKLM; Subkey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment; ValueType: string; ValueName: UDM_PATH; ValueData: {app}; Flags: uninsdeletevalue deletevalue; Components: System
Root: HKLM; Subkey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment; ValueType: string; ValueName: UDM_3RDPARTY_PATH; ValueData: {app}\3rdparty; Flags: uninsdeletevalue deletevalue; Components: System
-Root: HKLM; Subkey: SOFTWARE\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\UdmCli; ValueType: string; ValueData: "C:\Windows\assembly\GAC_32\UdmCli\3.2.9.0__9b61694741cb5693"; Flags: uninsdeletevalue deletevalue
+Root: HKLM; Subkey: SOFTWARE\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\UdmCli; ValueType: string; ValueData: "C:\Windows\assembly\GAC_32\UdmCli\3.2.10.0__9b61694741cb5693"; Flags: uninsdeletevalue deletevalue
[Run]
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmCli/Properties/AssemblyInfo.cs
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmCli/Properties/AssemblyInfo.cs Thu Feb 2 16:30:41 2012 (r3999)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmCli/Properties/AssemblyInfo.cs Thu Feb 2 16:31:07 2012 (r4000)
@@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.2.9.0")]
-[assembly: AssemblyFileVersion("3.2.9.0")]
+[assembly: AssemblyVersion("3.2.10.0")]
+[assembly: AssemblyFileVersion("3.2.10.0")]
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc Thu Feb 2 16:30:41 2012 (r3999)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc Thu Feb 2 16:31:07 2012 (r4000)
@@ -47,8 +47,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,9,0
- PRODUCTVERSION 3,2,9
+ FILEVERSION 3,2,10,0
+ PRODUCTVERSION 3,2,10
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -65,12 +65,12 @@
BEGIN
VALUE "CompanyName", "ISIS, Vanderbilt University"
VALUE "FileDescription", "UdmDll Dynamic Link Library"
- VALUE "FileVersion", "3.2.9"
+ VALUE "FileVersion", "3.2.10"
VALUE "InternalName", "UdmDll"
- VALUE "LegalCopyright", "Copyright (C) 2010"
+ VALUE "LegalCopyright", "Copyright (C) 2012"
VALUE "OriginalFilename", "UdmDll.dll"
VALUE "ProductName", "UdmDll Dynamic Link Library"
- VALUE "ProductVersion", "3.2.9"
+ VALUE "ProductVersion", "3.2.10"
END
END
BLOCK "VarFileInfo"
Modified: UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.rc
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.rc Thu Feb 2 16:30:41 2012 (r3999)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.rc Thu Feb 2 16:31:07 2012 (r4000)
@@ -47,8 +47,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,9,0
- PRODUCTVERSION 3,2,9
+ FILEVERSION 3,2,10,0
+ PRODUCTVERSION 3,2,10
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -65,12 +65,12 @@
BEGIN
VALUE "CompanyName", "ISIS, Vanderbilt University"
VALUE "FileDescription", "UdmDll Dynamic Link Library"
- VALUE "FileVersion", "3.2.9"
+ VALUE "FileVersion", "3.2.10"
VALUE "InternalName", "UdmDll"
- VALUE "LegalCopyright", "Copyright (C) 2010"
+ VALUE "LegalCopyright", "Copyright (C) 2012"
VALUE "OriginalFilename", "UdmDll.dll"
VALUE "ProductName", "UdmDll Dynamic Link Library"
- VALUE "ProductVersion", "3.2.9"
+ VALUE "ProductVersion", "3.2.10"
END
END
BLOCK "VarFileInfo"
Modified: UDM/trunk/WiX/Udm_inc.wxi
==============================================================================
--- UDM/trunk/WiX/Udm_inc.wxi Thu Feb 2 16:30:41 2012 (r3999)
+++ UDM/trunk/WiX/Udm_inc.wxi Thu Feb 2 16:31:07 2012 (r4000)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='windows-1252'?>
-<?define VERSIONSTR=3.2.9?>
+<?define VERSIONSTR=3.2.10?>
<Include>
<?if $(sys.BUILDARCH)=x64 ?>
<?define UpgradeCode='11CB0ED6-A45B-49FA-ABB2-A718EB5C970D'?>
Modified: UDM/trunk/configure.ac
==============================================================================
--- UDM/trunk/configure.ac Thu Feb 2 16:30:41 2012 (r3999)
+++ UDM/trunk/configure.ac Thu Feb 2 16:31:07 2012 (r4000)
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.59])
-AC_INIT([udm], [3.29])
+AC_INIT([udm], [3.210])
AC_CONFIG_AUX_DIR([config])
# judm paths are longer than 99 characters, so force pax format
AM_INIT_AUTOMAKE([tar-pax])
Modified: UDM/trunk/include/UdmBase.h
==============================================================================
--- UDM/trunk/include/UdmBase.h Thu Feb 2 16:30:41 2012 (r3999)
+++ UDM/trunk/include/UdmBase.h Thu Feb 2 16:31:07 2012 (r4000)
@@ -4100,8 +4100,8 @@
// tldr: use CHANGES_LOST_DEFAULT and CloseWithUpdate() instead
-//versioning
+// Version 3.2.10
#define UDM_VERSION_MAJOR 3
-#define UDM_VERSION_MINOR 29
+#define UDM_VERSION_MINOR (2 * 10 + 10 * 1)
#define UDM_VERSION UDM_VERSION_MAJOR * 100 + UDM_VERSION_MINOR
#endif//MOBIES_UDMBASE_H
Modified: UDM/trunk/releaseinfo.txt
==============================================================================
--- UDM/trunk/releaseinfo.txt Thu Feb 2 16:30:41 2012 (r3999)
+++ UDM/trunk/releaseinfo.txt Thu Feb 2 16:31:07 2012 (r4000)
@@ -1,4 +1,4 @@
-Copyright (c) Vanderbilt University, 2001-2011
+Copyright (c) Vanderbilt University, 2001-2012
ALL RIGHTS RESERVED
** UDM : Universal Data Model **
@@ -7,17 +7,20 @@
1. Windows Operating system (XP, Vista, 7)
-2. GME 11, r11.10.14 from: http://www.isis.vanderbilt.edu/Projects/gme/Download.html
+2. GME 12, r12.1.24 from: http://repo.isis.vanderbilt.edu/downloads?tool=GME
NOTE: You need to have administrative privileges to install GME correctly.
-3. Visual Studio 9 or Visual Studio 10
- (This version of UDM can also be used with Visual Studio 2008 Express Edition or Visual Studio 2010 Express Edition.
+3. To develop using UDM: Visual Studio 9 or Visual Studio 10
+ (This version of UDM can also be used with Visual Studio 2008 Express Edition or Visual C++ 2010 Express.
Please visit http://www.microsoft.com/eXPress/download/#webInstall
for instructions on how to download and install the free express edition)
PLEASE DOWNLOAD AND INSTALL 2 and 3 before proceeding.
** Changelog **
+02/02/12 - Release 3.2.10
+ - 64 bit UdmDll (VC10)
+
10/14/11 - Release 3.2.9
- Performance improvements
- Visual Studio 2010 Interpreter wizard
More information about the Mobies-commit
mailing list