msvc directory moved into builds dir

bindings/java/Socket.cpp

@@ -22,7 +22,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include "../src/stdint.hpp"
+#include "../../src/stdint.hpp"
 
 #include "zmq.h"
 #include "org_zmq_Socket.h"

msvc/c_local_lat/c_local_lat.vcproj → builds/msvc/c_local_lat/c_local_lat.vcproj

@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../c"
+				AdditionalIncludeDirectories="../../../bindings/c"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -58,7 +58,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../perf/c/local_lat.exe"
+				OutputFile="../../../perf/c/local_lat.exe"
 				GenerateDebugInformation="true"
 				TargetMachine="1"
 			/>
@@ -111,7 +111,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../c"
+				AdditionalIncludeDirectories="../../../bindings/c"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -128,7 +128,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../perf/c/local_lat.exe"
+				OutputFile="../../../perf/c/local_lat.exe"
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -166,7 +166,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\perf\c\local_lat.c"
+				RelativePath="..\..\..\perf\c\local_lat.c"
 				>
 			</File>
 		</Filter>

msvc/c_local_thr/c_local_thr.vcproj → builds/msvc/c_local_thr/c_local_thr.vcproj

@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../c"
+				AdditionalIncludeDirectories="../../../bindings/c"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -58,7 +58,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../perf/c/local_thr.exe"
+				OutputFile="../../../perf/c/local_thr.exe"
 				GenerateDebugInformation="true"
 				TargetMachine="1"
 			/>
@@ -111,7 +111,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../c"
+				AdditionalIncludeDirectories="../../../bindings/c"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -128,7 +128,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../perf/c/local_thr.exe"
+				OutputFile="../../../perf/c/local_thr.exe"
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -166,7 +166,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\perf\c\local_thr.c"
+				RelativePath="..\..\..\perf\c\local_thr.c"
 				>
 			</File>
 		</Filter>

msvc/c_remote_lat/c_remote_lat.vcproj → builds/msvc/c_remote_lat/c_remote_lat.vcproj

@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../c"
+				AdditionalIncludeDirectories="../../../bindings/c"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -58,7 +58,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../perf/c/remote_lat.exe"
+				OutputFile="../../../perf/c/remote_lat.exe"
 				GenerateDebugInformation="true"
 				TargetMachine="1"
 			/>
@@ -111,7 +111,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../c"
+				AdditionalIncludeDirectories="../../../bindings/c"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -128,7 +128,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../perf/c/remote_lat.exe"
+				OutputFile="../../../perf/c/remote_lat.exe"
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -166,7 +166,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\perf\c\remote_lat.c"
+				RelativePath="..\..\..\perf\c\remote_lat.c"
 				>
 			</File>
 		</Filter>

msvc/c_remote_thr/c_remote_thr.vcproj → builds/msvc/c_remote_thr/c_remote_thr.vcproj

@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../c"
+				AdditionalIncludeDirectories="../../../bindings/c"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -58,7 +58,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../perf/c/remote_thr.exe"
+				OutputFile="../../../perf/c/remote_thr.exe"
 				GenerateDebugInformation="true"
 				TargetMachine="1"
 			/>
@@ -111,7 +111,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../c"
+				AdditionalIncludeDirectories="../../../bindings/c"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -128,7 +128,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../perf/c/remote_thr.exe"
+				OutputFile="../../../perf/c/remote_thr.exe"
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -166,7 +166,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\perf\c\remote_thr.c"
+				RelativePath="..\..\..\perf\c\remote_thr.c"
 				>
 			</File>
 		</Filter>

msvc/cpp_local_lat/cpp_local_lat.vcproj → builds/msvc/cpp_local_lat/cpp_local_lat.vcproj

@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../c;../../cpp"
+				AdditionalIncludeDirectories="../../../bindings/c;../../../bindings/cpp"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -58,7 +58,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../perf/cpp/local_lat.exe"
+				OutputFile="../../../perf/cpp/local_lat.exe"
 				GenerateDebugInformation="true"
 				TargetMachine="1"
 			/>
@@ -111,7 +111,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../c;../../cpp"
+				AdditionalIncludeDirectories="../../../bindings/c;../../../bindings/cpp"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -128,7 +128,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../perf/cpp/local_lat.exe"
+				OutputFile="../../../perf/cpp/local_lat.exe"
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -166,7 +166,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\perf\cpp\local_lat.cpp"
+				RelativePath="..\..\..\perf\cpp\local_lat.cpp"
 				>
 			</File>
 		</Filter>

