[Winmerge-svn] SF.net SVN: winmerge:[6799] trunk/Src
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2009-05-28 20:45:23
|
Revision: 6799 http://winmerge.svn.sourceforge.net/winmerge/?rev=6799&view=rev Author: kimmov Date: 2009-05-28 20:45:15 +0000 (Thu, 28 May 2009) Log Message: ----------- Fix pre/postbuild batch files to work when VS2005/VS2008 devenv is called from command line. Modified Paths: -------------- trunk/Src/PostBuild.bat trunk/Src/PreLink.bat Modified: trunk/Src/PostBuild.bat =================================================================== --- trunk/Src/PostBuild.bat 2009-05-28 18:29:52 UTC (rev 6798) +++ trunk/Src/PostBuild.bat 2009-05-28 20:45:15 UTC (rev 6799) @@ -1,6 +1,17 @@ @echo off -if "%_ACP_ATLPROV%" == "" goto _MSDEV_BLD_ENV_(%_MSDEV_BLD_ENV_%) +REM $Id$ + +REM _ACP_ATLPROV is set by VS2005/VS2008 when compiling in IDE. But it is NOT +REM set when calling devenv from command line. + +REM This detects if the script is called from VS2003 or from IDE +if NOT "%_ACP_ATLPROV%" == "" goto IDEBuild + +REM This detects if the script is called from VS2005/VS2008 cmd line env +if "%VCBuildHelper_Command%" == "" goto _MSDEV_BLD_ENV_(%_MSDEV_BLD_ENV_%) + +:IDEBuild :_MSDEV_BLD_ENV_(1) cd REM Enable echo lines below if you need to debug this script Modified: trunk/Src/PreLink.bat =================================================================== --- trunk/Src/PreLink.bat 2009-05-28 18:29:52 UTC (rev 6798) +++ trunk/Src/PreLink.bat 2009-05-28 20:45:15 UTC (rev 6799) @@ -6,8 +6,17 @@ REM _ACP_ATLPROV was introduced in VC7. If not set, assume VC6. REM _MSDEV_BLD_ENV_ was removed in VC8. Don't care about it if _ACP_ATLPROV is set. +REM _ACP_ATLPROV is set by VS2005/VS2008 when compiling in IDE. But it is NOT +REM set when calling devenv from command line. -if "%_ACP_ATLPROV%" == "" goto _MSDEV_BLD_ENV_(%_MSDEV_BLD_ENV_%) +REM This detects if the script is called from VS2003 or from IDE +if NOT "%_ACP_ATLPROV%" == "" goto IDEBuild + +REM This detects if the script is called from VS2005/VS2008 cmd line env +if "%VCBuildHelper_Command%" == "" goto _MSDEV_BLD_ENV_(%_MSDEV_BLD_ENV_%) + +:IDEBuild + set msdev=rem set devenv=devenv goto Configure This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |