[Mobies-commit] [commit] r4274 - 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 redhat3.isis.vanderbilt.edu
ksmyth at redhat3.isis.vanderbilt.edu
Wed Mar 19 10:59:45 CDT 2014
Author: ksmyth
Date: Wed Mar 19 10:59:44 2014
New Revision: 4274
Log:
Prepare for release 3.2.13
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 Mon Mar 10 01:31:04 2014 (r4273)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmCli/Properties/AssemblyInfo.cs Wed Mar 19 10:59:44 2014 (r4274)
@@ -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.12.0")]
-[assembly: AssemblyFileVersion("3.2.12.0")]
+[assembly: AssemblyVersion("3.2.13.0")]
+[assembly: AssemblyFileVersion("3.2.13.0")]
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc Mon Mar 10 01:31:04 2014 (r4273)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc Wed Mar 19 10:59:44 2014 (r4274)
@@ -47,8 +47,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,12,0
- PRODUCTVERSION 3,2,12
+ FILEVERSION 3,2,13,0
+ PRODUCTVERSION 3,2,13
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.12"
+ VALUE "FileVersion", "3.2.13"
VALUE "InternalName", "UdmDll"
- VALUE "LegalCopyright", "Copyright (C) 2012"
+ VALUE "LegalCopyright", "Copyright (C) 2014"
VALUE "OriginalFilename", "UdmDll.dll"
VALUE "ProductName", "UdmDll Dynamic Link Library"
- VALUE "ProductVersion", "3.2.12"
+ VALUE "ProductVersion", "3.2.13"
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 Mon Mar 10 01:31:04 2014 (r4273) and UDM/trunk/Projects/Win32/VC10/src/UdmSwig/UdmSwig.rc Wed Mar 19 10:59:44 2014 (r4274) differ
Modified: UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.rc
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.rc Mon Mar 10 01:31:04 2014 (r4273)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.rc Wed Mar 19 10:59:44 2014 (r4274)
@@ -15,8 +15,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,12,0
- PRODUCTVERSION 3,2,12
+ FILEVERSION 3,2,13,0
+ PRODUCTVERSION 3,2,13
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.12"
+ VALUE "FileVersion", "3.2.13"
VALUE "InternalName", "UdmDll"
- VALUE "LegalCopyright", "Copyright (C) 2012"
+ VALUE "LegalCopyright", "Copyright (C) 2014"
VALUE "OriginalFilename", "UdmDll.dll"
VALUE "ProductName", "UdmDll Dynamic Link Library"
- VALUE "ProductVersion", "3.2.12"
+ VALUE "ProductVersion", "3.2.13"
END
END
BLOCK "VarFileInfo"
Modified: UDM/trunk/UDM_Release_Howto.txt
==============================================================================
--- UDM/trunk/UDM_Release_Howto.txt Mon Mar 10 01:31:04 2014 (r4273)
+++ UDM/trunk/UDM_Release_Howto.txt Wed Mar 19 10:59:44 2014 (r4274)
@@ -3,50 +3,50 @@
First see UDM_compile_guideVS2008.txt
Update with new version, info:
- /UDM/trunk/WiX/Udm_inc.wxi
- /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 (+GME version)
- /UDM/trunk/Projects/Win32/VC10/src/UdmCli/Properties/AssemblyInfo.cs
- /UDM/trunk/configure.ac
- /UDM/trunk/debian/changelog (`DEBEMAIL='ksmyth at isis.vanderbilt.edu' DEBFULLNAME='Kevin Smyth' dch -i`)
-ci -m 'Prepare for release 3.2.12'
+ WiX/Udm_inc.wxi
+ Projects/Win32/VC10/src/UdmDll/UdmDll.rc
+ Projects/Win32/VC9/src/UdmDll/UdmDll.rc
+ Projects/Win32/VC10/src/UdmSwig/UdmSwig.rc
+ include/UdmBase.h
+ releaseinfo.txt (+GME version)
+ Projects/Win32/VC10/src/UdmCli/Properties/AssemblyInfo.cs
+ configure.ac
+ debian/changelog (`DEBEMAIL='ksmyth at isis.vanderbilt.edu' DEBFULLNAME='Kevin Smyth' dch -i`)
+ci -m 'Prepare for release 3.2.13'
-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
+svn cp -m 'Tag release 3.2.13' https://svn.isis.vanderbilt.edu/MoBIES/UDM/trunk/ https://svn.isis.vanderbilt.edu/MoBIES/UDM/tags/3.2.13
for url in http://build.isis.vanderbilt.edu/job/UDM/label=build-slave8/lastSuccessfulBuild/console http://build.isis.vanderbilt.edu/job/UDM_x64/label=build-slave6/lastSuccessfulBuild/console http://build.isis.vanderbilt.edu/job/UDM_vc11/label=build-slave11/lastBuild/console;
do
- curl -s "$url" | grep "Finding ID" | sed 's/Finding ID... //'
+ curl -s "$url" | grep "Finding ID" | sed 's/Finding ID... //' | sed 's/copy_pdbs.py: symstore://'
done | xargs
For "Finding ID" in Udm (x3), Udm_x64 (x2): ssh kms1 cd symbolstmp python ./bin/pdb_promote.py
for file in 0000006636 0000006637 0000006632 0000006633 0000006631; do perl -pli -e 'foreach $f (qw/Udm.exe UdmSwig.dll MetaGME2UML.pdb MetaGME2Uml.dll Udmd.pdb UDMOclPat.exe UDMOclPat.pdb/) { s/$f/$f/ig; }' 000Admin/$file; done
-
-curl -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 &&
-curl -o UDM-3.2.12.msi http://build.isis.vanderbilt.edu/job/UDM_msi/label=build-slave6/lastSuccessfulBuild/artifact/trunk/WiX/Udm.msi
+curl -o UDM_x64-3.2.13.msi http://build.isis.vanderbilt.edu/job/UDM_x64_msi/label=build-slave6/lastSuccessfulBuild/artifact/trunk/WiX/Udm_x64.msi &&
+curl -o UDM-3.2.13.msi http://build.isis.vanderbilt.edu/job/UDM_msi/label=build-slave6/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 curl -O "$file"; done
(mkdir -p ubuntu10.04 && cd ubuntu10.04 &&
-curl -O http://build.isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu10.04/lastSuccessfulBuild/artifact/udm_3.2.12-1_i386.deb &&
-curl -O http://build.isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu10.04/lastSuccessfulBuild/artifact/udm-dev_3.2.12-1_i386.deb
-curl -O http://build.isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu10.04_x64/lastSuccessfulBuild/artifact/udm_3.2.12-1_amd64.deb &&
-curl -O http://build.isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu10.04_x64/lastSuccessfulBuild/artifact/udm-dev_3.2.12-1_amd64.deb )
+curl -O http://build.isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu10.04/lastSuccessfulBuild/artifact/udm_3.2.13-1_i386.deb &&
+curl -O http://build.isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu10.04/lastSuccessfulBuild/artifact/udm-dev_3.2.13-1_i386.deb
+curl -O http://build.isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu10.04_x64/lastSuccessfulBuild/artifact/udm_3.2.13-1_amd64.deb &&
+curl -O http://build.isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu10.04_x64/lastSuccessfulBuild/artifact/udm-dev_3.2.13-1_amd64.deb )
(mkdir ubuntu12.04 && cd ubuntu12.04 &&
-curl -O http://build.isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu12.04/lastSuccessfulBuild/artifact/udm_3.2.12-1_i386.deb &&
-curl -O http://build.isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu12.04/lastSuccessfulBuild/artifact/udm-dev_3.2.12-1_i386.deb
-curl -O http://build.isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu12.04_x64/lastSuccessfulBuild/artifact/udm_3.2.12-1_amd64.deb &&
-curl -O http://build.isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu12.04_x64/lastSuccessfulBuild/artifact/udm-dev_3.2.12-1_amd64.deb )
-
-svn export https://svn.isis.vanderbilt.edu/MoBIES/UDM/tags/3.2.12 Udm_source_r3.2.12 && \
-PATH="$PATH":'/c/Program Files (x86)/7-Zip/':'/c/Program Files/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 repo at repo.isis.vanderbilt.edu mkdir -p UDM/3.2.12/ UDM/3.2.12/ubuntu10.04 UDM/3.2.12/ubuntu12.04 && \
-scp UDM_Release_Notes.txt UDM-3.2.12.msi UDM_x64-3.2.12.msi Udm_source_r3.2.12.zip repo at repo.isis.vanderbilt.edu:UDM/3.2.12/ && \
-scp ubuntu10.04/* repo at repo.isis.vanderbilt.edu:UDM/3.2.12/ubuntu10.04 && \
-scp ubuntu12.04/* repo at repo.isis.vanderbilt.edu:UDM/3.2.12/ubuntu12.04 && \
-ssh repo at repo.isis.vanderbilt.edu chmod -R a+r UDM/3.2.12/
+curl -O http://build.isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu12.04/lastSuccessfulBuild/artifact/udm_3.2.13-1_i386.deb &&
+curl -O http://build.isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu12.04/lastSuccessfulBuild/artifact/udm-dev_3.2.13-1_i386.deb
+curl -O http://build.isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu12.04_x64/lastSuccessfulBuild/artifact/udm_3.2.13-1_amd64.deb &&
+curl -O http://build.isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu12.04_x64/lastSuccessfulBuild/artifact/udm-dev_3.2.13-1_amd64.deb )
+
+svn export https://svn.isis.vanderbilt.edu/MoBIES/UDM/tags/3.2.13 Udm_source_r3.2.13 && \
+PATH="$PATH":'/c/Program Files (x86)/7-Zip/':'/c/Program Files/7-Zip/' 7z.exe a -r Udm_source_r3.2.13.zip Udm_source_r3.2.13/ && \
+cp Udm_source_r3.2.13/releaseinfo.txt UDM_Release_Notes.txt
+
+ssh repo at repo.isis.vanderbilt.edu mkdir -p UDM/3.2.13/ UDM/3.2.13/ubuntu10.04 UDM/3.2.13/ubuntu12.04 && \
+scp UDM_Release_Notes.txt UDM-3.2.13.msi UDM_x64-3.2.13.msi Udm_source_r3.2.13.zip repo at repo.isis.vanderbilt.edu:UDM/3.2.13/ && \
+scp ubuntu10.04/* repo at repo.isis.vanderbilt.edu:UDM/3.2.13/ubuntu10.04 && \
+scp ubuntu12.04/* repo at repo.isis.vanderbilt.edu:UDM/3.2.13/ubuntu12.04 && \
+ssh repo at repo.isis.vanderbilt.edu chmod -R a+r UDM/3.2.13/
# For GReAT release:
@@ -73,10 +73,6 @@
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.12; add Downloads
-# EDIT uploadgme.py first
-set PATH=%PATH%;%userprofile%\bin
-%userprofile%\bin\selenium\Scripts\python.exe %userprofile%\bin\uploadgme.py
# 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
@@ -119,6 +115,5 @@
Check for missing symbols
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 (x86)\GME"
-"c:\Program Files (x86)\Debugging Tools for Windows (x86)\symchk.exe" /r "C:\Program Files\GME"
-
+"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 Mon Mar 10 01:31:04 2014 (r4273)
+++ UDM/trunk/WiX/Udm_inc.wxi Wed Mar 19 10:59:44 2014 (r4274)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='windows-1252'?>
-<?define VERSIONSTR=3.2.12?>
+<?define VERSIONSTR=3.2.13?>
<Include>
<?if $(sys.BUILDARCH)=x64 ?>
<?define UpgradeCode='11CB0ED6-A45B-49FA-ABB2-A718EB5C970D'?>
Modified: UDM/trunk/configure.ac
==============================================================================
--- UDM/trunk/configure.ac Mon Mar 10 01:31:04 2014 (r4273)
+++ UDM/trunk/configure.ac Wed Mar 19 10:59:44 2014 (r4274)
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.59])
-AC_INIT([udm], [3.212])
+AC_INIT([udm], [3.213])
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 Mon Mar 10 01:31:04 2014 (r4273)
+++ UDM/trunk/include/UdmBase.h Wed Mar 19 10:59:44 2014 (r4274)
@@ -4142,8 +4142,8 @@
// tldr: use CHANGES_LOST_DEFAULT and CloseWithUpdate() instead
-// Version 3.2.12
+// Version 3.2.13
#define UDM_VERSION_MAJOR 3
-#define UDM_VERSION_MINOR (2 * 10 + 12 * 1)
+#define UDM_VERSION_MINOR (2 * 10 + 13 * 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 Mar 10 01:31:04 2014 (r4273)
+++ UDM/trunk/releaseinfo.txt Wed Mar 19 10:59:44 2014 (r4274)
@@ -1,4 +1,4 @@
-Copyright (c) Vanderbilt University, 2001-2012
+Copyright (c) Vanderbilt University, 2001-2014
ALL RIGHTS RESERVED
** UDM : Universal Data Model **
@@ -8,7 +8,7 @@
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/GME/
+2. GME 14, 14.3.5 from: http://repo.isis.vanderbilt.edu/GME/
NOTE: You need to have administrative privileges to install GME correctly.
3. To develop using UDM: Visual Studio 2008, 2010, or 2012
@@ -20,10 +20,12 @@
PLEASE DOWNLOAD AND INSTALL 2 and 3 before proceeding.
** Changelog **
- - Next Release
+ - Release 3.2.13 (3/19/2014)
+ - UdmDll is backwards compatible with previous 3.2 releases
- Udm.exe: allow Classes an association and a parent with an association. Fixes "Class Connection has multiple associations" error
- MetaGME2Uml: fix bug where some refport associations were mistakenly excluded
- Uml2XML: check that a Class has maximum 1 association, since Uml.xml defines a cardinality of 1. Fixes bug where an Association would have not Class linking to it
+ - UdmDll: fix bug with nested GME namespaces
- Release 3.2.12 (7/29/2013)
- Add Visual Studio 2012 (VC11) UdmDll
More information about the Mobies-commit
mailing list