Merge Next into Master to prepare for build

.gitignore

@@ -0,0 +1,124 @@
+
+# samples
+samples/FallingBlocks/FallingBlocks.sdf
+samples/FallingBlocks/FallingBlocks.sln.DotSettings
+samples/FallingBlocks/FallingBlocks.suo
+samples/FallingBlocks/FallingBlocks.v11.suo
+samples/FallingBlocks/FallingBlocks.v12.suo
+samples/FallingBlocks/FallingBlocks/Debug/
+samples/FallingBlocks/FallingBlocks/FallingBlocks.vcxproj.user
+samples/HelloWorldDisplay/HelloWorldDisplay.sdf
+samples/HelloWorldDisplay/HelloWorldDisplay.v12.suo
+samples/HelloWorldDisplay/HelloWorldDisplay/HelloWorldDisplay.vcxproj.user
+samples/HelloWorldDisplay/HelloWorldDisplay/Device-Debug/
+samples/HelloWorldDisplay/HelloWorldDisplay/Simulator-Debug/
+
+# user configuration files
+src_vs2010/BlackBerry.NativePlugin.opensdf
+src_vs2010/BlackBerry.NativePlugin.sdf
+src_vs2010/BlackBerry.NativePlugin.sln.DotSettings
+src_vs2010/BlackBerry.NativePlugin.sln.DotSettings.user
+src_vs2010/BlackBerry.NativePlugin.suo
+src_vs2010/GDBParser/GDBParser.vcxproj.user
+src_vs2010/BuildTasks/BlackBerry.BuildTasks.csproj.user
+src_vs2010/DebugEngine/BlackBerry.DebugEngine.csproj.user
+src_vs2010/DebugEngine/BlackBerry.DebugEngine.csproj.DotSettings
+src_vs2010/GDBHost/BlackBerry.GDBHost.vcxproj.user
+src_vs2010/NativeCore/BlackBerry.NativeCore.csproj.user
+src_vs2010/Package/BlackBerry.Package.csproj.user
+src_vs2010/Tasks/BlackBerry.Tasks.csproj.user
+src_vs2010/UnitTests/UnitTests.csproj.user
+
+src_vs2012/BuildTasks/BlackBerry.BuildTasks.csproj.user
+src_vs2012/BlackBerry.NativePlugin.sdf
+src_vs2012/BlackBerry.NativePlugin.opensdf
+src_vs2012/BlackBerry.NativePlugin.sln.DotSettings
+src_vs2012/BlackBerry.NativePlugin.sln.DotSettings.user
+src_vs2012/BlackBerry.NativePlugin.v11.suo
+src_vs2012/GDBParser/GDBParser.vcxproj.user
+src_vs2012/DebugEngine/BlackBerry.DebugEngine.csproj.user
+src_vs2012/GDBHost/BlackBerry.GDBHost.vcxproj.user
+src_vs2012/NativeCore/BlackBerry.NativeCore.csproj.user
+src_vs2012/Package/BlackBerry.Package.csproj.user
+src_vs2012/Package/BlackBerry.Package.csproj.DotSettings
+src_vs2012/Tasks/BlackBerry.Tasks.csproj.user
+src_vs2012/UnitTests/UnitTests.csproj.user
+
+src_vs2013/BuildTasks/BlackBerry.BuildTasks.csproj.user
+src_vs2013/BlackBerry.NativePlugin.sdf
+src_vs2013/BlackBerry.NativePlugin.opensdf
+src_vs2013/BlackBerry.NativePlugin.sln.DotSettings
+src_vs2013/BlackBerry.NativePlugin.sln.DotSettings.user
+src_vs2013/BlackBerry.NativePlugin.v12.suo
+src_vs2013/DebugEngine/BlackBerry.DebugEngine.csproj.user
+src_vs2013/GDBHost/BlackBerry.GDBHost.vcxproj.user
+src_vs2013/NativeCore/BlackBerry.NativeCore.csproj.user
+src_vs2013/Package/BlackBerry.Package.csproj.user
+src_vs2013/Tasks/BlackBerry.Tasks.csproj.user
+src_vs2013/UnitTests/UnitTests.csproj.user
+
+
+# build temp outputs
+_BuildResults/
+BuildResults/
+src_vs2010/Debug/
+src_vs2010/Release/
+src_vs2010/GDBParser.UnitTests/bin/
+src_vs2010/GDBParser.UnitTests/obj/
+src_vs2010/GDBParser/Debug/
+src_vs2010/GDBParser/Release/
+src_vs2010/ipch/
+src_vs2010/BuildTasks/bin/
+src_vs2010/BuildTasks/obj/
+src_vs2010/DebugEngine/bin/
+src_vs2010/DebugEngine/obj/
+src_vs2010/GDBHost/Debug/
+src_vs2010/GDBHost/Release/
+src_vs2010/NativeCore/bin/
+src_vs2010/NativeCore/obj/
+src_vs2010/Package/bin/
+src_vs2010/Package/obj/
+src_vs2010/UnitTests/bin/
+src_vs2010/UnitTests/obj/
+
+src_vs2012/Debug/
+src_vs2012/Release/
+src_vs2012/GDBParser/Debug/
+src_vs2012/GDBParser/Release/
+src_vs2012/GDBParser.UnitTests/bin/
+src_vs2012/GDBParser.UnitTests/obj/
+src_vs2012/ipch/
+src_vs2012/BuildTasks/bin/
+src_vs2012/BuildTasks/obj/
+src_vs2012/DebugEngine/bin/
+src_vs2012/DebugEngine/obj/
+src_vs2012/GDBHost/Debug/
+src_vs2012/GDBHost/Release/
+src_vs2012/NativeCore/bin/
+src_vs2012/NativeCore/obj/
+src_vs2012/Package/bin/
+src_vs2012/Package/obj/
+src_vs2012/UnitTests/bin/
+src_vs2012/UnitTests/obj/
+
+src_vs2013/Debug/
+src_vs2013/Release/
+src_vs2013/GDBParser.UnitTests/bin/
+src_vs2013/GDBParser.UnitTests/obj/
+src_vs2013/GDBParser/Debug/
+src_vs2013/GDBParser/Release/
+src_vs2013/ipch/
+src_vs2013/BuildTasks/bin/
+src_vs2013/BuildTasks/obj/
+src_vs2013/DebugEngine/bin/
+src_vs2013/DebugEngine/obj/
+src_vs2013/GDBHost/Debug/
+src_vs2013/GDBHost/Release/
+src_vs2013/NativeCore/bin/
+src_vs2013/NativeCore/obj/
+src_vs2013/Package/bin/
+src_vs2013/Package/obj/
+src_vs2013/UnitTests/bin/
+src_vs2013/UnitTests/obj/
+
+

