acolyterm

Merge lp:~larryprice/acolyterm/fix-click-packaging into lp:acolyterm

  1. fix-click-packaging
  2. Merge into trunk
Proposed by Larry Price
Status: Merged
Approved by: Christopher Townsend
Approved revision: 224
Merged at revision: 214
Proposed branch: lp:~larryprice/acolyterm/fix-click-packaging
Merge into: lp:acolyterm
Diff against target: 43 lines (+13/-12)
2 files modified
com.ubuntu.acolyterm.desktop.in.in (+0/-1)
src/app/CMakeLists.txt (+13/-11)
To merge this branch: bzr merge lp:~larryprice/acolyterm/fix-click-packaging
Reviewer Review Type Date Requested Status
Libertine CI Bot continuous-integration Approve
Christopher Townsend Approve
Review via email: mp+298658@code.launchpad.net

This proposal supersedes a proposal from 2016-06-29.

Commit message

Conditionally install files to avoid recursive copy during click build.

Description of the change

Conditionally install files to avoid recursive copy during click build.

To post a comment you must log in.
Revision history for this message
Libertine CI Bot (libertine-ci-bot) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:223
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/31/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/128
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/90
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/90
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=default/90
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/90
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/90
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=yakkety,testname=default/90
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/104/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/131
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/116
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/116
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=yakkety/116
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/109
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/109/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/109
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/109/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/109
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/109/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/109
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/109/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/109
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/109/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/109
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/109/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/31/rebuild

review: Approve (continuous-integration)
lp:~larryprice/acolyterm/fix-click-packaging updated
224. By Larry Price

undo desktop file

Revision history for this message
Libertine CI Bot (libertine-ci-bot) wrote :

PASSED: Continuous integration, rev:223
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/32/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/129
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/91
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/91
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=default/91
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/91
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/91
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=yakkety,testname=default/91
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/105/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/132
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/117
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/117
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=yakkety/117
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/110
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/110/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/110
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/110/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/110
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/110/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/110
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/110/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/110
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/110/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/110
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/110/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/32/rebuild

review: Approve (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

LGTM

review: Approve
Revision history for this message
Libertine CI Bot (libertine-ci-bot) wrote :

FAILED: Continuous integration, rev:224
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/35/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/132/console
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/108/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/135
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/120
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/120
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=yakkety/120
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/113/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/113
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/113/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/113
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/113/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/113/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/113
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/113/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/113
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/113/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/35/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Libertine CI Bot (libertine-ci-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 'com.ubuntu.acolyterm.desktop.in.in'
2--- com.ubuntu.acolyterm.desktop.in.in 2016-06-16 20:27:27 +0000
3+++ com.ubuntu.acolyterm.desktop.in.in 2016-06-29 14:51:55 +0000
4@@ -1,7 +1,6 @@
5 [Desktop Entry]
6 Version=1.0
7 Type=Application
8-Terminal=false
9 Exec=@EXEC@
10 Icon=@ICON@
11 _Name=acolyterm
12
13=== modified file 'src/app/CMakeLists.txt'
14--- src/app/CMakeLists.txt 2016-06-22 15:30:43 +0000
15+++ src/app/CMakeLists.txt 2016-06-29 14:51:55 +0000
16@@ -9,14 +9,16 @@
17
18 qt5_use_modules(acolyterm Gui Qml Quick Widgets)
19
20-add_custom_target(acolyterm-qmlfiles ALL
21- COMMAND cp -r ${CMAKE_CURRENT_SOURCE_DIR}/qml ${CMAKE_CURRENT_BINARY_DIR}
22- DEPENDS ${QMLFILES})
23-
24-install(DIRECTORY qml DESTINATION ${DATA_DIR})
25-
26-if(CLICK_MODE)
27- install(TARGETS acolyterm DESTINATION ${BIN_DIR})
28-else(CLICK_MODE)
29- install(TARGETS acolyterm RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
30-endif(CLICK_MODE)
31+if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
32+ add_custom_target(acolyterm-qmlfiles ALL
33+ COMMAND cp -r ${CMAKE_CURRENT_SOURCE_DIR}/qml ${CMAKE_CURRENT_BINARY_DIR}
34+ DEPENDS ${QMLFILES})
35+
36+ install(DIRECTORY qml DESTINATION ${DATA_DIR})
37+
38+ if(CLICK_MODE)
39+ install(TARGETS acolyterm DESTINATION ${BIN_DIR})
40+ else(CLICK_MODE)
41+ install(TARGETS acolyterm RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
42+ endif(CLICK_MODE)
43+endif()

Subscribers

People subscribed via source and target branches

to all changes: