From f215a081eb41648b7b7fb84794341c71a552b408 Mon Sep 17 00:00:00 2001 From: soochoi Date: Fri, 29 Jun 2007 20:50:25 +0000 Subject: [PATCH] CASA Windows - change in buildu.sh to bump up msi version correctly --- CASA/build_config/win64/buildu.sh | 2 +- CASA/build_config/win64/builduser.cmd | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CASA/build_config/win64/buildu.sh b/CASA/build_config/win64/buildu.sh index 464adabf..74cb0e68 100755 --- a/CASA/build_config/win64/buildu.sh +++ b/CASA/build_config/win64/buildu.sh @@ -8,7 +8,7 @@ echo "=============================================" echo " START - Build casa" echo "=============================================" -/usr/bin/rsh -n -d -l nds_cm localhost 'cd /d c:\cygwin\home\nds_cm\build_win\casa~1.7\CASA\ && build_config\win64\builduser.cmd' +/usr/bin/rsh -n -d -l nds_cm localhost "set SVN_REVISION=$SVN_REVISION&& cd /d c:\cygwin\home\nds_cm\build_win\casa~1.7\CASA\ && build_config\win64\builduser.cmd" echo "Status: $?" diff --git a/CASA/build_config/win64/builduser.cmd b/CASA/build_config/win64/builduser.cmd index 530d27ed..3f849790 100755 --- a/CASA/build_config/win64/builduser.cmd +++ b/CASA/build_config/win64/builduser.cmd @@ -6,10 +6,13 @@ set casa_root_dir=%cd% rem Do a free (retail) build setlocal call "C:\Program Files (x86)\Microsoft Visual Studio 2005\VC\bin\amd64\vcvarsamd64.bat" +echo "%SVN_REVISION%" cd /d %casa_root_dir% cd package\windows\vs_solutions\CASA32-msi ..\..\..\..\tools\w32\VersionVDProj\bin\VersionVDProj.exe -msi CASA.vdproj version=1.7.%SVN_REVISION% + +cd /d %casa_root_dir% cd package\windows\vs_solutions\CASA64-msi ..\..\..\..\tools\w32\VersionVDProj\bin\VersionVDProj.exe -msi CASA64.vdproj version=1.7.%SVN_REVISION% devenv /rebuild Release CASA-64-32.sln /out build.log