[Mobies-commit] [commit] r4419 - in UDM/trunk: . Projects/Win32/VC10/src/UdmCli/Properties Projects/Win32/VC10/src/UdmDll Projects/Win32/VC10/src/UdmSwig Projects/Win32/VC9/src/UdmDll WiX include

ksmyth at svn.isis.vanderbilt.edu ksmyth at svn.isis.vanderbilt.edu
Mon May 21 09:38:03 CDT 2018


Author: ksmyth
Date: Mon May 21 09:38:03 2018
New Revision: 4419

Log:
Prepare for release 3.2.15

Modified:
   UDM/trunk/Projects/Win32/VC10/src/UdmCli/Properties/AssemblyInfo.cs
   UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc
   UDM/trunk/Projects/Win32/VC10/src/UdmSwig/UdmSwig.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	Thu May 17 11:58:03 2018	(r4418)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmCli/Properties/AssemblyInfo.cs	Mon May 21 09:38:03 2018	(r4419)
@@ -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.14.0")]
-[assembly: AssemblyFileVersion("3.2.14.0")]
+[assembly: AssemblyVersion("3.2.15.0")]
+[assembly: AssemblyFileVersion("3.2.15.0")]

Modified: UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc	Thu May 17 11:58:03 2018	(r4418)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc	Mon May 21 09:38:03 2018	(r4419)
@@ -15,8 +15,8 @@
 //
 
 1 VERSIONINFO
- FILEVERSION 3,2,14,0
- PRODUCTVERSION 3,2,14
+ FILEVERSION 3,2,15,0
+ PRODUCTVERSION 3,2,15
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -33,12 +33,12 @@
         BEGIN
             VALUE "CompanyName", "ISIS, Vanderbilt University"
             VALUE "FileDescription", "UdmDll Dynamic Link Library"
-            VALUE "FileVersion", "3.2.14"
+            VALUE "FileVersion", "3.2.15"
             VALUE "InternalName", "UdmDll"
-            VALUE "LegalCopyright", "Copyright (C) 2014"
+            VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "UdmDll.dll"
             VALUE "ProductName", "UdmDll Dynamic Link Library"
-            VALUE "ProductVersion", "3.2.14"
+            VALUE "ProductVersion", "3.2.15"
         END
     END
     BLOCK "VarFileInfo"

Modified: UDM/trunk/Projects/Win32/VC10/src/UdmSwig/UdmSwig.rc
==============================================================================
Binary files UDM/trunk/Projects/Win32/VC10/src/UdmSwig/UdmSwig.rc	Thu May 17 11:58:03 2018	(r4418) and UDM/trunk/Projects/Win32/VC10/src/UdmSwig/UdmSwig.rc	Mon May 21 09:38:03 2018	(r4419) differ

Modified: UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.rc
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.rc	Thu May 17 11:58:03 2018	(r4418)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.rc	Mon May 21 09:38:03 2018	(r4419)
@@ -15,8 +15,8 @@
 //
 
 1 VERSIONINFO
- FILEVERSION 3,2,14,0
- PRODUCTVERSION 3,2,14
+ FILEVERSION 3,2,15,0
+ PRODUCTVERSION 3,2,15
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -33,12 +33,12 @@
         BEGIN
             VALUE "CompanyName", "ISIS, Vanderbilt University"
             VALUE "FileDescription", "UdmDll Dynamic Link Library"
-            VALUE "FileVersion", "3.2.14"
+            VALUE "FileVersion", "3.2.15"
             VALUE "InternalName", "UdmDll"
-            VALUE "LegalCopyright", "Copyright (C) 2014"
+            VALUE "LegalCopyright", "Copyright (C) 2015"
             VALUE "OriginalFilename", "UdmDll.dll"
             VALUE "ProductName", "UdmDll Dynamic Link Library"
-            VALUE "ProductVersion", "3.2.14"
+            VALUE "ProductVersion", "3.2.15"
         END
     END
     BLOCK "VarFileInfo"

Modified: UDM/trunk/UDM_Release_Howto.txt
==============================================================================
--- UDM/trunk/UDM_Release_Howto.txt	Thu May 17 11:58:03 2018	(r4418)
+++ UDM/trunk/UDM_Release_Howto.txt	Mon May 21 09:38:03 2018	(r4419)
@@ -11,13 +11,13 @@
  releaseinfo.txt (+GME version)
  Projects/Win32/VC10/src/UdmCli/Properties/AssemblyInfo.cs
  configure.ac