msvc/cpp_local_thr/cpp_local_thr.vcproj → builds/msvc/cpp_local_thr/cpp_local_thr.vcproj

@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../c;../../cpp"
+				AdditionalIncludeDirectories="../../../bindings/c;../../../bindings/cpp"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -58,7 +58,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../perf/cpp/local_thr.exe"
+				OutputFile="../../../perf/cpp/local_thr.exe"
 				GenerateDebugInformation="true"
 				TargetMachine="1"
 			/>
@@ -111,7 +111,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../c;../../cpp"
+				AdditionalIncludeDirectories="../../../bindings/c;../../../bindings/cpp"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -128,7 +128,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../perf/cpp/local_thr.exe"
+				OutputFile="../../../perf/cpp/local_thr.exe"
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -166,7 +166,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\perf\cpp\local_thr.cpp"
+				RelativePath="..\..\..\perf\cpp\local_thr.cpp"
 				>
 			</File>
 		</Filter>

msvc/cpp_remote_lat/cpp_remote_lat.vcproj → builds/msvc/cpp_remote_lat/cpp_remote_lat.vcproj

@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../c;../../cpp"
+				AdditionalIncludeDirectories="../../../bindings/c;../../../bindings/cpp"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -58,7 +58,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../perf/cpp/remote_lat.exe"
+				OutputFile="../../../perf/cpp/remote_lat.exe"
 				GenerateDebugInformation="true"
 				TargetMachine="1"
 			/>
@@ -111,7 +111,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../c;../../cpp"
+				AdditionalIncludeDirectories="../../../bindings/c;../../../bindings/cpp"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -128,7 +128,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../perf/cpp/remote_lat.exe"
+				OutputFile="../../../perf/cpp/remote_lat.exe"
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -166,7 +166,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\perf\cpp\remote_lat.cpp"
+				RelativePath="..\..\..\perf\cpp\remote_lat.cpp"
 				>
 			</File>
 		</Filter>

msvc/cpp_remote_thr/cpp_remote_thr.vcproj → builds/msvc/cpp_remote_thr/cpp_remote_thr.vcproj

@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../c;../../cpp"
+				AdditionalIncludeDirectories="../../../bindings/c;../../../bindings/cpp"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -58,7 +58,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../perf/cpp/remote_thr.exe"
+				OutputFile="../../../perf/cpp/remote_thr.exe"
 				GenerateDebugInformation="true"
 				TargetMachine="1"
 			/>
@@ -111,7 +111,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../c;../../cpp"
+				AdditionalIncludeDirectories="../../../bindings/c;../../../bindings/cpp"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -128,7 +128,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../perf/cpp/remote_thr.exe"
+				OutputFile="../../../perf/cpp/remote_thr.exe"
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -166,7 +166,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\perf\cpp\remote_thr.cpp"
+				RelativePath="..\..\..\perf\cpp\remote_thr.cpp"
 				>
 			</File>
 		</Filter>

msvc/j_local_lat/j_local_lat.vcproj → builds/msvc/j_local_lat/j_local_lat.vcproj

@@ -25,7 +25,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Compiling Java classes"
-				CommandLine="javac -classpath ..\..\java ..\..\perf\java\local_lat.java"
+				CommandLine="javac -classpath ..\..\..\bindings\java ..\..\..\perf\java\local_lat.java"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -48,7 +48,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Compiling Java classes"
-				CommandLine="javac -classpath ..\..\java ..\..\perf\java\local_lat.java"
+				CommandLine="javac -classpath ..\..\..\bindings\java ..\..\..\perf\java\local_lat.java"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -68,7 +68,7 @@
 			Name="Java Files"
 			>
 			<File
-				RelativePath="..\..\perf\java\local_lat.java"
+				RelativePath="..\..\..\perf\java\local_lat.java"
 				>
 			</File>
 		</Filter>

msvc/j_local_thr/j_local_thr.vcproj → builds/msvc/j_local_thr/j_local_thr.vcproj