README.md

@@ -6,24 +6,36 @@ All assets in this repository, unless otherwise stated through sub-directory LIC
 
 ##Build requirements
 Install
-* [Microsoft Visual Studio Professional 2012 SDK] (http://www.microsoft.com/en-us/download/details.aspx?id=30668)
-
-or
-
 * [Microsoft Visual Studio Professional 2013 SDK] (http://www.microsoft.com/en-us/download/details.aspx?id=40758)
 
+Note: Currently, there is a bug in DIA SDK of Visual Studio 2013.
+If Microsoft Visual Studio 2013 is installed on a machine where Microsoft Visual Studio 2012 was installed, the DIA SDK folder for Microsoft Visual Studio 2013 is installed in the DIA SDK folder for Microsoft Visual Studio 2012.
+More info [here] (http://connect.microsoft.com/VisualStudio/feedback/details/814147/dia-sdk-installed-into-wrong-directory).
+
 ##Build commands
-1. VSNDKPluginBuild.bat – A batch file that builds the various components of the BlackBerry Native Plug-in to the ..\buildresults folder.
-2. VSNDKPluginSetup.bat – A batch file that installs the newly built components of the BlackBerry Native Plug-in to the correct locations on your computer. 
+**build.bat** – A batch file that builds the various components of the BlackBerry Native Plug-in for Microsoft Visual Studio to the "_BuildResults" folder.
+
+**setup.bat** – A batch file that installs the newly built components of the BlackBerry Native Plug-in for Microsoft Visual Studio to the correct locations on your computer. 
+
+Examples:  
+
+ **build.bat** - default, builds everything  
+ **build.bat vs2010** - builds only for Microsoft Visual Studio 2010  
+ **build.bat vs2012 "/out:D:\Shared folder\\_BuildResults"** - builds only for Microsoft Visual Studio 2012 into the specified directory  
+
+ **setup.bat** - installs the plug-in for all Microsoft Visual Studio versions  
+ **setup.bat vs2010** - installs the plug-in for only Microsoft Visual Studio 2010  
+ **setup.bat vs2012 /no-tools** - installs the plug-in for Microsoft Visual Studio 2012 without copying the bbndk_vs and qnxtools folders  
+ **setup.bat vs2012 /msbuild-only** - updates only the local MSBuild for Microsoft Visual Studio 2012 and adds the 'BlackBerry' and 'BlackBerrySimulator' target platforms
 
 ##Contributing
 The BlackBerry Native Plug-in for Microsoft Visual Studio project currently contains the following code branches: 
 
-**Master Branch** - The master branch contains the latest production release of the source code. This code is considered stable and is fully tested by the Test team. You can [download the binaries] (http://developer.blackberry.com/native/downloads/) from the Downloads page on the BlackBerry developer website.   
+**Master Branch** - This branch contains the latest production release of the source code. This code is considered stable and is fully tested by the test team. You can [download the binaries] (http://developer.blackberry.com/native/downloads/) from the Downloads page on the BlackBerry developer website.   
 
-**Next Branch** - The next branch contains the latest beta release of the source code. This code may be unstable and is not fully tested because it has passed unit tests only. At some point, a full regression test cycle is performed on the next branch and the code is promoted to the master branch.
+**Next Branch** - This branch contains the latest beta release of the source code. This code may be unstable and is not fully tested because it has passed unit tests only. At some point, a full regression test cycle is performed on the next branch and the code is promoted to the master branch.
 
-**Feature Branch** - Feature branches contain the code changes required to implement specific features or issues being worked on for the next release. This code is considered unstable. These branches are denoted by the following naming scheme in the repository: next-### (where ### is the related issue number). When implementation is completed, the branch is unit and integration tested and then merged into the next branch.
+**Feature Branch** - This branch contains the code changes required to implement specific features or issues being worked on for the next release. This code is considered unstable. These branches are denoted by the following naming scheme in the repository: next-### (where ### is the related issue number). When implementation is completed, the branch is unit and integration tested and then merged into the next branch.
 
 **To contribute code to this repository you must be [signed up as an official contributor](http://blackberry.github.com/howToContribute.html).**
 
@@ -42,5 +54,5 @@ The BlackBerry Native Plug-in for Microsoft Visual Studio project currently cont
 * [Gustavo Arnold](http://github.com/guarnold)
 
 ## Reference material
-* [Using Microsoft Visual Studio] (https://developer.blackberry.com/native/documentation/core/vs_using_microsoft_visual_studio.html)
-* Although Microsoft Visual Studio 2010 is no longer supported, you can still [download the plug-in and the docs] (http://developer.blackberry.com/native/downloads/) from the Downloads page. 
+* [Microsoft Visual Studio:] (http://developer.blackberry.com/native/documentation/dev/visual_studio/vs_using_microsoft_visual_studio.html) 
+* [GDB Commands] (http://sourceware.org/gdb/onlinedocs/gdb/GDB_002fMI.html)