Merge lp:~mrqtros/ubuntu-docviewer-app/ubuntu-docviewer-app-lib-cache into lp:ubuntu-docviewer-app

[Roman Shchekin]

Upstream libs caching.

Upstream libs caching.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:261
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/110/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/384/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/110/rebuild

review: Needs Fixing (continuous-integration)

[Roman Shchekin (mrqtros)]

Something is wrong with tests...

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:261
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/116/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/390/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/116/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:261
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/130/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/405/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/130/rebuild

review: Approve (continuous-integration)

[Stefano Verzegnassi (verzegnassi-stefano)]

It works great, I must approve it! \o/

I have just some doubt about the multi-arch support, since the latest release of 'Ubuntu SDK' has the new "CMake Wizard" which, by default, could assign the same name[1] to the build folder, even if two different kits (e.g. "desktop" and "UbuntuSDK_for_armhf_GCC_ubuntu_sdk_15_04_vivid") are used[2].
Anyway, that's IMHO just a small payback we only need to keep in mind.

[1] <source_folder> + "-build" suffix
[2] Older version always used to append the kit name as suffix

review: Approve

=== modified file 'cmake/modules/Click.cmake'
--- cmake/modules/Click.cmake	2015-11-22 17:28:09 +0000
+++ cmake/modules/Click.cmake	2016-01-14 19:36:18 +0000
@@ -17,11 +17,24 @@
   set(CUSTOM_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/click/disable-file-locking.sh)
   set(UPSTREAM_LIBS_DIR ${CMAKE_BINARY_DIR}/upstream-libs)
 
-  MESSAGE("Grabbing upstream libs to ${UPSTREAM_LIBS_DIR}")
-  execute_process(
-    COMMAND mkdir ${UPSTREAM_LIBS_DIR}
-    COMMAND ${GET_CLICK_DEPS_TOOL} -d ${DEPS_MANIFEST} -c ${CUSTOM_SCRIPT} ${CLICK_ARCH} ${UPSTREAM_LIBS_DIR}
-  )
+  MESSAGE("Grabbing upstream libs to ${UPSTREAM_LIBS_DIR}") 
+
+  get_filename_component(BLD_CONFIGURATION_NAME ${CMAKE_BINARY_DIR} NAME)
+  set(UPSTREAM_CACHE $ENV{HOME}/dev/upstream-libs-docviewer/${BLD_CONFIGURATION_NAME})
+  MESSAGE("Upstream libs cache path: ${UPSTREAM_CACHE}")  
+
+  if(EXISTS "${UPSTREAM_CACHE}")
+    MESSAGE("Upstream libs cache exists.") 
+    file(COPY ${UPSTREAM_CACHE}/upstream-libs/ DESTINATION ${UPSTREAM_LIBS_DIR} PATTERN * )
+  else()
+    MESSAGE("Cache miss, downloading from network.") 
+    execute_process(
+      COMMAND mkdir ${UPSTREAM_LIBS_DIR}
+      COMMAND ${GET_CLICK_DEPS_TOOL} -d ${DEPS_MANIFEST} -c ${CUSTOM_SCRIPT} ${CLICK_ARCH} ${UPSTREAM_LIBS_DIR}
+    )
+    # Cache for next usage.
+    file(COPY ${UPSTREAM_LIBS_DIR} DESTINATION ${UPSTREAM_CACHE} )
+  endif()
 
   MESSAGE("Installing upstream libs from ${UPSTREAM_LIBS_DIR}/usr/lib/${ARCH_TRIPLET}/ to ${DATA_DIR}lib/${ARCH_TRIPLET}")
   file(GLOB_RECURSE UPSTREAM_LIBS "${UPSTREAM_LIBS_DIR}/usr/lib/${ARCH_TRIPLET}/*")