[Spice-devel] [PATCH 05/12] build.bat: fix copy to install dir for amd64

[Alon Levy]

On 04/30/2014 07:32 PM, Marc-André Lureau wrote:
> 
> 
> ----- Original Message -----
>> ---
>>  xddm/build.bat | 14 ++++++++++----
>>  1 file changed, 10 insertions(+), 4 deletions(-)
>>
>> diff --git a/xddm/build.bat b/xddm/build.bat
>> index 1d19875..7dfe51b 100755
>> --- a/xddm/build.bat
>> +++ b/xddm/build.bat
>> @@ -16,6 +16,12 @@ if not DEFINED SPICE_COMMON_DIR (
>>   set SPICE_COMMON_DIR=%CD%\..\spice-protocol
>>  )
>>  
>> +if defined AMD64 (
>> +  set BUILD_ALT_DIR_SUBDIR=amd64
>> +) else (
>> +  set BUILD_ALT_DIR_SUBDIR=i386
>> +)
> 
> ARCH_DIR? that would make less confusion with the other variable BUILD_ALT_DIR
> 

This is on purpose, there is already a _BUILDARCH defined as x86/AMD64
as opposed to i386/amd64 (no environment variable provided by ddk batch
'setenv.bat' with this value), and we concatenate this value to
BUILD_ALT_DIR, hence BUILD_ALT_DIR_SUBDIR.

>> +
>>  set TARGET=install_%BUILD_ALT_DIR%
>>  echo TARGET=%TARGET%
>>  if not exist %TARGET% mkdir %TARGET%
>> @@ -30,11 +36,11 @@ build -cZg
>>  cd ../
>>  
>>  :copy_local
>> -copy display\obj%BUILD_ALT_DIR%\i386\qxldd.dll %TARGET%
>> -copy miniport\obj%BUILD_ALT_DIR%\i386\qxl.sys %TARGET%
>> +copy display\obj%BUILD_ALT_DIR%\%BUILD_ALT_DIR_SUBDIR%\qxldd.dll %TARGET%
>> +copy miniport\obj%BUILD_ALT_DIR%\%BUILD_ALT_DIR_SUBDIR%\qxl.sys %TARGET%
>>  copy miniport\qxl.inf %TARGET%
>> -copy display\obj%BUILD_ALT_DIR%\i386\qxldd.pdb %TARGET%
>> -copy miniport\obj%BUILD_ALT_DIR%\i386\qxl.pdb %TARGET%
>> +copy display\obj%BUILD_ALT_DIR%\%BUILD_ALT_DIR_SUBDIR%\qxldd.pdb %TARGET%
>> +copy miniport\obj%BUILD_ALT_DIR%\%BUILD_ALT_DIR_SUBDIR%\qxl.pdb %TARGET%
>>  if not defined DEST goto exit
>>  if exist %DEST% (
>>   echo copying to %DEST%
>> --
>> 1.9.0
>>
>> _______________________________________________
>> Spice-devel mailing list
>> Spice-devel at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/spice-devel
>>