[mapguide-commits] r9359 - in trunk/MgDev/Oem: . SQLite/src/SQLitePhpApi

[svn_mapguide at osgeo.org]

Author: jng
Date: 2018-03-06 04:45:29 -0800 (Tue, 06 Mar 2018)
New Revision: 9359

Modified:
   trunk/MgDev/Oem/SQLite/src/SQLitePhpApi/SQLitePhpApi.vcxproj
   trunk/MgDev/Oem/oem.sln
Log:
Add IMake to Oem.sln and ensure it is built before SQLitePhpApi

Fixes #2775

Modified: trunk/MgDev/Oem/SQLite/src/SQLitePhpApi/SQLitePhpApi.vcxproj
===================================================================
--- trunk/MgDev/Oem/SQLite/src/SQLitePhpApi/SQLitePhpApi.vcxproj	2018-03-05 13:19:22 UTC (rev 9358)
+++ trunk/MgDev/Oem/SQLite/src/SQLitePhpApi/SQLitePhpApi.vcxproj	2018-03-06 12:45:29 UTC (rev 9359)
@@ -94,7 +94,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
       <Command>copy .\php.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\SQLiteApiGen.xml PHP
+..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\SQLiteApiGen.xml -l PHP
 ..\..\..\SwigEx\Win32\swig -c++ -php -baseexception SqliteException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((SqliteDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o SQLitePhpApi_wrap.cpp SQLitePhpApi.i
 </Command>
     </PreBuildEvent>
@@ -128,7 +128,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <PreBuildEvent>
       <Command>copy .\php.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\SQLiteApiGen.xml PHP
+..\..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\SQLiteApiGen.xml -l PHP
 ..\..\..\SwigEx\Win32\swig -c++ -php -baseexception SqliteException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((SqliteDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o SQLitePhpApi_wrap.cpp SQLitePhpApi.i
 </Command>
     </PreBuildEvent>
@@ -165,7 +165,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <PreBuildEvent>
       <Command>copy .\php.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\SQLiteApiGen.xml PHP
+..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\SQLiteApiGen.xml -l PHP
 ..\..\..\SwigEx\Win32\swig -c++ -php -baseexception SqliteException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((SqliteDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o SQLitePhpApi_wrap.cpp SQLitePhpApi.i
 </Command>
     </PreBuildEvent>
@@ -200,7 +200,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <PreBuildEvent>
       <Command>copy .\php.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\SQLiteApiGen.xml PHP
+..\..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\SQLiteApiGen.xml -l PHP
 ..\..\..\SwigEx\Win32\swig -c++ -php -baseexception SqliteException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((SqliteDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o SQLitePhpApi_wrap.cpp SQLitePhpApi.i
 </Command>
     </PreBuildEvent>

Modified: trunk/MgDev/Oem/oem.sln
===================================================================
--- trunk/MgDev/Oem/oem.sln	2018-03-05 13:19:22 UTC (rev 9358)
+++ trunk/MgDev/Oem/oem.sln	2018-03-06 12:45:29 UTC (rev 9359)
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.22823.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27428.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "ACE\ACE_wrappers\ace\ACE.vcxproj", "{BD537C9A-FECA-1BAD-6757-8A6363336A1C}"
 EndProject
@@ -54,6 +54,9 @@
 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}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B601F04C-0D42-4AFC-A092-B31185E2EA8C} = {B601F04C-0D42-4AFC-A092-B31185E2EA8C}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLiteUnitTest", "SQLite\src\SQLiteUnitTest\SQLiteUnitTest.vcxproj", "{CC1C1060-E94B-46BC-886B-4997C384F346}"
 EndProject
@@ -84,6 +87,8 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DWF W3D Toolkit", "DWFTK\develop\global\build\VC 14.0\W3DToolkit\W3DToolkit.vcxproj", "{9415DE9A-E01E-47C1-A159-EB1E1D4E518C}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IMake", "..\BuildTools\WebTools\IMake\IMake.vcxproj", "{B601F04C-0D42-4AFC-A092-B31185E2EA8C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -372,8 +377,18 @@
 		{9415DE9A-E01E-47C1-A159-EB1E1D4E518C}.Release|Win32.Build.0 = Release (Read-Write WChar LIB)|Win32
 		{9415DE9A-E01E-47C1-A159-EB1E1D4E518C}.Release|x64.ActiveCfg = Release (Read-Write WChar LIB)|x64
 		{9415DE9A-E01E-47C1-A159-EB1E1D4E518C}.Release|x64.Build.0 = Release (Read-Write WChar LIB)|x64
+		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|Win32.Build.0 = Debug|Win32
+		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x64.ActiveCfg = Debug|Win32
+		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|Win32.ActiveCfg = Release|Win32
+		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|Win32.Build.0 = Release|Win32
+		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.ActiveCfg = Release|x64
+		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {60670312-D49B-46D0-AADC-273278A5327A}
+	EndGlobalSection
 EndGlobal