Ubuntu Document Viewer App

Merge lp:~nskaggs/ubuntu-docviewer-app/create-cache into lp:ubuntu-docviewer-app

  1. create-cache
  2. Merge into lo-viewer
Proposed by Nicholas Skaggs on 2016-03-10
Status: Merged
Approved by: Stefano Verzegnassi on 2016-03-15
Approved revision: 319
Merged at revision: 321
Proposed branch: lp:~nskaggs/ubuntu-docviewer-app/create-cache
Merge into: lp:ubuntu-docviewer-app
Prerequisite: lp:~nskaggs/ubuntu-docviewer-app/restore-ap-template
Diff against target: 23 lines (+3/-2)
1 file modified
cmake/modules/Click.cmake (+3/-2)
To merge this branch: bzr merge lp:~nskaggs/ubuntu-docviewer-app/create-cache
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve on 2016-03-15
Stefano Verzegnassi 2016-03-10 Approve on 2016-03-15
Review via email: mp+288718@code.launchpad.net

Commit Message

Create cache folder during cmake copy

Description of the Change

Create cache folder during cmake copy

To post a comment you must log in.
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Nicholas Skaggs (nskaggs) wrote :

Glorious working builds!

Nicholas Skaggs (nskaggs) wrote :

This was done to help jenkins, but it appears it's not needed. Still, being explicit isn't a bad idea, and it's better than using mkdir.

Stefano Verzegnassi (verzegnassi-stefano) :
review: Approve
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake/modules/Click.cmake'
2--- cmake/modules/Click.cmake 2016-02-22 22:44:48 +0000
3+++ cmake/modules/Click.cmake 2016-03-10 22:37:56 +0000
4@@ -17,7 +17,7 @@
5 set(CUSTOM_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/click/disable-lo-features.sh)
6 set(UPSTREAM_LIBS_DIR ${CMAKE_BINARY_DIR}/upstream-libs)
7
8- MESSAGE("Grabbing upstream libs to ${UPSTREAM_LIBS_DIR}")
9+ MESSAGE("Grabbing upstream libs to ${UPSTREAM_LIBS_DIR}")
10
11 if(NO_CACHE)
12 # It has been specified not to cache .click dependencies on the machine.
13@@ -38,8 +38,9 @@
14 file(COPY ${UPSTREAM_CACHE}/upstream-libs/ DESTINATION ${UPSTREAM_LIBS_DIR} PATTERN * )
15 else()
16 MESSAGE("Cache miss, downloading from network.")
17+ file(MAKE_DIRECTORY ${UPSTREAM_LIBS_DIR})
18+ file(MAKE_DIRECTORY ${UPSTREAM_CACHE})
19 execute_process(
20- COMMAND mkdir ${UPSTREAM_LIBS_DIR}
21 COMMAND ${GET_CLICK_DEPS_TOOL} -d ${DEPS_MANIFEST} -c ${CUSTOM_SCRIPT} ${CLICK_ARCH} ${UPSTREAM_LIBS_DIR}
22 )
23 # Cache for next usage.

Subscribers

People subscribed via source and target branches