[geary/wip/720442-vapigen] First stab.

[Jim Nelson <jnelson src gnome org>]

commit e55803bc31ae3f6a3e8ea9200f9b4065a855e1a3
Author: Jim Nelson <jim yorba org>
Date:   Fri Dec 13 18:07:52 2013 -0800

    First stab.
    
    Worried about the hardcoded path to the .gir file.

 .gitignore                                         |    1 +
 CMakeLists.txt                                     |    2 -
 Makefile.in                                        |    2 +
 bindings/Makefile                                  |   16 ++++++++
 .../{webkitgtk-2.2 => }/WebKit-3.0.metadata        |    0
 .../metadata/webkitgtk-1.10/WebKit-3.0.metadata    |   16 --------
 .../metadata/webkitgtk-2.0/WebKit-3.0.metadata     |   19 ----------
 src/CMakeLists.txt                                 |   39 ++------------------
 8 files changed, 22 insertions(+), 73 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7bd279e..f81021b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,5 @@ build/
 *.xz
 *.swp
 bindings/vapi/gmime-2.6/gmime-2.6.gi
+bindings/generated
 /valadoc
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a991c61..e7f2423 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,8 +52,6 @@ endif ()
 find_package(PkgConfig)
 pkg_check_modules(LIBUNITY QUIET unity>=5.12.0)
 pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2)
-pkg_check_modules(WEBKITGTK110X QUIET webkitgtk-3.0<=1.10.2)
-pkg_check_modules(WEBKITGTK22X QUIET webkitgtk-3.0>=2.2.0)
 
 # intl
 include(Gettext)
diff --git a/Makefile.in b/Makefile.in
index a966404..c66a57e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,6 +9,7 @@ BUILD_BINARIES := $(addprefix $(BUILD_DIR)/,$(BINARIES))
 
 .PHONY: all
 all:
+       @$(MAKE) -C bindings
        @$(MAKE) -C $(BUILD_DIR)
        @cp $(BUILD_BINARIES) .
 
@@ -29,6 +30,7 @@ pot_file:
 .PHONY: clean
 clean:
        @-$(MAKE) -C $(BUILD_DIR) clean
+       @-$(MAKE) -C bindings clean
        @-rm -f $(BINARIES)
        @-rm -f .stamp
 
diff --git a/bindings/Makefile b/bindings/Makefile
new file mode 100644
index 0000000..db71bba
--- /dev/null
+++ b/bindings/Makefile
@@ -0,0 +1,16 @@
+# Generate .vapi files from .gir files of needed libraries that don't supply VAPIs
+
+all: generated/webkitgtk-3.0.vapi
+
+distclean: clean
+       
+
+clean:
+       @-rm -rf generated
+
+generated/webkitgtk-3.0.vapi: /usr/share/gir-1.0/WebKit-3.0.gir
+       @mkdir -p generated
+       @vapigen --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --pkg=JSCore-3.0 \
+               --metadatadir=metadata --library=webkitgtk-3.0 --directory=generated \
+               /usr/share/gir-1.0/WebKit-3.0.gir
+
diff --git a/bindings/metadata/webkitgtk-2.2/WebKit-3.0.metadata b/bindings/metadata/WebKit-3.0.metadata
similarity index 100%
rename from bindings/metadata/webkitgtk-2.2/WebKit-3.0.metadata
rename to bindings/metadata/WebKit-3.0.metadata
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fab8709..831d82d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -438,40 +438,6 @@ else ()
     message(STATUS "Unity launcher support: OFF")
 endif ()
 
-if (WEBKITGTK110X_FOUND)
-    message(STATUS "Targeting WebKitGTK 1.10")
-    SET(EXTRA_CLIENT_PKG_CONFIG
-        ${EXTRA_CLIENT_PKG_CONFIG}
-        webkitgtk-3.0>=1.10.0
-        webkitgtk-3.0<=1.10.2
-    )
-    
-    SET(WEBKITGTK_METADATA_DIR
-        webkitgtk-1.10
-    )
-elseif (WEBKITGTK22X_FOUND)
-    message(STATUS "Targeting WebKitGTK 2.2")
-    SET(EXTRA_CLIENT_PKG_CONFIG
-        ${EXTRA_CLIENT_PKG_CONFIG}
-        webkitgtk-3.0>=2.2.0
-    )
-    
-    SET(WEBKITGTK_METADATA_DIR
-        webkitgtk-2.2
-    )
-else ()
-    message(STATUS "Targeting WebKitGTK 2.0")
-    SET(EXTRA_CLIENT_PKG_CONFIG
-        ${EXTRA_CLIENT_PKG_CONFIG}
-        webkitgtk-3.0>=2.0.0
-        webkitgtk-3.0<=2.0.4
-    )
-    
-    SET(WEBKITGTK_METADATA_DIR
-        webkitgtk-2.0
-    )
-endif ()
-
 if (NO_FATAL_WARNINGS)
     message(STATUS "Vala fatal warnings: OFF")
 else ()
@@ -497,6 +463,7 @@ pkg_check_modules(DEPS REQUIRED
     gmime-2.6>=2.6.0
     libsecret-1>=0.11
     libxml-2.0>=2.7.8
+    webkitgtk-3.0>=1.10
     ${EXTRA_CLIENT_PKG_CONFIG}
 )
 
@@ -505,7 +472,7 @@ set(ENGINE_PACKAGES
 )
 
 set(CLIENT_PACKAGES
-    gtk+-3.0 libsecret-1 WebKit-3.0 libnotify libcanberra ${EXTRA_CLIENT_PACKAGES}
+    gtk+-3.0 libsecret-1 webkitgtk-3.0 libsoup-2.4 libnotify libcanberra ${EXTRA_CLIENT_PACKAGES}
 )
 
 set(CONSOLE_PACKAGES
@@ -553,8 +520,8 @@ add_definitions(${CFLAGS})
 
 set(VALAC_OPTIONS
     --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi
+    --vapidir=${CMAKE_SOURCE_DIR}/bindings/generated
     --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata
-    --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata/${WEBKITGTK_METADATA_DIR}
     --target-glib=${TARGET_GLIB}
     --thread
     --enable-checking