Mail

Merge lp:~elementary-apps/pantheon-mail/mail-binary into lp:~elementary-apps/pantheon-mail/trunk

  1. mail-binary
  2. Merge into trunk
Proposed by Danielle Foré
Status: Merged
Approved by: Danielle Foré
Approved revision: 1969
Merged at revision: 1971
Proposed branch: lp:~elementary-apps/pantheon-mail/mail-binary
Merge into: lp:~elementary-apps/pantheon-mail/trunk
Diff against target: 322 lines (+49/-49)
8 files modified
CMakeLists.txt (+4/-4)
data/CMakeLists.txt (+2/-2)
data/pantheon-mail.appdata.xml (+1/-1)
data/theming/CMakeLists.txt (+1/-1)
data/ui/CMakeLists.txt (+1/-1)
sql/CMakeLists.txt (+1/-1)
src/CMakeLists.txt (+30/-30)
src/client/application/geary-application.vala (+9/-9)
To merge this branch: bzr merge lp:~elementary-apps/pantheon-mail/mail-binary
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+286235@code.launchpad.net

Commit message

rename 'geary' binary with 'pantheon-mail' and rename conflicting install directories

To post a comment you must log in.
lp:~elementary-apps/pantheon-mail/mail-binary updated
1968. By Danielle Foré

geary binary to pantheon-mail

1969. By Danielle Foré

merge trunk

Revision history for this message
Cody Garver (codygarver) wrote :

One remaining known issue that's blocking this branch from fully address the goal "Don't conflict with Geary":

* icons installed to /usr/share/icons/hicolor/ conflict with geary

