From b87828d91b1f8d5d7a376d8a49069d2f6e801c58 Mon Sep 17 00:00:00 2001 From: stansmith Date: Sat, 29 Aug 2009 00:33:41 +0000 Subject: [PATCH] [WinOF] All installs now install into 'Program Files' and not 'Program Files (x86)'..Cleanup references to \Program Files (x86)\WinOF. git-svn-id: svn://openib.tc.cornell.edu/gen1@2390 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- branches/WOF2-1/WinOF/WIX/HPC/cert-add.bat | 2 +- branches/WOF2-1/WinOF/WIX/README_release.txt | 95 ++---------------- branches/WOF2-1/WinOF/WIX/Release_notes.htm | 18 ++-- branches/WOF2-1/WinOF/WIX/dat.conf | 8 +- .../WOF2-1/WinOF/WIX/ia64/Command Window.lnk | Bin 1350 -> 1368 bytes branches/WOF2-1/WinOF/WIX/win7/ia64/wof.wxs | 5 +- branches/WOF2-1/WinOF/WIX/win7/x64/wof.wxs | 5 +- branches/WOF2-1/WinOF/WIX/wlh/ia64/wof.wxs | 5 +- branches/WOF2-1/WinOF/WIX/wlh/x64/wof.wxs | 5 +- branches/WOF2-1/WinOF/WIX/wnet/ia64/wof.wxs | 5 +- branches/WOF2-1/WinOF/WIX/wnet/x64/wof.wxs | 5 +- .../WOF2-1/WinOF/WIX/x64/Command Window.lnk | Bin 1350 -> 1368 bytes .../dapl2/test/dapltest/scripts/dt-cli.bat | 6 +- .../dapl2/test/dapltest/scripts/dt-svr.bat | 6 +- 14 files changed, 45 insertions(+), 120 deletions(-) diff --git a/branches/WOF2-1/WinOF/WIX/HPC/cert-add.bat b/branches/WOF2-1/WinOF/WIX/HPC/cert-add.bat index eb3d8adb..49e3349e 100644 --- a/branches/WOF2-1/WinOF/WIX/HPC/cert-add.bat +++ b/branches/WOF2-1/WinOF/WIX/HPC/cert-add.bat @@ -41,7 +41,7 @@ set CISF=rem-cert-ADD.bat if exist "%CISF%" ( set CIS="%CD%\%CISF%" ) else ( - set CIS="%ProgramFiles(x86)%\WinOF\%CISF%" + set CIS="%ProgramFiles%\WinOF\%CISF%" ) if not exist %CIS% ( diff --git a/branches/WOF2-1/WinOF/WIX/README_release.txt b/branches/WOF2-1/WinOF/WIX/README_release.txt index 247ac77d..6c685896 100644 --- a/branches/WOF2-1/WinOF/WIX/README_release.txt +++ b/branches/WOF2-1/WinOF/WIX/README_release.txt @@ -1,15 +1,17 @@ -[8-24-09] WinOF 2.1 RC-4 release +[9-3-09] WinOF 2.1 RC-5 release -WinOF 2.1 Release Candidate #4 (RC4) is available - @ http://www.openfabrics.org/downloads/WinOF/v2.1-RC4/ +WinOF 2.1 Release Candidate #4 (RC5) is available + @ http://www.openfabrics.org/downloads/WinOF/v2.1-RC5/ Please address comments and concerns to the ofw@lists.openfabrics.org -RC4 Changes: +RC5 Changes: - All RC4 WinOF installers are signed with a new OpenFabrics Alliance Digital-ID + *** WinOF is now installed into %ProgramFiles%\WinOF on all systems/architectures! + + All RC5 WinOF installers are signed with a new OpenFabrics Alliance Digital-ID from Verisign. Only unattended installs (HPC compute nodes generally) are effected. Console installs will be prompted for an answer to the question 'Do you trust drivers from the OpenFabrics Alliance 3rd party SW Publisher?' @@ -19,7 +21,7 @@ RC4 Changes: Server 2008 HPC installs only: The implication for HPC compute node installation is the head-node script - '%ProgramFiles(x86)\WinOF\HPC\cert-add.bat' must be run to install the 'new' + '%ProgramFiles\WinOF\HPC\cert-add.bat' must be run to install the 'new' OFA cert in the compute nodes cert store prior to performing an unattended WinOF install; otherwise the unattended install attempts to prompt for an answer to 'Do you trust the OpenFabrics Alliance 3rd party SW Publisher?' @@ -29,81 +31,6 @@ Server 2008 HPC installs only: SVN Commits -2381 - [WinOF] RC4 staging; again. - Modified : /gen1/branches/WOF2-1/WinOF/buildrelease.bat - Modified : /gen1/branches/WOF2-1/WinOF/Wix/ReadMe_release.txt - Modified : /gen1/branches/WOF2-1/WinOF/Wix/Release_notes.htm - -2380 - [LIBRDMACM] Fix a potential race with ucma_init() and calls that check whether the library - is ready for use. - Modified : /gen1/branches/WOF2-1/ulp/librdmacm/src/cma.cpp - -2379 - [WinOF] OFA Digital-ID expired 8/20/09, added new OFA cert signature so the 'new' cert can - be added to compute nodes cert store. - Modified : /gen1/branches/WOF2-1/WinOF/WIX/HPC/cert-add.bat - -2372 - [DAPL2] Completion Channel refactoring - Modified : /gen1/branches/WOF2-1/etc/user/comp_channel.cpp - Modified : /gen1/branches/WOF2-1/inc/user/comp_channel.h - Modified : /gen1/branches/WOF2-1/ulp/dapl2/dapl/openib_cma/device.c - Modified : /gen1/branches/WOF2-1/ulp/dapl2/dapl/openib_scm/device.c - -2371 - [DAPL2] dapltest.exe: yield the processor as the Windows thread scheduler will starve other - threads unlike the Linux scheduler. - Modified : /gen1/branches/WOF2-1/ulp/dapl2/test/dapltest/mdep/linux/dapl_mdep_user.h - Modified : /gen1/branches/WOF2-1/ulp/dapl2/test/dapltest/mdep/solaris/dapl_mdep_user.h - Modified : /gen1/branches/WOF2-1/ulp/dapl2/test/dapltest/mdep/windows/dapl_mdep_user.h - Modified : /gen1/branches/WOF2-1/ulp/dapl2/test/dapltest/test/dapl_test_util.c - -2370,2369 [WIX] - wix\win7\x64\wof.wxs: added comment indicating Win7_x64 installer was for Server 2008 R2 also. - WIX/build-OFA-dist.bat: update usage instructions to reflect WinOF is now under Trunk\ and - no longer under branches. - -2368 - [DAPL2] dt-cli.bat: %ERRORLEVEL% inside a for loop does not evaluate as expected; change to !ERRORLEVEL! -2367 - [DOCS] manual.htm: Update DAPL provider text w.r.t. names in DAT.conf file. -2364 - [IPOIB] IPoIB PXE boot support: Clear remainder of chaddr - The IPoIB PXE boot firmware (gPXE) now sends the 8-byte port GUID in - the DHCP chaddr field. WinOF replaces the first 6 bytes of chaddr - with the Ethernet-style MAC address, but leaves the remain untouched. - This results in trailing garbage after the Ethernet-style MAC in the modified chaddr. - Fix by explicitly zeroing the remainder of chaddr. - Modified : /gen1/branches/WOF2-1/ulp/ipoib/kernel/ipoib_port.c - -2363 - [IBAT] allow simultaneous IBAT device access from user mode by adding RW sharing - attributes to CreateFileW() call. - Modified : /gen1/branches/WOF2-1/core/ibat/user/ibat.cpp -2362 - [LIBRDMACM] retry IBAT call on E_PENDING return. - Modified : /gen1/branches/WOF2-1/ulp/librdmacm/src/cma.cpp - -2361 - [MLX4] on catastrophic error, dump error buffer before reset. [winof: 2358] - Modified : /gen1/branches/WOF2-1/hw/mlx4/kernel/bus/net/catas.c - -2360 - [MLX4] bug fix in error flow: doesn't return error on allocation failure. [winof: 2356] - Modified : /gen1/branches/WOF2-1/hw/mlx4/kernel/bus/core/l2w_umem.c - -2359 - [IBAL] fix to 2226. cause an asynchronic event to be handled immediately (and not after SMI_POLL_INTERVAL, - which is 20 secs) - Modified : /gen1/branches/WOF2-1/core/al/al_ci_ca_shared.c - Modified : /gen1/branches/WOF2-1/core/al/kernel/al_pnp.c - -2353 - [ND provider] patch to fix to 2333. Eemove a facility to define MaxDataInlineSize from application, - because it breaks MS API - [ND porvider] Improved latency of ND provider by using INLINE send. [winof: 2333, 2352] - This patch adds usage of INLINE DATA facility of Mellanox HCAs for improving latency of ND provider. - Ideas of the patch: - - by default, ND provider will create QP with inline data of 160 bytes; - (this can enlarge user's QP size) - - one can change this default by defining environment variable IBNDPROV_MAX_INLINE_SIZE; - - Modified : /gen1/branches/WOF2-1/ulp/nd/user/NdEndpoint.cpp - Modified : /gen1/branches/WOF2-1/ulp/nd/user/NdEndpoint.h - Modified : /gen1/branches/WOF2-1/ulp/nd/user/NdProv.cpp - -2351 - [IPOIB] Prevent a BSOD which happens when restarting the opensm more than once - (if the local endpoint was not in the lid_endpts list). - Modified : /gen1/branches/WOF2-1/ulp/ipoib/kernel/ipoib_port.c - Modified : /gen1/trunk/ulp/ipoib/kernel/ipoib_port.c WinOF 2.1 Summary @@ -166,17 +93,17 @@ WinOF 2.1 Summary are not processed during the WinOF install. The base assumption is the WDM node provisioning template (see cluster Manager) will install HCA drivers. All other WinOF files are installed - to the standard WinOF location '%ProgramFiles(x86)%\WinOF'. + to the standard WinOF location '%ProgramFiles%\WinOF'. When uninstalling a WinOF install which was done with NODRV=1, you MUST include NODRV=1 on the msiexec.exe uninstall command line or the uninstall will uninstall HCA drivers installed via WDM templates. Incorporating a msiexec based WinOF install into a node provisioning template works well. - See examples '%ProgramFiles(x86)%\WinOF\HPC\ReadMe-HPC.txt' + See examples '%ProgramFiles%\WinOF\HPC\ReadMe-HPC.txt' For 'first' time HPC WinOF installs or node provisioning with WinOF drivers - via WDM, the batch script cert-add.bat, in '%ProgramFiles(x86)%\WinOF\HPC', + via WDM, the batch script cert-add.bat, in '%ProgramFiles%\WinOF\HPC', should be utilized to extract the 3rd Party Software Publisher certificate from the WinOF_2-1_wlh_x64.msi installer and inserted in all compute nodes certificate store. diff --git a/branches/WOF2-1/WinOF/WIX/Release_notes.htm b/branches/WOF2-1/WinOF/WIX/Release_notes.htm index 71df1caf..99d70931 100644 --- a/branches/WOF2-1/WinOF/WIX/Release_notes.htm +++ b/branches/WOF2-1/WinOF/WIX/Release_notes.htm @@ -92,7 +92,7 @@ src=openfabrics.gif>