@@ -25,7 +25,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Compiling Java classes"
-				CommandLine="javac -classpath ..\..\java ..\..\perf\java\local_thr.java"
+				CommandLine="javac -classpath ..\..\..\bindings\java ..\..\..\perf\java\local_thr.java"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -48,7 +48,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Compiling Java classes"
-				CommandLine="javac -classpath ..\..\java ..\..\perf\java\local_thr.java"
+				CommandLine="javac -classpath ..\..\..\bindings\java ..\..\..\perf\java\local_thr.java"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -68,7 +68,7 @@
 			Name="Java Files"
 			>
 			<File
-				RelativePath="..\..\perf\java\local_thr.java"
+				RelativePath="..\..\..\perf\java\local_thr.java"
 				>
 			</File>
 		</Filter>

msvc/j_remote_lat/j_remote_lat.vcproj → builds/msvc/j_remote_lat/j_remote_lat.vcproj

@@ -25,7 +25,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Compiling Java classes"
-				CommandLine="javac -classpath ..\..\java ..\..\perf\java\remote_lat.java"
+				CommandLine="javac -classpath ..\..\..\bindings\java ..\..\..\perf\java\remote_lat.java"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -48,7 +48,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Compiling Java classes"
-				CommandLine="javac -classpath ..\..\java ..\..\perf\java\remote_lat.java"
+				CommandLine="javac -classpath ..\..\..\bindings\java ..\..\..\perf\java\remote_lat.java"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -68,7 +68,7 @@
 			Name="Java Files"
 			>
 			<File
-				RelativePath="..\..\perf\java\remote_lat.java"
+				RelativePath="..\..\..\perf\java\remote_lat.java"
 				>
 			</File>
 		</Filter>

msvc/j_remote_thr/j_remote_thr.vcproj → builds/msvc/j_remote_thr/j_remote_thr.vcproj

@@ -25,7 +25,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Compiling Java classes"
-				CommandLine="javac -classpath ..\..\java ..\..\perf\java\remote_thr.java"
+				CommandLine="javac -classpath ..\..\..\bindings\java ..\..\..\perf\java\remote_thr.java"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -48,7 +48,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Compiling Java classes"
-				CommandLine="javac -classpath ..\..\java ..\..\perf\java\remote_thr.java"
+				CommandLine="javac -classpath ..\..\..\bindings\java ..\..\..\perf\java\remote_thr.java"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -68,7 +68,7 @@
 			Name="Java Files"
 			>
 			<File
-				RelativePath="..\..\perf\java\remote_thr.java"
+				RelativePath="..\..\..\perf\java\remote_thr.java"
 				>
 			</File>
 		</Filter>

msvc/java/java.vcproj → builds/msvc/java/java.vcproj

@@ -25,7 +25,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Compiling Java classes"
-				CommandLine="javac ..\..\java\org\zmq\Context.java ..\..\java\org\zmq\Socket.java"
+				CommandLine="javac ..\..\..\bindings\java\org\zmq\Context.java ..\..\..\bindings\java\org\zmq\Socket.java"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../c"
+				AdditionalIncludeDirectories="../../../bindings/c"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -62,7 +62,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../lib/jzmq.dll"
+				OutputFile="../../../lib/jzmq.dll"
 				GenerateDebugInformation="true"
 				TargetMachine="1"
 			/>
@@ -87,7 +87,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Creating JAR archive"
-				CommandLine="cd ..\..\java&#x0D;&#x0A;jar -cfv ..\lib\zmq.jar org\zmq\Context.class org\zmq\Socket.class&#x0D;&#x0A;cd ..\msvc\java"
+				CommandLine="cd ..\..\..\bindings\java&#x0D;&#x0A;jar -cfv ..\..\lib\zmq.jar org\zmq\Context.class org\zmq\Socket.class&#x0D;&#x0A;cd ..\..\builds\msvc\java"
 			/>
 		</Configuration>
 		<Configuration
