From 6a95140d981d9629fb1580cdba093258b73ebbc0 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Sat, 15 Jul 2017 01:34:41 +0800 Subject: Visual Studio builds: Don't build introspection by default We aren't able to do a sanity check for g-ir-scanner in the NMake Makefiles without extra tools, so it turns out that it would make it more clear to people if we do not build the introspection files by default here (especially that this is optional). So, by doing so people could get the items needed for introspection ready instead of build failures they do not expect, so people have to build the introspect project explicitly, which will copy the built introspection files to the appropriate location under $(GlibEtcInstallPrefix) when sucessfully done. Also fix the Visual Studio 2008 property sheets as a letter was accidentaly added, breaking the builds. --- win32/vs10/README.txt | 10 +++++----- win32/vs10/atk-install.propsin | 3 --- win32/vs10/atk-install.vcxproj | 4 ---- win32/vs10/atk-introspect.vcxproj | 20 ++++++++++---------- win32/vs10/atk.sln | 16 ++++++---------- win32/vs9/README.txt | 12 ++++++------ win32/vs9/atk-gen-src.vsprops | 2 +- win32/vs9/atk-install.vspropsin | 3 --- win32/vs9/atk-introspect.vcproj | 16 ++++++++-------- win32/vs9/atk.sln | 18 +++++++----------- 10 files changed, 43 insertions(+), 61 deletions(-) diff --git a/win32/vs10/README.txt b/win32/vs10/README.txt index 80ea7bd..40f8a7d 100644 --- a/win32/vs10/README.txt +++ b/win32/vs10/README.txt @@ -79,12 +79,12 @@ your GLib sources in \ and build it from there, following the instructions in \glib<-version>\win32\vs10, so that the required headers, EXEs, DLLs and LIBs will end up in \vs10\\include\glib-2.0 (headers) -\vs10\\lib (LIBs, also glib-2.0/include/glibocnfig.h) +\vs10\\lib (LIBs, also glib-2.0/include/glibconfig.h) \vs10\\bin (EXEs/DLLs) respectively. -Building introspection files are now integrated in the build process of the -solution files. In order for this to work, ensure that PythonDir (32-bit builds) +Building introspection files is now integrated in the solution files, but this is +not built by default. In order for this to work, ensure that PythonDir (32-bit builds) or PythonDirX64 (x64 builds) are set at the installation directory of where your Python installation is. Please note the following: @@ -94,8 +94,8 @@ Python installation is. Please note the following: -g-ir-scanner needs to be found at \vs10\\bin, and the other Python items needs to be under \vs10\\lib\gobject-introspection. --If this fails, the other parts of the build/"install" will still continue to proceed - normally, so this is optional. +-Use the rebuild command on this project, atk-introspect, to re-build or build for other + configurations. After the build of ATK, the "install" project will copy build results and headers into their appropriate location under \vs10\. diff --git a/win32/vs10/atk-install.propsin b/win32/vs10/atk-install.propsin index f8c2815..6f71d14 100644 --- a/win32/vs10/atk-install.propsin +++ b/win32/vs10/atk-install.propsin @@ -18,9 +18,6 @@ copy $(BinDir)\atk-$(ApiVersion).lib $(CopyDir)\lib mkdir $(CopyDir)\include\atk-$(ApiVersion)\atk #include "atk.vs10.headers" -if exist ..\Atk-1.0.gir (mkdir $(CopyDir)\share\gir-1.0 & copy ..\Atk-1.0.gir $(CopyDir)\share\gir-1.0) -if exist ..\Atk-1.0.typelib (mkdir $(CopyDir)\lib\girepository-1.0 & copy ..\Atk-1.0.gir $(CopyDir)\lib\girepository-1.0) - mkdir $(CopyDir)\lib\pkgconfig copy ..\atk.pc $(CopyDir)\lib\pkgconfig diff --git a/win32/vs10/atk-install.vcxproj b/win32/vs10/atk-install.vcxproj index 675d03a..2b36db2 100644 --- a/win32/vs10/atk-install.vcxproj +++ b/win32/vs10/atk-install.vcxproj @@ -110,10 +110,6 @@ {86eacd59-f69f-4aad-854b-aa03d5447360} false - - {7034d75b-2ac9-4ea6-97a2-db4f8526ec5a} - false - diff --git a/win32/vs10/atk-introspect.vcxproj b/win32/vs10/atk-introspect.vcxproj index 98b8e90..965d636 100644 --- a/win32/vs10/atk-introspect.vcxproj +++ b/win32/vs10/atk-introspect.vcxproj @@ -68,32 +68,32 @@ - $(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) - $(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all + $(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) install-introspection + $(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean install-introspection $(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean $(AtkIntrospectBuiltFiles) - $(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) - $(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all + $(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) install-introspection + $(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean install-introspection $(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean $(AtkIntrospectBuiltFiles) - $(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) - $(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all + $(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) install-introspection + $(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean install-introspection $(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean $(AtkIntrospectBuiltFiles) - $(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) - $(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all + $(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) install-introspection + $(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean install-introspection $(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean $(AtkIntrospectBuiltFiles) - - {86eacd59-f69f-4aad-854b-aa03d5447360} + + {00702787-1566-484d-991f-3e7e459bb909} false diff --git a/win32/vs10/atk.sln b/win32/vs10/atk.sln index 8263831..f5f2905 100644 --- a/win32/vs10/atk.sln +++ b/win32/vs10/atk.sln @@ -3,10 +3,10 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk", "atk.vcxproj", "{86EACD59-F69F-4AAD-854B-AA03D5447360}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk-introspect", "atk-introspect.vcxproj", "{7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk-install", "atk-install.vcxproj", "{00702787-1566-484D-991F-3E7E459BB909}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk-introspect", "atk-introspect.vcxproj", "{7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -23,14 +23,6 @@ Global {86EACD59-F69F-4AAD-854B-AA03D5447360}.Release|Win32.Build.0 = Release|Win32 {86EACD59-F69F-4AAD-854B-AA03D5447360}.Release|x64.ActiveCfg = Release|x64 {86EACD59-F69F-4AAD-854B-AA03D5447360}.Release|x64.Build.0 = Release|x64 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|Win32.ActiveCfg = Debug|Win32 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|Win32.Build.0 = Debug|Win32 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|Win32.ActiveCfg = Release|Win32 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|Win32.Build.0 = Release|Win32 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|x64.ActiveCfg = Debug|x64 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|x64.Build.0 = Debug|x64 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|x64.ActiveCfg = Release|x64 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.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 @@ -39,6 +31,10 @@ Global {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 + {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|Win32.ActiveCfg = Debug|Win32 + {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|Win32.ActiveCfg = Release|Win32 + {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|x64.ActiveCfg = Debug|x64 + {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|x64.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/win32/vs9/README.txt b/win32/vs9/README.txt index 472e419..b517104 100644 --- a/win32/vs9/README.txt +++ b/win32/vs9/README.txt @@ -79,13 +79,13 @@ your GLib sources in \ and build it from there, following the instructions in \glib<-version>\win32\vs9, so that the required headers, EXEs, DLLs and LIBs will end up in \vs9\\include\glib-2.0 (headers) -\vs9\\lib (LIBs, also glib-2.0/include/glibocnfig.h) +\vs9\\lib (LIBs, also glib-2.0/include/glibconfig.h) \vs9\\bin (EXEs/DLLs) respectively. -Building introspection files are now integrated in the build process of the -solution files. In order for this to work, ensure that PythonDir (32-bit builds) -or PythonDirX64 (x64 builds) are set at the installation directory of where your +Building introspection files is now integrated in the solution files, but this is +not built by default. In order for this to work, ensure that PythonDir (32-bit builds) +and/or PythonDirX64 (x64 builds) are set at the installation directory of where your Python installation is. Please note the following: -This Python installation must be the same installation/configuration as the @@ -94,8 +94,8 @@ Python installation is. Please note the following: -g-ir-scanner needs to be found at \vs9\\bin, and the other Python items needs to be under \vs9\\lib\gobject-introspection. --If this fails, the other parts of the build/"install" will still continue to proceed - normally, so this is optional. +-Use the rebuild command on this project, atk-introspect, to re-build or build for other + configurations. After the build of ATK, the "install" project will copy build results and headers into their appropriate location under \vs9\. diff --git a/win32/vs9/atk-gen-src.vsprops b/win32/vs9/atk-gen-src.vsprops index aef02e4..e7ffb6c 100644 --- a/win32/vs9/atk-gen-src.vsprops +++ b/win32/vs9/atk-gen-src.vsprops @@ -9,7 +9,7 @@ Name="GenConfigH" Value="if not exist ..\..\config.h copy ..\..\config.h.win32 ..\..\config.h" /> - @@ -38,8 +38,8 @@ > @@ -53,8 +53,8 @@ > @@ -66,8 +66,8 @@ > diff --git a/win32/vs9/atk.sln b/win32/vs9/atk.sln index 4880737..06ed938 100644 --- a/win32/vs9/atk.sln +++ b/win32/vs9/atk.sln @@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk", "atk.vcproj", "{86EACD59-F69F-4AAD-854B-AA03D5447360}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk-introspect", "atk-introspect.vcproj", "{7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk-install", "atk-install.vcproj", "{00702787-1566-484D-991F-3E7E459BB909}" ProjectSection(ProjectDependencies) = postProject {86EACD59-F69F-4AAD-854B-AA03D5447360} = {86EACD59-F69F-4AAD-854B-AA03D5447360} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk-install", "atk-install.vcproj", "{00702787-1566-484D-991F-3E7E459BB909}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk-introspect", "atk-introspect.vcproj", "{7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}" ProjectSection(ProjectDependencies) = postProject {86EACD59-F69F-4AAD-854B-AA03D5447360} = {86EACD59-F69F-4AAD-854B-AA03D5447360} - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A} = {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A} + {00702787-1566-484D-991F-3E7E459BB909} = {00702787-1566-484D-991F-3E7E459BB909} EndProjectSection EndProject Global @@ -30,14 +30,6 @@ Global {86EACD59-F69F-4AAD-854B-AA03D5447360}.Debug|x64.Build.0 = Debug|x64 {86EACD59-F69F-4AAD-854B-AA03D5447360}.Release|x64.ActiveCfg = Release|x64 {86EACD59-F69F-4AAD-854B-AA03D5447360}.Release|x64.Build.0 = Release|x64 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|Win32.ActiveCfg = Debug|Win32 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|Win32.Build.0 = Debug|Win32 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|Win32.ActiveCfg = Release|Win32 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|Win32.Build.0 = Release|Win32 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|x64.ActiveCfg = Debug|x64 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|x64.Build.0 = Debug|x64 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|x64.ActiveCfg = Release|x64 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.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}.Release|Win32.ActiveCfg = Release|Win32 @@ -46,6 +38,10 @@ Global {00702787-1566-484D-991F-3E7E459BB909}.Debug|x64.Build.0 = Debug|x64 {00702787-1566-484D-991F-3E7E459BB909}.Release|x64.ActiveCfg = Release|x64 {00702787-1566-484D-991F-3E7E459BB909}.Release|x64.Build.0 = Release|x64 + {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|Win32.ActiveCfg = Debug|Win32 + {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|Win32.ActiveCfg = Release|Win32 + {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|x64.ActiveCfg = Debug|x64 + {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|x64.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE -- cgit v1.2.1