[Mobies-commit] [commit] r4374 - 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 debian include
ksmyth at redhat3.isis.vanderbilt.edu
ksmyth at redhat3.isis.vanderbilt.edu
Wed Apr 6 10:26:28 CDT 2016
Author: ksmyth
Date: Wed Apr 6 10:26:28 2016
New Revision: 4374
Log:
Prepare for release 3.2.14
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/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 Wed Jan 27 14:27:40 2016 (r4373)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmCli/Properties/AssemblyInfo.cs Wed Apr 6 10:26:28 2016 (r4374)
@@ -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.13.0")]
-[assembly: AssemblyFileVersion("3.2.13.0")]
+[assembly: AssemblyVersion("3.2.14.0")]
+[assembly: AssemblyFileVersion("3.2.14.0")]
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc Wed Jan 27 14:27:40 2016 (r4373)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc Wed Apr 6 10:26:28 2016 (r4374)
@@ -15,8 +15,8 @@
//
1 VERSIONINFO
- FILEVERSION 3,2,13,0
- PRODUCTVERSION 3,2,13
+ FILEVERSION 3,2,14,0
+ PRODUCTVERSION 3,2,14
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.13"
+ VALUE "FileVersion", "3.2.14"
VALUE "InternalName", "UdmDll"
VALUE "LegalCopyright", "Copyright (C) 2014"
VALUE "OriginalFilename", "UdmDll.dll"
VALUE "ProductName", "UdmDll Dynamic Link Library"
- VALUE "ProductVersion", "3.2.13"
+ VALUE "ProductVersion", "3.2.14"
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 Wed Jan 27 14:27:40 2016 (r4373) and UDM/trunk/Projects/Win32/VC10/src/UdmSwig/UdmSwig.rc Wed Apr 6 10:26:28 2016 (r4374) differ
Modified: UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.rc
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.rc Wed Jan 27 14:27:40 2016 (r4373)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.rc Wed Apr 6 10:26:28 2016 (r4374)
@@ -15,8 +15,8 @@
//
1 VERSIONINFO
- FILEVERSION 3,2,13,0
- PRODUCTVERSION 3,2,13
+ FILEVERSION 3,2,14,0
+ PRODUCTVERSION 3,2,14
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.13"
+ VALUE "FileVersion", "3.2.14"
VALUE "InternalName", "UdmDll"
VALUE "LegalCopyright", "Copyright (C) 2014"
VALUE "OriginalFilename", "UdmDll.dll"
VALUE "ProductName", "UdmDll Dynamic Link Library"
- VALUE "ProductVersion", "3.2.13"
+ VALUE "ProductVersion", "3.2.14"
END
END
BLOCK "VarFileInfo"
Modified: UDM/trunk/UDM_Release_Howto.txt
==============================================================================
--- UDM/trunk/UDM_Release_Howto.txt Wed Jan 27 14:27:40 2016 (r4373)
+++ UDM/trunk/UDM_Release_Howto.txt Wed Apr 6 10:26:28 2016 (r4374)
@@ -11,42 +11,44 @@
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"
+ 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"
-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
+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
+export build_isis=http://build.isis
+# export build_isis="-u user:pass https://build.isis"
-
-for url in http://build.isis.vanderbilt.edu/job/UDM/label=UDM_x86/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;
+IDs=$(for url in "$build_isis.vanderbilt.edu/job/UDM/label=UDM_x86/lastSuccessfulBuild/consoleText" "$build_isis.vanderbilt.edu/job/UDM_x64/label=build-slave6/lastSuccessfulBuild/consoleText" "$build_isis.vanderbilt.edu/job/UDM_vc11/label=build-slave11/lastBuild/consoleText" \
+ "$build_isis.vanderbilt.edu/job/UDM_vc12/label=build-slave11/lastSuccessfulBuild/consoleText" "$build_isis.vanderbilt.edu/job/UDM_vc14/label=build-slave9/lastSuccessfulBuild/consoleText"
do
- 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 0000009647 0000009648 0000009642 0000009643 0000009644; 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.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=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} 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
+ curl -s $url | grep "Finding ID" | sed 's/.*Finding ID.....//; s/'$'\r'//
+done)
+ssh kms1 cd symbolstmp '&&' python \~/bin/pdb_promote.py $IDs
+for file in $IDs; do echo ssh kms1 '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.14.msi $build_isis.vanderbilt.edu/job/UDM_x64_msi/label=build-slave6/lastSuccessfulBuild/artifact/trunk/WiX/Udm_x64.msi &&
+curl -o UDM-3.2.14.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 -p ubuntu10.04 && cd ubuntu10.04 &&
-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 )
+curl -O $build_isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu10.04/lastSuccessfulBuild/artifact/udm_3.2.14-1_i386.deb &&
+curl -O $build_isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu10.04/lastSuccessfulBuild/artifact/udm-dev_3.2.14-1_i386.deb
+curl -O $build_isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu10.04_x64/lastSuccessfulBuild/artifact/udm_3.2.14-1_amd64.deb &&
+curl -O $build_isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu10.04_x64/lastSuccessfulBuild/artifact/udm-dev_3.2.14-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.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":'/cygdrive/c/Program Files/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/
+curl -O $build_isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu12.04/lastSuccessfulBuild/artifact/udm_3.2.14-1_i386.deb &&
+curl -O $build_isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu12.04/lastSuccessfulBuild/artifact/udm-dev_3.2.14-1_i386.deb
+curl -O $build_isis.vanderbilt.edu/job/Udm_Linux/label=ubuntu12.04_x64/lastSuccessfulBuild/artifact/udm_3.2.14-1_amd64.deb &&
+curl -O $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.exe a -r 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/ UDM/3.2.14/ubuntu10.04 UDM/3.2.14/ubuntu12.04 && \
+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/ && \
+scp ubuntu10.04/* repo at repo.isis.vanderbilt.edu:UDM/3.2.14/ubuntu10.04 && \
+scp ubuntu12.04/* repo at repo.isis.vanderbilt.edu:UDM/3.2.14/ubuntu12.04 && \
+ssh repo at repo.isis.vanderbilt.edu chmod -R a+r UDM/3.2.14/
# For GReAT release:
@@ -60,12 +62,12 @@
svn cp -m 'Tag release 1.7.8' https://svn.isis.vanderbilt.edu/MoBIES/GReAT/trunk/ https://svn.isis.vanderbilt.edu/MoBIES/GReAT/tags/1.7.8
-curl -s -S http://build.isis.vanderbilt.edu/job/GReAT/label=build-slave9/lastBuild/consoleText | grep Finding\ ID
+curl -s -S $build_isis.vanderbilt.edu/job/GReAT/label=build-slave9/lastBuild/consoleText | grep Finding\ ID
perl -pli -e 's/grcc.pdb/GRCC.pdb/g; s/metagme2uml.pdb/MetaGME2UML.pdb/g; s/codegenerator.pdb/CodeGenerator.pdb/g; s/grd_interpreter.pdb/GRD_interpreter.pdb/g; s/generatecfgmodel.pdb/GenerateCfgModel.pdb/g; s/generateconfig.pdb/GenerateConfig.pdb/g; s/generategr.pdb/GenerateGR.pdb/g; s/generategrc.pdb/GenerateGRC.pdb/g; s/great master interpreter.pdb/GReAT Master Interpreter.pdb/g; s/libraryupdate.pdb/LibraryUpdate.pdb/g; s/umtdecorator.pdb/UMTDecorator.pdb/g; s/umthelper.pdb/UMTHelper.pdb/g; s/legacyupdate.pdb/LegacyUpdate.pdb/g; s/blockify.pdb/Blockify.pdb/g; s/createrule.pdb/CreateRule.pdb/g; ' symbolstmp/000Admin/0000011732
ssh kms1 'cd symbolstmp && python ~/bin/pdb_promote.py 0000011732' # "Finding ID"
-wget -O GReAT-1.7.8.exe http://build.isis.vanderbilt.edu/job/GReAT/label=build-slave9/lastSuccessfulBuild/artifact/trunk/InnoSetup/GReAT_setup.exe
+wget -O GReAT-1.7.8.exe $build_isis.vanderbilt.edu/job/GReAT/label=build-slave9/lastSuccessfulBuild/artifact/trunk/InnoSetup/GReAT_setup.exe
svn export https://svn.isis.vanderbilt.edu/MoBIES/GReAT/tags/1.7.8 GReAT_source_r1.7.8 && \
/cygdrive/c/Program\ Files/7-Zip/7z.exe a -r GReAT_source_r1.7.8{.zip,} && \
@@ -93,5 +95,4 @@
SYMCHK: UdmCliGen.exe FAILED - Built without debugging information.
Xalan
-start /wait msiexec /I UDM_x64-3.2.12.msi /qb /Lv* UDM_x64-3.2.12.log ALLUSERS=1
-start /wait msiexec /I UDM_x64-3.2.13.msi /qb /Lv* UDM_x64-3.2.13.log ALLUSERS=1
+start /wait msiexec /I UDM_x64-3.2.14.msi /qb /Lv* UDM_x64-3.2.14.log ALLUSERS=1
Modified: UDM/trunk/WiX/Udm_inc.wxi
==============================================================================
--- UDM/trunk/WiX/Udm_inc.wxi Wed Jan 27 14:27:40 2016 (r4373)
+++ UDM/trunk/WiX/Udm_inc.wxi Wed Apr 6 10:26:28 2016 (r4374)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='windows-1252'?>
-<?define VERSIONSTR=3.2.13?>
+<?define VERSIONSTR=3.2.14?>
<Include>
<?if $(sys.BUILDARCH)=x64 ?>
<?define UpgradeCode='11CB0ED6-A45B-49FA-ABB2-A718EB5C970D'?>
Modified: UDM/trunk/configure.ac
==============================================================================
--- UDM/trunk/configure.ac Wed Jan 27 14:27:40 2016 (r4373)
+++ UDM/trunk/configure.ac Wed Apr 6 10:26:28 2016 (r4374)
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.59])
-AC_INIT([udm], [3.213])
+AC_INIT([udm], [3.214])
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 Wed Jan 27 14:27:40 2016 (r4373)
+++ UDM/trunk/debian/changelog Wed Apr 6 10:26:28 2016 (r4374)
@@ -1,3 +1,9 @@
+udm (3.2.14-ubuntu1) trusty; urgency=medium
+
+ * Udm 3.2.14
+
+ -- Kevin Smyth <kevin.m.smyth at gmail.com> Tue, 05 Apr 2016 14:12:01 -0500
+
udm (3.2.13-1ubuntu1) precise; urgency=low
* Udm 3.2.13
Modified: UDM/trunk/include/UdmBase.h
==============================================================================
--- UDM/trunk/include/UdmBase.h Wed Jan 27 14:27:40 2016 (r4373)
+++ UDM/trunk/include/UdmBase.h Wed Apr 6 10:26:28 2016 (r4374)
@@ -4247,8 +4247,8 @@
// tldr: use CHANGES_LOST_DEFAULT and CloseWithUpdate() instead
-// Version 3.2.13
+// Version 3.2.14
#define UDM_VERSION_MAJOR 3
-#define UDM_VERSION_MINOR (2 * 10 + 13 * 1)
+#define UDM_VERSION_MINOR (2 * 10 + 14 * 1)
#define UDM_VERSION UDM_VERSION_MAJOR * 100 + UDM_VERSION_MINOR
#endif//MOBIES_UDMBASE_H
Modified: UDM/trunk/releaseinfo.txt
==============================================================================
--- UDM/trunk/releaseinfo.txt Wed Jan 27 14:27:40 2016 (r4373)
+++ UDM/trunk/releaseinfo.txt Wed Apr 6 10:26:28 2016 (r4374)
@@ -1,14 +1,14 @@
-Copyright (c) Vanderbilt University, 2001-2014
+Copyright (c) Vanderbilt University, 2001-2016
ALL RIGHTS RESERVED
** UDM : Universal Data Model **
** Software Requirements **
-1. Windows Operating system (XP, Vista, 7)
+1. Windows Operating system (XP or later)
NOTE: Udm can also be used on Linux
-2. GME 14, 14.3.5 from: http://repo.isis.vanderbilt.edu/GME/
+2. GME, 16.3.23 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, 2012, or 2015
@@ -20,7 +20,7 @@
PLEASE DOWNLOAD AND INSTALL 2 and 3 before proceeding.
** Changelog **
- - Next Release
+ - Release 3.2.14 (4/6/2016)
- UdmDll is backwards compatible with previous 3.2 releases
- UdmDll: Visual Studio 2012 and 2015 support
- UdmGme: fix getParent with role parameter: check for Folder parent to prevent crash
More information about the Mobies-commit
mailing list