[mapguide-commits] r8779 - in sandbox/jng/diet_vs2015/Oem: . ACE/ACE_wrappers/lib SQLite/src/SQLitePhpApi SQLite/src/SQLiteUnitTest
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Oct 14 06:53:08 PDT 2015
Author: jng
Date: 2015-10-14 06:53:08 -0700 (Wed, 14 Oct 2015)
New Revision: 8779
Added:
sandbox/jng/diet_vs2015/Oem/oem_sqlite.sln
Modified:
sandbox/jng/diet_vs2015/Oem/
sandbox/jng/diet_vs2015/Oem/ACE/ACE_wrappers/lib/
sandbox/jng/diet_vs2015/Oem/SQLite/src/SQLitePhpApi/SQLitePhpApi.vcxproj
sandbox/jng/diet_vs2015/Oem/SQLite/src/SQLiteUnitTest/SQLiteUnitTest.vcxproj
sandbox/jng/diet_vs2015/Oem/oem.sln
Log:
Like the old diet_oem sandbox, split oem.sln into two solutions
- One without SQLite components (oem.sln)
- One which is exclusively SQLite components (oem_sqlite.sln)
This allows us to build the main OEM components (oem.sln) without any environment variable setup (required for SQLitePhpApi so it knows where PHP is)
Also update svn ignore lists
Property changes on: sandbox/jng/diet_vs2015/Oem
___________________________________________________________________
Added: svn:ignore
+ .vs
oem.sdf
oem_sqlite.sdf
Property changes on: sandbox/jng/diet_vs2015/Oem/ACE/ACE_wrappers/lib
___________________________________________________________________
Modified: svn:ignore
- Release
+ Release
Debug
Modified: sandbox/jng/diet_vs2015/Oem/SQLite/src/SQLitePhpApi/SQLitePhpApi.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/Oem/SQLite/src/SQLitePhpApi/SQLitePhpApi.vcxproj 2015-10-14 13:46:53 UTC (rev 8778)
+++ sandbox/jng/diet_vs2015/Oem/SQLite/src/SQLitePhpApi/SQLitePhpApi.vcxproj 2015-10-14 13:53:08 UTC (rev 8779)
@@ -244,10 +244,6 @@
<ClCompile Include="SwigWrappers.cpp" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\..\ACE\ACE_wrappers\ace\ACE.vcxproj">
- <Project>{bd537c9a-feca-1bad-6757-8a6363336a1c}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
<ProjectReference Include="..\SQLite3\SQLite.vcxproj">
<Project>{6be4f878-73f2-42f7-b77f-4974dcf8b005}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
Modified: sandbox/jng/diet_vs2015/Oem/SQLite/src/SQLiteUnitTest/SQLiteUnitTest.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/Oem/SQLite/src/SQLiteUnitTest/SQLiteUnitTest.vcxproj 2015-10-14 13:46:53 UTC (rev 8778)
+++ sandbox/jng/diet_vs2015/Oem/SQLite/src/SQLiteUnitTest/SQLiteUnitTest.vcxproj 2015-10-14 13:53:08 UTC (rev 8779)
@@ -208,14 +208,6 @@
<ClInclude Include="tester.h" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\..\ACE\ACE_wrappers\ace\ACE.vcxproj">
- <Project>{bd537c9a-feca-1bad-6757-8a6363336a1c}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="..\..\..\CppUnit-1.9.14\src\cppunit\cppunit.vcxproj">
- <Project>{aa0817e7-095c-465c-90b3-9221de17ec70}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
<ProjectReference Include="..\SQLite3\SQLite.vcxproj">
<Project>{6be4f878-73f2-42f7-b77f-4974dcf8b005}</Project>
</ProjectReference>
Modified: sandbox/jng/diet_vs2015/Oem/oem.sln
===================================================================
--- sandbox/jng/diet_vs2015/Oem/oem.sln 2015-10-14 13:46:53 UTC (rev 8778)
+++ sandbox/jng/diet_vs2015/Oem/oem.sln 2015-10-14 13:53:08 UTC (rev 8779)
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
-VisualStudioVersion = 14.0.22823.1
+VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "ACE\ACE_wrappers\ace\ACE.vcxproj", "{BD537C9A-FECA-1BAD-6757-8A6363336A1C}"
EndProject
@@ -49,20 +49,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppunit", "CppUnit-1.9.14\src\cppunit\cppunit.vcxproj", "{AA0817E7-095C-465C-90B3-9221DE17EC70}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite", "SQLite\src\SQLite3\SQLite.vcxproj", "{6BE4F878-73F2-42F7-B77F-4974DCF8B005}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SqliteDotNet", "SQLite\src\SqliteDotNet\SqliteDotNet.vcxproj", "{82BAB86A-BBDE-42F3-B0BD-E69CDF1E8119}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLitePhpApi", "SQLite\src\SQLitePhpApi\SQLitePhpApi.vcxproj", "{7E6F7F0D-0045-47B9-868C-E31C04FAE81F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLiteUnitTest", "SQLite\src\SQLiteUnitTest\SQLiteUnitTest.vcxproj", "{CC1C1060-E94B-46BC-886B-4997C384F346}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqliteVM", "SQLite\src\SqliteVM\sqliteVM.vcxproj", "{BE0B498C-2C41-46E9-82B7-697FDD3F68E3}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_json", "jsoncpp\src\lib_json\lib_json.vcxproj", "{B84F7231-16CE-41D8-8C08-7B523FF4225B}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqliteGUI", "SQLite\src\SqliteGUI\SqliteGUI.csproj", "{5CB5F2F4-D9B5-4E3E-B758-240E6E5D156A}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "gd\lpng\projects\vs\libpng.vcxproj", "{AB3DAD75-F5C9-4DA6-9773-9B659E97274C}"
ProjectSection(ProjectDependencies) = postProject
{3CECB989-0B34-449D-9161-8BEE074D7EC0} = {3CECB989-0B34-449D-9161-8BEE074D7EC0}
@@ -244,46 +232,6 @@
{AA0817E7-095C-465C-90B3-9221DE17EC70}.Release|Win32.Build.0 = Release|Win32
{AA0817E7-095C-465C-90B3-9221DE17EC70}.Release|x64.ActiveCfg = Release|x64
{AA0817E7-095C-465C-90B3-9221DE17EC70}.Release|x64.Build.0 = Release|x64
- {6BE4F878-73F2-42F7-B77F-4974DCF8B005}.Debug|Win32.ActiveCfg = Debug|Win32
- {6BE4F878-73F2-42F7-B77F-4974DCF8B005}.Debug|Win32.Build.0 = Debug|Win32
- {6BE4F878-73F2-42F7-B77F-4974DCF8B005}.Debug|x64.ActiveCfg = Debug|x64
- {6BE4F878-73F2-42F7-B77F-4974DCF8B005}.Debug|x64.Build.0 = Debug|x64
- {6BE4F878-73F2-42F7-B77F-4974DCF8B005}.Release|Win32.ActiveCfg = Release|Win32
- {6BE4F878-73F2-42F7-B77F-4974DCF8B005}.Release|Win32.Build.0 = Release|Win32
- {6BE4F878-73F2-42F7-B77F-4974DCF8B005}.Release|x64.ActiveCfg = Release|x64
- {6BE4F878-73F2-42F7-B77F-4974DCF8B005}.Release|x64.Build.0 = Release|x64
- {82BAB86A-BBDE-42F3-B0BD-E69CDF1E8119}.Debug|Win32.ActiveCfg = Debug|Win32
- {82BAB86A-BBDE-42F3-B0BD-E69CDF1E8119}.Debug|Win32.Build.0 = Debug|Win32
- {82BAB86A-BBDE-42F3-B0BD-E69CDF1E8119}.Debug|x64.ActiveCfg = Debug|x64
- {82BAB86A-BBDE-42F3-B0BD-E69CDF1E8119}.Debug|x64.Build.0 = Debug|x64
- {82BAB86A-BBDE-42F3-B0BD-E69CDF1E8119}.Release|Win32.ActiveCfg = Release|Win32
- {82BAB86A-BBDE-42F3-B0BD-E69CDF1E8119}.Release|Win32.Build.0 = Release|Win32
- {82BAB86A-BBDE-42F3-B0BD-E69CDF1E8119}.Release|x64.ActiveCfg = Release|x64
- {82BAB86A-BBDE-42F3-B0BD-E69CDF1E8119}.Release|x64.Build.0 = Release|x64
- {7E6F7F0D-0045-47B9-868C-E31C04FAE81F}.Debug|Win32.ActiveCfg = Debug|Win32
- {7E6F7F0D-0045-47B9-868C-E31C04FAE81F}.Debug|Win32.Build.0 = Debug|Win32
- {7E6F7F0D-0045-47B9-868C-E31C04FAE81F}.Debug|x64.ActiveCfg = Debug|x64
- {7E6F7F0D-0045-47B9-868C-E31C04FAE81F}.Debug|x64.Build.0 = Debug|x64
- {7E6F7F0D-0045-47B9-868C-E31C04FAE81F}.Release|Win32.ActiveCfg = Release|Win32
- {7E6F7F0D-0045-47B9-868C-E31C04FAE81F}.Release|Win32.Build.0 = Release|Win32
- {7E6F7F0D-0045-47B9-868C-E31C04FAE81F}.Release|x64.ActiveCfg = Release|x64
- {7E6F7F0D-0045-47B9-868C-E31C04FAE81F}.Release|x64.Build.0 = Release|x64
- {CC1C1060-E94B-46BC-886B-4997C384F346}.Debug|Win32.ActiveCfg = Debug|Win32
- {CC1C1060-E94B-46BC-886B-4997C384F346}.Debug|Win32.Build.0 = Debug|Win32
- {CC1C1060-E94B-46BC-886B-4997C384F346}.Debug|x64.ActiveCfg = Debug|x64
- {CC1C1060-E94B-46BC-886B-4997C384F346}.Debug|x64.Build.0 = Debug|x64
- {CC1C1060-E94B-46BC-886B-4997C384F346}.Release|Win32.ActiveCfg = Release|Win32
- {CC1C1060-E94B-46BC-886B-4997C384F346}.Release|Win32.Build.0 = Release|Win32
- {CC1C1060-E94B-46BC-886B-4997C384F346}.Release|x64.ActiveCfg = Release|x64
- {CC1C1060-E94B-46BC-886B-4997C384F346}.Release|x64.Build.0 = Release|x64
- {BE0B498C-2C41-46E9-82B7-697FDD3F68E3}.Debug|Win32.ActiveCfg = Debug|Win32
- {BE0B498C-2C41-46E9-82B7-697FDD3F68E3}.Debug|Win32.Build.0 = Debug|Win32
- {BE0B498C-2C41-46E9-82B7-697FDD3F68E3}.Debug|x64.ActiveCfg = Debug|x64
- {BE0B498C-2C41-46E9-82B7-697FDD3F68E3}.Debug|x64.Build.0 = Debug|x64
- {BE0B498C-2C41-46E9-82B7-697FDD3F68E3}.Release|Win32.ActiveCfg = Release|Win32
- {BE0B498C-2C41-46E9-82B7-697FDD3F68E3}.Release|Win32.Build.0 = Release|Win32
- {BE0B498C-2C41-46E9-82B7-697FDD3F68E3}.Release|x64.ActiveCfg = Release|x64
- {BE0B498C-2C41-46E9-82B7-697FDD3F68E3}.Release|x64.Build.0 = Release|x64
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Debug|Win32.ActiveCfg = Debug|Win32
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Debug|Win32.Build.0 = Debug|Win32
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Debug|x64.ActiveCfg = Debug|x64
@@ -292,14 +240,6 @@
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Release|Win32.Build.0 = Release|Win32
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Release|x64.ActiveCfg = Release|x64
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Release|x64.Build.0 = Release|x64
- {5CB5F2F4-D9B5-4E3E-B758-240E6E5D156A}.Debug|Win32.ActiveCfg = Debug|Any CPU
- {5CB5F2F4-D9B5-4E3E-B758-240E6E5D156A}.Debug|Win32.Build.0 = Debug|Any CPU
- {5CB5F2F4-D9B5-4E3E-B758-240E6E5D156A}.Debug|x64.ActiveCfg = Debug|x64
- {5CB5F2F4-D9B5-4E3E-B758-240E6E5D156A}.Debug|x64.Build.0 = Debug|x64
- {5CB5F2F4-D9B5-4E3E-B758-240E6E5D156A}.Release|Win32.ActiveCfg = Release|Any CPU
- {5CB5F2F4-D9B5-4E3E-B758-240E6E5D156A}.Release|Win32.Build.0 = Release|Any CPU
- {5CB5F2F4-D9B5-4E3E-B758-240E6E5D156A}.Release|x64.ActiveCfg = Release|x64
- {5CB5F2F4-D9B5-4E3E-B758-240E6E5D156A}.Release|x64.Build.0 = Release|x64
{AB3DAD75-F5C9-4DA6-9773-9B659E97274C}.Debug|Win32.ActiveCfg = LIB ASM Debug|Win32
{AB3DAD75-F5C9-4DA6-9773-9B659E97274C}.Debug|Win32.Build.0 = LIB ASM Debug|Win32
{AB3DAD75-F5C9-4DA6-9773-9B659E97274C}.Debug|x64.ActiveCfg = LIB Debug|x64
Added: sandbox/jng/diet_vs2015/Oem/oem_sqlite.sln
===================================================================
--- sandbox/jng/diet_vs2015/Oem/oem_sqlite.sln (rev 0)
+++ sandbox/jng/diet_vs2015/Oem/oem_sqlite.sln 2015-10-14 13:53:08 UTC (rev 8779)
@@ -0,0 +1,77 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite", "SQLite\src\SQLite3\SQLite.vcxproj", "{6BE4F878-73F2-42F7-B77F-4974DCF8B005}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SqliteDotNet", "SQLite\src\SqliteDotNet\SqliteDotNet.vcxproj", "{82BAB86A-BBDE-42F3-B0BD-E69CDF1E8119}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLitePhpApi", "SQLite\src\SQLitePhpApi\SQLitePhpApi.vcxproj", "{7E6F7F0D-0045-47B9-868C-E31C04FAE81F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLiteUnitTest", "SQLite\src\SQLiteUnitTest\SQLiteUnitTest.vcxproj", "{CC1C1060-E94B-46BC-886B-4997C384F346}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqliteVM", "SQLite\src\SqliteVM\sqliteVM.vcxproj", "{BE0B498C-2C41-46E9-82B7-697FDD3F68E3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqliteGUI", "SQLite\src\SqliteGUI\SqliteGUI.csproj", "{5CB5F2F4-D9B5-4E3E-B758-240E6E5D156A}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {6BE4F878-73F2-42F7-B77F-4974DCF8B005}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6BE4F878-73F2-42F7-B77F-4974DCF8B005}.Debug|Win32.Build.0 = Debug|Win32
+ {6BE4F878-73F2-42F7-B77F-4974DCF8B005}.Debug|x64.ActiveCfg = Debug|x64
+ {6BE4F878-73F2-42F7-B77F-4974DCF8B005}.Debug|x64.Build.0 = Debug|x64
+ {6BE4F878-73F2-42F7-B77F-4974DCF8B005}.Release|Win32.ActiveCfg = Release|Win32
+ {6BE4F878-73F2-42F7-B77F-4974DCF8B005}.Release|Win32.Build.0 = Release|Win32
+ {6BE4F878-73F2-42F7-B77F-4974DCF8B005}.Release|x64.ActiveCfg = Release|x64
+ {6BE4F878-73F2-42F7-B77F-4974DCF8B005}.Release|x64.Build.0 = Release|x64
+ {82BAB86A-BBDE-42F3-B0BD-E69CDF1E8119}.Debug|Win32.ActiveCfg = Debug|Win32
+ {82BAB86A-BBDE-42F3-B0BD-E69CDF1E8119}.Debug|Win32.Build.0 = Debug|Win32
+ {82BAB86A-BBDE-42F3-B0BD-E69CDF1E8119}.Debug|x64.ActiveCfg = Debug|x64
+ {82BAB86A-BBDE-42F3-B0BD-E69CDF1E8119}.Debug|x64.Build.0 = Debug|x64
+ {82BAB86A-BBDE-42F3-B0BD-E69CDF1E8119}.Release|Win32.ActiveCfg = Release|Win32
+ {82BAB86A-BBDE-42F3-B0BD-E69CDF1E8119}.Release|Win32.Build.0 = Release|Win32
+ {82BAB86A-BBDE-42F3-B0BD-E69CDF1E8119}.Release|x64.ActiveCfg = Release|x64
+ {82BAB86A-BBDE-42F3-B0BD-E69CDF1E8119}.Release|x64.Build.0 = Release|x64
+ {7E6F7F0D-0045-47B9-868C-E31C04FAE81F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7E6F7F0D-0045-47B9-868C-E31C04FAE81F}.Debug|Win32.Build.0 = Debug|Win32
+ {7E6F7F0D-0045-47B9-868C-E31C04FAE81F}.Debug|x64.ActiveCfg = Debug|x64
+ {7E6F7F0D-0045-47B9-868C-E31C04FAE81F}.Debug|x64.Build.0 = Debug|x64
+ {7E6F7F0D-0045-47B9-868C-E31C04FAE81F}.Release|Win32.ActiveCfg = Release|Win32
+ {7E6F7F0D-0045-47B9-868C-E31C04FAE81F}.Release|Win32.Build.0 = Release|Win32
+ {7E6F7F0D-0045-47B9-868C-E31C04FAE81F}.Release|x64.ActiveCfg = Release|x64
+ {7E6F7F0D-0045-47B9-868C-E31C04FAE81F}.Release|x64.Build.0 = Release|x64
+ {CC1C1060-E94B-46BC-886B-4997C384F346}.Debug|Win32.ActiveCfg = Debug|Win32
+ {CC1C1060-E94B-46BC-886B-4997C384F346}.Debug|Win32.Build.0 = Debug|Win32
+ {CC1C1060-E94B-46BC-886B-4997C384F346}.Debug|x64.ActiveCfg = Debug|x64
+ {CC1C1060-E94B-46BC-886B-4997C384F346}.Debug|x64.Build.0 = Debug|x64
+ {CC1C1060-E94B-46BC-886B-4997C384F346}.Release|Win32.ActiveCfg = Release|Win32
+ {CC1C1060-E94B-46BC-886B-4997C384F346}.Release|Win32.Build.0 = Release|Win32
+ {CC1C1060-E94B-46BC-886B-4997C384F346}.Release|x64.ActiveCfg = Release|x64
+ {CC1C1060-E94B-46BC-886B-4997C384F346}.Release|x64.Build.0 = Release|x64
+ {BE0B498C-2C41-46E9-82B7-697FDD3F68E3}.Debug|Win32.ActiveCfg = Debug|Win32
+ {BE0B498C-2C41-46E9-82B7-697FDD3F68E3}.Debug|Win32.Build.0 = Debug|Win32
+ {BE0B498C-2C41-46E9-82B7-697FDD3F68E3}.Debug|x64.ActiveCfg = Debug|x64
+ {BE0B498C-2C41-46E9-82B7-697FDD3F68E3}.Debug|x64.Build.0 = Debug|x64
+ {BE0B498C-2C41-46E9-82B7-697FDD3F68E3}.Release|Win32.ActiveCfg = Release|Win32
+ {BE0B498C-2C41-46E9-82B7-697FDD3F68E3}.Release|Win32.Build.0 = Release|Win32
+ {BE0B498C-2C41-46E9-82B7-697FDD3F68E3}.Release|x64.ActiveCfg = Release|x64
+ {BE0B498C-2C41-46E9-82B7-697FDD3F68E3}.Release|x64.Build.0 = Release|x64
+ {5CB5F2F4-D9B5-4E3E-B758-240E6E5D156A}.Debug|Win32.ActiveCfg = Debug|Any CPU
+ {5CB5F2F4-D9B5-4E3E-B758-240E6E5D156A}.Debug|Win32.Build.0 = Debug|Any CPU
+ {5CB5F2F4-D9B5-4E3E-B758-240E6E5D156A}.Debug|x64.ActiveCfg = Debug|x64
+ {5CB5F2F4-D9B5-4E3E-B758-240E6E5D156A}.Debug|x64.Build.0 = Debug|x64
+ {5CB5F2F4-D9B5-4E3E-B758-240E6E5D156A}.Release|Win32.ActiveCfg = Release|Any CPU
+ {5CB5F2F4-D9B5-4E3E-B758-240E6E5D156A}.Release|Win32.Build.0 = Release|Any CPU
+ {5CB5F2F4-D9B5-4E3E-B758-240E6E5D156A}.Release|x64.ActiveCfg = Release|x64
+ {5CB5F2F4-D9B5-4E3E-B758-240E6E5D156A}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
More information about the mapguide-commits
mailing list