[Mobies-commit] [commit] r4181 - in UDM/trunk: . Projects/Win32/VC10/src/UdmCli/Properties Projects/Win32/VC10/src/UdmDll Projects/Win32/VC9/src/UdmDll WiX debian include
ksmyth at redhat3.isis.vanderbilt.edu
ksmyth at redhat3.isis.vanderbilt.edu
Mon Jul 29 13:59:34 CDT 2013
Author: ksmyth
Date: Mon Jul 29 13:59:34 2013
New Revision: 4181
Log:
Prepare for release 3.2.12
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/debian/changelog
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 Mon Jul 29 13:58:35 2013 (r4180)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmCli/Properties/AssemblyInfo.cs Mon Jul 29 13:59:34 2013 (r4181)
@@ -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.11.0")]
-[assembly: AssemblyFileVersion("3.2.11.0")]
+[assembly: AssemblyVersion("3.2.12.0")]
+[assembly: AssemblyFileVersion("3.2.12.0")]
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc Mon Jul 29 13:58:35 2013 (r4180)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc Mon Jul 29 13:59:34 2013 (r4181)
@@ -47,8 +47,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,11,7
- PRODUCTVERSION 3,2,11
+ FILEVERSION 3,2,12,0
+ PRODUCTVERSION 3,2,12
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.11"
+ VALUE "FileVersion", "3.2.12"
VALUE "InternalName", "UdmDll"
VALUE "LegalCopyright", "Copyright (C) 2012"
VALUE "OriginalFilename", "UdmDll.dll"
VALUE "ProductName", "UdmDll Dynamic Link Library"
- VALUE "ProductVersion", "3.2.11"
+ VALUE "ProductVersion", "3.2.12"
END
END
BLOCK "VarFileInfo"
Modified: UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.rc
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.rc Mon Jul 29 13:58:35 2013 (r4180)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.rc Mon Jul 29 13:59:34 2013 (r4181)
@@ -47,8 +47,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,11,7
- PRODUCTVERSION 3,2,11
+ FILEVERSION 3,2,12,0
+ PRODUCTVERSION 3,2,12
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.11"
+ VALUE "FileVersion", "3.2.12"
VALUE "InternalName", "UdmDll"
VALUE "LegalCopyright", "Copyright (C) 2012"
VALUE "OriginalFilename", "UdmDll.dll"
VALUE "ProductName", "UdmDll Dynamic Link Library"
- VALUE "ProductVersion", "3.2.11"
+ VALUE "ProductVersion", "3.2.12"
END
END
BLOCK "VarFileInfo"
Modified: UDM/trunk/UDM_Release_Howto.txt
==============================================================================
--- UDM/trunk/UDM_Release_Howto.txt Mon Jul 29 13:58:35 2013 (r4180)
+++ UDM/trunk/UDM_Release_Howto.txt Mon Jul 29 13:59:34 2013 (r4181)
@@ -10,32 +10,32 @@
/UDM/trunk/releaseinfo.txt (+GME version)
/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.11'
+ /UDM/trunk/debian/changelog (`DEBEMAIL='ksmyth at isis.vanderbilt.edu' DEBFULLNAME='Kevin Smyth' dch -i`)
+ci -m 'Prepare for release 3.2.12'
-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
+svn cp -m 'Tag release 3.2.12' https://svn.isis.vanderbilt.edu/MoBIES/UDM/trunk/ https://svn.isis.vanderbilt.edu/MoBIES/UDM/tags/3.2.12
For "Finding ID" in Udm (x2), Udm_x64 (x2): ssh kms1 cd symbolstmp python ./bin/pdb_promote.py
perl -pli -e 'foreach $f (qw/Udm.exe UdmSwig.dll MetaGME2UML.pdb MetaGME2Uml.dll Udmd.pdb UDMOclPat.exe UDMOclPat.pdb/) { s/$f/$f/ig; }'
-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
+wget -O UDM_x64-3.2.12.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.12.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
-wget http://build.isis.vanderbilt.edu/job/Udm_Linux/label=kms1/lastSuccessfulBuild/artifact/udm_3.2.11-2_i386.deb
-wget http://build.isis.vanderbilt.edu/job/Udm_Linux/label=kms1/lastSuccessfulBuild/artifact/udm-dev_3.2.11-2_i386.deb
-wget http://build.isis.vanderbilt.edu/job/Udm_Linux/label=kms46/lastSuccessfulBuild/artifact/udm_3.2.11-2_amd64.deb
-wget http://build.isis.vanderbilt.edu/job/Udm_Linux/label=kms46/lastSuccessfulBuild/artifact/udm-dev_3.2.11-2_amd64.deb
-
-svn export https://svn.isis.vanderbilt.edu/MoBIES/UDM/tags/3.2.11 Udm_source_r3.2.11 && \
-'/c/Program Files (x86)/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/ && \
-scp udm_3.2.11-2_i386.deb udm-dev_3.2.11-2_i386.deb udm_3.2.11-2_amd64.deb udm-dev_3.2.11-2_amd64.deb 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/
+wget http://build.isis.vanderbilt.edu/job/Udm_Linux/label=kms1/lastSuccessfulBuild/artifact/udm_3.2.12-2_i386.deb
+wget http://build.isis.vanderbilt.edu/job/Udm_Linux/label=kms1/lastSuccessfulBuild/artifact/udm-dev_3.2.12-2_i386.deb
+wget http://build.isis.vanderbilt.edu/job/Udm_Linux/label=kms46/lastSuccessfulBuild/artifact/udm_3.2.12-2_amd64.deb
+wget http://build.isis.vanderbilt.edu/job/Udm_Linux/label=kms46/lastSuccessfulBuild/artifact/udm-dev_3.2.12-2_amd64.deb
+
+svn export https://svn.isis.vanderbilt.edu/MoBIES/UDM/tags/3.2.12 Udm_source_r3.2.12 && \
+'/c/Program Files (x86)/7-Zip/7z.exe' a -r Udm_source_r3.2.12.zip Udm_source_r3.2.12/ && \
+cp Udm_source_r3.2.12/releaseinfo.txt UDM_Release_Notes.txt
+
+ssh ksmyth at repo.isis.vanderbilt.edu mkdir /project/www/Download/UDM/3.2.12/ && \
+scp UDM_Release_Notes.txt UDM-3.2.12.msi UDM_x64-3.2.12.msi Udm_source_r3.2.12.zip ksmyth at repo.isis.vanderbilt.edu:/project/www/Download/UDM/3.2.12/ && \
+scp udm_3.2.12-2_i386.deb udm-dev_3.2.12-2_i386.deb udm_3.2.12-2_amd64.deb udm-dev_3.2.12-2_amd64.deb ksmyth at repo.isis.vanderbilt.edu:/project/www/Download/UDM/3.2.12/ && \
+ssh ksmyth at repo.isis.vanderbilt.edu chmod -R a+r /project/www/Download/UDM/3.2.12/
-# repo: Add Folder, short name A3.2.11. Add "Download"s
+# repo: Add Folder, short name A3.2.12. Add "Download"s
# For GReAT release:
Bump Jenkins GReAT release number
@@ -61,7 +61,7 @@
ssh ksmyth at repo.isis.vanderbilt.edu chmod -R a+r /project/www/Download/GReAT/1.7.7
# For Udm and GReAT
-# On http://repo add Folder 3.2.11; add Downloads
+# On http://repo add Folder 3.2.12; add Downloads
# EDIT uploadgme.py first
set PATH=%PATH%;%userprofile%\bin
%userprofile%\bin\selenium\Scripts\python.exe %userprofile%\bin\uploadgme.py
Modified: UDM/trunk/WiX/Udm_inc.wxi
==============================================================================
--- UDM/trunk/WiX/Udm_inc.wxi Mon Jul 29 13:58:35 2013 (r4180)
+++ UDM/trunk/WiX/Udm_inc.wxi Mon Jul 29 13:59:34 2013 (r4181)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='windows-1252'?>
-<?define VERSIONSTR=3.2.11?>
+<?define VERSIONSTR=3.2.12?>
<Include>
<?if $(sys.BUILDARCH)=x64 ?>
<?define UpgradeCode='11CB0ED6-A45B-49FA-ABB2-A718EB5C970D'?>
Modified: UDM/trunk/configure.ac
==============================================================================
--- UDM/trunk/configure.ac Mon Jul 29 13:58:35 2013 (r4180)
+++ UDM/trunk/configure.ac Mon Jul 29 13:59:34 2013 (r4181)
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.59])
-AC_INIT([udm], [3.211])
+AC_INIT([udm], [3.212])
AC_CONFIG_AUX_DIR([config])
# judm paths are longer than 99 characters, so force pax format
AM_INIT_AUTOMAKE([tar-pax])
Modified: UDM/trunk/debian/changelog
==============================================================================
--- UDM/trunk/debian/changelog Mon Jul 29 13:58:35 2013 (r4180)
+++ UDM/trunk/debian/changelog Mon Jul 29 13:59:34 2013 (r4181)
@@ -1,3 +1,9 @@
+udm (3.2.11-1) lucid; urgency=low
+
+ * Udm 3.2.12
+
+ -- Kevin Smyth <ksmyth at isis.vanderbilt.edu> Mon, 29 Jul 2013 18:52:51 +0000
+
udm (3.2.11-2) lucid; urgency=low
* Include judm.jar
Modified: UDM/trunk/include/UdmBase.h
==============================================================================
--- UDM/trunk/include/UdmBase.h Mon Jul 29 13:58:35 2013 (r4180)
+++ UDM/trunk/include/UdmBase.h Mon Jul 29 13:59:34 2013 (r4181)
@@ -4133,8 +4133,8 @@
// tldr: use CHANGES_LOST_DEFAULT and CloseWithUpdate() instead
-// Version 3.2.11
+// Version 3.2.12
#define UDM_VERSION_MAJOR 3
-#define UDM_VERSION_MINOR (2 * 10 + 11 * 1)
+#define UDM_VERSION_MINOR (2 * 10 + 12 * 1)
#define UDM_VERSION UDM_VERSION_MAJOR * 100 + UDM_VERSION_MINOR
#endif//MOBIES_UDMBASE_H
Modified: UDM/trunk/releaseinfo.txt
==============================================================================
--- UDM/trunk/releaseinfo.txt Mon Jul 29 13:58:35 2013 (r4180)
+++ UDM/trunk/releaseinfo.txt Mon Jul 29 13:59:34 2013 (r4181)
@@ -6,11 +6,12 @@
** Software Requirements **
1. Windows Operating system (XP, Vista, 7)
+NOTE: Udm can also be used on Linux
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
+3. To develop using UDM: Visual Studio 2008, 2010, or 2012
(The UDM library can also be used with Visual Studio 2008 Express Edition or Visual C++ 2010 Express.
Note that you cannot make GME interpreters with the Express Editions, as they do not include MFC or ATL.
Please visit http://www.microsoft.com/eXPress/download/#webInstall
@@ -19,6 +20,26 @@
PLEASE DOWNLOAD AND INSTALL 2 and 3 before proceeding.
** Changelog **
+ - Release 3.2.12 (7/29/2013)
+ - Add Visual Studio 2012 (VC11) UdmDll
+ - UdmGme: fix GetMetaRole for cross-namespace compositions where the contained class has multiple child roles (META-990)
+ - UdmGme: fix GetMetaRole for a class that inherits from an abstract class with no other descendents (META-990)
+ - UdmGme: fix position attribute for out-of-proc GME objects
+ - UdmGme: fix UdmId2GmeId: GME IDs are lower-case
+ - Udm.exe: domain-specific Python code generation
+ - Unicode support:
+ std::string in Udm are now UTF-8
+ udm.pyd: Support unicode objects
+ Udm VS C++ project wizard: support Unicode in GMEConsole
+ - udm.pyd: Add convert_udm2gme method
+ - udm.pyd: Fix meta lifetime management, which appeared as an access violation/segfault
+ - Uml2UDMXML: fix crash on default value empty string ("")
+ - Fix Java generation for baseclass outside namespace containing links inside namespace
+ - Fix Java generation for class that inherits from a baseclass multiple times
+ - VC: Fix std::exception.what for catching udm_exception as std::exception
+ - UdmDll_VS10: delay-load Xalan dll
+
+
06/29/2012 - Release 3.2.11
- Add Object::getSrcObject() and Object::getDstObject() (only works with GME backend)
- Add Object::GetChildRole()
More information about the Mobies-commit
mailing list