2.1 Release Notes

-08/24/2009

+08/28/2009
@@ -150,7 +150,7 @@ InfiniBand fabric.

 Binary files generated from the OpenIB-windows developers subversion (svn) source tree -'svn://openib.tc.cornell.edu' +'svn://openib.tc.cornell.edu' (branches\WOF2-1 svn revision 2381) are packaged into a WIX 2.0 (Windows Installer Xml) single file install package referred to as the @@ -322,15 +322,15 @@ Current HCA firmware version can be viewed from the 'vstat' command.

Installation Notes

-

User mode tools and diagnostics are installed in '%SystemDrive%\Program -Files (x86)\WinOF'.  Although device driver modules initially reside in -'%SystemDrive%\Program Files (x86)\WinOF\Drivers', when installed the Windows device +

User mode tools and diagnostics are installed in '%SystemDrive%\Program +Files\WinOF'.  Although device driver modules initially reside in +'%SystemDrive%\Program Files\WinOF\Drivers', when installed the Windows device installer copies driver files to %SystemRoot%\system32 & %SystemRoot%\SysWOW64'. DAT & DAPL runtime libraries are installed into %SystemRoot% in order to be accessible to user mode applications.
WinOF user mode executables are designed to be run from a Command Prompt window; see  'Start->Program Files-> Windows OpenFabrics-> Command Prompt'.

