[ofw] commits for svn.1787
Stan C. Smith
stan.smith at intel.com
Thu Dec 11 17:30:32 PST 2008
Signed off by stan.smith at intel.com
svn.1787
Added *.rc files for trunk\tests\perftest\*
Modified SOURCES files in trunk\tests\perftest\* to use .rc files
Fixed trunk\tests\perftest\*\*.c getopt() error handing of missing hostname on '-h hostname'.
trunk\etc\makebin.bat - correctly handle winverbs support w.r.t.
WinVerbs filter driver loading (mthca.inf & mlx4_hca.inf mods once we are past WHQL).
winverbs.{sys,pdb} --> bin\HCA\{ia64,amd64,x86}
winverbs{d}.dll --> bin\HCA\{ia64,amd64,x86}
Remove IbInstaller.dll copy - no longer used.
libibverbs.dll, libibverbsd.dll correctly setup for install.
Copy ia64 ConnectX (mlx4) HCA files.
Added .rc files to trunk\ul\libibverbs\examples\*
SOURCES files modified compile .rc files.
trunk\WinOF\WIX\{wlh,wnet,wxp}\*\wof.wxs
Enable ia64 ConnectX (mlx4) HCA support in WinOF Installs.
Setup winverbs.sys filter driver in WinOF\IBcore\
Winverbs[ibverbs.dll] OFED verbs & OFED test pgms (ibv_read_bs & friends) installed by default.
trunk\WinOF\WIX\CustomActions.vbs
Use dpinst.exe for WLH variants; skip having to specify InfiniHost or ConnectX driver.
Server 2003/XP/XP64 (devman) still need to specify 'which' HCA driver (see below).
Support cmd-line msiexec installs:
start/wait msiexec /I WOF.msi /passive NODRV=1 #install defaults except drivers (WDM)
(Server 2003/Xp64/XP ONLY - ignored for WLH installs)
start/wait msiexec /I WOF.msi /passive # Install InfiniHost HCA driver as default.
start/wait msiexec /I WOF.msi /passive HCA=cx # Install ConnectX instead of InfiniHost.
start/wait msiexec /I WOF.msi /passive HCA=+cx # Install ConnectX and InfiniHost.
(Valid for all [Vista, Server 2008,3 XP, XP64]
start/wait msiexec /I WOF.msi /passive HCA=SRP # add SRP driver to default install.
start/wait msiexec /I WOF.msi /passive HCA=VNIC # add VNIC driver to default install.
trunk\winof\buildrelease.bat
Rearrange varible set(s) so 'clean' cmd can 'rmdir WinOF\WIX\{wlh,wnet,wxp}\bin'.
support trunk\..\..\..\latest.txt containing svn.commit # used for the build (USER_SVN).
trunk\etc\user\getopt.c - fixed error return to be '?' instead of EOF on missing arg & others.
diff U3 C:/Documents and Settings/scsmith/Local Settings/Temp/getopt.c-rev1785.svn000.tmp.c C:/Documents and
Settings/scsmith/My Documents/openIB-windows/SVN/gen1/trunk/etc/user/getopt.c
--- C:/Documents and Settings/scsmith/Local Settings/Temp/getopt.c-rev1785.svn000.tmp.c Thu Dec 11 17:09:26 2008
+++ C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/trunk/etc/user/getopt.c Tue Dec 09
16:41:51 2008
@@ -45,7 +45,7 @@
optarg = NULL;
- if (optind == argc) {
+ if (optind >= argc) {
return EOF;
}
@@ -55,14 +55,14 @@
if (!strcmp(argv[optind], "--")) {
optind++;
- return EOF;
+ return '?';
}
optopt = argv[optind][1];
loc = strchr(opts, optopt);
if (loc == NULL) {
- return EOF;
+ return '?';
}
if (loc[1] != ':') {
@@ -74,13 +74,14 @@
goto out;
}
- if ((optind + 1 == argc) || (argv[optind + 1][0] == '-')) {
- if (loc[2] != ':') {
- return EOF;
- }
- } else {
- optarg = argv[++optind];
- }
+ /* switch argument is optional (::) - be careful */
+ if (loc[2] == ':' && (argv[optind+1] && argv[optind+1][0] == '-'))
+ goto out;
+
+ optarg = argv[++optind];
+ while(optarg && *optarg && (*optarg == ' ' || *optarg == ' ')) optarg++;
+ if (optarg && !(*optarg))
+ optarg = NULL;
out:
optind++;
@@ -104,7 +105,7 @@
if (!strcmp(argv[optind], "--")) {
optind++;
- return EOF;
+ return '?';
}
if (argv[optind][1] != '-') {
More information about the ofw
mailing list