From 73e2a3300a92a53d3c8c49c148655093ae642afb Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Thu, 17 Mar 2016 15:23:50 +0800 Subject: MSVC builds: Re-integrate introspection build in projects GLib has been recently updated to optionally generate the .pc files within the MSVC builds, which is needed to build the introspection files, if Python is available. As we are looking for the .pc files from a common location as a result, we can build the introspection files within the project files, so that the build process does not have to be split into 2 stages. This is done by using wrapper projects that calls the NMake Makefiles that is used to build the introspection files. Note that although the IDE claims that the introspection files failed to build, but they are really generated-so some investigation is needed to see whether we can silence those false-positive errors. Also clean up the property sheets a bit. --- build/win32/vs10/Makefile.am | 2 +- build/win32/vs10/_giscanner.vcxproj | 8 +- build/win32/vs10/gi-build-defines.props | 10 ++ build/win32/vs10/gi-gen-srcs.props | 2 +- build/win32/vs10/gi-install.props | 173 +++++++++++++++++++++++++++++ build/win32/vs10/gi-install.vcxproj | 4 + build/win32/vs10/gi-introspect.vcxproj | 115 +++++++++++++++++++ build/win32/vs10/gi-version-paths.props | 29 +++-- build/win32/vs10/gobject-introspection.sln | 10 ++ build/win32/vs11/Makefile.am | 2 +- build/win32/vs12/Makefile.am | 2 +- build/win32/vs14/Makefile.am | 2 +- build/win32/vs9/Makefile.am | 2 +- build/win32/vs9/_giscanner.vcproj | 8 +- build/win32/vs9/gi-build-defines.vsprops | 8 ++ build/win32/vs9/gi-extra-paths.vsprops | 18 --- build/win32/vs9/gi-gen-srcs.vsprops | 2 +- build/win32/vs9/gi-install.vspropsin | 29 ++++- build/win32/vs9/gi-introspect.vcproj | 76 +++++++++++++ build/win32/vs9/gi-version-paths.vsprops | 30 +++-- build/win32/vs9/gobject-introspection.sln | 17 +++ 21 files changed, 497 insertions(+), 52 deletions(-) create mode 100644 build/win32/vs10/gi-install.props create mode 100644 build/win32/vs10/gi-introspect.vcxproj delete mode 100644 build/win32/vs9/gi-extra-paths.vsprops create mode 100644 build/win32/vs9/gi-introspect.vcproj diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index c22e86cf..30ba26bd 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -10,7 +10,6 @@ GENERATED_ITEMS = \ EXTRA_DIST = \ gobject-introspection.sln \ gi-build-defines.props \ - gi-extra-paths.props \ gi-gen-srcs.props \ gi-install.propsin \ gi-version-paths.props \ @@ -30,6 +29,7 @@ EXTRA_DIST = \ _giscanner.vcxproj \ _giscanner.vcxproj.filters \ gi-install.vcxproj \ + gi-introspect.vcxproj \ README.txt \ $(GENERATED_ITEMS) diff --git a/build/win32/vs10/_giscanner.vcxproj b/build/win32/vs10/_giscanner.vcxproj index 9543bc72..d6894e7b 100644 --- a/build/win32/vs10/_giscanner.vcxproj +++ b/build/win32/vs10/_giscanner.vcxproj @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/build/win32/vs10/gi-build-defines.props b/build/win32/vs10/gi-build-defines.props index 2d60f33e..686cd4d7 100644 --- a/build/win32/vs10/gi-build-defines.props +++ b/build/win32/vs10/gi-build-defines.props @@ -6,6 +6,10 @@ FFI_BUILDING G_IREPOSITORY_COMPILATION;$(FFIDefines);DLL_EXPORT + cd .. +set VCInstallDir=$(VCInstallDir) +nmake -f gi-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstallRoot) + $(SolutionDir)\..\GLib-2.0.gir;$(SolutionDir)\..\GObject-2.0.gir;$(SolutionDir)\..\GModule-2.0.gir;$(SolutionDir)\..\Gio-2.0.gir;$(SolutionDir)\..\GIRepository-2.0.gir;$(SolutionDir)\..\cairo-1.0.gir;$(SolutionDir)\..\win32-1.0.gir;$(SolutionDir)\..\fontconfig-2.0.gir;$(SolutionDir)\..\freetype-2.0.gir;$(SolutionDir)\..\libxml2-2.0.gir;$(SolutionDir)\..\GL-1.0.gir;$(SolutionDir)\..\GLib-2.0.typelib;$(SolutionDir)\..\GObject-2.0.typelib;$(SolutionDir)\..\GModule-2.0.typelib;$(SolutionDir)\..\Gio-2.0.typelib;$(SolutionDir)\..\GIRepository-2.0.typelib;$(SolutionDir)\..\cairo-1.0.typelib;$(SolutionDir)\..\win32-1.0.typelib;$(SolutionDir)\..\fontconfig-2.0.typelib;$(SolutionDir)\..\freetype-2.0.typelib;$(SolutionDir)\..\libxml2-2.0.typelib;$(SolutionDir)\..\GL-1.0.typelib <_PropertySheetDisplayName>gibuilddefinesprops @@ -32,5 +36,11 @@ $(GIRepositoryBuildDefines) + + $(GIIntrospectNMakeCmd) + + + $(GIIntrospectBuiltFiles) + diff --git a/build/win32/vs10/gi-gen-srcs.props b/build/win32/vs10/gi-gen-srcs.props index 37a06c1d..8f7ab6ef 100644 --- a/build/win32/vs10/gi-gen-srcs.props +++ b/build/win32/vs10/gi-gen-srcs.props @@ -1,7 +1,7 @@ - + copy ..\..\..\config.h.win32 ..\..\..\config.h diff --git a/build/win32/vs10/gi-install.props b/build/win32/vs10/gi-install.props new file mode 100644 index 00000000..5a7047ca --- /dev/null +++ b/build/win32/vs10/gi-install.props @@ -0,0 +1,173 @@ + + + + + + + $(SolutionDir)$(Configuration)\$(Platform)\bin + +mkdir $(CopyDir) +mkdir $(CopyDir)\bin +copy $(BinDir)\$(LibGIDllPrefix)girepository$(LibGIDllSuffix).dll $(CopyDir)\bin +copy $(BinDir)\$(LibGIDllPrefix)girepository$(LibGIDllSuffix).pdb $(CopyDir)\bin +copy $(BinDir)\g-ir-compiler.exe $(CopyDir)\bin +copy $(BinDir)\g-ir-compiler.pdb $(CopyDir)\bin +copy $(BinDir)\g-ir-generate.exe $(CopyDir)\bin +copy $(BinDir)\g-ir-generate.pdb $(CopyDir)\bin +copy ..\..\..\tools\g-ir-annotation-tool $(CopyDir)\bin +copy ..\..\..\tools\g-ir-doc-tool $(CopyDir)\bin +copy ..\..\..\tools\g-ir-scanner $(CopyDir)\bin +copy $(BinDir)\glib-print.exe $(CopyDir)\bin +copy $(BinDir)\glib-print.pdb $(CopyDir)\bin +mkdir $(CopyDir)\include\gobject-introspection-1.0\girepository +copy ..\..\..\girepository\giarginfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giarginfo.h +copy ..\..\..\girepository\gibaseinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gibaseinfo.h +copy ..\..\..\girepository\gicallableinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gicallableinfo.h +copy ..\..\..\girepository\giconstantinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giconstantinfo.h +copy ..\..\..\girepository\gienuminfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gienuminfo.h +copy ..\..\..\girepository\gifieldinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gifieldinfo.h +copy ..\..\..\girepository\gifunctioninfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gifunctioninfo.h +copy ..\..\..\girepository\giinterfaceinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giinterfaceinfo.h +copy ..\..\..\girepository\giobjectinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giobjectinfo.h +copy ..\..\..\girepository\gipropertyinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gipropertyinfo.h +copy ..\..\..\girepository\giregisteredtypeinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giregisteredtypeinfo.h +copy ..\..\..\girepository\girepository.h $(CopyDir)\include\gobject-introspection-1.0\girepository\girepository.h +copy ..\..\..\girepository\girffi.h $(CopyDir)\include\gobject-introspection-1.0\girepository\girffi.h +copy ..\..\..\girepository\gisignalinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gisignalinfo.h +copy ..\..\..\girepository\gistructinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gistructinfo.h +copy ..\..\..\girepository\gitypeinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gitypeinfo.h +copy ..\..\..\girepository\gitypelib.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gitypelib.h +copy ..\..\..\girepository\gitypes.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gitypes.h +copy ..\..\..\girepository\giunioninfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giunioninfo.h +copy ..\..\..\girepository\giversionmacros.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giversionmacros.h +copy ..\..\..\girepository\givfuncinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\givfuncinfo.h +mkdir $(CopyDir)\lib\gobject-introspection\giscanner +mkdir $(CopyDir)\lib\gobject-introspection\giscanner\collections +mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates +mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C +mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs +mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python +copy ..\..\..\giscanner\__init__.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\annotationmain.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\annotationparser.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\ast.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\cachestore.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\ccompiler.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\codegen.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\docmain.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\docwriter.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\dumper.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\introspectablepass.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\girparser.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\girwriter.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\gdumpparser.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\libtoolimporter.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\maintransformer.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\message.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\msvccompiler.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\shlibs.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\scannermain.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\sectionparser.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\sourcescanner.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\testcodegen.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\transformer.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\utils.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\xmlwriter.py $(CopyDir)\lib\gobject-introspection\giscanner +copy ..\..\..\giscanner\collections\__init__.py $(CopyDir)\lib\gobject-introspection\giscanner\collections +copy ..\..\..\giscanner\collections\counter.py $(CopyDir)\lib\gobject-introspection\giscanner\collections +copy ..\..\..\giscanner\collections\ordereddict.py $(CopyDir)\lib\gobject-introspection\giscanner\collections +copy ..\..\..\giscanner\doctemplates\base.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates +copy ..\..\..\giscanner\doctemplates\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates +copy ..\..\..\giscanner\doctemplates\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates +copy ..\..\..\giscanner\doctemplates\C\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C +copy ..\..\..\giscanner\doctemplates\C\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C +copy ..\..\..\giscanner\doctemplates\C\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C +copy ..\..\..\giscanner\doctemplates\C\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C +copy ..\..\..\giscanner\doctemplates\C\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C +copy ..\..\..\giscanner\doctemplates\C\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C +copy ..\..\..\giscanner\doctemplates\C\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C +copy ..\..\..\giscanner\doctemplates\C\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C +copy ..\..\..\giscanner\doctemplates\C\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C +copy ..\..\..\giscanner\doctemplates\C\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C +copy ..\..\..\giscanner\doctemplates\C\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C +copy ..\..\..\giscanner\doctemplates\C\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C +copy ..\..\..\giscanner\doctemplates\C\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C +copy ..\..\..\giscanner\doctemplates\C\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C +copy ..\..\..\giscanner\doctemplates\Python\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python +copy ..\..\..\giscanner\doctemplates\Python\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python +copy ..\..\..\giscanner\doctemplates\Python\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python +copy ..\..\..\giscanner\doctemplates\Python\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python +copy ..\..\..\giscanner\doctemplates\Python\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python +copy ..\..\..\giscanner\doctemplates\Python\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python +copy ..\..\..\giscanner\doctemplates\Python\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python +copy ..\..\..\giscanner\doctemplates\Python\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python +copy ..\..\..\giscanner\doctemplates\Python\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python +copy ..\..\..\giscanner\doctemplates\Python\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python +copy ..\..\..\giscanner\doctemplates\Python\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python +copy ..\..\..\giscanner\doctemplates\Python\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python +copy ..\..\..\giscanner\doctemplates\Python\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python +copy ..\..\..\giscanner\doctemplates\Python\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python +copy ..\..\..\giscanner\doctemplates\Gjs\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs +copy ..\..\..\giscanner\doctemplates\Gjs\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs +copy ..\..\..\giscanner\doctemplates\Gjs\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs +copy ..\..\..\giscanner\doctemplates\Gjs\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs +copy ..\..\..\giscanner\doctemplates\Gjs\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs +copy ..\..\..\giscanner\doctemplates\Gjs\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs +copy ..\..\..\giscanner\doctemplates\Gjs\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs +copy ..\..\..\giscanner\doctemplates\Gjs\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs +copy ..\..\..\giscanner\doctemplates\Gjs\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs +copy ..\..\..\giscanner\doctemplates\Gjs\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs +copy ..\..\..\giscanner\doctemplates\Gjs\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs +copy ..\..\..\giscanner\doctemplates\Gjs\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs +copy ..\..\..\giscanner\doctemplates\Gjs\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs +copy ..\..\..\giscanner\doctemplates\Gjs\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs +mkdir $(CopyDir)\share\gobject-introspection-1.0\tests +copy ..\..\..\tests\gitestmacros.h $(CopyDir)\share\gobject-introspection-1.0\tests +copy ..\..\..\tests\gimarshallingtests.c $(CopyDir)\share\gobject-introspection-1.0\tests +copy ..\..\..\tests\gimarshallingtests.h $(CopyDir)\share\gobject-introspection-1.0\tests +copy ..\..\..\tests\scanner\regress.c $(CopyDir)\share\gobject-introspection-1.0\tests +copy ..\..\..\tests\scanner\regress.h $(CopyDir)\share\gobject-introspection-1.0\tests +copy $(BinDir)\_giscanner.pyd $(CopyDir)\lib\gobject-introspection\giscanner +copy $(BinDir)\_giscanner.pdb $(CopyDir)\lib\gobject-introspection\giscanner +mkdir $(CopyDir)\share\gobject-introspection-$(ApiVersion) +copy ..\..\..\girepository\gdump.c $(CopyDir)\share\gobject-introspection-$(ApiVersion) +mkdir $(CopyDir)\lib +copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\girepository-$(ApiVersion).lib $(CopyDir)\lib +mkdir $(CopyDir)\share\gir-$(ApiVersion) +copy ..\cairo-1.0.gir $(CopyDir)\share\gir-$(ApiVersion) +copy ..\fontconfig-2.0.gir $(CopyDir)\share\gir-$(ApiVersion) +copy ..\freetype2-2.0.gir $(CopyDir)\share\gir-$(ApiVersion) +copy ..\Gio-2.0.gir $(CopyDir)\share\gir-$(ApiVersion) +copy ..\GIRepository-2.0.gir $(CopyDir)\share\gir-$(ApiVersion) +copy ..\GL-1.0.gir $(CopyDir)\share\gir-$(ApiVersion) +copy ..\GLib-2.0.gir $(CopyDir)\share\gir-$(ApiVersion) +copy ..\GModule-2.0.gir $(CopyDir)\share\gir-$(ApiVersion) +copy ..\GObject-2.0.gir $(CopyDir)\share\gir-$(ApiVersion) +copy ..\libxml2-2.0.gir $(CopyDir)\share\gir-$(ApiVersion) +copy ..\win32-1.0.gir $(CopyDir)\share\gir-$(ApiVersion) +mkdir $(CopyDir)\lib\girepository-$(ApiVersion) +copy ..\cairo-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion) +copy ..\fontconfig-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion) +copy ..\freetype2-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion) +copy ..\Gio-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion) +copy ..\GIRepository-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion) +copy ..\GL-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion) +copy ..\GLib-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion) +copy ..\GModule-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion) +copy ..\GObject-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion) +copy ..\libxml2-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion) +copy ..\win32-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion) + + + + <_PropertySheetDisplayName>giinstallprops + + + + $(BinDir) + + + $(GIDoInstall) + + + diff --git a/build/win32/vs10/gi-install.vcxproj b/build/win32/vs10/gi-install.vcxproj index fbb757f9..04f214fd 100644 --- a/build/win32/vs10/gi-install.vcxproj +++ b/build/win32/vs10/gi-install.vcxproj @@ -117,6 +117,10 @@ {8311394f-9114-4c97-80f2-51bcaba054c9} false + + {7a36674c-379d-4989-a978-07124e5f852c} + false + diff --git a/build/win32/vs10/gi-introspect.vcxproj b/build/win32/vs10/gi-introspect.vcxproj new file mode 100644 index 00000000..b634495e --- /dev/null +++ b/build/win32/vs10/gi-introspect.vcxproj @@ -0,0 +1,115 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + {7A36674C-379D-4989-A978-07124E5F852C} + giintrospect + + + + Makefile + true + MultiByte + v100 + + + Makefile + false + true + MultiByte + v100 + + + Makefile + MultiByte + v100 + + + Makefile + MultiByte + true + v100 + + + + + + + + + + + + + + + + + + + + + + + $(GIIntrospectNMakeCmd) $(IntrospectPythonParam) + $(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean all + $(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean + $(GIIntrospectBuiltFiles) + + + $(GIIntrospectNMakeCmd) $(IntrospectPythonParam) + $(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean all + $(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean + $(GIIntrospectBuiltFiles) + + + $(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) + $(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all + $(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean + $(GIIntrospectBuiltFiles) + + + $(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) + $(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all + $(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean + $(GIIntrospectBuiltFiles) + + + + {5dcb55ce-f32c-4c77-8bf4-b4dad3ec7774} + false + + + {f4e6621f-a7dd-4863-8ccf-ba04dfc601e3} + false + + + {23e28245-8fc7-4b41-b1c5-8785bd4366a7} + false + + + {8311394f-9114-4c97-80f2-51bcaba054c9} + false + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/gi-version-paths.props b/build/win32/vs10/gi-version-paths.props index bcf31f1c..ae370f45 100644 --- a/build/win32/vs10/gi-version-paths.props +++ b/build/win32/vs10/gi-version-paths.props @@ -3,8 +3,14 @@ 10 $(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform) - $(SolutionDir)\..\..\.. $(GlibEtcInstallRoot) + + c:\\python34 + + $(PythonDir).x64 + PYTHON=$(PythonDir)\python.exe + PYTHON=$(PythonDirX64)\python.exe + $(SolutionDir)\..\..\.. 1.0 $(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName) lib @@ -24,18 +30,27 @@ $(GlibEtcInstallRoot) - - $(BASE_GI_DIR) - $(CopyDir) + + $(PythonDir) + + + $(PythonDirX64) + + + $(IntrospectPythonParam) + + + $(IntrospectPythonParamX64) + + + $(BASE_GI_DIR) + $(ApiVersion) - - $(DefDir) - $(LibGILibtoolCompatibleDllPrefix) diff --git a/build/win32/vs10/gobject-introspection.sln b/build/win32/vs10/gobject-introspection.sln index 25bb9219..57673e09 100644 --- a/build/win32/vs10/gobject-introspection.sln +++ b/build/win32/vs10/gobject-introspection.sln @@ -17,6 +17,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-generate", "g-ir-gener EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-compiler", "g-ir-compiler.vcxproj", "{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gi-introspect", "gi-introspect.vcxproj", "{7A36674C-379D-4989-A978-07124E5F852C}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gi-install", "gi-install.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}" EndProject Global @@ -91,6 +93,14 @@ Global {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.Build.0 = Release|Win32 {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.ActiveCfg = Release|x64 {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.Build.0 = Release|x64 + {7A36674C-379D-4989-A978-07124E5F852C}.Debug|Win32.ActiveCfg = Debug|Win32 + {7A36674C-379D-4989-A978-07124E5F852C}.Debug|Win32.Build.0 = Debug|Win32 + {7A36674C-379D-4989-A978-07124E5F852C}.Debug|x64.ActiveCfg = Debug|x64 + {7A36674C-379D-4989-A978-07124E5F852C}.Debug|x64.Build.0 = Debug|x64 + {7A36674C-379D-4989-A978-07124E5F852C}.Release|Win32.ActiveCfg = Release|Win32 + {7A36674C-379D-4989-A978-07124E5F852C}.Release|Win32.Build.0 = Release|Win32 + {7A36674C-379D-4989-A978-07124E5F852C}.Release|x64.ActiveCfg = Release|x64 + {7A36674C-379D-4989-A978-07124E5F852C}.Release|x64.Build.0 = Release|x64 {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32 {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32 {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am index 9c19974c..db1ca943 100644 --- a/build/win32/vs11/Makefile.am +++ b/build/win32/vs11/Makefile.am @@ -1,7 +1,6 @@ EXTRA_DIST = \ gobject-introspection.sln \ gi-build-defines.props \ - gi-extra-paths.props \ gi-gen-srcs.props \ gi-install.props \ gi-version-paths.props \ @@ -21,6 +20,7 @@ EXTRA_DIST = \ _giscanner.vcxproj \ _giscanner.vcxproj.filters \ gi-install.vcxproj \ + gi-introspect.vcxproj \ README.txt DISTCLEANFILES = $(EXTRA_DIST) diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am index 2ec8bd1a..54f036d0 100644 --- a/build/win32/vs12/Makefile.am +++ b/build/win32/vs12/Makefile.am @@ -1,7 +1,6 @@ EXTRA_DIST = \ gobject-introspection.sln \ gi-build-defines.props \ - gi-extra-paths.props \ gi-gen-srcs.props \ gi-install.props \ gi-version-paths.props \ @@ -21,6 +20,7 @@ EXTRA_DIST = \ _giscanner.vcxproj \ _giscanner.vcxproj.filters \ gi-install.vcxproj \ + gi-introspect.vcxproj \ README.txt DISTCLEANFILES = $(EXTRA_DIST) diff --git a/build/win32/vs14/Makefile.am b/build/win32/vs14/Makefile.am index cc958310..2541de1e 100644 --- a/build/win32/vs14/Makefile.am +++ b/build/win32/vs14/Makefile.am @@ -1,7 +1,6 @@ EXTRA_DIST = \ gobject-introspection.sln \ gi-build-defines.props \ - gi-extra-paths.props \ gi-gen-srcs.props \ gi-install.props \ gi-version-paths.props \ @@ -21,6 +20,7 @@ EXTRA_DIST = \ _giscanner.vcxproj \ _giscanner.vcxproj.filters \ gi-install.vcxproj \ + gi-introspect.vcxproj \ README.txt DISTCLEANFILES = $(EXTRA_DIST) diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index 725a18a5..3ddf180d 100644 --- a/build/win32/vs9/Makefile.am +++ b/build/win32/vs9/Makefile.am @@ -7,7 +7,6 @@ GENERATED_ITEMS = \ EXTRA_DIST = \ gobject-introspection.sln \ gi-build-defines.vsprops \ - gi-extra-paths.vsprops \ gi-gen-srcs.vsprops \ gi-install.vspropsin \ gi-version-paths.vsprops \ @@ -19,6 +18,7 @@ EXTRA_DIST = \ g-ir-generate.vcproj \ glib-print.vcproj \ gi-install.vcproj \ + gi-introspect.vcproj \ _giscanner.vcproj \ README.txt \ $(GENERATED_ITEMS) diff --git a/build/win32/vs9/_giscanner.vcproj b/build/win32/vs9/_giscanner.vcproj index 8f1e2a6e..c19faf7f 100644 --- a/build/win32/vs9/_giscanner.vcproj +++ b/build/win32/vs9/_giscanner.vcproj @@ -22,7 +22,7 @@ @@ -83,7 +83,7 @@ diff --git a/build/win32/vs9/gi-build-defines.vsprops b/build/win32/vs9/gi-build-defines.vsprops index efc28524..7fbf93e1 100644 --- a/build/win32/vs9/gi-build-defines.vsprops +++ b/build/win32/vs9/gi-build-defines.vsprops @@ -27,4 +27,12 @@ Name="GIRepositoryBuildDefines" Value="G_IREPOSITORY_COMPILATION;$(FFIDefines);DLL_EXPORT" /> + + diff --git a/build/win32/vs9/gi-extra-paths.vsprops b/build/win32/vs9/gi-extra-paths.vsprops deleted file mode 100644 index ba7c4a6e..00000000 --- a/build/win32/vs9/gi-extra-paths.vsprops +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - diff --git a/build/win32/vs9/gi-gen-srcs.vsprops b/build/win32/vs9/gi-gen-srcs.vsprops index cd83b45a..8a249789 100644 --- a/build/win32/vs9/gi-gen-srcs.vsprops +++ b/build/win32/vs9/gi-gen-srcs.vsprops @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="8.00" Name="gigensrcsprops" - InheritedPropertySheets=".\gi-extra-paths.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" > diff --git a/build/win32/vs9/gi-introspect.vcproj b/build/win32/vs9/gi-introspect.vcproj new file mode 100644 index 00000000..661c2d5d --- /dev/null +++ b/build/win32/vs9/gi-introspect.vcproj @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/gi-version-paths.vsprops b/build/win32/vs9/gi-version-paths.vsprops index ae0ef094..5cde3304 100644 --- a/build/win32/vs9/gi-version-paths.vsprops +++ b/build/win32/vs9/gi-version-paths.vsprops @@ -12,21 +12,35 @@ Name="GlibEtcInstallRoot" Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)" /> - + + + + + +