SF.net SVN: orm:[1564] trunk

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1564
          http://sourceforge.net/p/orm/code/1564
Author:   mcurland
Date:     2016-01-30 09:32:44 +0000 (Sat, 30 Jan 2016)
Log Message:
-----------
 * Fix build issues on standalone VS2015 machine
 * Remove extra predefinedDataType line from DCIL generator

Modified Paths:
--------------
    trunk/README.txt
    trunk/Tools/NUBuildVS/Neumont.Build.VisualStudio.targets
    trunk/VS2015.bat
    trunk/VSIXInstall/VS2012/Readme.txt
    trunk/VSIXInstall/VS2013/Readme.txt
    trunk/VSIXInstall/VS2015/Readme.txt
    trunk/XML/ConceptualDBtoDCIL/ConceptualDBtoDCIL.xslt

Added Paths:
-----------
    trunk/ORMPackage.VS2015.sln

Added: trunk/ORMPackage.VS2015.sln
===================================================================
(Binary files differ)

Index: trunk/ORMPackage.VS2015.sln
===================================================================

--- trunk/ORMPackage.VS2015.sln	2015-09-07 23:39:27 UTC (rev 1563)
+++ trunk/ORMPackage.VS2015.sln	2016-01-30 09:32:44 UTC (rev 1564)

Property changes on: trunk/ORMPackage.VS2015.sln
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/README.txt
===================================================================
--- trunk/README.txt	2015-09-07 23:39:27 UTC (rev 1563)
+++ trunk/README.txt	2016-01-30 09:32:44 UTC (rev 1564)
@@ -80,13 +80,15 @@
 Notes on building and debugging with VS2008 through VS2015:
 The project files (.csproj, etc) are multitargeted to work correctly in Visual Studio 2005 and higher. However, the solution files (.sln) have slightly different formats in each VS version. If you open a VS2005 solution file in VS2008 then you will be prompted to upgrade. *.VS2008.sln files are provided as companions to all *.sln files for use in VS2008, and you will find corresponding .sln files for each successive version of VisualStudio. However, the *.VS2008.sln files are not sufficient for successfully building in VS2008 (etc).
 
-You must set the TargetVisualStudioVersion to the correct version (listed above) before opening a NORMA project file from any of the Visual Studio IDE environments. There is also a registry that needs to be set so that the ToolsVersion setting the project files match the target environment. The easiest way to do this (after the initial batch files mentioned above have completed successfully) is with the following steps. You may want to put these steps into an easily accessible batch file. The example given is for Visual Studio 2008, but 2010, 2012, 2013, and 2015 work similarly.
+You must set the TargetVisualStudioVersion to the correct version (listed above) before opening a NORMA project file from any of the Visual Studio IDE environments. There is also registry information that needs to be set so that the ToolsVersion setting the project files match the target environment. The easiest way to do this (after the initial batch files mentioned above have completed successfully) is with the following steps. You may want to put these steps into an easily accessible batch file. The example given is for Visual Studio 2008, but 2010, 2012, 2013, and 2015 work similarly.
 
 1) Open a Visual Studio 2008 Command Prompt (as an Administrator)
 2) Navigate to your NORMA root code directory
-3) Execute the VS2008.bat batch file in the command prompt. Each of these batch files (matching the VS20xx environment you're opening) do two things. First, it sets the TargetVisualStudioVersion variable to the appropriate value. Second, it updates the registry to copy the contents of the tools version matching your system to the tools version 12.34. All of the NORMA .csproj files use ToolsVersion="12.34" (a fake number), and modifying the contents of the corresponding registry key allows the same .csproj file to be used for all of the visual studio versions. 
+3) Execute the VS2008.bat batch file in the command prompt. Each of these batch files (matching the VS20xx environment you're opening) do two things. First, it sets the TargetVisualStudioVersion variable to the appropriate value. Second, it updates the registry to copy the contents of the tools version matching your system to the tools version 12.34. All of the NORMA .csproj files use ToolsVersion="12.34" (a fake number), and modifying the contents of the corresponding registry key allows the same .csproj file to be used for all of the visual studio versions.
 4) devenv ORMPackage.VS2008.sln
 
