Stepan Mishura wrote:
On 3/1/07, Gregory Shimansky wrote:
Stepan Mishura wrote:
> Hi Gregory,
>
> Your commit broke my script for building snapshot :-)
>
> What I should do if Mirosoft Visual Studio is located on D:?
Does it help to set CXX=msvc?
No, it doesn't because COMPILER_CFG_SCRIPT env. value is ignored now. For
example, federated build sets it:
<env key="CXX" value="msvc"/>
but it won't work if Microsoft Visual Studio was installed to non-standard
location.
Now I see what you are talking about.
I suggest reverting the commit a bit - if COMPILER_CFG_SCRIPT is defined
goto to configuring.
Agreed. I like the change. Could you commit it yourself?
For example,
Index: working_vm/build/build.bat
===================================================================
--- working_vm/build/build.bat (revision 513119)
+++ working_vm/build/build.bat (working copy)
@@ -47,6 +47,8 @@
GOTO DEFAULT_COMPILER
:MSVC_COMPILER
+IF DEFINED COMPILER_CFG_SCRIPT GOTO CHOOSE_ARGS
+
REM Try Platform SDK first
SET COMPILER_CFG_SCRIPT=C:\Program Files\Microsoft Platform SDK\SetEnv.Cmd
IF EXIST "%COMPILER_CFG_SCRIPT%" GOTO CHOOSE_ARGS
@@ -79,14 +81,18 @@
)
)
+IF DEFINED COMPILER_CFG_SCRIPT GOTO RUN_COMPILER_CONFIGURATION
SET COMPILER_CFG_SCRIPT=C:\Program
Files\Intel\Compiler\C++\9.0\IA32\Bin\iclvars.bat
IF EXIST "%COMPILER_CFG_SCRIPT%" GOTO RUN_COMPILER_CONFIGURATION
GOTO NO_CFG_SCRIPT
:X86_64_CONFIG
+SET PLATFORM_64BIT=amd64
+
+IF DEFINED COMPILER_CFG_SCRIPT GOTO RUN_COMPILER_CONFIGURATION
+
REM Select Microsoft Visual Studio 2005 on Windows x64 edition
SET COMPILER_CFG_SCRIPT=C:\Program Files (x86)\Microsoft Visual Studio
8\VC\vcvarsall.bat
-SET PLATFORM_64BIT=amd64
IF EXIST "%COMPILER_CFG_SCRIPT%" GOTO RUN_COMPILER_CONFIGURATION
:NO_CFG_SCRIPT
-Stepan.
-----Original Message-----
> From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
> Sent: Wednesday, February 28, 2007 9:31 PM
> To: [EMAIL PROTECTED]
> Subject: svn commit: r512802 -
> /harmony/enhanced/drlvm/trunk/build/build.bat
>
> Author: gshimansky
> Date: Wed Feb 28 07:30:41 2007
> New Revision: 512802
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=512802
> Log:
> Applied HARMONY-3255 [drlvm][winx64][build] COMPILER_CFG_SCRIPT must be
set
> automatically
>
> Build seems to work ok on both x86 and x86_64 windows platforms
>
> Modified:
> harmony/enhanced/drlvm/trunk/build/build.bat
>
> Modified: harmony/enhanced/drlvm/trunk/build/build.bat
>
> <SNIP>
>
--
Gregory
--
Gregory
