[pytango] 347/483: Little changes to compile on Windows

[Sandor Bodo-Merle]

This is an automated email from the git hooks/post-receive script.

sbodomerle-guest pushed a commit to annotated tag bliss_8.10
in repository pytango.

commit bc4ae989e0e3ccb19ed39b08a4afed04b08ee771
Author: cmft <cmft at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Thu Jan 16 14:23:24 2014 +0000

    Little changes to compile on Windows
    
    git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@24725 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
 ci/ESRF/build.sh                | 22 ++++++++++++----------
 win/PyTango_VS9/PyTango.vsprops |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ci/ESRF/build.sh b/ci/ESRF/build.sh
index 63cec78..1b35769 100755
--- a/ci/ESRF/build.sh
+++ b/ci/ESRF/build.sh
@@ -32,25 +32,27 @@ case "${realos}" in
 	"windows7")
 		cd /cygdrive/c
         export PATH=$PATH:/cygdrive/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 9.0/Common7/IDE 
-        export PATH=$PATH:/cygdrive/c/Windows/Microsoft.Net/Framework64/v4.0.30319
-		/bin/rm -rf /cygdrive/c/Temp/pytango
+        #export PATH=$PATH:/cygdrive/c/Windows/Microsoft.Net/Framework64/v4.0.30319
+		/bin/rm -rf /cygdrive/c/pytango
 		LIBNAME="PyTango.vcproj"
-		pyVersion="py26, py27, py33"
-		platform="Win32, x64"
+		pyVersion="py26 py27"
+		platform="Win32 x64"
 		SLN="C:\jenkins\workspace\PyTango\OperatingSystems\Windows64-VC10\win\PyTango_VS9\PyTango.sln"
 		LIBNAME="PyTango.vcproj"
-		#devenv="\cygdrive\c\Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 9.0/Common7/IDE/devenv.exe"
 		for pv in $pyVersion
 		do
 		    for p in $platform
 		    do
 		        pyN=${pv:2:4}
 			    MODE=$pv"_bopystatic_tangostatic_release|"$p
-			    OUTFILE="c:/Temp/log_${p}_"${pyN}
+			    OUTFILE="c:/Temp/log_"${p}"_"${pyN}
+                echo "BUILD_"$pv"_"$p
                 if [ "$pyN" -eq 33 ]
                 then
-                    SLN="C:\jenkins\workspace\PyTango\OperatingSystems\Windows64-VC10\win\PyTango_VS10\PyTango.sln"
-			        MAKE_CMD="MSBuild.exe $SLN /project PyTango.vcproj /rebuild $MODE /projectconfig $MODE /out $OUTFILE"
+                    SLN="C:\jenkins\workspace\PyTango\OperatingSystems\Windows64-VC10\win\PyTango_VS10"
+					MODE=$pv"_bopystatic_tangostatic_release"
+					MAKE_CMD="MSBuild.exe $SLN/PyTango.vcxproj /p:Platform=$p /t:rebuild /p:Configuration=$MODE /v:quiet /flp:LogFile=$OUTFILE;Summary;ShowCommandLine;Verbosity=minimal"
+                    #MsBuild.exe $SLN /t:Rebuild /p:Configuration=py33_bopystatic_tangostatic_release /p:Platform=x86 /flp:LogFile=C:/Temp/log_
                 else          
 			        MAKE_CMD="devenv.exe $SLN /project PyTango.vcproj /rebuild $MODE /projectconfig $MODE /out $OUTFILE"
                 fi
@@ -89,8 +91,8 @@ case "${realos}" in
     "windows7"*)
 		INSTALL_DIR="//unixhome/segfs/tango/ci/PyTango/windows7"
 		/bin/rm -rf $INSTALL_DIR/* || echo "Error executing rm command"
-        /bin/cp -rf /cygdrive/c/Temp/pytango/build_8.1.0_tg8.1.2_boost1.53.0/lib  $INSTALL_DIR || echo "Error executing cp command, LIB"
-		/bin/cp -rf /cygdrive/c/Temp/pytango/build_8.1.0_tg8.1.2_boost1.53.0/dist  $INSTALL_DIR || echo "Error executing cp command, DIST"
+        /bin/cp -rf /cygdrive/c/pytango/build_8.1.2_tg8.1.2_boost1.53.0/lib  $INSTALL_DIR || echo "Error executing cp command, LIB"
+		/bin/cp -rf /cygdrive/c/pytango/build_8.1.2_tg8.1.2_boost1.53.0/dist  $INSTALL_DIR || echo "Error executing cp command, DIST"
 		/bin/chmod -R 755  $INSTALL_DIR || echo "Error executing chmod command"
         ;;
 	*)
diff --git a/win/PyTango_VS9/PyTango.vsprops b/win/PyTango_VS9/PyTango.vsprops
index 8b03682..26a613f 100644
--- a/win/PyTango_VS9/PyTango.vsprops
+++ b/win/PyTango_VS9/PyTango.vsprops
@@ -108,7 +108,7 @@
     <UserMacro Name="BoostVer" Value="$(BoostMajorVer).$(BoostMinorVer).$(BoostPatchVer)" />
   
     <!-- Tiago Coutinho personal configuration -->
-    <-- <UserMacro Name="RootDir" Value="C:\Users\coutinho\bin" /> -->
+    <!-- <UserMacro Name="RootDir" Value="C:\Users\coutinho\bin" /> -->
     <UserMacro Name="RootDir" Value="C:" />
 
     <UserMacro Name="TangoBaseDir" Value="$(RootDir)\tango-$(TangoVer)" />

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git