[Mobies-commit] [commit] r4067 - in UDM/trunk: . 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
Fri Jun 29 11:47:00 CDT 2012
Author: ksmyth
Date: Fri Jun 29 11:46:59 2012
New Revision: 4067
Log:
Prepare for release 3.2.11
Modified:
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/UDM_Release_Howto.txt
UDM/trunk/WiX/Udm_inc.wxi
UDM/trunk/configure.ac
UDM/trunk/include/UdmBase.h
UDM/trunk/releaseinfo.txt
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmCli/Properties/AssemblyInfo.cs
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmCli/Properties/AssemblyInfo.cs Fri Jun 29 11:46:20 2012 (r4066)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmCli/Properties/AssemblyInfo.cs Fri Jun 29 11:46:59 2012 (r4067)
@@ -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.10.0")]
-[assembly: AssemblyFileVersion("3.2.10.0")]
+[assembly: AssemblyVersion("3.2.11.0")]
+[assembly: AssemblyFileVersion("3.2.11.0")]
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc Fri Jun 29 11:46:20 2012 (r4066)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc Fri Jun 29 11:46:59 2012 (r4067)
@@ -47,8 +47,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,10,2
- PRODUCTVERSION 3,2,10
+ FILEVERSION 3,2,11,0
+ PRODUCTVERSION 3,2,11
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.10"
+ VALUE "FileVersion", "3.2.11"
VALUE "InternalName", "UdmDll"
VALUE "LegalCopyright", "Copyright (C) 2012"
VALUE "OriginalFilename", "UdmDll.dll"
VALUE "ProductName", "UdmDll Dynamic Link Library"
- VALUE "ProductVersion", "3.2.10"
+ VALUE "ProductVersion", "3.2.11"
END
END
BLOCK "VarFileInfo"
Modified: UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.rc
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.rc Fri Jun 29 11:46:20 2012 (r4066)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.rc Fri Jun 29 11:46:59 2012 (r4067)
@@ -47,8 +47,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,10,2
- PRODUCTVERSION 3,2,10
+ FILEVERSION 3,2,11,0
+ PRODUCTVERSION 3,2,11
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.10"
+ VALUE "FileVersion", "3.2.11"
VALUE "InternalName", "UdmDll"
VALUE "LegalCopyright", "Copyright (C) 2012"
VALUE "OriginalFilename", "UdmDll.dll"
VALUE "ProductName", "UdmDll Dynamic Link Library"
- VALUE "ProductVersion", "3.2.10"
+ VALUE "ProductVersion", "3.2.11"
END
END
BLOCK "VarFileInfo"
Modified: UDM/trunk/UDM_Release_Howto.txt
==============================================================================
--- UDM/trunk/UDM_Release_Howto.txt Fri Jun 29 11:46:20 2012 (r4066)
+++ UDM/trunk/UDM_Release_Howto.txt Fri Jun 29 11:46:59 2012 (r4067)
@@ -3,7 +3,6 @@
First see UDM_compile_guideVS2008.txt
Update with new version, info:
- /UDM/trunk/InnoSetup/udm_innosetupVS2008.iss
/UDM/trunk/WiX/Udm_inc.wxi
/UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc
/UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.rc
@@ -12,23 +11,23 @@
/UDM/trunk/Projects/Win32/VC10/src/UdmCli/Properties/AssemblyInfo.cs
/UDM/trunk/configure.ac
/UDM/trunk/debian/changelog (`dch -i`)
-ci -m 'Prepare for release 3.2.10'
+ci -m 'Prepare for release 3.2.11'
-svn cp -m 'Tag release 3.2.10' https://svn.isis.vanderbilt.edu/MoBIES/UDM/trunk/ https://svn.isis.vanderbilt.edu/MoBIES/UDM/tags/3.2.10
+svn cp -m 'Tag release 3.2.11' https://svn.isis.vanderbilt.edu/MoBIES/UDM/trunk/ https://svn.isis.vanderbilt.edu/MoBIES/UDM/tags/3.2.11
For "Finding ID" in Udm (x2), Udm_x64: ssh kms1 python ./bin/pdb_promote.py
-wget -O UDM_x64-3.2.10.msi http://build.isis.vanderbilt.edu/job/UDM_x64_msi/label=build-slave6/lastSuccessfulBuild/artifact/trunk/WiX/Udm_x64.msi
-wget -O UDM-3.2.10.msi http://build.isis.vanderbilt.edu/job/UDM/label=build-slave8/lastSuccessfulBuild/artifact/trunk/WiX/Udm.msi
+wget -O UDM_x64-3.2.11.msi http://build.isis.vanderbilt.edu/job/UDM_x64_msi/label=build-slave6/lastSuccessfulBuild/artifact/trunk/WiX/Udm_x64.msi
+wget -O UDM-3.2.11.msi http://build.isis.vanderbilt.edu/job/UDM/label=build-slave8/lastSuccessfulBuild/artifact/trunk/WiX/Udm.msi
for file in http://build.isis.vanderbilt.edu/job/UDM/label=build-slave8/lastSuccessfulBuild/artifact/trunk/WiX/{Udm_bin/Udm_bin.msm,Udm_SDK/Udm_SDK.msm,UdmDll/UdmDll.msm,UdmDll_VS10/UdmDll_VS10.msm,xerces_c/xerces_c.msm} http://build.isis.vanderbilt.edu/job/UDM_x64/label=build-slave6/lastSuccessfulBuild/artifact/trunk/WiX/{Udm_bin/Udm_bin_x64.msm,Udm_SDK/Udm_SDK_x64.msm,UdmDll_VS10/UdmDll_VS10_x64.msm,xerces_c/xerces_c_x64.msm}; do wget "$file"; done
-svn export https://svn.isis.vanderbilt.edu/MoBIES/UDM/tags/3.2.10 Udm_source_r3.2.10 && \
-/c/Program\ Files/7-Zip/7z.exe a -r Udm_source_r3.2.10.zip Udm_source_r3.2.10/ && \
-cp Udm_source_r3.2.10/releaseinfo.txt UDM_Release_Notes.txt
-
-ssh ksmyth at repo.isis.vanderbilt.edu mkdir /project/www/Download/UDM/3.2.10/ && \
-scp UDM_Release_Notes.txt UDM-3.2.10.msi UDM_x64-3.2.10.msi Udm_source_r3.2.10.zip ksmyth at repo.isis.vanderbilt.edu:/project/www/Download/UDM/3.2.10/ && \
-ssh ksmyth at repo.isis.vanderbilt.edu chmod -R a+r /project/www/Download/UDM/3.2.10/
+svn export https://svn.isis.vanderbilt.edu/MoBIES/UDM/tags/3.2.11 Udm_source_r3.2.11 && \
+/c/Program\ Files/7-Zip/7z.exe a -r Udm_source_r3.2.11.zip Udm_source_r3.2.11/ && \
+cp Udm_source_r3.2.11/releaseinfo.txt UDM_Release_Notes.txt
+
+ssh ksmyth at repo.isis.vanderbilt.edu mkdir /project/www/Download/UDM/3.2.11/ && \
+scp UDM_Release_Notes.txt UDM-3.2.11.msi UDM_x64-3.2.11.msi Udm_source_r3.2.11.zip ksmyth at repo.isis.vanderbilt.edu:/project/www/Download/UDM/3.2.11/ && \
+ssh ksmyth at repo.isis.vanderbilt.edu chmod -R a+r /project/www/Download/UDM/3.2.11/
# For GReAT release:
Bump Jenkins GReAT release number
@@ -54,7 +53,7 @@
ssh ksmyth at repo.isis.vanderbilt.edu chmod -R a+r /project/www/Download/GReAT/1.7.6
# For Udm and GReAT
-# On http://repo add Folder 3.2.10; add Downloads
+# On http://repo add Folder 3.2.11; add Downloads
# JIRA: make release
# email announcement
# change http://kms1/svn/installs/install.py sync to installs/install.exe, https://svn.isis.vanderbilt.edu/isis-common/trunk/common-scripts/install.exe
Modified: UDM/trunk/WiX/Udm_inc.wxi
==============================================================================
--- UDM/trunk/WiX/Udm_inc.wxi Fri Jun 29 11:46:20 2012 (r4066)
+++ UDM/trunk/WiX/Udm_inc.wxi Fri Jun 29 11:46:59 2012 (r4067)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='windows-1252'?>
-<?define VERSIONSTR=3.2.10?>
+<?define VERSIONSTR=3.2.11?>
<Include>
<?if $(sys.BUILDARCH)=x64 ?>
<?define UpgradeCode='11CB0ED6-A45B-49FA-ABB2-A718EB5C970D'?>
Modified: UDM/trunk/configure.ac
==============================================================================
--- UDM/trunk/configure.ac Fri Jun 29 11:46:20 2012 (r4066)
+++ UDM/trunk/configure.ac Fri Jun 29 11:46:59 2012 (r4067)
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.59])
-AC_INIT([udm], [3.210])
+AC_INIT([udm], [3.211])
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 Fri Jun 29 11:46:20 2012 (r4066)
+++ UDM/trunk/include/UdmBase.h Fri Jun 29 11:46:59 2012 (r4067)
@@ -4125,8 +4125,8 @@
// tldr: use CHANGES_LOST_DEFAULT and CloseWithUpdate() instead
-// Version 3.2.10
+// Version 3.2.11
#define UDM_VERSION_MAJOR 3
-#define UDM_VERSION_MINOR (2 * 10 + 10 * 1)
+#define UDM_VERSION_MINOR (2 * 10 + 11 * 1)
#define UDM_VERSION UDM_VERSION_MAJOR * 100 + UDM_VERSION_MINOR
#endif//MOBIES_UDMBASE_H
Modified: UDM/trunk/releaseinfo.txt
==============================================================================
--- UDM/trunk/releaseinfo.txt Fri Jun 29 11:46:20 2012 (r4066)
+++ UDM/trunk/releaseinfo.txt Fri Jun 29 11:46:59 2012 (r4067)
@@ -7,7 +7,7 @@
1. Windows Operating system (XP, Vista, 7)
-2. GME 12, r12.1.24 from: http://repo.isis.vanderbilt.edu/downloads?tool=GME
+2. GME 12, r12.6.29 from: http://repo.isis.vanderbilt.edu/downloads?tool=GME
NOTE: You need to have administrative privileges to install GME correctly.
3. To develop using UDM: Visual Studio 9 or Visual Studio 10
@@ -19,6 +19,21 @@
PLEASE DOWNLOAD AND INSTALL 2 and 3 before proceeding.
** Changelog **
+06/29/2012 - Release 3.2.11
+ - Add Object::getSrcObject() and Object::getDstObject() (only works with GME backend)
+ - Add Object::GetChildRole()
+ - GME backend refport changes:
+ refport_parent_rev may return Udm::null if the src/dst is not set
+ refport_parent may return Udm::null after src/dst is cleared
+ Reference's registry is not modified, and Connection's registry is cleared when src/dst is set
+ Fixes some "Object not found" exceptions (especially after xme export, import)
+ - Fix serialization/deserialization of double values INF, -INF, and NaN in DOM backend
+ - Fix bug in GME backend where CompositionRole in a Namespace isn't matched to GME role in CreateChild or GetChildren(CCR)
+ - Fix bug with UML2XML: with crosslinks, a Diagram cannot have the same name as the RootFolder
+ - Fix bug in CopyObjectHierarchy with a pre-populated copy-associative map: set AssociationClass ends
+ Bug appears as a Connection not having an endpoint set when source/dest is refport
+ - Ubuntu build: read /etc/alternatives/javac to determine default Java. Support 12.04 (Precise)
+
02/02/12 - Release 3.2.10
- 64 bit UdmDll (VC10 only)
More information about the Mobies-commit
mailing list