Ubuntu File Manager App

Merge lp:~nskaggs/ubuntu-filemanager-app/add-dep-cache into lp:ubuntu-filemanager-app

  1. add-dep-cache
  2. Merge into trunk
Proposed by Nicholas Skaggs
Status: Merged
Approved by: Arto Jalkanen
Approved revision: 534
Merged at revision: 531
Proposed branch: lp:~nskaggs/ubuntu-filemanager-app/add-dep-cache
Merge into: lp:ubuntu-filemanager-app
Prerequisite: lp:~nskaggs/ubuntu-filemanager-app/fix-ap-tests
Diff against target: 61 lines (+35/-16)
1 file modified
CMakeLists.txt (+35/-16)
To merge this branch: bzr merge lp:~nskaggs/ubuntu-filemanager-app/add-dep-cache
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Arto Jalkanen Approve
Review via email: mp+288714@code.launchpad.net

This proposal supersedes a proposal from 2016-03-10.

Commit message

Add dependency cache for click depends downloads

Description of the change

Add dependency cache for click depends downloads

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:532
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/54/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/751/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/54/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:532
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/55/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/752/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/55/rebuild

review: Needs Fixing (continuous-integration)
lp:~nskaggs/ubuntu-filemanager-app/add-dep-cache updated
533. By Nicholas Skaggs

add mkdir for cache

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:532
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/56/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/753/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/56/rebuild

review: Approve (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:533
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/57/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/754/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/57/rebuild

review: Approve (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:533
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/58/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/756/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/58/rebuild

review: Approve (continuous-integration)
lp:~nskaggs/ubuntu-filemanager-app/add-dep-cache updated
534. By Nicholas Skaggs

use make directory

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:534
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/59/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/759/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/59/rebuild

review: Approve (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:534
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/60/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/760/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/60/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:534
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/61/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/762/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/61/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:534
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/62/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/763/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/62/rebuild

review: Approve (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:534
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/63/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/765/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/63/rebuild

review: Approve (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:534
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/64/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/767/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/64/rebuild

review: Approve (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:534
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/65/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/768/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/65/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:534
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/66/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/770/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/66/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:534
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/67/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/771/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/67/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:534
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/68/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/772/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/68/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:534
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/69/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/773/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/69/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:534
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/70/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/774/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/70/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:534
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/71/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/776/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/71/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:534
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/72/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/781/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/72/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:534
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/73/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/782/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/73/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:534
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/78/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/787/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/78/rebuild

review: Approve (continuous-integration)
Revision history for this message
Arto Jalkanen (ajalkane) wrote :

Passes tests, approved

review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-10-20 18:28:30 +0000
3+++ CMakeLists.txt 2016-03-10 22:38:08 +0000
4@@ -73,22 +73,41 @@
5
6 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json filemanager.apparmor ${CONTENT_HUB_EXPORTER} DESTINATION ${CMAKE_INSTALL_PREFIX})
7
8- MESSAGE("Grabbing upstream libs to ${CMAKE_CURRENT_BINARY_DIR}/upstream-libs")
9- execute_process(
10- COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/upstream-libs
11- COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/get-click-deps -d ${CMAKE_CURRENT_SOURCE_DIR}/filemanager-libs.json ${CLICK_ARCH} ${CMAKE_CURRENT_BINARY_DIR}/upstream-libs
12- )
13- MESSAGE("Installing upstream libs from ${CMAKE_CURRENT_BINARY_DIR}/upstream-libs/usr/lib/${ARCH_TRIPLET}/ to ${DATA_DIR}lib/${ARCH_TRIPLET}")
14- file(GLOB_RECURSE UPSTREAM_LIBS "${CMAKE_CURRENT_BINARY_DIR}/upstream-libs/usr/lib/${ARCH_TRIPLET}/*")
15- foreach(ITEM ${UPSTREAM_LIBS})
16- IF( IS_DIRECTORY "${ITEM}" )
17- LIST( APPEND DIRS_TO_DEPLOY "${ITEM}" )
18- ELSE()
19- LIST( APPEND FILES_TO_DEPLOY "${ITEM}" )
20- ENDIF()
21- endforeach()
22- MESSAGE("Following files to install:- ${FILES_TO_DEPLOY}")
23- INSTALL( FILES ${FILES_TO_DEPLOY} DESTINATION ${DATA_DIR}lib/${ARCH_TRIPLET} )
24+ set(UPSTREAM_LIBS_DIR ${CMAKE_BINARY_DIR}/upstream-libs)
25+
26+ #grab dependencies
27+ set(GET_CLICK_DEPS_TOOL ${CMAKE_SOURCE_DIR}/get-click-deps)
28+ set(DEPS_MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/filemanager-libs.json)
29+ MESSAGE("Grabbing upstream libs to ${UPSTREAM_LIBS_DIR}")
30+
31+ get_filename_component(BLD_CONFIGURATION_NAME ${CMAKE_BINARY_DIR} NAME)
32+ set(UPSTREAM_CACHE $ENV{HOME}/dev/upstream-libs-filemanager/${BLD_CONFIGURATION_NAME})
33+ MESSAGE("Upstream libs cache path: ${UPSTREAM_CACHE}")
34+
35+ if(EXISTS "${UPSTREAM_CACHE}")
36+ MESSAGE("Upstream libs cache exists.")
37+ file(COPY ${UPSTREAM_CACHE}/upstream-libs/ DESTINATION ${UPSTREAM_LIBS_DIR} PATTERN * )
38+ else()
39+ MESSAGE("Cache miss, downloading from network.")
40+ file(MAKE_DIRECTORY ${UPSTREAM_LIBS_DIR})
41+ file(MAKE_DIRECTORY ${UPSTREAM_CACHE})
42+ execute_process(
43+ COMMAND ${GET_CLICK_DEPS_TOOL} -d ${DEPS_MANIFEST} ${CLICK_ARCH} ${UPSTREAM_LIBS_DIR}
44+ )
45+ # Cache for next usage
46+ file(COPY ${UPSTREAM_LIBS_DIR} DESTINATION ${UPSTREAM_CACHE} )
47+ endif()
48+ MESSAGE("Installing upstream libs from ${CMAKE_CURRENT_BINARY_DIR}/upstream-libs/usr/lib/${ARCH_TRIPLET}/ to ${DATA_DIR}lib/${ARCH_TRIPLET}")
49+ file(GLOB_RECURSE UPSTREAM_LIBS "${CMAKE_CURRENT_BINARY_DIR}/upstream-libs/usr/lib/${ARCH_TRIPLET}/*")
50+ foreach(ITEM ${UPSTREAM_LIBS})
51+ IF( IS_DIRECTORY "${ITEM}" )
52+ LIST( APPEND DIRS_TO_DEPLOY "${ITEM}" )
53+ ELSE()
54+ LIST( APPEND FILES_TO_DEPLOY "${ITEM}" )
55+ ENDIF()
56+ endforeach()
57+ MESSAGE("Following files to install:- ${FILES_TO_DEPLOY}")
58+ INSTALL( FILES ${FILES_TO_DEPLOY} DESTINATION ${DATA_DIR}lib/${ARCH_TRIPLET} )
59 else(CLICK_MODE)
60 execute_process(
61 COMMAND qmake -query QT_INSTALL_QML

Subscribers

People subscribed via source and target branches