[mpich2-commits] r4039 - in mpich2/trunk: . src/mpid/ch3/channels/nemesis src/mpid/ch3/channels/nemesis/nemesis/netmod

[jayesh at mcs.anl.gov]

Author: jayesh
Date: 2009-03-12 15:44:24 -0500 (Thu, 12 Mar 2009)
New Revision: 4039

Added:
   mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/
Removed:
   mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp_module/
Modified:
   mpich2/trunk/mpich2.vcproj
   mpich2/trunk/src/mpid/ch3/channels/nemesis/ch3nemesis.vcproj
   mpich2/trunk/winconfigure.wsf
Log:
1) Moving wintcp_module to wintcp - to follow naming convention of nemesis channel dirs 2)Update windows configure scripts & proj files to reflect the renaming of files done in r4037 & this change. MPICH2 on windows should compile now

Modified: mpich2/trunk/mpich2.vcproj
===================================================================
--- mpich2/trunk/mpich2.vcproj	2009-03-12 20:34:48 UTC (rev 4038)
+++ mpich2/trunk/mpich2.vcproj	2009-03-12 20:44:24 UTC (rev 4039)
@@ -7961,10 +7961,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\src\include\mpimem.h"
-				>
-			</File>
-			<File
 				RelativePath=".\src\include\mpio.h"
 				>
 			</File>

Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/ch3nemesis.vcproj
===================================================================
--- mpich2/trunk/src/mpid/ch3/channels/nemesis/ch3nemesis.vcproj	2009-03-12 20:34:48 UTC (rev 4038)
+++ mpich2/trunk/src/mpid/ch3/channels/nemesis/ch3nemesis.vcproj	2009-03-12 20:44:24 UTC (rev 4039)
@@ -765,43 +765,27 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\nemesis\netmod\wintcp_module\socksm.c"
+				RelativePath=".\nemesis\netmod\wintcp\socksm.c"
 				>
-				<FileConfiguration
-					Name="ch3nemesisRelease|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ShowIncludes="false"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ch3nemesisPRelease|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ShowIncludes="false"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\nemesis\netmod\wintcp_module\wintcp_module_finalize.c"
+				RelativePath=".\nemesis\netmod\wintcp\wintcp_finalize.c"
 				>
 			</File>
 			<File
-				RelativePath=".\nemesis\netmod\wintcp_module\wintcp_module_init.c"
+				RelativePath=".\nemesis\netmod\wintcp\wintcp_init.c"
 				>
 			</File>
 			<File
-				RelativePath=".\nemesis\netmod\wintcp_module\wintcp_module_poll.c"
+				RelativePath=".\nemesis\netmod\wintcp\wintcp_poll.c"
 				>
 			</File>
 			<File
-				RelativePath=".\nemesis\netmod\wintcp_module\wintcp_module_send.c"
+				RelativePath=".\nemesis\netmod\wintcp\wintcp_send.c"
 				>
 			</File>
 			<File
-				RelativePath=".\nemesis\netmod\wintcp_module\wintcp_module_utility.c"
+				RelativePath=".\nemesis\netmod\wintcp\wintcp_utility.c"
 				>
 			</File>
 		</Filter>

Copied: mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp (from rev 4037, mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp_module)

Modified: mpich2/trunk/winconfigure.wsf
===================================================================
--- mpich2/trunk/winconfigure.wsf	2009-03-12 20:34:48 UTC (rev 4038)
+++ mpich2/trunk/winconfigure.wsf	2009-03-12 20:44:24 UTC (rev 4039)
@@ -5761,7 +5761,7 @@
 	mfile.WriteLine(" /DMPICH_MULTITHREADED /D ENABLE_NO_MACRO_VARARG_NAME \")
 	mfile.WriteLine(" /I..\src\mpid\ch3\channels\nemesis\nemesis\include \")
 	mfile.WriteLine(" /I..\src\mpid\ch3\channels\nemesis\nemesis\utils\monitor \")
-	mfile.WriteLine(" /I..\src\mpid\ch3\channels\nemesis\nemesis\netmod\wintcp_module")
+	mfile.WriteLine(" /I..\src\mpid\ch3\channels\nemesis\nemesis\netmod\wintcp")
 	mfile.WriteLine("!ENDIF")
 '	mfile.WriteLine
 '	mfile.WriteLine("!IF ""$(CHANNEL)"" == ""essm""")
@@ -6119,14 +6119,14 @@
 	CreateRules f.GetFolder("src\mpid\ch3\channels\nemesis\src"), trimlength
 	CreateRules f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\src"), trimlength
 '	CreateRules f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\utils"), trimlength
-	CreateRules f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\netmod\wintcp_module"), trimlength
+	CreateRules f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\netmod\wintcp"), trimlength
 	mfile.WriteLine("{..\src\util\thread}.c{$(NEMESIS_OUTDIR)}.obj:")
 	mfile.WriteLine("    $(cc) $(cflags) /Fo""$(NEMESIS_OUTDIR)\\"" /Fd""$(NEMESIS_OUTDIR)\\"" $**")
 	mfile.WriteLine
 	CreateObjs "ch3nemesis", f.GetFolder("src\mpid\ch3\channels\nemesis\src"), trimlength, true, false
 	CreateObjs "ch3nemesis", f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\src"), trimlength, false, false
 '	CreateObjs "ch3nemesis", f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\utils"), trimlength, false, false
-	CreateObjs "ch3nemesis", f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\netmod\wintcp_module"), trimlength, false, false
+	CreateObjs "ch3nemesis", f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\netmod\wintcp"), trimlength, false, false
 	mfile.WriteLine(" \" & vbCrLf & "	$(NEMESIS_OUTDIR)\mpe_thread_win.obj")
 
 	mfile.WriteLine