@@ -101,7 +101,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Compiling Java classes"
-				CommandLine="javac ..\..\java\org\zmq\Context.java ..\..\java\org\zmq\Socket.java"
+				CommandLine="javac ..\..\..\bindings\java\org\zmq\Context.java ..\..\..\bindings\java\org\zmq\Socket.java"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../c"
+				AdditionalIncludeDirectories="../../../bindings/c"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -138,7 +138,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../lib/jzmq.dll"
+				OutputFile="../../../lib/jzmq.dll"
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -165,7 +165,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Creating JAR archive"
-				CommandLine="cd ..\..\java&#x0D;&#x0A;jar -cfv ..\lib\zmq.jar org\zmq\Context.class org\zmq\Socket.class&#x0D;&#x0A;cd ..\msvc\java"
+				CommandLine="cd ..\..\..\bindings\java&#x0D;&#x0A;jar -cfv ..\..\lib\zmq.jar org\zmq\Context.class org\zmq\Socket.class&#x0D;&#x0A;cd ..\..\builds\msvc\java"
 			/>
 		</Configuration>
 	</Configurations>
@@ -178,11 +178,11 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\java\Context.cpp"
+				RelativePath="..\..\..\bindings\java\Context.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\java\Socket.cpp"
+				RelativePath="..\..\..\bindings\java\Socket.cpp"
 				>
 			</File>
 		</Filter>
@@ -190,7 +190,7 @@
 			Name="Java Files"
 			>
 			<File
-				RelativePath="..\..\java\org\zmq\Context.java"
+				RelativePath="..\..\..\bindings\java\org\zmq\Context.java"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -198,7 +198,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating JNI header"
-						CommandLine="javah -jni -classpath ..\..\java -d ..\..\java org.zmq.Context&#x0D;&#x0A;"
+						CommandLine="javah -jni -classpath ..\..\..\bindings\java -d ..\..\..\bindings\java org.zmq.Context&#x0D;&#x0A;"
 						Outputs="org_zmq_Context.h"
 					/>
 				</FileConfiguration>
@@ -208,13 +208,13 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating JNI header"
-						CommandLine="javah -jni -classpath ..\..\java -d ..\..\java org.zmq.Context&#x0D;&#x0A;"
+						CommandLine="javah -jni -classpath ..\..\..\bindings\java -d ..\..\..\bindings\java org.zmq.Context&#x0D;&#x0A;"
 						Outputs="org_zmq_Context.h"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\java\org\zmq\Socket.java"
+				RelativePath="..\..\..\bindings\java\org\zmq\Socket.java"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -222,7 +222,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating JNI header"
-						CommandLine="javah -jni -classpath ..\..\java -d ..\..\java org.zmq.Socket&#x0D;&#x0A;"
+						CommandLine="javah -jni -classpath ..\..\..\bindings\java -d ..\..\..\bindings\java org.zmq.Socket&#x0D;&#x0A;"
 						Outputs="org_zmq_Socket.h"
 					/>
 				</FileConfiguration>
@@ -232,7 +232,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating JNI header"
-						CommandLine="javah -jni -classpath ..\..\java -d ..\..\java org.zmq.Socket&#x0D;&#x0A;"
+						CommandLine="javah -jni -classpath ..\..\..\bindings\java -d ..\..\..\bindings\java org.zmq.Socket&#x0D;&#x0A;"
 						Outputs="org_zmq_Socket.h"
 					/>
 				</FileConfiguration>

msvc/libzmq/libzmq.vcproj → builds/msvc/libzmq/libzmq.vcproj

@@ -24,7 +24,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="copy ..\platform.hpp ..\..\src"
+				CommandLine="copy ..\platform.hpp ..\..\..\src"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -60,7 +60,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="Ws2_32.lib Rpcrt4.lib"
-				OutputFile="../../lib/libzmq.dll"
+				OutputFile="../../../lib/libzmq.dll"
 				GenerateDebugInformation="true"
 				TargetMachine="1"
 			/>