+VS2015 builds are exhibiting an additional issue where the VSCT.exe file used during the build cannot load VSCTCompress.dll. The only current solution for this is to include the directory containing this file on your path. With the Visual Studio SDK installed you should have an environment variable call VSSDK140Install. The VSCT directory is %VSSDK140Install%\VisualStudioIntegration\Tools\Bin. The VS2015.bat file has been extended to automatically extend the path in your local command prompt as needed (be sure to run as an admin or the batch file will not complete).
+
 To build from the command line for VS2008:
 1) Open a 'Visual Studio 2008 Command Prompt'
 2) Navigate to your NORMA root code directory

Modified: trunk/Tools/NUBuildVS/Neumont.Build.VisualStudio.targets
===================================================================
--- trunk/Tools/NUBuildVS/Neumont.Build.VisualStudio.targets	2015-09-07 23:39:27 UTC (rev 1563)
+++ trunk/Tools/NUBuildVS/Neumont.Build.VisualStudio.targets	2016-01-30 09:32:44 UTC (rev 1564)
@@ -55,9 +55,9 @@
 
 	<PropertyGroup>
 		<!-- If we are building for Visual Studio 9.0, use VSCT v3.5, otherwise use VSCT v2.0. -->
-		<VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'=='' and '$(TargetVisualStudioVersion)'=='v14.0'">10.0.0.0</VsctAssemblyVersion>
-		<VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'=='' and '$(TargetVisualStudioVersion)'=='v12.0'">10.0.0.0</VsctAssemblyVersion>
-		<VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'=='' and '$(TargetVisualStudioVersion)'=='v11.0'">10.0.0.0</VsctAssemblyVersion>
+		<VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'=='' and '$(TargetVisualStudioVersion)'=='v14.0'">14.0.0.0</VsctAssemblyVersion>
+		<VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'=='' and '$(TargetVisualStudioVersion)'=='v12.0'">12.0.0.0</VsctAssemblyVersion>
+		<VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'=='' and '$(TargetVisualStudioVersion)'=='v11.0'">11.0.0.0</VsctAssemblyVersion>
 		<VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'=='' and '$(TargetVisualStudioVersion)'=='v10.0'">10.0.0.0</VsctAssemblyVersion>
 		<VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'=='' and '$(TargetVisualStudioVersion)'=='v9.0'">3.5.0.0</VsctAssemblyVersion>
 		<VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'==''">2.0.0.0</VsctAssemblyVersion>

Modified: trunk/VS2015.bat
===================================================================
--- trunk/VS2015.bat	2015-09-07 23:39:27 UTC (rev 1563)
+++ trunk/VS2015.bat	2016-01-30 09:32:44 UTC (rev 1564)
@@ -1 +1,23 @@
 @CALL "%~dp0VSVer.bat" 2015
+
+@ECHO OFF
+::Add SDK tools to path if vsct cannot be found, fails to compile in VS2015 otherwise
+set SDKVSCT=
+for %%i in (vsct.exe) do (set EXISTINGVSCT=%%~s$PATH:i)
+if '%EXISTINGVSCT%'=='' (
+	CALL:GETSHORTPATH "SDKVSCT" "%VSSDK140INSTALL%\VisualStudioIntegration\Tools\Bin"
+)
+if NOT '%SDKVSCT%'=='' (
+	CALL:EXTENDPATH "%SDKVSCT%"
+)
+SET FOUNDVSCT=
+SET SDKVSCT=
+goto:EOF
+
+:GETSHORTPATH
+SET %~1=%~s2
+GOTO:EOF
+
+:EXTENDPATH
+SET PATH=%PATH%;%~1
+GOTO:EOF

Modified: trunk/VSIXInstall/VS2012/Readme.txt
===================================================================
--- trunk/VSIXInstall/VS2012/Readme.txt	2015-09-07 23:39:27 UTC (rev 1563)
+++ trunk/VSIXInstall/VS2012/Readme.txt	2016-01-30 09:32:44 UTC (rev 1564)
@@ -8,7 +8,7 @@
 
 If menu or other packages changes are made and VS2012 does not recognize them, then the .vsixmanifest file can be modified in place as follows:
 1) Shut down VS2012 Experimental Hive
