[gobject-introspection] build/gi-introspection-msvc.mak: Fix Build and Installation
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] build/gi-introspection-msvc.mak: Fix Build and Installation
- Date: Wed, 16 Apr 2014 06:15:01 +0000 (UTC)
commit 37c90f6110924eab439f240fcdb7c6e30f47ade4
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Wed Apr 16 14:14:51 2014 +0800
build/gi-introspection-msvc.mak: Fix Build and Installation
Copy the .gir files that are bundled with g-i to build/ before trying to
compile the .gir's that were generated during the build process, so that
the compilation of these .gir's may succeed. Also, create the
share/gir-1.0 and lib/girepository-1.0 directories, if needed, before
trying to copy the .gir/.typelib files.
build/gi-introspection-msvc.mak | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/build/gi-introspection-msvc.mak b/build/gi-introspection-msvc.mak
index 47e73ec..fc4f258 100644
--- a/build/gi-introspection-msvc.mak
+++ b/build/gi-introspection-msvc.mak
@@ -170,7 +170,7 @@ $(bundled_girs): ..\gir\win32-1.0.gir ..\gir\fontconfig-2.0.gir ..\gir\freetype2
@-copy ..\gir\$*.gir $@
# Generate .typelib's from generated .gir's
-$(built_install_typelibs): $(built_install_girs)
+$(built_install_typelibs): $(bundled_girs) $(built_install_girs)
@-echo Compiling $*.typelib...
@-$(G_IR_COMPILER_CURRENT) --includedir=. --debug --verbose $*.gir -o $@
@@ -180,6 +180,8 @@ $(bundled_typelibs): cairo-1.0.gir $(bundled_girs)
@-$(G_IR_COMPILER_CURRENT) --includedir=. --debug --verbose $*.gir -o $@
install-introspection: setgirbuildnev $(built_install_girs) $(built_install_typelibs) $(bundled_girs)
cairo-1.0.gir $(bundled_typelibs)
+ @-mkdir $(G_IR_INCLUDEDIR)
+ @-mkdir $(G_IR_TYPELIBDIR)
@-copy cairo-1.0.gir $(G_IR_INCLUDEDIR)
@-for %a in ($(built_install_girs)) do @copy %a $(G_IR_INCLUDEDIR)
@-for %b in ($(built_install_typelibs)) do @copy %b $(G_IR_TYPELIBDIR)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]