From 16c41f0c36e20d63db28bc0938d28bd9e40bf1e4 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 6 Jan 2014 11:22:39 +0800 Subject: [PATCH] Drop the testglib MSVC Projects There are many test programs that are shipped with GLib, and this project is a one-to-one project, which does not make sense to keep as various test programs may have different CFLAGS, etc, which will require different build options. --- build/win32/vs10/Makefile.am | 2 - build/win32/vs10/glib.sln | 18 ---- build/win32/vs10/testglib.vcxproj | 173 ------------------------------ build/win32/vs10/testglib.vcxproj.filters | 22 ---- build/win32/vs11/.gitignore | 2 - build/win32/vs11/Makefile.am | 2 - build/win32/vs9/Makefile.am | 1 - build/win32/vs9/glib.sln | 21 ---- build/win32/vs9/testglib.vcproj | 158 --------------------------- 9 files changed, 399 deletions(-) delete mode 100644 build/win32/vs10/testglib.vcxproj delete mode 100644 build/win32/vs10/testglib.vcxproj.filters delete mode 100644 build/win32/vs9/testglib.vcproj diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index e71be5d..2325751 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -23,8 +23,6 @@ EXTRA_DIST = \ gio.vcxproj.filters \ gio.vcxprojin \ gio.vcxproj.filtersin \ - testglib.vcxproj \ - testglib.vcxproj.filters \ glib-compile-schemas.vcxproj \ glib-compile-schemas.vcxproj.filters \ gsettings.vcxproj \ diff --git a/build/win32/vs10/glib.sln b/build/win32/vs10/glib.sln index e6813a1..f647b56 100644 --- a/build/win32/vs10/glib.sln +++ b/build/win32/vs10/glib.sln @@ -16,8 +16,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gspawn-win32-helper", "gspa EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gspawn-win32-helper-console", "gspawn-win32-helper-console.vcxproj", "{E40E8A7E-7CAE-4659-9B8B-BC38898E3074}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testglib", "testglib.vcxproj", "{64E09909-5599-40C0-B808-27F55F7B823C}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-compile-schemas", "glib-compile-schemas.vcxproj", "{015D69D0-8B42-438A-ADAE-052AC036E065}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsettings", "gsettings.vcxproj", "{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}" @@ -172,22 +170,6 @@ Global {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|Win32.Build.0 = Release|Win32 {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|x64.ActiveCfg = Release|x64 {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release|x64.Build.0 = Release|x64 - {64E09909-5599-40C0-B808-27F55F7B823C}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32 - {64E09909-5599-40C0-B808-27F55F7B823C}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32 - {64E09909-5599-40C0-B808-27F55F7B823C}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64 - {64E09909-5599-40C0-B808-27F55F7B823C}.Debug_ExtPCRE|x64.Build.0 = Debug|x64 - {64E09909-5599-40C0-B808-27F55F7B823C}.Debug|Win32.ActiveCfg = Debug|Win32 - {64E09909-5599-40C0-B808-27F55F7B823C}.Debug|Win32.Build.0 = Debug|Win32 - {64E09909-5599-40C0-B808-27F55F7B823C}.Debug|x64.ActiveCfg = Debug|x64 - {64E09909-5599-40C0-B808-27F55F7B823C}.Debug|x64.Build.0 = Debug|x64 - {64E09909-5599-40C0-B808-27F55F7B823C}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32 - {64E09909-5599-40C0-B808-27F55F7B823C}.Release_ExtPCRE|Win32.Build.0 = Release|Win32 - {64E09909-5599-40C0-B808-27F55F7B823C}.Release_ExtPCRE|x64.ActiveCfg = Release|x64 - {64E09909-5599-40C0-B808-27F55F7B823C}.Release_ExtPCRE|x64.Build.0 = Release|x64 - {64E09909-5599-40C0-B808-27F55F7B823C}.Release|Win32.ActiveCfg = Release|Win32 - {64E09909-5599-40C0-B808-27F55F7B823C}.Release|Win32.Build.0 = Release|Win32 - {64E09909-5599-40C0-B808-27F55F7B823C}.Release|x64.ActiveCfg = Release|x64 - {64E09909-5599-40C0-B808-27F55F7B823C}.Release|x64.Build.0 = Release|x64 {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32 {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32 {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64 diff --git a/build/win32/vs10/testglib.vcxproj b/build/win32/vs10/testglib.vcxproj deleted file mode 100644 index 7964a75..0000000 --- a/build/win32/vs10/testglib.vcxproj +++ /dev/null @@ -1,173 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {64E09909-5599-40C0-B808-27F55F7B823C} - testglib - Win32Proj - - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - true - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - false - true - false - - - - Disabled - _DEBUG;GLIB_DISABLE_DEPRECATION_WARNINGS;G_LOG_DOMAIN="GLib";%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - CompileAsC - - - true - Console - false - - - MachineX86 - - - - - GLIB_DISABLE_DEPRECATION_WARNINGS;G_LOG_DOMAIN="GLib";%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - true - Console - true - true - false - - - MachineX86 - - - - - Disabled - _DEBUG;GLIB_DISABLE_DEPRECATION_WARNINGS;G_LOG_DOMAIN="GLib";%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - true - Console - false - - - MachineX64 - - - - - GLIB_DISABLE_DEPRECATION_WARNINGS;G_LOG_DOMAIN="GLib";%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - true - Console - true - true - false - - - MachineX64 - - - - - - - - {12bca020-eabf-429e-876a-a476bc9c10c0} - false - - - - - - \ No newline at end of file diff --git a/build/win32/vs10/testglib.vcxproj.filters b/build/win32/vs10/testglib.vcxproj.filters deleted file mode 100644 index d871809..0000000 --- a/build/win32/vs10/testglib.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - \ No newline at end of file diff --git a/build/win32/vs11/.gitignore b/build/win32/vs11/.gitignore index 8b2b34f..a7e3d4a 100644 --- a/build/win32/vs11/.gitignore +++ b/build/win32/vs11/.gitignore @@ -22,8 +22,6 @@ gspawn-win32-helper.vcxproj gspawn-win32-helper.vcxproj.filters gthread.vcxproj gthread.vcxproj.filters -testglib.vcxproj -testglib.vcxproj.filters install.vcxproj glib.sln README.txt diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am index 538b451..5058d7e 100644 --- a/build/win32/vs11/Makefile.am +++ b/build/win32/vs11/Makefile.am @@ -17,8 +17,6 @@ EXTRA_DIST = \ gthread.vcxproj.filters \ gio.vcxproj \ gio.vcxproj.filters \ - testglib.vcxproj \ - testglib.vcxproj.filters \ glib-compile-schemas.vcxproj \ glib-compile-schemas.vcxproj.filters \ gsettings.vcxproj \ diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index a998bfc..3b34cb9 100644 --- a/build/win32/vs9/Makefile.am +++ b/build/win32/vs9/Makefile.am @@ -12,7 +12,6 @@ EXTRA_DIST = \ gthread.vcproj \ gio.vcproj \ gio.vcprojin \ - testglib.vcproj \ glib-compile-schemas.vcproj \ gsettings.vcproj \ glib-compile-resources.vcproj \ diff --git a/build/win32/vs9/glib.sln b/build/win32/vs9/glib.sln index a32237d..9f7343d 100644 --- a/build/win32/vs9/glib.sln +++ b/build/win32/vs9/glib.sln @@ -40,11 +40,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gspawn-win32-helper-console {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testglib", "testglib.vcproj", "{64E09909-5599-40C0-B808-27F55F7B823C}" - ProjectSection(ProjectDependencies) = postProject - {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-compile-schemas", "glib-compile-schemas.vcproj", "{015D69D0-8B42-438A-ADAE-052AC036E065}" ProjectSection(ProjectDependencies) = postProject {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} @@ -246,22 +241,6 @@ Global {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_ExtPCRE|Win32.Build.0 = Release|Win32 {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_ExtPCRE|x64.ActiveCfg = Release|x64 {E40E8A7E-7CAE-4659-9B8B-BC38898E3074}.Release_ExtPCRE|x64.Build.0 = Release|x64 - {64E09909-5599-40C0-B808-27F55F7B823C}.Debug|Win32.ActiveCfg = Debug|Win32 - {64E09909-5599-40C0-B808-27F55F7B823C}.Debug|Win32.Build.0 = Debug|Win32 - {64E09909-5599-40C0-B808-27F55F7B823C}.Debug|x64.ActiveCfg = Debug|x64 - {64E09909-5599-40C0-B808-27F55F7B823C}.Debug|x64.Build.0 = Debug|x64 - {64E09909-5599-40C0-B808-27F55F7B823C}.Release|Win32.ActiveCfg = Release|Win32 - {64E09909-5599-40C0-B808-27F55F7B823C}.Release|Win32.Build.0 = Release|Win32 - {64E09909-5599-40C0-B808-27F55F7B823C}.Release|x64.ActiveCfg = Release|x64 - {64E09909-5599-40C0-B808-27F55F7B823C}.Release|x64.Build.0 = Release|x64 - {64E09909-5599-40C0-B808-27F55F7B823C}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32 - {64E09909-5599-40C0-B808-27F55F7B823C}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32 - {64E09909-5599-40C0-B808-27F55F7B823C}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64 - {64E09909-5599-40C0-B808-27F55F7B823C}.Debug_ExtPCRE|x64.Build.0 = Debug|x64 - {64E09909-5599-40C0-B808-27F55F7B823C}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32 - {64E09909-5599-40C0-B808-27F55F7B823C}.Release_ExtPCRE|Win32.Build.0 = Release|Win32 - {64E09909-5599-40C0-B808-27F55F7B823C}.Release_ExtPCRE|x64.ActiveCfg = Release|x64 - {64E09909-5599-40C0-B808-27F55F7B823C}.Release_ExtPCRE|x64.Build.0 = Release|x64 {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|Win32.ActiveCfg = Debug|Win32 {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|Win32.Build.0 = Debug|Win32 {015D69D0-8B42-438A-ADAE-052AC036E065}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/build/win32/vs9/testglib.vcproj b/build/win32/vs9/testglib.vcproj deleted file mode 100644 index 49e227f..0000000 --- a/build/win32/vs9/testglib.vcproj +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- 2.7.4