[Mobies-commit] [commit] r3734 - in UDM/trunk: . InnoSetup Projects/Win32/VC10/src/UdmCli/Properties Projects/Win32/VC10/src/UdmDll Projects/Win32/VC9/src/UdmDll include
ksmyth at redhat1.isis.vanderbilt.edu
ksmyth at redhat1.isis.vanderbilt.edu
Wed May 11 16:57:25 CDT 2011
Author: ksmyth
Date: Wed May 11 16:57:24 2011
New Revision: 3734
Log:
Prepare for release 3.2.8
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/include/UdmBase.h
UDM/trunk/releaseinfo.txt
Modified: UDM/trunk/InnoSetup/udm_innosetupVS2008.iss
==============================================================================
--- UDM/trunk/InnoSetup/udm_innosetupVS2008.iss Wed May 11 16:34:12 2011 (r3733)
+++ UDM/trunk/InnoSetup/udm_innosetupVS2008.iss Wed May 11 16:57:24 2011 (r3734)
@@ -5,7 +5,7 @@
#pragma option -v+
#pragma verboselevel 9
-#define GMEVER "10.8.18"
+#define GMEVER "11.3.23"
#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.7"
+#define UDMVER "3.2.8"
#endif
#define OutputFileBase "Udm_setup"
@@ -28,9 +28,9 @@
APPVerName=ISIS UDM v{#UDMVER}
AppVersion={#UDMVER}
AppPublisher=ISIS, Vanderbilt University
-AppPublisherURL=http://www.escherinstitute.org/Plone/tools/suites/mic/udm
-AppSupportURL=http://www.escherinstitute.org/Plone/tools/suites/mic/udm
-AppUpdatesURL=http://www.escherinstitute.org/Plone/tools/suites/mic/udm
+AppPublisherURL=http://repo.isis.vanderbilt.edu/downloads?tool=UDM
+AppSupportURL=http://repo.isis.vanderbilt.edu/downloads?tool=UDM
+AppUpdatesURL=http://repo.isis.vanderbilt.edu/downloads?tool=UDM
DefaultDirName={pf}\ISIS\UDM
DefaultGroupName=UDM
LicenseFile={#UDMPATH}\license.txt
@@ -105,7 +105,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.7.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.8.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}\Build\Win32\VC10\Release\udm.pyd; DestDir: {app}\bin; Components: Python CS; Flags: ignoreversion
@@ -207,7 +207,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.7.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.8.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 Wed May 11 16:34:12 2011 (r3733)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmCli/Properties/AssemblyInfo.cs Wed May 11 16:57:24 2011 (r3734)
@@ -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.7.0")]
-[assembly: AssemblyFileVersion("3.2.7.0")]
+[assembly: AssemblyVersion("3.2.8.0")]
+[assembly: AssemblyFileVersion("3.2.8.0")]
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc Wed May 11 16:34:12 2011 (r3733)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc Wed May 11 16:57:24 2011 (r3734)
@@ -47,8 +47,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,7,0
- PRODUCTVERSION 3,2,7
+ FILEVERSION 3,2,8,0
+ PRODUCTVERSION 3,2,8
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -63,14 +63,14 @@
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "CompanyName", "Vanderbilt University"
+ VALUE "CompanyName", "ISIS, Vanderbilt University"
VALUE "FileDescription", "UdmDll Dynamic Link Library"
- VALUE "FileVersion", "3.2.7"
+ VALUE "FileVersion", "3.2.8"
VALUE "InternalName", "UdmDll"
VALUE "LegalCopyright", "Copyright (C) 2010"
VALUE "OriginalFilename", "UdmDll.dll"
VALUE "ProductName", "UdmDll Dynamic Link Library"
- VALUE "ProductVersion", "3.2.7"
+ VALUE "ProductVersion", "3.2.8"
END
END
BLOCK "VarFileInfo"
Modified: UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.rc
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.rc Wed May 11 16:34:12 2011 (r3733)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.rc Wed May 11 16:57:24 2011 (r3734)
@@ -47,8 +47,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,7,0
- PRODUCTVERSION 3,2,7
+ FILEVERSION 3,2,8,0
+ PRODUCTVERSION 3,2,8
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -63,14 +63,14 @@
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "CompanyName", "Vanderbilt University"
+ VALUE "CompanyName", "ISIS, Vanderbilt University"
VALUE "FileDescription", "UdmDll Dynamic Link Library"
- VALUE "FileVersion", "3.2.7"
+ VALUE "FileVersion", "3.2.8"
VALUE "InternalName", "UdmDll"
VALUE "LegalCopyright", "Copyright (C) 2010"
VALUE "OriginalFilename", "UdmDll.dll"
VALUE "ProductName", "UdmDll Dynamic Link Library"
- VALUE "ProductVersion", "3.2.7"
+ VALUE "ProductVersion", "3.2.8"
END
END
BLOCK "VarFileInfo"
Modified: UDM/trunk/include/UdmBase.h
==============================================================================
--- UDM/trunk/include/UdmBase.h Wed May 11 16:34:12 2011 (r3733)
+++ UDM/trunk/include/UdmBase.h Wed May 11 16:57:24 2011 (r3734)
@@ -4069,6 +4069,6 @@
//versioning
#define UDM_VERSION_MAJOR 3
-#define UDM_VERSION_MINOR 27
+#define UDM_VERSION_MINOR 28
#define UDM_VERSION UDM_VERSION_MAJOR * 100 + UDM_VERSION_MINOR
#endif//MOBIES_UDMBASE_H
Modified: UDM/trunk/releaseinfo.txt
==============================================================================
--- UDM/trunk/releaseinfo.txt Wed May 11 16:34:12 2011 (r3733)
+++ UDM/trunk/releaseinfo.txt Wed May 11 16:57:24 2011 (r3734)
@@ -1,13 +1,13 @@
-Copyright (c) Vanderbilt University, 2001-2010
+Copyright (c) Vanderbilt University, 2001-2011
ALL RIGHTS RESERVED
** UDM : Universal Data Model **
-** Software Requirement**
+** Software Requirements **
1. Windows Operating system (XP, Vista, 7)
-2. GME 10, R10.8.18 from: http://www.isis.vanderbilt.edu/Projects/gme/Download.html
+2. GME 10, r11.3.23 from: http://www.isis.vanderbilt.edu/Projects/gme/Download.html
NOTE: You need to have administrative privileges to install GME correctly.
3. Visual Studio 9 or Visual Studio 10
@@ -18,6 +18,11 @@
PLEASE DOWNLOAD AND INSTALL 2 and 3 before proceeding.
** Changelog **
+05/11/11 - Release 3.2.8
+ - ASSERT is no longer #defined, since it may conflict with other libraries (e.g. MFC)
+ - Fix generated CreateDerived methods
+ - Add UdmGme::Udm2Gme to convert from a Udm::Object instance to an IUnknown*. Returns NULL if the Udm::Object::impl isn't from a UdmGme backend
+
11/30/10 - Release 3.2.7
- MetaGME2UML now generates refport container associations when dRefParent or sRefParent are specified in MetaGME under the Connection's General Preferences
With these associations, it is possible to navigate from a connection to refport parent and vice versa.
More information about the Mobies-commit
mailing list