- debian/changelog (`DEBEMAIL='kevin.m.smyth at gmail.com' DEBFULLNAME='Kevin Smyth' dch --release-heuristic log -v 3.2.14-ubuntu1`)
-ci -m "Prepare for release 3.2.14"
+ debian/changelog (`DEBEMAIL='kevin.m.smyth at gmail.com' DEBFULLNAME='Kevin Smyth' dch --release-heuristic log -v 3.2.15-ubuntu1`)
+ci -m "Prepare for release 3.2.15"
 
 # wait for jenkins build to complete
 
 #!/bin/bash
-svn cp -m 'Tag release 3.2.14' https://svn.isis.vanderbilt.edu/MoBIES/UDM/trunk/ https://svn.isis.vanderbilt.edu/MoBIES/UDM/tags/3.2.14
+svn cp -m 'Tag release 3.2.15' https://svn.isis.vanderbilt.edu/MoBIES/UDM/trunk/ https://svn.isis.vanderbilt.edu/MoBIES/UDM/tags/3.2.15
 
 export build_isis=http://build.isis
 # export build_isis="-u user:pass https://build.isis"
@@ -29,24 +29,24 @@
 done)
 for file in $IDs; do ssh build at kms1.isis.vanderbilt.edu 'perl -pli -e '"'"'foreach $f (qw/Udm.exe UdmSwig.dll MetaGME2UML.pdb MetaGME2Uml.dll Udmd.pdb UDMOclPat.exe UDMOclPat.pdb Test_CrossLinksD.exe/) { s/$f/$f/ig; }'"'"' symbolstmp/000Admin/'$file; done
 ssh build at kms1.isis.vanderbilt.edu cd symbolstmp '&&' python \~/bin/pdb_promote.py $IDs
-curl -sS -o UDM_x64-3.2.14.msi $build_isis.vanderbilt.edu/job/UDM_x64_msi/label=build-slave6/lastSuccessfulBuild/artifact/trunk/WiX/Udm_x64.msi &&
-curl -sS -o UDM-3.2.14.msi $build_isis.vanderbilt.edu/job/UDM_msi/label=build-slave6/lastSuccessfulBuild/artifact/trunk/WiX/Udm.msi
+curl -sS -o UDM_x64-3.2.15.msi $build_isis.vanderbilt.edu/job/UDM_x64_msi/label=build-slave6/lastSuccessfulBuild/artifact/trunk/WiX/Udm_x64.msi &&
+curl -sS -o UDM-3.2.15.msi $build_isis.vanderbilt.edu/job/UDM_msi/label=build-slave6/lastSuccessfulBuild/artifact/trunk/WiX/Udm.msi
 for file in $build_isis.vanderbilt.edu/job/UDM/label=UDM_x86/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} $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 curl -O "$file"; done
 (mkdir ubuntu12.04 && cd ubuntu12.04 &&
-curl -O -sS $build_isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu12.04/lastSuccessfulBuild/artifact/udm_3.2.14-1_i386.deb &&
-curl -O -sS $build_isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu12.04/lastSuccessfulBuild/artifact/udm-dev_3.2.14-1_i386.deb
-curl -O -sS $build_isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu12.04_x64/lastSuccessfulBuild/artifact/udm_3.2.14-1_amd64.deb &&
-curl -O -sS $build_isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu12.04_x64/lastSuccessfulBuild/artifact/udm-dev_3.2.14-1_amd64.deb )
-
-svn export https://svn.isis.vanderbilt.edu/MoBIES/UDM/tags/3.2.14 Udm_source_r3.2.14 && \
-PATH="$PATH":'/cygdrive/c/Program Files/7-Zip/':'/c/Program Files/7-Zip/' 7z a Udm_source_r3.2.14.zip Udm_source_r3.2.14/ && \
-cp Udm_source_r3.2.14/releaseinfo.txt UDM_Release_Notes.txt
-
-ssh repo at repo.isis.vanderbilt.edu mkdir -p UDM/3.2.14/ && \
-ssh -A build at kms1.isis.vanderbilt.edu scp UDM_Release_Notes.txt UDM-3.2.14.msi UDM_x64-3.2.14.msi Udm_source_r3.2.14.zip repo at repo.isis.vanderbilt.edu:UDM/3.2.14/ && \
-ssh repo at repo.isis.vanderbilt.edu chmod -R a+r UDM/3.2.14/
+curl -O -sS $build_isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu12.04/lastSuccessfulBuild/artifact/udm_3.2.15-1_i386.deb &&
+curl -O -sS $build_isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu12.04/lastSuccessfulBuild/artifact/udm-dev_3.2.15-1_i386.deb
+curl -O -sS $build_isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu12.04_x64/lastSuccessfulBuild/artifact/udm_3.2.15-1_amd64.deb &&
+curl -O -sS $build_isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu12.04_x64/lastSuccessfulBuild/artifact/udm-dev_3.2.15-1_amd64.deb )
+
+svn export https://svn.isis.vanderbilt.edu/MoBIES/UDM/tags/3.2.15 Udm_source_r3.2.15 && \
+PATH="$PATH":'/cygdrive/c/Program Files/7-Zip/':'/c/Program Files/7-Zip/' 7z a Udm_source_r3.2.15.zip Udm_source_r3.2.15/ && \
+cp Udm_source_r3.2.15/releaseinfo.txt UDM_Release_Notes.txt
+
+ssh repo at repo.isis.vanderbilt.edu mkdir -p UDM/3.2.15/ && \
+ssh -A build at kms1.isis.vanderbilt.edu scp UDM_Release_Notes.txt UDM-3.2.15.msi UDM_x64-3.2.15.msi Udm_source_r3.2.15.zip repo at repo.isis.vanderbilt.edu:UDM/3.2.15/ && \
+ssh repo at repo.isis.vanderbilt.edu chmod -R a+r UDM/3.2.15/
 