-2) Find the vsix install location for the package. Starting from the directory in the LocalAppData environment variable (or "%userprofile%\Local Settings\Application Data" if LocalAppData is not set), find the extension.vsixmanifest file in "Microsoft\VisualStudio\10.0Exp\Extensions\ORM Solutions\Natural ORM Architect\1.0".
+2) Find the vsix install location for the package. Starting from the directory in the LocalAppData environment variable (or "%userprofile%\Local Settings\Application Data" if LocalAppData is not set), find the extension.vsixmanifest file in "Microsoft\VisualStudio\11.0Exp\Extensions\ORM Solutions\Natural ORM Architect\1.0".
 3) Change the contents of the <InstalledByMsi> tag from true to false (this enables you to disable the extension below).
 4) Delete any .cache files you find in the Extensions directory (three directories above the directory with the manifest file).
 5) Relaunch VS2012 Experimental Hive (devenv /RootSuffix Exp) and open the Tools/Extension Manager dialog.

Modified: trunk/VSIXInstall/VS2013/Readme.txt
===================================================================
--- trunk/VSIXInstall/VS2013/Readme.txt	2015-09-07 23:39:27 UTC (rev 1563)
+++ trunk/VSIXInstall/VS2013/Readme.txt	2016-01-30 09:32:44 UTC (rev 1564)
@@ -8,7 +8,7 @@
 
 If menu or other packages changes are made and VS2013 does not recognize them, then the .vsixmanifest file can be modified in place as follows:
 1) Shut down VS2013 Experimental Hive
-2) Find the vsix install location for the package. Starting from the directory in the LocalAppData environment variable (or "%userprofile%\Local Settings\Application Data" if LocalAppData is not set), find the extension.vsixmanifest file in "Microsoft\VisualStudio\10.0Exp\Extensions\ORM Solutions\Natural ORM Architect\1.0".
+2) Find the vsix install location for the package. Starting from the directory in the LocalAppData environment variable (or "%userprofile%\Local Settings\Application Data" if LocalAppData is not set), find the extension.vsixmanifest file in "Microsoft\VisualStudio\12.0Exp\Extensions\ORM Solutions\Natural ORM Architect\1.0".
 3) Change the contents of the <InstalledByMsi> tag from true to false (this enables you to disable the extension below).
 4) Delete any .cache files you find in the Extensions directory (three directories above the directory with the manifest file).
 5) Relaunch VS2013 Experimental Hive (devenv /RootSuffix Exp) and open the Tools/Extension Manager dialog.

Modified: trunk/VSIXInstall/VS2015/Readme.txt
===================================================================
--- trunk/VSIXInstall/VS2015/Readme.txt	2015-09-07 23:39:27 UTC (rev 1563)
+++ trunk/VSIXInstall/VS2015/Readme.txt	2016-01-30 09:32:44 UTC (rev 1564)
@@ -8,7 +8,7 @@
 
 If menu or other packages changes are made and VS2015 does not recognize them, then the .vsixmanifest file can be modified in place as follows:
 1) Shut down VS2015 Experimental Hive
-2) Find the vsix install location for the package. Starting from the directory in the LocalAppData environment variable (or "%userprofile%\Local Settings\Application Data" if LocalAppData is not set), find the extension.vsixmanifest file in "Microsoft\VisualStudio\10.0Exp\Extensions\ORM Solutions\Natural ORM Architect\1.0".
+2) Find the vsix install location for the package. Starting from the directory in the LocalAppData environment variable (or "%userprofile%\Local Settings\Application Data" if LocalAppData is not set), find the extension.vsixmanifest file in "Microsoft\VisualStudio\14.0Exp\Extensions\ORM Solutions\Natural ORM Architect\1.0".
 3) Change the contents of the <InstalledByMsi> tag from true to false (this enables you to disable the extension below).
 4) Delete any .cache files you find in the Extensions directory (three directories above the directory with the manifest file).
 5) Relaunch VS2015 Experimental Hive (devenv /RootSuffix Exp) and open the Tools/Extension Manager dialog.

Modified: trunk/XML/ConceptualDBtoDCIL/ConceptualDBtoDCIL.xslt
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



