From 9207f349d1c97618ab38e6b095207bbd8184d844 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 29 Jul 2015 15:11:38 +0800 Subject: MSVC Builds: Rename "Install" Project ...and update its GUID so that the existing libcroco projects will fit in easier into all-in-one solution files that is used to build the entire GTK+ stack, where project GUIDs need to me mutually exclusive in solution files. --- build/win32/vs10/Makefile.am | 2 +- build/win32/vs10/croco-install.vcxproj | 132 +++++++++++++++++++++++++++++++++ build/win32/vs10/install.vcxproj | 132 --------------------------------- build/win32/vs10/libcroco.sln | 18 ++--- build/win32/vs11/Makefile.am | 4 +- build/win32/vs12/Makefile.am | 4 +- build/win32/vs9/Makefile.am | 2 +- build/win32/vs9/croco-install.vcproj | 99 +++++++++++++++++++++++++ build/win32/vs9/install.vcproj | 99 ------------------------- build/win32/vs9/libcroco.sln | 18 ++--- 10 files changed, 255 insertions(+), 255 deletions(-) create mode 100644 build/win32/vs10/croco-install.vcxproj delete mode 100644 build/win32/vs10/install.vcxproj create mode 100644 build/win32/vs9/croco-install.vcproj delete mode 100644 build/win32/vs9/install.vcproj diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index 4006e4b..42c87ba 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -27,7 +27,7 @@ EXTRA_DIST = \ croco.vcxproj.filtersin \ csslint.vcxproj \ csslint.vcxproj.filters \ - install.vcxproj \ + croco-install.vcxproj \ libcroco.sln \ croco-build-defines.props \ croco-gen-srcs.props \ diff --git a/build/win32/vs10/croco-install.vcxproj b/build/win32/vs10/croco-install.vcxproj new file mode 100644 index 0000000..6e702bc --- /dev/null +++ b/build/win32/vs10/croco-install.vcxproj @@ -0,0 +1,132 @@ + + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {00702787-1566-484D-991F-4E7E459BB909} + crocoinstall + + + + Utility + MultiByte + true + v100 + + + Utility + MultiByte + v100 + + + Utility + MultiByte + true + v100 + + + Utility + MultiByte + v100 + + + + + + + + + + + + + + + + + + + + + + + $(GlibEtcInstallRoot)\ + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + $(GlibEtcInstallRoot)\ + + + + + + + + + + + + + Installing Build Results... + $(LibCrocoDoInstall) + $(InstalledDlls);$(InstalledBins);$(InstalledWin32Bins);%(Outputs) + Installing Build Results... + $(LibCrocoDoInstall) + $(InstalledDlls);$(InstalledBins);$(InstalledX64Bins);%(Outputs) + Installing Build Results... + $(LibCrocoDoInstall) + $(InstalledDlls);$(InstalledBins);$(InstalledWin32Bins);%(Outputs) + Installing Build Results... + $(LibCrocoDoInstall) + $(InstalledDlls);$(InstalledBins);$(InstalledX64Bins);%(Outputs) + + + + + {4afe9f9b-7f78-41a8-b066-c7ca89938aba} + false + + + {345080b1-9c5b-44b8-98d7-7381d50f3e13} + false + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj deleted file mode 100644 index dfeffcb..0000000 --- a/build/win32/vs10/install.vcxproj +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {00702787-1566-484D-991F-3E7E459BB909} - install - - - - Utility - MultiByte - true - v100 - - - Utility - MultiByte - v100 - - - Utility - MultiByte - true - v100 - - - Utility - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - $(GlibEtcInstallRoot)\ - $(GlibEtcInstallRoot)\ - - $(GlibEtcInstallRoot)\ - $(GlibEtcInstallRoot)\ - - - - - - - - - - - - - Installing Build Results... - $(LibCrocoDoInstall) - $(InstalledDlls);$(InstalledBins);$(InstalledWin32Bins);%(Outputs) - Installing Build Results... - $(LibCrocoDoInstall) - $(InstalledDlls);$(InstalledBins);$(InstalledX64Bins);%(Outputs) - Installing Build Results... - $(LibCrocoDoInstall) - $(InstalledDlls);$(InstalledBins);$(InstalledWin32Bins);%(Outputs) - Installing Build Results... - $(LibCrocoDoInstall) - $(InstalledDlls);$(InstalledBins);$(InstalledX64Bins);%(Outputs) - - - - - {4afe9f9b-7f78-41a8-b066-c7ca89938aba} - false - - - {345080b1-9c5b-44b8-98d7-7381d50f3e13} - false - - - - - - \ No newline at end of file diff --git a/build/win32/vs10/libcroco.sln b/build/win32/vs10/libcroco.sln index a131bf6..2077ef1 100644 --- a/build/win32/vs10/libcroco.sln +++ b/build/win32/vs10/libcroco.sln @@ -5,7 +5,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "croco", "croco.vcxproj", "{ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csslint", "csslint.vcxproj", "{345080B1-9C5B-44B8-98D7-7381D50F3E13}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{00702787-1566-484D-991F-3E7E459BB909}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "croco-install", "croco-install.vcxproj", "{00702787-1566-484D-991F-4E7E459BB909}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -31,14 +31,14 @@ Global {345080B1-9C5B-44B8-98D7-7381D50F3E13}.Release|Win32.Build.0 = Release|Win32 {345080B1-9C5B-44B8-98D7-7381D50F3E13}.Release|x64.ActiveCfg = Release|x64 {345080B1-9C5B-44B8-98D7-7381D50F3E13}.Release|x64.Build.0 = Release|x64 - {00702787-1566-484D-991F-3E7E459BB909}.Debug|Win32.ActiveCfg = Debug|Win32 - {00702787-1566-484D-991F-3E7E459BB909}.Debug|Win32.Build.0 = Debug|Win32 - {00702787-1566-484D-991F-3E7E459BB909}.Debug|x64.ActiveCfg = Debug|x64 - {00702787-1566-484D-991F-3E7E459BB909}.Debug|x64.Build.0 = Debug|x64 - {00702787-1566-484D-991F-3E7E459BB909}.Release|Win32.ActiveCfg = Release|Win32 - {00702787-1566-484D-991F-3E7E459BB909}.Release|Win32.Build.0 = Release|Win32 - {00702787-1566-484D-991F-3E7E459BB909}.Release|x64.ActiveCfg = Release|x64 - {00702787-1566-484D-991F-3E7E459BB909}.Release|x64.Build.0 = Release|x64 + {00702787-1566-484D-991F-4E7E459BB909}.Debug|Win32.ActiveCfg = Debug|Win32 + {00702787-1566-484D-991F-4E7E459BB909}.Debug|Win32.Build.0 = Debug|Win32 + {00702787-1566-484D-991F-4E7E459BB909}.Debug|x64.ActiveCfg = Debug|x64 + {00702787-1566-484D-991F-4E7E459BB909}.Debug|x64.Build.0 = Debug|x64 + {00702787-1566-484D-991F-4E7E459BB909}.Release|Win32.ActiveCfg = Release|Win32 + {00702787-1566-484D-991F-4E7E459BB909}.Release|Win32.Build.0 = Release|Win32 + {00702787-1566-484D-991F-4E7E459BB909}.Release|x64.ActiveCfg = Release|x64 + {00702787-1566-484D-991F-4E7E459BB909}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am index a2865a3..53c654a 100644 --- a/build/win32/vs11/Makefile.am +++ b/build/win32/vs11/Makefile.am @@ -21,8 +21,8 @@ EXTRA_DIST = \ croco.vcxproj \ croco.vcxproj.filters \ csslint.vcxproj \ - csslint.vcxproj.filters \ - install.vcxproj \ + csslint.vcxproj.filters \ + croco-install.vcxproj \ croco-build-defines.props \ croco-gen-srcs.props \ croco-install.props \ diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am index 9e99cfd..26cda86 100644 --- a/build/win32/vs12/Makefile.am +++ b/build/win32/vs12/Makefile.am @@ -21,8 +21,8 @@ EXTRA_DIST = \ croco.vcxproj \ croco.vcxproj.filters \ csslint.vcxproj \ - csslint.vcxproj.filters \ - install.vcxproj \ + csslint.vcxproj.filters \ + croco-install.vcxproj \ croco-build-defines.props \ croco-gen-srcs.props \ croco-install.props \ diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index 9e5f2bc..7e42a9a 100644 --- a/build/win32/vs9/Makefile.am +++ b/build/win32/vs9/Makefile.am @@ -24,7 +24,7 @@ GENERATED_ITEMS = \ EXTRA_DIST = \ croco.vcprojin \ csslint.vcproj \ - install.vcproj \ + croco-install.vcproj \ libcroco.sln \ croco-build-defines.vsprops \ croco-gen-srcs.vsprops \ diff --git a/build/win32/vs9/croco-install.vcproj b/build/win32/vs9/croco-install.vcproj new file mode 100644 index 0000000..a1588b1 --- /dev/null +++ b/build/win32/vs9/croco-install.vcproj @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj deleted file mode 100644 index 9fb8ef6..0000000 --- a/build/win32/vs9/install.vcproj +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/libcroco.sln b/build/win32/vs9/libcroco.sln index 095a8c7..71e1b2f 100644 --- a/build/win32/vs9/libcroco.sln +++ b/build/win32/vs9/libcroco.sln @@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csslint", "csslint.vcproj", {4AFE9F9B-7F78-41A8-B066-C7CA89938ABA} = {4AFE9F9B-7F78-41A8-B066-C7CA89938ABA} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{00702787-1566-484D-991F-3E7E459BB909}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "croco-install", "croco-install.vcproj", "{00702787-1566-484D-991F-4E7E459BB909}" ProjectSection(ProjectDependencies) = postProject {4AFE9F9B-7F78-41A8-B066-C7CA89938ABA} = {4AFE9F9B-7F78-41A8-B066-C7CA89938ABA} {345080B1-9C5B-44B8-98D7-7381D50F3E13} = {345080B1-9C5B-44B8-98D7-7381D50F3E13} @@ -38,14 +38,14 @@ Global {345080B1-9C5B-44B8-98D7-7381D50F3E13}.Release|Win32.Build.0 = Release|Win32 {345080B1-9C5B-44B8-98D7-7381D50F3E13}.Release|x64.ActiveCfg = Release|x64 {345080B1-9C5B-44B8-98D7-7381D50F3E13}.Release|x64.Build.0 = Release|x64 - {00702787-1566-484D-991F-3E7E459BB909}.Debug|Win32.ActiveCfg = Debug|Win32 - {00702787-1566-484D-991F-3E7E459BB909}.Debug|Win32.Build.0 = Debug|Win32 - {00702787-1566-484D-991F-3E7E459BB909}.Debug|x64.ActiveCfg = Debug|x64 - {00702787-1566-484D-991F-3E7E459BB909}.Debug|x64.Build.0 = Debug|x64 - {00702787-1566-484D-991F-3E7E459BB909}.Release|Win32.ActiveCfg = Release|Win32 - {00702787-1566-484D-991F-3E7E459BB909}.Release|Win32.Build.0 = Release|Win32 - {00702787-1566-484D-991F-3E7E459BB909}.Release|x64.ActiveCfg = Release|x64 - {00702787-1566-484D-991F-3E7E459BB909}.Release|x64.Build.0 = Release|x64 + {00702787-1566-484D-991F-4E7E459BB909}.Debug|Win32.ActiveCfg = Debug|Win32 + {00702787-1566-484D-991F-4E7E459BB909}.Debug|Win32.Build.0 = Debug|Win32 + {00702787-1566-484D-991F-4E7E459BB909}.Debug|x64.ActiveCfg = Debug|x64 + {00702787-1566-484D-991F-4E7E459BB909}.Debug|x64.Build.0 = Debug|x64 + {00702787-1566-484D-991F-4E7E459BB909}.Release|Win32.ActiveCfg = Release|Win32 + {00702787-1566-484D-991F-4E7E459BB909}.Release|Win32.Build.0 = Release|Win32 + {00702787-1566-484D-991F-4E7E459BB909}.Release|x64.ActiveCfg = Release|x64 + {00702787-1566-484D-991F-4E7E459BB909}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE -- cgit v1.2.1