-scp ubuntu12.04/* repo at repo.isis.vanderbilt.edu:UDM/3.2.14/ubuntu12.04
+scp ubuntu12.04/* repo at repo.isis.vanderbilt.edu:UDM/3.2.15/ubuntu12.04
 
 
 # For GReAT release:
@@ -86,19 +86,19 @@
 
 SetLocal EnableDelayedExpansion
 cd %userprofile%\Downloads
-curl -sS -O http://repo.isis.vanderbilt.edu/UDM/3.2.14/UDM_x64-3.2.14.msi || exit /b !ERRORLEVEL!
-set _NT_SYMBOL_PATH=srv*%userprofile%\Downloads\UDM_3.2.14_symbols*http://symbols.isis.vanderbilt.edu/
-"C:\Program Files\7-Zip\7z.exe" x UDM_x64-3.2.14.msi -oUDM_x64-3.2.14 || exit /b !ERRORLEVEL!
-del UDM_x64-3.2.14\fil* UDM_x64-3.2.14\F_CENTRAL*
-"c:\Program Files (x86)\Debugging Tools for Windows (x86)\symchk.exe" /r "%userprofile%\Downloads\UDM_x64-3.2.14"
+curl -sS -O http://repo.isis.vanderbilt.edu/UDM/3.2.15/UDM_x64-3.2.15.msi || exit /b !ERRORLEVEL!
+set _NT_SYMBOL_PATH=srv*%userprofile%\Downloads\UDM_3.2.15_symbols*http://symbols.isis.vanderbilt.edu/
+"C:\Program Files\7-Zip\7z.exe" x UDM_x64-3.2.15.msi -oUDM_x64-3.2.15 || exit /b !ERRORLEVEL!
+del UDM_x64-3.2.15\fil* UDM_x64-3.2.15\F_CENTRAL*
+"c:\Program Files (x86)\Debugging Tools for Windows (x86)\symchk.exe" /r "%userprofile%\Downloads\UDM_x64-3.2.15"
 @rem pause
-"C:\Program Files\7-Zip\7z.exe" a UDM_3.2.14_symbols.7z UDM_3.2.14_symbols || exit /b !ERRORLEVEL!
-"C:\Program Files\7-Zip\7z.exe" l UDM_3.2.14_symbols.7z
-scp -v UDM_3.2.14_symbols.7z repo at repo.isis.vanderbilt.edu:UDM/3.2.14/
-ssh repo at repo.isis.vanderbilt.edu chmod -R a+r UDM/3.2.14/
+"C:\Program Files\7-Zip\7z.exe" a UDM_3.2.15_symbols.7z UDM_3.2.15_symbols || exit /b !ERRORLEVEL!
+"C:\Program Files\7-Zip\7z.exe" l UDM_3.2.15_symbols.7z
+scp -v UDM_3.2.15_symbols.7z repo at repo.isis.vanderbilt.edu:UDM/3.2.15/
+ssh repo at repo.isis.vanderbilt.edu chmod -R a+r UDM/3.2.15/
 
 Method 2: install Udm_x64.msi:
-start /wait msiexec /I UDM_x64-3.2.14.msi /qb /Lv* UDM_x64-3.2.14.log ALLUSERS=1
+start /wait msiexec /I UDM_x64-3.2.15.msi /qb /Lv* UDM_x64-3.2.15.log ALLUSERS=1
 set _NT_SYMBOL_PATH=C:\Windows\symbols\dll;C:\Windows\system32;srv*c:\symbols*http://symbols.isis.vanderbilt.edu/;srv*c:\symbols*http://msdl.microsoft.com/download/symbols
 "c:\Program Files (x86)\Debugging Tools for Windows (x86)\symchk.exe" /r "C:\Program Files\ISIS\Udm"
 "c:\Program Files (x86)\Debugging Tools for Windows (x86)\symchk.exe" /r "C:\Program Files (x86)\ISIS\Udm"

Modified: UDM/trunk/WiX/Udm_inc.wxi
==============================================================================
--- UDM/trunk/WiX/Udm_inc.wxi	Thu May 17 11:58:03 2018	(r4418)
+++ UDM/trunk/WiX/Udm_inc.wxi	Mon May 21 09:38:03 2018	(r4419)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='windows-1252'?>
 
-<?define VERSIONSTR=3.2.14?>
+<?define VERSIONSTR=3.2.15?>
 <Include>
   <?if $(sys.BUILDARCH)=x64 ?>
   <?define UpgradeCode='11CB0ED6-A45B-49FA-ABB2-A718EB5C970D'?>

Modified: UDM/trunk/configure.ac
==============================================================================
--- UDM/trunk/configure.ac	Thu May 17 11:58:03 2018	(r4418)
+++ UDM/trunk/configure.ac	Mon May 21 09:38:03 2018	(r4419)
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.59])
-AC_INIT([udm], [3.214])
+AC_INIT([udm], [3.215])
 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 May 17 11:58:03 2018	(r4418)
+++ UDM/trunk/include/UdmBase.h	Mon May 21 09:38:03 2018	(r4419)
@@ -4254,8 +4254,8 @@
 // tldr: use CHANGES_LOST_DEFAULT and CloseWithUpdate() instead
 
 
-// Version 3.2.14
+// Version 3.2.15
 #define UDM_VERSION_MAJOR 3
-#define UDM_VERSION_MINOR (2 * 10 + 14 * 1)
+#define UDM_VERSION_MINOR (2 * 10 + 15 * 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 May 17 11:58:03 2018	(r4418)
+++ UDM/trunk/releaseinfo.txt	Mon May 21 09:38:03 2018	(r4419)
@@ -20,6 +20,16 @@
 PLEASE DOWNLOAD AND INSTALL 2 and 3 before proceeding.
 
 ** Changelog **
+    - Release 3.2.15 (5/21/2018)
+        -   UdmDll is backwards compatible with previous 3.2 releases
+        -   Udm interpreter wizard: Visual Studio 2015 support
+        -   UdmDom: fix bug where crosslinks (e.g. from GReAT) can point to deleted objects
+        -   Fix memory leaks
+        -   Udm.exe performance improvements
+        -   Fix ArrAttrItem::operator==
+        -   MetaGME2Uml: return FAILED HRESULT under silent mode
+        -   UdmCli: fix compile error if model has 'type' attribute
+
     - Release 3.2.14 (4/6/2016)
         -   UdmDll is backwards compatible with previous 3.2 releases
         -   UdmDll: Visual Studio 2012 and 2015 support


More information about the Mobies-commit mailing list