Sudoku App

Merge lp:~zeller-benjamin/sudoku-app/sdkcompat into lp:sudoku-app

  1. sdkcompat
  2. Merge into trunk
Proposed by Benjamin Zeller
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
Approved revision: 282
Merged at revision: 282
Proposed branch: lp:~zeller-benjamin/sudoku-app/sdkcompat
Merge into: lp:sudoku-app
Diff against target: 263 lines (+17/-186)
6 files modified
.bzrignore (+1/-0)
CMakeLists.txt (+2/-1)
CMakeLists.txt.user (+0/-182)
click/CMakeLists.txt (+8/-1)
click/manifest.json.in (+3/-2)
debian/rules (+3/-0)
To merge this branch: bzr merge lp:~zeller-benjamin/sudoku-app/sdkcompat
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Sudoku Touch developers Pending
David Planella Pending
Review via email: mp+233689@code.launchpad.net

Commit message

Make sure cmake project works out of the Box in the SDK
- Rename apparmor file to sudoku.apparmor (editor support)
- Removed user file from the repository
- Enabled click mode per default
- Disable click mode in debian packaging
- Add UBUNTU_MANIFEST_PATH so QtCreator can find the manifest file

Description of the change

Make sure cmake project works out of the Box in the SDK
- Rename apparmor file to sudoku.apparmor (editor support)
- Removed user file from the repository
- Enabled click mode per default
- Disable click mode in debian packaging
- Add UBUNTU_MANIFEST_PATH so QtCreator can find the manifest file

To post a comment you must log in.
lp:~zeller-benjamin/sudoku-app/sdkcompat updated
281. By Benjamin Zeller

Fix typo

282. By Benjamin Zeller

Move click file target into the if(CLICK_MODE) block

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:280
http://91.189.93.70:8080/job/sudoku-app-ci/135/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1929
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1929/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-utopic-amd64-ci/45

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/sudoku-app-ci/135/rebuild

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

