From a3f2b40d0889ddd6622ccf91a46c3b4466e74419 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Wed, 5 Dec 2007 19:03:47 +0000 Subject: [PATCH] - WIN: Update project files to account for new directory structure. win_buld/ svn path=/trunk/boinc/; revision=14360 --- checkin_notes | 6 +++++ win_build/boinc_cli_curl.vcproj | 32 +++++++++++------------ win_build/boinc_post_bld_rules.cmd | 41 +++++++++++++++++++----------- 3 files changed, 48 insertions(+), 31 deletions(-) diff --git a/checkin_notes b/checkin_notes index 8d74dec64e..1c7b554c03 100644 --- a/checkin_notes +++ b/checkin_notes @@ -12130,3 +12130,9 @@ Rom 5 Dec 2007 zlib/ + +Rom 5 Dec 2007 + - WIN: Update project files to account for new directory structure. + + win_buld/ + diff --git a/win_build/boinc_cli_curl.vcproj b/win_build/boinc_cli_curl.vcproj index a3398aae67..9927e49b75 100644 --- a/win_build/boinc_cli_curl.vcproj +++ b/win_build/boinc_cli_curl.vcproj @@ -85,11 +85,11 @@ /> diff --git a/win_build/boinc_post_bld_rules.cmd b/win_build/boinc_post_bld_rules.cmd index d3e7fc9838..9acd14453b 100644 --- a/win_build/boinc_post_bld_rules.cmd +++ b/win_build/boinc_post_bld_rules.cmd @@ -22,55 +22,66 @@ rem FOR /F "usebackq delims==" %%I IN ('%1') DO set PROJECTROOTDIR=%%~I\.. FOR /F "usebackq delims==" %%J IN ('%2') DO set OUTPUTDIR=%%~J FOR /F "usebackq delims==" %%K IN ('%3') DO set PLATFORMNAME=%%~K - +FOR /F "usebackq delims==" %%L IN ('%4') DO set CONFIGNAME=%%~L if not exist %OUTPUTDIR%\dbghelp.dll ( - echo Coping dbghelp to the output directory... + echo Copying dbghelp to the output directory... copy "%PROJECTROOTDIR%\win_build\installerv2\redist\Windows\%PLATFORMNAME%\dbghelp.dll" "%OUTPUTDIR%" ) if not exist %OUTPUTDIR%\dbghelp95.dll ( - echo Coping dbghelp95 to the output directory... + echo Copying dbghelp95 to the output directory... copy "%PROJECTROOTDIR%\win_build\installerv2\redist\Windows\%PLATFORMNAME%\dbghelp95.dll" "%OUTPUTDIR%" ) if not exist %OUTPUTDIR%\symsrv.dll ( - echo Coping symsrv to the output directory... + echo Copying symsrv to the output directory... copy "%PROJECTROOTDIR%\win_build\installerv2\redist\Windows\%PLATFORMNAME%\symsrv.dll" "%OUTPUTDIR%" ) if not exist %OUTPUTDIR%\symsrv.yes ( - echo Coping symsrv.yes to the output directory... + echo Copying symsrv.yes to the output directory... copy "%PROJECTROOTDIR%\win_build\installerv2\redist\Windows\%PLATFORMNAME%\symsrv.yes" "%OUTPUTDIR%" ) if not exist %OUTPUTDIR%\srcsrv.dll ( - echo Coping srcsrv.dll to the output directory... + echo Copying srcsrv.dll to the output directory... copy "%PROJECTROOTDIR%\win_build\installerv2\redist\Windows\%PLATFORMNAME%\srcsrv.dll" "%OUTPUTDIR%" ) +if not exist %OUTPUTDIR%\libcurld.dll ( + echo Copying libcurld to the output directory... + copy "%PROJECTROOTDIR%\curl\mswin\%PLATFORMNAME%\%CONFIGNAME%\bin\libcurld.dll" "%OUTPUTDIR%" +) + if not exist %OUTPUTDIR%\libcurl.dll ( - echo Coping libcurl to the output directory... - copy "%PROJECTROOTDIR%\curl\mswin\%PLATFORMNAME%\bin\libcurl.dll" "%OUTPUTDIR%" + echo Copying libcurl to the output directory... + copy "%PROJECTROOTDIR%\curl\mswin\%PLATFORMNAME%\%CONFIGNAME%\bin\libcurl.dll" "%OUTPUTDIR%" ) if not exist %OUTPUTDIR%\ca-bundle.crt ( - echo Coping ca-bundle.crt to the output directory... + echo Copying ca-bundle.crt to the output directory... copy "%PROJECTROOTDIR%\curl\ca-bundle.crt" "%OUTPUTDIR%" ) if not exist %OUTPUTDIR%\libeay32.dll ( - echo Coping libeay32 to the output directory... - copy "%PROJECTROOTDIR%\openssl\mswin\%PLATFORMNAME%\bin\libeay32.dll" "%OUTPUTDIR%" + echo Copying libeay32 to the output directory... + copy "%PROJECTROOTDIR%\openssl\mswin\%PLATFORMNAME%\%CONFIGNAME%\bin\libeay32.dll" "%OUTPUTDIR%" ) if not exist %OUTPUTDIR%\ssleay32.dll ( - echo Coping ssleay32 to the output directory... - copy "%PROJECTROOTDIR%\openssl\mswin\%PLATFORMNAME%\bin\ssleay32.dll" "%OUTPUTDIR%" + echo Copying ssleay32 to the output directory... + copy "%PROJECTROOTDIR%\openssl\mswin\%PLATFORMNAME%\%CONFIGNAME%\bin\ssleay32.dll" "%OUTPUTDIR%" +) + +if not exist %OUTPUTDIR%\zlib1d.dll ( + echo Copying zlib1d to the output directory... + copy "%PROJECTROOTDIR%\zlib\mswin\%PLATFORMNAME%\%CONFIGNAME%\bin\zlib1d.dll" "%OUTPUTDIR%" ) if not exist %OUTPUTDIR%\zlib1.dll ( - echo Coping zlib1 to the output directory... - copy "%PROJECTROOTDIR%\zlib\mswin\%PLATFORMNAME%\bin\zlib1.dll" "%OUTPUTDIR%" + echo Copying zlib1 to the output directory... + copy "%PROJECTROOTDIR%\zlib\mswin\%PLATFORMNAME%\%CONFIGNAME%\bin\zlib1.dll" "%OUTPUTDIR%" ) +EXIT /B 0