@@ -96,7 +96,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="copy ..\platform.hpp ..\..\src"
+				CommandLine="copy ..\platform.hpp ..\..\..\src"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -132,7 +132,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="Ws2_32.lib Rpcrt4.lib"
-				OutputFile="../../lib/libzmq.dll"
+				OutputFile="../../../lib/libzmq.dll"
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -170,139 +170,151 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\src\app_thread.cpp"
+				RelativePath="..\..\..\src\app_thread.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\devpoll.cpp"
+				RelativePath="..\..\..\src\devpoll.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\dispatcher.cpp"
+				RelativePath="..\..\..\src\dispatcher.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\epoll.cpp"
+				RelativePath="..\..\..\src\epoll.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\err.cpp"
+				RelativePath="..\..\..\src\err.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\fd_signaler.cpp"
+				RelativePath="..\..\..\src\fd_signaler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\io_object.cpp"
+				RelativePath="..\..\..\src\io_object.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\io_thread.cpp"
+				RelativePath="..\..\..\src\io_thread.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\ip.cpp"
+				RelativePath="..\..\..\src\ip.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\kqueue.cpp"
+				RelativePath="..\..\..\src\kqueue.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\object.cpp"
+				RelativePath="..\..\..\src\object.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\options.cpp"
+				RelativePath="..\..\..\src\options.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\owned.cpp"
+				RelativePath="..\..\..\src\owned.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\pipe.cpp"
+				RelativePath="..\..\..\src\pgm_receiver.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\poll.cpp"
+				RelativePath="..\..\..\src\pgm_sender.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\pub.cpp"
+				RelativePath="..\..\..\src\pgm_socket.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\select.cpp"
+				RelativePath="..\..\..\src\pipe.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\session.cpp"
+				RelativePath="..\..\..\src\poll.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\socket_base.cpp"
+				RelativePath="..\..\..\src\pub.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\sub.cpp"
+				RelativePath="..\..\..\src\select.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\tcp_connecter.cpp"
+				RelativePath="..\..\..\src\session.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\tcp_listener.cpp"
+				RelativePath="..\..\..\src\socket_base.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\tcp_socket.cpp"
+				RelativePath="..\..\..\src\sub.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\thread.cpp"
+				RelativePath="..\..\..\src\tcp_connecter.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\uuid.cpp"
+				RelativePath="..\..\..\src\tcp_listener.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\ypollset.cpp"
+				RelativePath="..\..\..\src\tcp_socket.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\zmq.cpp"
+				RelativePath="..\..\..\src\thread.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\zmq_connecter.cpp"
+				RelativePath="..\..\..\src\uuid.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\zmq_connecter_init.cpp"
+				RelativePath="..\..\..\src\ypollset.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\zmq_decoder.cpp"
+				RelativePath="..\..\..\src\zmq.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\zmq_encoder.cpp"
+				RelativePath="..\..\..\src\zmq_connecter.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\zmq_engine.cpp"
+				RelativePath="..\..\..\src\zmq_connecter_init.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\zmq_listener.cpp"
+				RelativePath="..\..\..\src\zmq_decoder.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\zmq_listener_init.cpp"
+				RelativePath="..\..\..\src\zmq_encoder.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\zmq_engine.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\zmq_listener.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\zmq_listener_init.cpp"
 				>
 			</File>
 		</Filter>
@@ -312,123 +324,135 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\..\src\app_thread.hpp"
+				RelativePath="..\..\..\src\app_thread.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\atomic_bitmap.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\atomic_counter.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\atomic_ptr.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\atomic_bitmap.hpp"
+				RelativePath="..\..\..\src\command.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\atomic_counter.hpp"
+				RelativePath="..\..\..\src\config.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\atomic_ptr.hpp"
+				RelativePath="..\..\..\src\decoder.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\command.hpp"
+				RelativePath="..\..\..\src\devpoll.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\config.hpp"
+				RelativePath="..\..\..\src\dispatcher.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\decoder.hpp"
+				RelativePath="..\..\..\src\encoder.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\devpoll.hpp"
+				RelativePath="..\..\..\src\epoll.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\dispatcher.hpp"
+				RelativePath="..\..\..\src\err.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\encoder.hpp"
+				RelativePath="..\..\..\src\fd.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\epoll.hpp"
+				RelativePath="..\..\..\src\fd_signaler.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\err.hpp"
+				RelativePath="..\..\..\src\i_endpoint.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\fd.hpp"
+				RelativePath="..\..\..\src\i_engine.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\fd_signaler.hpp"
+				RelativePath="..\..\..\src\i_inout.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\i_endpoint.hpp"
+				RelativePath="..\..\..\src\i_poll_events.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\i_engine.hpp"
+				RelativePath="..\..\..\src\i_poller.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\i_inout.hpp"
+				RelativePath="..\..\..\src\i_signaler.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\i_poll_events.hpp"
+				RelativePath="..\..\..\src\io_object.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\i_poller.hpp"
+				RelativePath="..\..\..\src\io_thread.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\i_signaler.hpp"
+				RelativePath="..\..\..\src\ip.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\io_object.hpp"
+				RelativePath="..\..\..\src\kqueue.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\io_thread.hpp"
+				RelativePath="..\..\..\src\msg_content.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\ip.hpp"
+				RelativePath="..\..\..\src\mutex.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\kqueue.hpp"
+				RelativePath="..\..\..\src\object.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\msg_content.hpp"
+				RelativePath="..\..\..\src\options.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\mutex.hpp"
+				RelativePath="..\..\..\src\owned.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\object.hpp"
+				RelativePath="..\..\..\src\pgm_receiver.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\options.hpp"
+				RelativePath="..\..\..\src\pgm_sender.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\owned.hpp"
+				RelativePath="..\..\..\src\pgm_socket.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\pipe.hpp"
+				RelativePath="..\..\..\src\pipe.hpp"
 				>
 			</File>
 			<File