Other than that, I approve this branch.

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 2016-01-28 17:48:53 +0000
3+++ CMakeLists.txt 2016-02-17 01:22:00 +0000
4@@ -1,4 +1,4 @@
5-# Geary build script
6+# Mail build script
7 # Copyright 2011-2015 Yorba Foundation
8 #
9 # Check http://webdev.elementaryos.org/docs/developer-guide/cmake for documentation
10@@ -6,15 +6,15 @@
11 cmake_minimum_required(VERSION 2.8)
12 cmake_policy(VERSION 2.6)
13
14-project(geary C)
15+project(pantheon-mail C)
16
17 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
18
19 #
20 # Base bits
21 #
22-set(GETTEXT_PACKAGE "geary")
23-set(EXEC_NAME "geary")
24+set(GETTEXT_PACKAGE ${CMAKE_PROJECT_NAME})
25+set(EXEC_NAME ${CMAKE_PROJECT_NAME})
26 set(APP_NAME "Mail")
27 set(RELEASE_NAME "Lightweight email client")
28 set(DESKTOP_ICON "internet-mail")
29
30=== modified file 'data/CMakeLists.txt'
31--- data/CMakeLists.txt 2015-11-30 17:25:19 +0000
32+++ data/CMakeLists.txt 2016-02-17 01:22:00 +0000
33@@ -1,5 +1,5 @@
34 #
35-# Build and install geary.desktop
36+# Build and install pantheon-mail.desktop
37 #
38
39 configure_file(pantheon-mail.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/pantheon-mail.desktop)
40@@ -13,7 +13,7 @@
41 install(FILES mail-attach.contract DESTINATION share/contractor)
42
43 # Optional: run update-desktop-database at install time.
44-# (This has to happen after the geary.desktop file is installed.)
45+# (This has to happen after the pantheon-mail.desktop file is installed.)
46 if (DESKTOP_UPDATE)
47 install(
48 CODE
49
50=== modified file 'data/pantheon-mail.appdata.xml'
51--- data/pantheon-mail.appdata.xml 2016-02-10 18:30:47 +0000
52+++ data/pantheon-mail.appdata.xml 2016-02-17 01:22:00 +0000
53@@ -25,7 +25,7 @@
54 </ul>
55 </description>
56 <provides>
57- <binary>geary</binary>
58+ <binary>pantheon-mail</binary>
59 </provides>
60 <developer_name>elementary LLC.</developer_name>
61 <url type="homepage">https://elementary.io/</url>
62
63=== modified file 'data/theming/CMakeLists.txt'
64--- data/theming/CMakeLists.txt 2012-06-13 21:23:36 +0000
65+++ data/theming/CMakeLists.txt 2016-02-17 01:22:00 +0000
66@@ -1,4 +1,4 @@
67-set(THEMING_DEST share/geary/theming)
68+set(THEMING_DEST share/${CMAKE_PROJECT_NAME}/theming)
69
70 install(FILES message-viewer.html DESTINATION ${THEMING_DEST})
71 install(FILES message-viewer.css DESTINATION ${THEMING_DEST})
72
73=== modified file 'data/ui/CMakeLists.txt'
74--- data/ui/CMakeLists.txt 2015-12-14 17:47:50 +0000
75+++ data/ui/CMakeLists.txt 2016-02-17 01:22:00 +0000
76@@ -1,4 +1,4 @@
77-set(UI_DEST share/geary/ui)
78+set(UI_DEST share/${CMAKE_PROJECT_NAME}/ui)
79
80 install(FILES accelerators.ui DESTINATION ${UI_DEST})
81 install(FILES account_list.ui DESTINATION ${UI_DEST})
82
83=== modified file 'sql/CMakeLists.txt'
84--- sql/CMakeLists.txt 2014-12-19 01:00:47 +0000
85+++ sql/CMakeLists.txt 2016-02-17 01:22:00 +0000
86@@ -1,4 +1,4 @@
87-set(SQL_DEST share/geary/sql)
88+set(SQL_DEST share/${CMAKE_PROJECT_NAME}/sql)
89
90 install(FILES version-001.sql DESTINATION ${SQL_DEST})
91 install(FILES version-002.sql DESTINATION ${SQL_DEST})
92
93=== modified file 'src/CMakeLists.txt'
94--- src/CMakeLists.txt 2016-02-08 02:26:38 +0000
95+++ src/CMakeLists.txt 2016-02-17 01:22:00 +0000
96@@ -419,7 +419,7 @@
97 # Vapigen
98 find_program(VAPIGEN vapigen)
99 if (VAPIGEN STREQUAL "VAPIGEN-NOTFOUND")
100- message(FATAL_ERROR "vapigen must be installed to build Geary.")
101+ message(FATAL_ERROR "vapigen must be installed to build Mail.")
102 else ()
103 message(STATUS "Found vapigen: " ${VAPIGEN})
104 endif ()
105@@ -610,19 +610,19 @@
106
107 # Engine (static library used for building)
108 #################################################
109-vala_precompile(ENGINE_VALA_C geary-static
110+vala_precompile(ENGINE_VALA_C ${CMAKE_PROJECT_NAME}-static
111 ${ENGINE_SRC}
112 PACKAGES
113 ${CONSOLE_PACKAGES}
114 ${ENGINE_PACKAGES}
115 GENERATE_VAPI
116- geary-static
117+ ${CMAKE_PROJECT_NAME}-static
118 OPTIONS
119 ${VALAC_OPTIONS}
120 )
121
122-add_library(geary-static STATIC ${ENGINE_VALA_C})
123-target_link_libraries(geary-static ${DEPS_LIBRARIES} sqlite3-unicodesn gthread-2.0)
124+add_library(${CMAKE_PROJECT_NAME}-static STATIC ${ENGINE_VALA_C})
125+target_link_libraries(${CMAKE_PROJECT_NAME}-static ${DEPS_LIBRARIES} sqlite3-unicodesn gthread-2.0)
126
127 # WebKitGTK VAPI generation
128 #################################################
129@@ -635,83 +635,83 @@
130 vapigen --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --metadatadir=. --metadatadir=${WEBKITGTK_METADATA_DIR} --library=webkitgtk-3.0 --directory=${CMAKE_BINARY_DIR}/src ${WEBKITGTK_CUSTOM_VALA} `pkg-config --variable=girdir gobject-introspection-1.0`/WebKit-3.0.gir
131 )
132
133-# Geary client app
134+# Mail client app
135 #################################################
136-vala_precompile(GEARY_VALA_C geary
137+vala_precompile(GEARY_VALA_C ${CMAKE_PROJECT_NAME}
138 ${CLIENT_SRC}
139 PACKAGES
140 ${CLIENT_PACKAGES}
141 ${ENGINE_PACKAGES}
142 CUSTOM_VAPIS
143- "${CMAKE_BINARY_DIR}/src/geary-static.vapi"
144+ "${CMAKE_BINARY_DIR}/src/${CMAKE_PROJECT_NAME}-static.vapi"
145 "${CMAKE_BINARY_DIR}/src/webkitgtk-3.0.vapi"
146 OPTIONS
147 ${VALAC_OPTIONS}
148 --vapidir=${CMAKE_BINARY_DIR}/src
149 )
150
151-add_executable(geary ${GEARY_VALA_C})
152-target_link_libraries(geary m ${DEPS_LIBRARIES} gthread-2.0 geary-static)
153-install(TARGETS geary RUNTIME DESTINATION bin)
154+add_executable(${CMAKE_PROJECT_NAME} ${GEARY_VALA_C})
155+target_link_libraries(${CMAKE_PROJECT_NAME} m ${DEPS_LIBRARIES} gthread-2.0 ${CMAKE_PROJECT_NAME}-static)
156+install(TARGETS ${CMAKE_PROJECT_NAME} RUNTIME DESTINATION bin)
157 add_custom_command(
158 TARGET
159- geary
160+ ${CMAKE_PROJECT_NAME}
161 POST_BUILD
162 COMMAND
163- ${CMAKE_COMMAND} -E copy geary ${CMAKE_BINARY_DIR}/
164+ ${CMAKE_COMMAND} -E copy ${CMAKE_PROJECT_NAME} ${CMAKE_BINARY_DIR}/
165 )
166
167 # GSettings
168-# This needs to be here and not in desktop/CMakeLists.txt in order for Geary to run in the build
169+# This needs to be here and not in desktop/CMakeLists.txt in order for Mail to run in the build
170 # directory
171 include(GSettings)
172-add_schemas(geary ${GSETTINGS_DIR} ${CMAKE_INSTALL_PREFIX})
173+add_schemas(${CMAKE_PROJECT_NAME} ${GSETTINGS_DIR} ${CMAKE_INSTALL_PREFIX})
174
175 # Console app
176 #################################################
177-vala_precompile(CONSOLE_VALA_C geary-console
178+vala_precompile(CONSOLE_VALA_C ${CMAKE_PROJECT_NAME}-console
179 ${CONSOLE_SRC}
180 PACKAGES
181 ${CONSOLE_PACKAGES}
182 ${ENGINE_PACKAGES}
183 CUSTOM_VAPIS
184- "${CMAKE_BINARY_DIR}/src/geary-static.vapi"
185+ "${CMAKE_BINARY_DIR}/src/${CMAKE_PROJECT_NAME}-static.vapi"
186 OPTIONS
187 ${VALAC_OPTIONS}
188 --vapidir=${CMAKE_BINARY_DIR}/src
189 )
190
191-add_executable(geary-console ${CONSOLE_VALA_C})
192-target_link_libraries(geary-console ${DEPS_LIBRARIES} gthread-2.0 geary-static)
193+add_executable(${CMAKE_PROJECT_NAME}-console ${CONSOLE_VALA_C})
194+target_link_libraries(${CMAKE_PROJECT_NAME}-console ${DEPS_LIBRARIES} gthread-2.0 ${CMAKE_PROJECT_NAME}-static)
195 add_custom_command(
196 TARGET
197- geary-console
198+ ${CMAKE_PROJECT_NAME}-console
199 POST_BUILD
200 COMMAND
201- ${CMAKE_COMMAND} -E copy geary-console ${CMAKE_BINARY_DIR}/
202+ ${CMAKE_COMMAND} -E copy ${CMAKE_PROJECT_NAME}-console ${CMAKE_BINARY_DIR}/
203 )
204
205 # Mailer app
206 #################################################
207-vala_precompile(MAILER_VALA_C geary-mailer
208+vala_precompile(MAILER_VALA_C ${CMAKE_PROJECT_NAME}-mailer
209 ${MAILER_SRC}
210 PACKAGES
211 ${ENGINE_PACKAGES}
212 CUSTOM_VAPIS
213- "${CMAKE_BINARY_DIR}/src/geary-static.vapi"
214+ "${CMAKE_BINARY_DIR}/src/${CMAKE_PROJECT_NAME}-static.vapi"
215 OPTIONS
216 ${VALAC_OPTIONS}
217 --vapidir=${CMAKE_BINARY_DIR}/src
218 )
219
220-add_executable(geary-mailer ${MAILER_VALA_C})
221-target_link_libraries(geary-mailer ${DEPS_LIBRARIES} gthread-2.0 geary-static)
222+add_executable(${CMAKE_PROJECT_NAME}-mailer ${MAILER_VALA_C})
223+target_link_libraries(${CMAKE_PROJECT_NAME}-mailer ${DEPS_LIBRARIES} gthread-2.0 ${CMAKE_PROJECT_NAME}-static)
224 add_custom_command(
225 TARGET
226- geary-mailer
227+ ${CMAKE_PROJECT_NAME}-mailer
228 POST_BUILD
229 COMMAND
230- ${CMAKE_COMMAND} -E copy geary-mailer ${CMAKE_BINARY_DIR}/
231+ ${CMAKE_COMMAND} -E copy ${CMAKE_PROJECT_NAME}-mailer ${CMAKE_BINARY_DIR}/
232 )
233
234 # Valadoc
235@@ -726,7 +726,7 @@
236 WORKING_DIRECTORY
237 ${CMAKE_SOURCE_DIR}/src
238 COMMAND
239- ${VALADOC_EXECUTABLE} --force --no-protected --target-glib=${TARGET_GLIB} -b ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_SOURCE_DIR}/valadoc --package-name=geary --package-version=${VERSION} ${ENGINE_SRC} ${valadoc_pkg_opts} --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi
240+ ${VALADOC_EXECUTABLE} --force --no-protected --target-glib=${TARGET_GLIB} -b ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_SOURCE_DIR}/valadoc --package-name=${CMAKE_PROJECT_NAME} --package-version=${VERSION} ${ENGINE_SRC} ${valadoc_pkg_opts} --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi
241 )
242
243 ## Make clean: remove copied files
244@@ -735,8 +735,8 @@
245 DIRECTORY ..
246 APPEND
247 PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
248- geary
249- geary-console
250+ ${CMAKE_PROJECT_NAME}
251+ ${CMAKE_PROJECT_NAME}-console
252 geary-mailer
253 )
254
255
256=== modified file 'src/client/application/geary-application.vala'
257--- src/client/application/geary-application.vala 2016-02-09 18:34:21 +0000
258+++ src/client/application/geary-application.vala 2016-02-17 01:22:00 +0000
259@@ -13,7 +13,7 @@
260
261 public class GearyApplication : Gtk.Application {
262 public const string NAME = "Mail";
263- public const string PRGNAME = "geary";
264+ public const string PRGNAME = "pantheon-mail";
265 public const string APP_ID = "org.pantheon.mail";
266 public const string COPYRIGHT = _("2011-2015 Yorba Foundation\n© 2016 elementary LLC.");
267 public const string WEBSITE = "https://elementary.io";
268@@ -231,11 +231,11 @@
269 }
270
271 public File get_user_data_directory() {
272- return File.new_for_path(Environment.get_user_data_dir()).get_child("geary");
273+ return File.new_for_path(Environment.get_user_data_dir()).get_child("pantheon-mail");
274 }
275
276 public File get_user_config_directory() {
277- return File.new_for_path(Environment.get_user_config_dir()).get_child("geary");
278+ return File.new_for_path(Environment.get_user_config_dir()).get_child("pantheon-mail");
279 }
280
281 /**
282@@ -246,9 +246,9 @@
283 */
284 public File get_resource_directory() {
285 if (get_install_dir() != null)
286- return get_install_dir().get_child("share").get_child("geary");
287+ return get_install_dir().get_child("share").get_child("pantheon-mail");
288 else
289- return File.new_for_path(SOURCE_ROOT_DIR);
290+ return File.new_for_path(SOURCE_ROOT_DIR + "/data");
291 }
292
293 // Returns the directory the application is currently executing from.
294@@ -259,8 +259,8 @@
295 public File? get_desktop_file() {
296 File? install_dir = get_install_dir();
297 File desktop_file = (install_dir != null)
298- ? install_dir.get_child("share").get_child("applications").get_child("geary.desktop")
299- : File.new_for_path(SOURCE_ROOT_DIR).get_child("build").get_child("desktop").get_child("geary.desktop");
300+ ? install_dir.get_child("share").get_child("applications").get_child("pantheon-mail.desktop")
301+ : File.new_for_path(SOURCE_ROOT_DIR).get_child("build").get_child("desktop").get_child("pantheon-mail.desktop");
302
303 return desktop_file.query_exists() ? desktop_file : null;
304 }
305@@ -343,7 +343,7 @@
306 }
307
308 // Give asynchronous destroy_async() a chance to complete, but to avoid bug(s) where
309- // Geary hangs at exit, shut the whole thing down if destroy_async() takes too long to
310+ // Mail hangs at exit, shut the whole thing down if destroy_async() takes too long to
311 // complete
312 int64 start_usec = get_monotonic_time();
313 destroy_async.begin();
314@@ -352,7 +352,7 @@
315
316 int64 delta_usec = get_monotonic_time() - start_usec;
317 if (delta_usec >= FORCE_SHUTDOWN_USEC) {
318- debug("Forcing shutdown of Geary, %ss passed...", (delta_usec / USEC_PER_SEC).to_string());
319+ debug("Forcing shutdown of Mail, %ss passed...", (delta_usec / USEC_PER_SEC).to_string());
320
321 break;
322 }

Subscribers

People subscribed via source and target branches