[mapguide-commits] r10011 - in trunk/MgDev: . Bindings/src/Bindings Bindings/src/Tools
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Nov 11 01:57:05 PST 2022
Author: jng
Date: 2022-11-11 01:57:04 -0800 (Fri, 11 Nov 2022)
New Revision: 10011
Added:
trunk/MgDev/Bindings/src/Tools/Tools.sln
Removed:
trunk/MgDev/Bindings/src/Tools/Common/
trunk/MgDev/Bindings/src/Tools/PhpPostProcess/
trunk/MgDev/Bindings/src/Tools/StampVer/
trunk/MgDev/Bindings/src/Tools/SwigPrepare/
Modified:
trunk/MgDev/Bindings/src/Bindings/Bindings.sln
trunk/MgDev/Bindings/src/Tools/CMakeLists.txt
trunk/MgDev/setenvironment64.bat
Log:
#2852: More binding project cleanup
- Rmeove various tools that were needed when these bindings were outside of the MpaGuide source tree, but are now no longer needed now that the bindings are in the MapGuide source tree
- Move existing net6.0 tool projects out of bindings.sln to a separate tools.sln. These projects are optional and are not needed as part of the main build. This should remove the need of .net 6.0 SDK as a hard build requirement.
- Remove dotnet restore step in setenvironment64.bat now that we've restructured the binding solution
Modified: trunk/MgDev/Bindings/src/Bindings/Bindings.sln
===================================================================
--- trunk/MgDev/Bindings/src/Bindings/Bindings.sln 2022-11-11 09:48:10 UTC (rev 10010)
+++ trunk/MgDev/Bindings/src/Bindings/Bindings.sln 2022-11-11 09:57:04 UTC (rev 10011)
@@ -87,16 +87,6 @@
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "split", "split", "{025034E6-A625-427B-AA99-5158095ED5F9}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassMapGen", "..\Tools\ClassMapGen\ClassMapGen.csproj", "{C266761B-BC19-4BD7-9EE8-3AE2CE7DE7A4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PhpPostProcess", "..\Tools\PhpPostProcess\PhpPostProcess.csproj", "{42199427-9825-4A45-A3D1-5C3090C57035}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StampVer", "..\Tools\StampVer\StampVer.csproj", "{7A73A95F-DCCC-4880-BA8C-AE8D9D48FA59}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SwigPrepare", "..\Tools\SwigPrepare\SwigPrepare.csproj", "{27210DB6-811B-4D4E-A7E0-6488E5AFA733}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MgTestAdmin", "..\Tools\MgTestAdmin\MgTestAdmin.csproj", "{096D661F-DEA7-4EAB-95BB-F6A0E0AF59FF}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wrap Dependencies", "Wrap Dependencies", "{8CF61B8E-3BE0-4F25-B663-DFB082A67F00}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Geometry", "..\..\..\Common\Geometry\Geometry.vcxproj", "{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}"
@@ -223,46 +213,6 @@
{C83BF842-ABB1-4870-8003-11EF860E6741}.Release|x64.ActiveCfg = Release|x64
{C83BF842-ABB1-4870-8003-11EF860E6741}.Release|x64.Build.0 = Release|x64
{C83BF842-ABB1-4870-8003-11EF860E6741}.Release|x86.ActiveCfg = Release|x64
- {C266761B-BC19-4BD7-9EE8-3AE2CE7DE7A4}.Debug|x64.ActiveCfg = Debug|Any CPU
- {C266761B-BC19-4BD7-9EE8-3AE2CE7DE7A4}.Debug|x64.Build.0 = Debug|Any CPU
- {C266761B-BC19-4BD7-9EE8-3AE2CE7DE7A4}.Debug|x86.ActiveCfg = Debug|Any CPU
- {C266761B-BC19-4BD7-9EE8-3AE2CE7DE7A4}.Debug|x86.Build.0 = Debug|Any CPU
- {C266761B-BC19-4BD7-9EE8-3AE2CE7DE7A4}.Release|x64.ActiveCfg = Release|Any CPU
- {C266761B-BC19-4BD7-9EE8-3AE2CE7DE7A4}.Release|x64.Build.0 = Release|Any CPU
- {C266761B-BC19-4BD7-9EE8-3AE2CE7DE7A4}.Release|x86.ActiveCfg = Release|Any CPU
- {C266761B-BC19-4BD7-9EE8-3AE2CE7DE7A4}.Release|x86.Build.0 = Release|Any CPU
- {42199427-9825-4A45-A3D1-5C3090C57035}.Debug|x64.ActiveCfg = Debug|Any CPU
- {42199427-9825-4A45-A3D1-5C3090C57035}.Debug|x64.Build.0 = Debug|Any CPU
- {42199427-9825-4A45-A3D1-5C3090C57035}.Debug|x86.ActiveCfg = Debug|Any CPU
- {42199427-9825-4A45-A3D1-5C3090C57035}.Debug|x86.Build.0 = Debug|Any CPU
- {42199427-9825-4A45-A3D1-5C3090C57035}.Release|x64.ActiveCfg = Release|Any CPU
- {42199427-9825-4A45-A3D1-5C3090C57035}.Release|x64.Build.0 = Release|Any CPU
- {42199427-9825-4A45-A3D1-5C3090C57035}.Release|x86.ActiveCfg = Release|Any CPU
- {42199427-9825-4A45-A3D1-5C3090C57035}.Release|x86.Build.0 = Release|Any CPU
- {7A73A95F-DCCC-4880-BA8C-AE8D9D48FA59}.Debug|x64.ActiveCfg = Debug|Any CPU
- {7A73A95F-DCCC-4880-BA8C-AE8D9D48FA59}.Debug|x64.Build.0 = Debug|Any CPU
- {7A73A95F-DCCC-4880-BA8C-AE8D9D48FA59}.Debug|x86.ActiveCfg = Debug|Any CPU
- {7A73A95F-DCCC-4880-BA8C-AE8D9D48FA59}.Debug|x86.Build.0 = Debug|Any CPU
- {7A73A95F-DCCC-4880-BA8C-AE8D9D48FA59}.Release|x64.ActiveCfg = Release|Any CPU
- {7A73A95F-DCCC-4880-BA8C-AE8D9D48FA59}.Release|x64.Build.0 = Release|Any CPU
- {7A73A95F-DCCC-4880-BA8C-AE8D9D48FA59}.Release|x86.ActiveCfg = Release|Any CPU
- {7A73A95F-DCCC-4880-BA8C-AE8D9D48FA59}.Release|x86.Build.0 = Release|Any CPU
- {27210DB6-811B-4D4E-A7E0-6488E5AFA733}.Debug|x64.ActiveCfg = Debug|Any CPU
- {27210DB6-811B-4D4E-A7E0-6488E5AFA733}.Debug|x64.Build.0 = Debug|Any CPU
- {27210DB6-811B-4D4E-A7E0-6488E5AFA733}.Debug|x86.ActiveCfg = Debug|Any CPU
- {27210DB6-811B-4D4E-A7E0-6488E5AFA733}.Debug|x86.Build.0 = Debug|Any CPU
- {27210DB6-811B-4D4E-A7E0-6488E5AFA733}.Release|x64.ActiveCfg = Release|Any CPU
- {27210DB6-811B-4D4E-A7E0-6488E5AFA733}.Release|x64.Build.0 = Release|Any CPU
- {27210DB6-811B-4D4E-A7E0-6488E5AFA733}.Release|x86.ActiveCfg = Release|Any CPU
- {27210DB6-811B-4D4E-A7E0-6488E5AFA733}.Release|x86.Build.0 = Release|Any CPU
- {096D661F-DEA7-4EAB-95BB-F6A0E0AF59FF}.Debug|x64.ActiveCfg = Debug|Any CPU
- {096D661F-DEA7-4EAB-95BB-F6A0E0AF59FF}.Debug|x64.Build.0 = Debug|Any CPU
- {096D661F-DEA7-4EAB-95BB-F6A0E0AF59FF}.Debug|x86.ActiveCfg = Debug|Any CPU
- {096D661F-DEA7-4EAB-95BB-F6A0E0AF59FF}.Debug|x86.Build.0 = Debug|Any CPU
- {096D661F-DEA7-4EAB-95BB-F6A0E0AF59FF}.Release|x64.ActiveCfg = Release|Any CPU
- {096D661F-DEA7-4EAB-95BB-F6A0E0AF59FF}.Release|x64.Build.0 = Release|Any CPU
- {096D661F-DEA7-4EAB-95BB-F6A0E0AF59FF}.Release|x86.ActiveCfg = Release|Any CPU
- {096D661F-DEA7-4EAB-95BB-F6A0E0AF59FF}.Release|x86.Build.0 = Release|Any CPU
{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Debug|x64.ActiveCfg = Debug|x64
{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Debug|x64.Build.0 = Debug|x64
{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Debug|x86.ActiveCfg = Debug|Win32
@@ -369,11 +319,6 @@
{0B90819D-4066-4D6C-87E6-3BE4D8F595DE} = {025034E6-A625-427B-AA99-5158095ED5F9}
{C83BF842-ABB1-4870-8003-11EF860E6741} = {025034E6-A625-427B-AA99-5158095ED5F9}
{025034E6-A625-427B-AA99-5158095ED5F9} = {A9257857-9844-4CEA-AF02-A7D8AB8F46AB}
- {C266761B-BC19-4BD7-9EE8-3AE2CE7DE7A4} = {99132700-5CAD-4540-9939-7502C1A448EA}
- {42199427-9825-4A45-A3D1-5C3090C57035} = {99132700-5CAD-4540-9939-7502C1A448EA}
- {7A73A95F-DCCC-4880-BA8C-AE8D9D48FA59} = {99132700-5CAD-4540-9939-7502C1A448EA}
- {27210DB6-811B-4D4E-A7E0-6488E5AFA733} = {99132700-5CAD-4540-9939-7502C1A448EA}
- {096D661F-DEA7-4EAB-95BB-F6A0E0AF59FF} = {99132700-5CAD-4540-9939-7502C1A448EA}
{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0} = {8CF61B8E-3BE0-4F25-B663-DFB082A67F00}
{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425} = {8CF61B8E-3BE0-4F25-B663-DFB082A67F00}
{5287A594-4D4F-43FE-A281-E279AB708CF1} = {8CF61B8E-3BE0-4F25-B663-DFB082A67F00}
Modified: trunk/MgDev/Bindings/src/Tools/CMakeLists.txt
===================================================================
--- trunk/MgDev/Bindings/src/Tools/CMakeLists.txt 2022-11-11 09:48:10 UTC (rev 10010)
+++ trunk/MgDev/Bindings/src/Tools/CMakeLists.txt 2022-11-11 09:57:04 UTC (rev 10011)
@@ -5,8 +5,4 @@
#cmake_policy(SET CMP0054 OLD)
endif(COMMAND cmake_policy)
-set(TOOL_INSTALL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../tools")
-
-add_subdirectory(PhpPostProcess)
-add_subdirectory(StampVer)
-add_subdirectory(SwigPrepare)
\ No newline at end of file
+set(TOOL_INSTALL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../tools")
\ No newline at end of file
Added: trunk/MgDev/Bindings/src/Tools/Tools.sln
===================================================================
--- trunk/MgDev/Bindings/src/Tools/Tools.sln (rev 0)
+++ trunk/MgDev/Bindings/src/Tools/Tools.sln 2022-11-11 09:57:04 UTC (rev 10011)
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassMapGen", "ClassMapGen\ClassMapGen.csproj", "{7E773D5E-50BA-452C-AC95-4D2EA1984ECE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MgTestAdmin", "MgTestAdmin\MgTestAdmin.csproj", "{B8C2DB84-5AAE-4071-9C8D-A16A6BDB40D3}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {7E773D5E-50BA-452C-AC95-4D2EA1984ECE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7E773D5E-50BA-452C-AC95-4D2EA1984ECE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7E773D5E-50BA-452C-AC95-4D2EA1984ECE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7E773D5E-50BA-452C-AC95-4D2EA1984ECE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B8C2DB84-5AAE-4071-9C8D-A16A6BDB40D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B8C2DB84-5AAE-4071-9C8D-A16A6BDB40D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B8C2DB84-5AAE-4071-9C8D-A16A6BDB40D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B8C2DB84-5AAE-4071-9C8D-A16A6BDB40D3}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {3268D1BA-C6D4-4650-A9BE-1F064D13B7FD}
+ EndGlobalSection
+EndGlobal
Modified: trunk/MgDev/setenvironment64.bat
===================================================================
--- trunk/MgDev/setenvironment64.bat 2022-11-11 09:48:10 UTC (rev 10010)
+++ trunk/MgDev/setenvironment64.bat 2022-11-11 09:57:04 UTC (rev 10011)
@@ -134,12 +134,6 @@
SET MSBUILD_CLEAN=msbuild.exe /nologo /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% /t:Clean %MSBUILD_VERBOSITY%
SET ANT=ant
-rem The bindings solution (with net6.0 projects) will not build from a clean slate without doing a dotnet restore first
-if not exist "%CD%\packages\DotNet\Release" mkdir "%CD%\packages\DotNet\Release"
-pushd %CD%\Bindings\src\Bindings
-dotnet restore --force
-popd
-
echo ======== Environment Variable Summary =============
echo PHP_SRC = %PHP_SRC%
echo PHP_LIB = %PHP_LIB%
More information about the mapguide-commits
mailing list