@@ -436,99 +460,99 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\poll.hpp"
+				RelativePath="..\..\..\src\poll.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\select.hpp"
+				RelativePath="..\..\..\src\select.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\session.hpp"
+				RelativePath="..\..\..\src\session.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\simple_semaphore.hpp"
+				RelativePath="..\..\..\src\simple_semaphore.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\socket_base.hpp"
+				RelativePath="..\..\..\src\socket_base.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stdint.hpp"
+				RelativePath="..\..\..\src\stdint.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\sub.hpp"
+				RelativePath="..\..\..\src\sub.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\tcp_connecter.hpp"
+				RelativePath="..\..\..\src\tcp_connecter.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\tcp_listener.hpp"
+				RelativePath="..\..\..\src\tcp_listener.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\tcp_socket.hpp"
+				RelativePath="..\..\..\src\tcp_socket.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\thread.hpp"
+				RelativePath="..\..\..\src\thread.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\uuid.hpp"
+				RelativePath="..\..\..\src\uuid.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\windows.hpp"
+				RelativePath="..\..\..\src\windows.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\wire.hpp"
+				RelativePath="..\..\..\src\wire.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\ypipe.hpp"
+				RelativePath="..\..\..\src\ypipe.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\ypollset.hpp"
+				RelativePath="..\..\..\src\ypollset.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\yqueue.hpp"
+				RelativePath="..\..\..\src\yqueue.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\zmq_connecter.hpp"
+				RelativePath="..\..\..\src\zmq_connecter.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\zmq_connecter_init.hpp"
+				RelativePath="..\..\..\src\zmq_connecter_init.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\zmq_decoder.hpp"
+				RelativePath="..\..\..\src\zmq_decoder.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\zmq_encoder.hpp"
+				RelativePath="..\..\..\src\zmq_encoder.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\zmq_engine.hpp"
+				RelativePath="..\..\..\src\zmq_engine.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\zmq_listener.hpp"
+				RelativePath="..\..\..\src\zmq_listener.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\zmq_listener_init.hpp"
+				RelativePath="..\..\..\src\zmq_listener_init.hpp"
 				>
 			</File>
 		</Filter>

msvc/python/python.vcproj → builds/msvc/python/python.vcproj

@@ -57,7 +57,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../lib/libpyzmq.pyd"
+				OutputFile="../../../lib/libpyzmq.pyd"
 				GenerateDebugInformation="true"
 				ImportLibrary=""
 				TargetMachine="1"
@@ -127,7 +127,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../lib/libpyzmq.pyd"
+				OutputFile="../../../lib/libpyzmq.pyd"
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -166,7 +166,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\python\pyzmq.cpp"
+				RelativePath="..\..\..\bindings\python\pyzmq.cpp"
 				>
 			</File>
 		</Filter>

msvc/zmq_forwarder/zmq_forwarder.vcproj → builds/msvc/zmq_forwarder/zmq_forwarder.vcproj

@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../c;../../cpp"
+				AdditionalIncludeDirectories="../../../bindings/c;../../../bindings/cpp"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -110,7 +110,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../c;../../cpp"
+				AdditionalIncludeDirectories="../../../bindings/c;../../../bindings/cpp"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -164,7 +164,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\devices\zmq_forwarder\zmq_forwarder.cpp"
+				RelativePath="..\..\..\devices\zmq_forwarder\zmq_forwarder.cpp"
 				>
 			</File>
 		</Filter>