PASSED: Continuous integration, rev:282
http://91.189.93.70:8080/job/sudoku-app-ci/136/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1933
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1933/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-utopic-amd64-ci/46

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/sudoku-app-ci/136/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2013-06-14 11:17:43 +0000
3+++ .bzrignore 2014-09-08 10:09:27 +0000
4@@ -1,2 +1,3 @@
5 SudokuTouch.qmlproject.user
6 sudoku-app.qmlproject.user
7+*.user
8
9=== modified file 'CMakeLists.txt'
10--- CMakeLists.txt 2014-08-30 11:32:21 +0000
11+++ CMakeLists.txt 2014-09-08 10:09:27 +0000
12@@ -8,7 +8,7 @@
13 include(GNUInstallDirs)
14
15 option(INSTALL_TESTS "Install the tests on make install" on)
16-option(CLICK_MODE "Installs to a contained location" off)
17+option(CLICK_MODE "Installs to a contained location" on)
18
19 set(APP_NAME sudoku)
20 set(DESKTOP_FILE "${PROJECT_NAME}_${APP_NAME}.desktop")
21@@ -16,6 +16,7 @@
22 set(MAIN_QML ${APP_HARDCODE}.qml)
23 set(ICON_FILE SudokuGameIcon.png)
24 set(AUTOPILOT_DIR sudoku_app)
25+set(UBUNTU_MANIFEST_PATH "click/manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
26
27 if(CLICK_MODE)
28 if(NOT DEFINED BZR_SOURCE)
29
30=== removed file 'CMakeLists.txt.user'
31--- CMakeLists.txt.user 2014-08-30 11:32:21 +0000
32+++ CMakeLists.txt.user 1970-01-01 00:00:00 +0000
33@@ -1,182 +0,0 @@
34-<?xml version="1.0" encoding="UTF-8"?>
35-<!DOCTYPE QtCreatorProject>
36-<!-- Written by QtCreator 3.1.1, 2014-08-30T13:31:33. -->
37-<qtcreator>
38- <data>
39- <variable>ProjectExplorer.Project.ActiveTarget</variable>
40- <value type="int">0</value>
41- </data>
42- <data>
43- <variable>ProjectExplorer.Project.EditorSettings</variable>
44- <valuemap type="QVariantMap">
45- <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
46- <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
47- <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
48- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
49- <value type="QString" key="language">Cpp</value>
50- <valuemap type="QVariantMap" key="value">
51- <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
52- </valuemap>
53- </valuemap>
54- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
55- <value type="QString" key="language">QmlJS</value>
56- <valuemap type="QVariantMap" key="value">
57- <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
58- </valuemap>
59- </valuemap>
60- <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
61- <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
62- <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
63- <value type="int" key="EditorConfiguration.IndentSize">4</value>
64- <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
65- <value type="int" key="EditorConfiguration.MarginColumn">80</value>
66- <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
67- <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
68- <value type="int" key="EditorConfiguration.PaddingMode">1</value>
69- <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
70- <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
71- <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
72- <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
73- <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
74- <value type="int" key="EditorConfiguration.TabSize">8</value>
75- <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
76- <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
77- <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
78- <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
79- <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
80- <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
81- </valuemap>
82- </data>
83- <data>
84- <variable>ProjectExplorer.Project.PluginSettings</variable>
85- <valuemap type="QVariantMap"/>
86- </data>
87- <data>
88- <variable>ProjectExplorer.Project.Target.0</variable>
89- <valuemap type="QVariantMap">
90- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
91- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
92- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{fc2706cc-8f77-448a-9b8c-fffba1d6b7f4}</value>
93- <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
94- <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
95- <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
96- <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
97- <value type="bool" key="CMakeProjectManager.CMakeBuildConfiguration.UseNinja">false</value>
98- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/dinko/UbuntuTouch/build-sudoku-cmake-Desktop-Default</value>
99- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
100- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
101- <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
102- <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"/>
103- <value type="bool" key="CMakeProjectManager.MakeStep.Clean">false</value>
104- <value type="bool" key="CMakeProjectManager.MakeStep.UseNinja">false</value>
105- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
106- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
107- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
108- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
109- </valuemap>
110- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
111- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
112- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
113- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
114- </valuemap>
115- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
116- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
117- <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments">clean</value>
118- <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"/>
119- <value type="bool" key="CMakeProjectManager.MakeStep.Clean">true</value>
120- <value type="bool" key="CMakeProjectManager.MakeStep.UseNinja">false</value>
121- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
122- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
123- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
124- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
125- </valuemap>
126- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
127- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
128- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
129- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
130- </valuemap>
131- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
132- <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
133- <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
134- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Default</value>
135- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Default</value>
136- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
137- </valuemap>
138- <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
139- <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
140- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
141- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
142- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
143- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
144- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
145- </valuemap>
146- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
147- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value>
148- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
149- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
150- </valuemap>
151- <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
152- <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
153- <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
154- <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
155- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
156- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
157- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
158- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
159- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
160- <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
161- <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
162- <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
163- <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
164- <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
165- <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
166- <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
167- <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
168- <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
169- <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
170- <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
171- <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
172- <value type="int">0</value>
173- <value type="int">1</value>
174- <value type="int">2</value>
175- <value type="int">3</value>
176- <value type="int">4</value>
177- <value type="int">5</value>
178- <value type="int">6</value>
179- <value type="int">7</value>
180- <value type="int">8</value>
181- <value type="int">9</value>
182- <value type="int">10</value>
183- <value type="int">11</value>
184- <value type="int">12</value>
185- <value type="int">13</value>
186- <value type="int">14</value>
187- </valuelist>
188- <value type="int" key="PE.EnvironmentAspect.Base">2</value>
189- <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
190- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value>
191- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">sudoku-cmake</value>
192- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UbuntuRunConfigurationsudoku</value>
193- <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
194- <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
195- <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
196- <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
197- <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
198- <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
199- </valuemap>
200- <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
201- </valuemap>
202- </data>
203- <data>
204- <variable>ProjectExplorer.Project.TargetCount</variable>
205- <value type="int">1</value>
206- </data>
207- <data>
208- <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
209- <value type="QByteArray">{e5d2750f-1f37-4d1f-a627-94f997ee356c}</value>
210- </data>
211- <data>
212- <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
213- <value type="int">15</value>
214- </data>
215-</qtcreator>
216
217=== modified file 'click/CMakeLists.txt'
218--- click/CMakeLists.txt 2014-08-30 11:32:21 +0000
219+++ click/CMakeLists.txt 2014-09-08 10:09:27 +0000
220@@ -3,6 +3,13 @@
221 set(BZR_REVNO "latest")
222 endif(NOT BZR_REVNO)
223 configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
224- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json apparmor.json
225+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json sudoku.apparmor
226 DESTINATION ${CMAKE_INSTALL_PREFIX})
227+
228+ # make the click files visible on qtcreator
229+ file(GLOB CLICK_FILES
230+ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
231+ *.json *.json.in *.apparmor)
232+
233+ add_custom_target(com_ubuntu_sudoku_CLICKFiles ALL SOURCES ${CLICK_FILES})
234 endif(CLICK_MODE)
235
236=== modified file 'click/manifest.json.in'
237--- click/manifest.json.in 2014-08-30 11:32:21 +0000
238+++ click/manifest.json.in 2014-09-08 10:09:27 +0000
239@@ -1,9 +1,10 @@
240 {
241+ "architecture": "all",
242 "description": "Sudoku game for Ubuntu devices.",
243 "framework": "ubuntu-sdk-14.10-qml-dev3",
244 "hooks": {
245- "@APP_NAME@": {
246- "apparmor": "apparmor.json",
247+ "sudoku": {
248+ "apparmor": "sudoku.apparmor",
249 "desktop": "@DESKTOP_FILE@"
250 }
251 },
252
253=== renamed file 'click/apparmor.json' => 'click/sudoku.apparmor'
254=== modified file 'debian/rules'
255--- debian/rules 2014-08-30 12:10:18 +0000
256+++ debian/rules 2014-09-08 10:09:27 +0000
257@@ -12,3 +12,6 @@
258 %:
259 dh $@
260
261+override_dh_auto_configure:
262+ dh_auto_configure -- -DCLICK_MODE=OFF
263+

Subscribers

People subscribed via source and target branches