From 242210d8d5fe5a1c2e607a2d1f3ef4077ecab532 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 19 Jul 2013 12:42:30 +0800 Subject: MSVC Builds: Fix "Installation" Process again My previous commit on this (d2613dd9) didn't quite get it right then and some items were missed from that commit. Get that corrected, and ensure also the scripts/templates in collections/ and doctemplates are "installed" accordingly. --- Makefile-msvcproj.am | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/Makefile-msvcproj.am b/Makefile-msvcproj.am index 7937a3aa..a9eb88c5 100644 --- a/Makefile-msvcproj.am +++ b/Makefile-msvcproj.am @@ -120,10 +120,25 @@ done >>./build/win32/vs9/gir.vs9.install echo '' >>./build/win32/vs9/gir.vs9.install echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner ' >>./build/win32/vs9/gir.vs9.install + echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\collections ' >>./build/win32/vs9/gir.vs9.install + echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates ' >>./build/win32/vs9/gir.vs9.install + echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C ' >>./build/win32/vs9/gir.vs9.install + echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs ' >>./build/win32/vs9/gir.vs9.install + echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python ' >>./build/win32/vs9/gir.vs9.install echo '' >>./build/win32/vs9/gir.vs9.install - for F in `echo $(pkgpyexec_PYTHON) | tr '/' '\\'`; do \ + for F in `echo $(pkgpyexec_PYTHON) $(collections_PYTHON) $(nobase_dist_template_DATA) | tr '/' '\\'`; do \ case $$F in \ - *.py|*.tmpl) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner ' \ + giscanner\\doctemplates\\C\\*.tmpl) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C ' \ + ;; \ + giscanner\\doctemplates\\Gjs\\*.tmpl) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs ' \ + ;; \ + giscanner\\doctemplates\\Python\\*.tmpl) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python ' \ + ;; \ + giscanner\\doctemplates\\*.tmpl) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates ' \ + ;; \ + giscanner\\collections\\*.py) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\collections ' \ + ;; \ + giscanner\\*.py) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner ' \ ;; \ esac; \ done >>./build/win32/vs9/gir.vs9.install @@ -141,10 +156,23 @@ echo '' >>./build/win32/vs10/gir.vs10.install echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\collections' >>./build/win32/vs10/gir.vs10.install echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates' >>./build/win32/vs10/gir.vs10.install + echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C' >>./build/win32/vs10/gir.vs10.install + echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs' >>./build/win32/vs10/gir.vs10.install + echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python' >>./build/win32/vs10/gir.vs10.install echo '' >>./build/win32/vs10/gir.vs10.install for F in `echo $(pkgpyexec_PYTHON) $(collections_PYTHON) $(nobase_dist_template_DATA) | tr '/' '\\'`; do \ case $$F in \ - *.py|*.tmpl) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner' && \ + giscanner\\doctemplates\\C\\*.tmpl) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C' \ + ;; \ + giscanner\\doctemplates\\Gjs\\*.tmpl) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs' \ + ;; \ + giscanner\\doctemplates\\Python\\*.tmpl) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python' \ + ;; \ + giscanner\\doctemplates\\*.tmpl) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates' \ + ;; \ + giscanner\\collections\\*.py) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\collections' \ + ;; \ + giscanner\\*.py) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner' && \ echo '' \ ;; \ esac; \ -- cgit v1.2.1