-

'%SystemDrive%\Program Files (x86)\WinOF' is appended to the system wide search +

'%SystemDrive%\Program Files\WinOF' is appended to the system wide search path environment variable 'PATH'; new command windows created after the installation will have the updated %PATH% environment variable, hence will be able to access WinOF executables.

@@ -1094,7 +1094,7 @@ check for your desired adapter ordering.

Adapters-> OpenFabrics IPoIB Adapter-> Properties-> Driver-> Details
    The subversion (svn) revision number will be listed under 'Driver Version'. The svn revision number will match what's listed in the release notes. -
  • Hold the mouse point over \Program Files(x86)\WinOF\ib_read_bw.exe to display +
  • Hold the mouse point over \Program Files\WinOF\ib_read_bw.exe to display the file version; [WinOF-Major.Minor.not-used.svn revision number].
      • @@ -1208,7 +1208,7 @@ folder (a.k.a. \Windows).

      a template configuration file will be installed as '%SystemDrive%\DAT\dat.conf'.
      In order to preserve existing installations, the dat.conf file is not automatically installed if '%SystemDrive%\DAT\dat.conf' exists.
      -A sample dat.conf file is always installed as '\Program Files (x86)\WinOF\dat.conf +A sample dat.conf file is always installed as '\Program Files\WinOF\dat.conf '.

      The default DAT configuration file specification can be overridden by use of the environment variable DAT_OVERRIDE. Such that 'DAT_OVERRIDE=D:\MyDAT\test.conf' @@ -1222,7 +1222,7 @@ library file specification must be contained within double-quotes. A side effect of the double-quotes is the library specification is treated as a Windows string which implies the '\' (backslash character) is treated as an 'escape' character.  Hence all backslashes in the library path must be duplicated when enclosed in -double-quotes (e.g., "C:\\Programs Files (x86)\\WinOF\\dapl.dll").

      +double-quotes (e.g., "C:\\Programs Files\\WinOF\\dapl.dll").

      DAT/DAPL version 2.0 runtime libraries are identified as dat2.dll and dapl2.dll, both in %SystemRoot%; see manual for further details.
      diff --git a/branches/WOF2-1/WinOF/WIX/dat.conf b/branches/WOF2-1/WinOF/WIX/dat.conf index 3dfce3a9..b8419f2a 100644 --- a/branches/WOF2-1/WinOF/WIX/dat.conf +++ b/branches/WOF2-1/WinOF/WIX/dat.conf @@ -14,7 +14,7 @@ ibnic0 u1.1 threadsafe default C:\Windows\dapl.dll ri.1.1 "IbalHca0 1" "" IbalHca0 u1.1 threadsafe default C:\Windows\dapl.dll ri.1.1 "IbalHca0 1" "" # # DAT 1.1 debug -ibnic0d u1.1 threadsafe default "C:\\Program Files (x86)\\WinOF\\dapld.dll" ri.1.1 "IbalHca0 1" "" +ibnic0d u1.1 threadsafe default "C:\\Program Files\\WinOF\\dapld.dll" ri.1.1 "IbalHca0 1" "" # # DAT 2.0 ibnic0v2 u2.0 nonthreadsafe default C:\Windows\dapl2.dll ri.2.0 "IbalHca0 1" "" @@ -22,18 +22,18 @@ ibnic1v2 u2.0 nonthreadsafe default C:\Windows\dapl2.dll ri.2.0 "IbalHca1 1" "" IbalHca0v2 u2.0 nonthreadsafe default C:\Windows\dapl2.dll ri.2.0 "IbalHca0 1" "" # # DAT 2.0 (debug) -ibnic0v2d u2.0 nonthreadsafe default "C:\\Program Files (x86)\\WinOF\\dapl2d.dll" ri.2.0 "IbalHca0 1" "" +ibnic0v2d u2.0 nonthreadsafe default "C:\\Program Files\\WinOF\\dapl2d.dll" ri.2.0 "IbalHca0 1" "" # # DAT 2.0 [socket-cm] InfiniBand QPs setup by passing QP info over a socket # connection; supports DAT Windows <==> Linux over IB connections. ibnic0v2-scm u2.0 nonthreadsafe default C:\Windows\dapl2-ofa-scm.dll ri.2.0 "ibv_device0 1" "" # # Socket-CM (debug) -ibnic0v2-scmd u2.0 nonthreadsafe default "C:\\Program Files (x86)\\WinOF\\dapl2-ofa-scmd.dll" ri.2.0 "ibv_device0 1" "" +ibnic0v2-scmd u2.0 nonthreadsafe default "C:\\Program Files\\WinOF\\dapl2-ofa-scmd.dll" ri.2.0 "ibv_device0 1" "" # # DAT 2.0 RDMA-CM # connection; supports DAT Windows <==> Linux over IB connections. ibnic0v2-cma u2.0 nonthreadsafe default C:\Windows\dapl2-ofa-cma.dll ri.2.0 "rdma_dev0 1" "" # # DAT 2.0 RDMA-CM (debug) -ibnic0v2-cmad u2.0 nonthreadsafe default "C:\\Program Files (x86)\\WinOF\\dapl2-ofa-cmad.dll" ri.2.0 "rdma_dev0 1" "" +ibnic0v2-cmad u2.0 nonthreadsafe default "C:\\Program Files\\WinOF\\dapl2-ofa-cmad.dll" ri.2.0 "rdma_dev0 1" "" diff --git a/branches/WOF2-1/WinOF/WIX/ia64/Command Window.lnk b/branches/WOF2-1/WinOF/WIX/ia64/Command Window.lnk index 51cf55050a5ac4a90efd92bf6aeb8d4624ce0973..662fc9c70181440afd3891ef2dc96974c9a508d9 100644 GIT binary patch delta 78 zcmX@cb%Sd|7bBy{ttx9AE$eVJ4Qz4;gdofi#E<5>ElD$@x8@rVxmc)j0sgL26PyhcipOgUEpdN`T@` zlN)Nll0g0gAYXn*16=Qp4-kDUj0_Ab-ayzOb3mZu?@#6=lK8~3X+4dSzd)RThx9lcK~9Um*LDdFT$D6%h`e1*MT%h zE65UFm>~?D3h+54+J1RelqsulTWY|fP)hN!Ax)~ diff --git a/branches/WOF2-1/WinOF/WIX/win7/ia64/wof.wxs b/branches/WOF2-1/WinOF/WIX/win7/ia64/wof.wxs index 886ed36c..c792afc2 100644 --- a/branches/WOF2-1/WinOF/WIX/win7/ia64/wof.wxs +++ b/branches/WOF2-1/WinOF/WIX/win7/ia64/wof.wxs @@ -23,7 +23,8 @@ Description="WinOF Installer" Comments="Windows OpenFabrics Alliance InfiniBand stack" Manufacturer="OpenFabrics Alliance" InstallerVersion="200" - Languages="1033" Compressed="yes" SummaryCodepage="1252" /> + Platforms="Intel64" Languages="1033" + Compressed="yes" SummaryCodepage="1252" /> AdminUser @@ -49,7 +50,7 @@ Name="WinOF" /> - + diff --git a/branches/WOF2-1/WinOF/WIX/win7/x64/wof.wxs b/branches/WOF2-1/WinOF/WIX/win7/x64/wof.wxs index 2ff84e19..e8c0228a 100644 --- a/branches/WOF2-1/WinOF/WIX/win7/x64/wof.wxs +++ b/branches/WOF2-1/WinOF/WIX/win7/x64/wof.wxs @@ -23,7 +23,8 @@ Description="WinOF Installer" Comments="Windows OpenFabrics Alliance InfiniBand stack" Manufacturer="OpenFabrics Alliance" InstallerVersion="200" - Languages="1033" Compressed="yes" SummaryCodepage="1252" /> + Platforms="x64" Languages="1033" + Compressed="yes" SummaryCodepage="1252" /> Privileged @@ -49,7 +50,7 @@ Name="WinOF" /> - + diff --git a/branches/WOF2-1/WinOF/WIX/wlh/ia64/wof.wxs b/branches/WOF2-1/WinOF/WIX/wlh/ia64/wof.wxs index 3089a99c..bf116ea9 100644 --- a/branches/WOF2-1/WinOF/WIX/wlh/ia64/wof.wxs +++ b/branches/WOF2-1/WinOF/WIX/wlh/ia64/wof.wxs @@ -23,7 +23,8 @@ Description="WinOF Installer" Comments="Windows OpenFabrics Alliance InfiniBand stack" Manufacturer="OpenFabrics Alliance" InstallerVersion="200" - Languages="1033" Compressed="yes" SummaryCodepage="1252" /> + Platforms="Intel64" Languages="1033" + Compressed="yes" SummaryCodepage="1252" /> AdminUser @@ -50,7 +51,7 @@ Name="WinOF" /> - + diff --git a/branches/WOF2-1/WinOF/WIX/wlh/x64/wof.wxs b/branches/WOF2-1/WinOF/WIX/wlh/x64/wof.wxs index ea2583ea..1f644936 100644 --- a/branches/WOF2-1/WinOF/WIX/wlh/x64/wof.wxs +++ b/branches/WOF2-1/WinOF/WIX/wlh/x64/wof.wxs @@ -23,7 +23,8 @@ Description="WinOF Installer" Comments="Windows OpenFabrics Alliance InfiniBand stack" Manufacturer="OpenFabrics Alliance" InstallerVersion="200" - Languages="1033" Compressed="yes" SummaryCodepage="1252" /> + Platforms="x64" Languages="1033" + Compressed="yes" SummaryCodepage="1252" /> Privileged @@ -50,7 +51,7 @@ Name="WinOF" /> - + diff --git a/branches/WOF2-1/WinOF/WIX/wnet/ia64/wof.wxs b/branches/WOF2-1/WinOF/WIX/wnet/ia64/wof.wxs index f51da3d1..264453a1 100644 --- a/branches/WOF2-1/WinOF/WIX/wnet/ia64/wof.wxs +++ b/branches/WOF2-1/WinOF/WIX/wnet/ia64/wof.wxs @@ -23,7 +23,8 @@ Description="WinOF Installer" Comments="Windows OpenFabrics Alliance InfiniBand stack" Manufacturer="OpenFabrics Alliance" InstallerVersion="200" - Languages="1033" Compressed="yes" SummaryCodepage="1252" /> + Platforms="Intel64" Languages="1033" + Compressed="yes" SummaryCodepage="1252" /> Privileged @@ -49,7 +50,7 @@ Name="WinOF" /> - + diff --git a/branches/WOF2-1/WinOF/WIX/wnet/x64/wof.wxs b/branches/WOF2-1/WinOF/WIX/wnet/x64/wof.wxs index 093773ca..13e23ea1 100644 --- a/branches/WOF2-1/WinOF/WIX/wnet/x64/wof.wxs +++ b/branches/WOF2-1/WinOF/WIX/wnet/x64/wof.wxs @@ -23,7 +23,8 @@ Description="WinOF Installer" Comments="Windows OpenFabrics Alliance InfiniBand stack" Manufacturer="OpenFabrics Alliance" InstallerVersion="200" - Languages="1033" Compressed="yes" SummaryCodepage="1252" /> + Platforms="x64" Languages="1033" + Compressed="yes" SummaryCodepage="1252" /> Privileged @@ -49,7 +50,7 @@ Name="WinOF" /> - + diff --git a/branches/WOF2-1/WinOF/WIX/x64/Command Window.lnk b/branches/WOF2-1/WinOF/WIX/x64/Command Window.lnk index 51cf55050a5ac4a90efd92bf6aeb8d4624ce0973..662fc9c70181440afd3891ef2dc96974c9a508d9 100644 GIT binary patch delta 78 zcmX@cb%Sd|7bBy{ttx9AE$eVJ4Qz4;gdofi#E<5>ElD$@x8@rVxmc)j0sgL26PyhcipOgUEpdN`T@` zlN)Nll0g0gAYXn*16=Qp4-kDUj0_Ab-ayzOb3mZu?@#6=lK8~3X+4dSzd)RThx9lcK~9Um*LDdFT$D6%h`e1*MT%h zE65UFm>~?D3h+54+J1RelqsulTWY|fP)hN!Ax)~ diff --git a/branches/WOF2-1/ulp/dapl2/test/dapltest/scripts/dt-cli.bat b/branches/WOF2-1/ulp/dapl2/test/dapltest/scripts/dt-cli.bat index 25800bff..f1eb23b8 100644 --- a/branches/WOF2-1/ulp/dapl2/test/dapltest/scripts/dt-cli.bat +++ b/branches/WOF2-1/ulp/dapl2/test/dapltest/scripts/dt-cli.bat @@ -17,11 +17,7 @@ if not "!F!" == "off" ( rem set DAT_OVERRIDE=D:\dapl2\dat.conf rem favor DAT 2.0 (dapl2test.exe) over DAT 1.1 (dapltest.exe) -if EXIST "%ProgramFiles(x86)%" ( - set PF="%ProgramFiles(x86)%\WinOF" -) else ( - set PF="%ProgramFiles%\WinOF" -) +set PF="%ProgramFiles%\WinOF" if NOT EXIST %PF%\dapl2test.exe ( echo Missing file %PF%\dapl2test.exe ? diff --git a/branches/WOF2-1/ulp/dapl2/test/dapltest/scripts/dt-svr.bat b/branches/WOF2-1/ulp/dapl2/test/dapltest/scripts/dt-svr.bat index c876d413..abd17fb0 100644 --- a/branches/WOF2-1/ulp/dapl2/test/dapltest/scripts/dt-svr.bat +++ b/branches/WOF2-1/ulp/dapl2/test/dapltest/scripts/dt-svr.bat @@ -6,11 +6,7 @@ SETLOCAL rem set DAT_OVERRIDE=C:\DAT\dat.conf -if EXIST "%ProgramFiles(x86)%" ( - set PF="%ProgramFiles(x86)%\WinOF" -) else ( - set PF="%ProgramFiles%\WinOF" -) +set PF="%ProgramFiles%\WinOF" if NOT EXIST %PF%\dapl2test.exe ( echo Missing file %PF%\dapl2test.exe ? -- 2.46.0