diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-07-30 14:35:16 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-09-25 23:40:50 +0800 |
| commit | c34741e73e237501156cb0dd536fbef46c84adfa (patch) | |
| tree | 668ac172303927ad2045bd778ca6233ab1fd3871 /build | |
| parent | 6031a99b39c58e0311bf042cee634826bde2845c (diff) | |
| download | gobject-introspection-c34741e73e237501156cb0dd536fbef46c84adfa.tar.gz | |
Clean Up Visual Studio Project Generation
This makes use of the common autotools modules that was just added so that
there would need to be less items in g-i's main Makefile-msvcproj.am, so that
we can generate the complete Visual Studio 2008/2010 project files (which
will then be used to obtain the Visual Studio 2012 and 2013 projects) and
the property sheets to "install" the built binaries and headers.
Diffstat (limited to 'build')
| -rw-r--r-- | build/win32/vs10/Makefile.am | 20 | ||||
| -rw-r--r-- | build/win32/vs10/gi-install.propsin | 4 | ||||
| -rw-r--r-- | build/win32/vs9/Makefile.am | 21 | ||||
| -rw-r--r-- | build/win32/vs9/gi-install.vspropsin | 5 |
4 files changed, 36 insertions, 14 deletions
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index d0d32caa..297224c2 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -1,10 +1,18 @@ +GENERATED_ITEMS = \ + cmph.vcxproj \ + cmph.vcxproj.filters \ + girepository.vcxproj \ + girepository.vcxproj.filters \ + g-ir-compiler.vcxproj \ + g-ir-compiler.vcxproj.filters \ + gi-install.props + EXTRA_DIST = \ gobject-introspection.sln \ gi-build-defines.props \ gi-extra-paths.props \ gi-gen-srcs.props \ gi-install.propsin \ - gi-install.props \ gi-version-paths.props \ gi-prebuild.vcxproj \ girepository.vcxprojin \ @@ -22,10 +30,12 @@ EXTRA_DIST = \ _giscanner.vcxproj \ _giscanner.vcxproj.filters \ install.vcxproj \ - README.txt + README.txt \ + $(GENERATED_ITEMS) -gi-install.props: $(top_srcdir)/build/win32/vs10/gi-install.propsin gir.vs10.install +gi-install.props: $(top_srcdir)/build/win32/vs10/gi-install.propsin girepository.vs10.headers giscanner.vs10.scripts $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gi-install.propsin >$@ - rm gir.vs10.install + rm girepository.vs10.headers + rm giscanner.vs10.scripts -CLEANFILES = gi-install.props +DISTCLEANFILES = $(GENERATED_ITEMS) diff --git a/build/win32/vs10/gi-install.propsin b/build/win32/vs10/gi-install.propsin index 6bdc997d..bf2c0b71 100644 --- a/build/win32/vs10/gi-install.propsin +++ b/build/win32/vs10/gi-install.propsin @@ -24,7 +24,9 @@ copy ..\..\..\tools\g-ir-scanner $(CopyDir)\bin copy $(BinDir)\glib-print.exe $(CopyDir)\bin copy $(BinDir)\glib-print.pdb $(CopyDir)\bin -#include "gir.vs10.install" +mkdir $(CopyDir)\include\gobject-introspection-1.0\girepository +#include "girepository.vs10.headers" +#include "giscanner.vs10.scripts" copy $(BinDir)\_giscanner.pyd $(CopyDir)\lib\gobject-introspection\giscanner copy $(BinDir)\_giscanner.pdb $(CopyDir)\lib\gobject-introspection\giscanner diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index 4fa1e768..0c5845d8 100644 --- a/build/win32/vs9/Makefile.am +++ b/build/win32/vs9/Makefile.am @@ -1,24 +1,31 @@ +GENERATED_ITEMS = \ + cmph.vcproj \ + girepository.vcproj \ + g-ir-compiler.vcproj \ + gi-install.vsprops + EXTRA_DIST = \ gobject-introspection.sln \ gi-build-defines.vsprops \ gi-extra-paths.vsprops \ gi-gen-srcs.vsprops \ gi-install.vspropsin \ - gi-install.vsprops \ gi-version-paths.vsprops \ gi-prebuild.vcproj \ girepository.vcprojin \ - cmph-bdz-test.vcproj \ - cmph.vcprojin \ + cmph-bdz-test.vcproj \ + cmph.vcprojin \ g-ir-compiler.vcprojin \ g-ir-generate.vcproj \ glib-print.vcproj \ install.vcproj \ _giscanner.vcproj \ - README.txt + README.txt \ + $(GENERATED_ITEMS) -gi-install.vsprops: $(top_srcdir)/build/win32/vs9/gi-install.vspropsin gir.vs9.install +gi-install.vsprops: $(top_srcdir)/build/win32/vs9/gi-install.vspropsin girepository.headers giscanner.scripts $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gi-install.vspropsin >$@ - rm gir.vs9.install + rm girepository.headers + rm giscanner.scripts -CLEANFILES = gi-install.vsprops +DISTCLEANFILES = $(GENERATED_ITEMS) diff --git a/build/win32/vs9/gi-install.vspropsin b/build/win32/vs9/gi-install.vspropsin index f7b47165..f47937a3 100644 --- a/build/win32/vs9/gi-install.vspropsin +++ b/build/win32/vs9/gi-install.vspropsin @@ -23,7 +23,10 @@ copy ..\..\..\tools\g-ir-scanner $(CopyDir)\bin
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-print.exe $(CopyDir)\bin
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-print.pdb $(CopyDir)\bin
 -#include "gir.vs9.install" +mkdir $(CopyDir)\include\gobject-introspection-1.0\girepository
 +#include "girepository.headers" +#include "giscanner.scripts" + copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\_giscanner.pyd $(CopyDir)\lib\gobject-introspection\giscanner
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\_giscanner.pdb $(CopyDir)\lib\gobject-introspection\giscanner
 |