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

[Danielle Foré]

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

[lp:~elementary-apps/pantheon-mail/mail-binary]

1968. By Danielle Foré on 2016-02-17

geary binary to pantheon-mail

1969. By Danielle Foré on 2016-02-17

merge trunk

[Cody Garver (codygarver)]

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.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-01-28 17:48:53 +0000
+++ CMakeLists.txt	2016-02-17 01:22:00 +0000
@@ -1,4 +1,4 @@
-# Geary build script
+# Mail build script
 # Copyright 2011-2015 Yorba Foundation
 #
 # Check http://webdev.elementaryos.org/docs/developer-guide/cmake for documentation
@@ -6,15 +6,15 @@
 cmake_minimum_required(VERSION 2.8)
 cmake_policy(VERSION 2.6)
 
-project(geary C)
+project(pantheon-mail C)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
 
 #
 # Base bits
 #
-set(GETTEXT_PACKAGE "geary")
-set(EXEC_NAME "geary")
+set(GETTEXT_PACKAGE ${CMAKE_PROJECT_NAME})
+set(EXEC_NAME ${CMAKE_PROJECT_NAME})
 set(APP_NAME "Mail")
 set(RELEASE_NAME "Lightweight email client")
 set(DESKTOP_ICON "internet-mail")
 
=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2015-11-30 17:25:19 +0000
+++ data/CMakeLists.txt	2016-02-17 01:22:00 +0000
@@ -1,5 +1,5 @@
 #
-# Build and install geary.desktop
+# Build and install pantheon-mail.desktop
 #
 
 configure_file(pantheon-mail.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/pantheon-mail.desktop)
@@ -13,7 +13,7 @@
 install(FILES mail-attach.contract DESTINATION share/contractor)
 
 # Optional: run update-desktop-database at install time.
-# (This has to happen after the geary.desktop file is installed.)
+# (This has to happen after the pantheon-mail.desktop file is installed.)
 if (DESKTOP_UPDATE)
     install(
         CODE
 
=== modified file 'data/pantheon-mail.appdata.xml'
--- data/pantheon-mail.appdata.xml	2016-02-10 18:30:47 +0000
+++ data/pantheon-mail.appdata.xml	2016-02-17 01:22:00 +0000
@@ -25,7 +25,7 @@
         </ul>
     </description>
     <provides>
-        <binary>geary</binary>
+        <binary>pantheon-mail</binary>
     </provides>
     <developer_name>elementary LLC.</developer_name>
     <url type="homepage">https://elementary.io/</url>
 
=== modified file 'data/theming/CMakeLists.txt'
--- data/theming/CMakeLists.txt	2012-06-13 21:23:36 +0000
+++ data/theming/CMakeLists.txt	2016-02-17 01:22:00 +0000
@@ -1,4 +1,4 @@
-set(THEMING_DEST share/geary/theming)
+set(THEMING_DEST share/${CMAKE_PROJECT_NAME}/theming)
 
 install(FILES message-viewer.html DESTINATION ${THEMING_DEST})
 install(FILES message-viewer.css DESTINATION ${THEMING_DEST})
 
=== modified file 'data/ui/CMakeLists.txt'
--- data/ui/CMakeLists.txt	2015-12-14 17:47:50 +0000
+++ data/ui/CMakeLists.txt	2016-02-17 01:22:00 +0000
@@ -1,4 +1,4 @@
-set(UI_DEST share/geary/ui)
+set(UI_DEST share/${CMAKE_PROJECT_NAME}/ui)
 
 install(FILES accelerators.ui DESTINATION ${UI_DEST})
 install(FILES account_list.ui DESTINATION ${UI_DEST})
 
=== modified file 'sql/CMakeLists.txt'
--- sql/CMakeLists.txt	2014-12-19 01:00:47 +0000
+++ sql/CMakeLists.txt	2016-02-17 01:22:00 +0000
@@ -1,4 +1,4 @@
-set(SQL_DEST share/geary/sql)
+set(SQL_DEST share/${CMAKE_PROJECT_NAME}/sql)
 
 install(FILES version-001.sql DESTINATION ${SQL_DEST})
 install(FILES version-002.sql DESTINATION ${SQL_DEST})
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-02-08 02:26:38 +0000
+++ src/CMakeLists.txt	2016-02-17 01:22:00 +0000
@@ -419,7 +419,7 @@
 # Vapigen
 find_program(VAPIGEN vapigen)
 if (VAPIGEN STREQUAL "VAPIGEN-NOTFOUND")
-    message(FATAL_ERROR "vapigen must be installed to build Geary.")
+    message(FATAL_ERROR "vapigen must be installed to build Mail.")
 else ()
     message(STATUS "Found vapigen: " ${VAPIGEN})
 endif ()
@@ -610,19 +610,19 @@
 
 # Engine (static library used for building)
 #################################################
-vala_precompile(ENGINE_VALA_C geary-static
+vala_precompile(ENGINE_VALA_C ${CMAKE_PROJECT_NAME}-static
     ${ENGINE_SRC}
 PACKAGES
     ${CONSOLE_PACKAGES}
     ${ENGINE_PACKAGES}
 GENERATE_VAPI
-    geary-static
+    ${CMAKE_PROJECT_NAME}-static
 OPTIONS
     ${VALAC_OPTIONS}
 )
 
-add_library(geary-static STATIC ${ENGINE_VALA_C})
-target_link_libraries(geary-static ${DEPS_LIBRARIES} sqlite3-unicodesn gthread-2.0)
+add_library(${CMAKE_PROJECT_NAME}-static STATIC ${ENGINE_VALA_C})
+target_link_libraries(${CMAKE_PROJECT_NAME}-static ${DEPS_LIBRARIES} sqlite3-unicodesn gthread-2.0)
 
 # WebKitGTK VAPI generation
 #################################################
@@ -635,83 +635,83 @@
         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
 )
 
-# Geary client app
+# Mail client app
 #################################################
-vala_precompile(GEARY_VALA_C geary
+vala_precompile(GEARY_VALA_C ${CMAKE_PROJECT_NAME}
     ${CLIENT_SRC}
 PACKAGES
     ${CLIENT_PACKAGES}
     ${ENGINE_PACKAGES}
 CUSTOM_VAPIS
-    "${CMAKE_BINARY_DIR}/src/geary-static.vapi"
+    "${CMAKE_BINARY_DIR}/src/${CMAKE_PROJECT_NAME}-static.vapi"
     "${CMAKE_BINARY_DIR}/src/webkitgtk-3.0.vapi"
 OPTIONS
     ${VALAC_OPTIONS}
     --vapidir=${CMAKE_BINARY_DIR}/src
 )
 
-add_executable(geary ${GEARY_VALA_C})
-target_link_libraries(geary m ${DEPS_LIBRARIES} gthread-2.0 geary-static)
-install(TARGETS geary RUNTIME DESTINATION bin)
+add_executable(${CMAKE_PROJECT_NAME} ${GEARY_VALA_C})
+target_link_libraries(${CMAKE_PROJECT_NAME} m ${DEPS_LIBRARIES} gthread-2.0 ${CMAKE_PROJECT_NAME}-static)
+install(TARGETS ${CMAKE_PROJECT_NAME} RUNTIME DESTINATION bin)
 add_custom_command(
     TARGET
-        geary
+        ${CMAKE_PROJECT_NAME}
     POST_BUILD
     COMMAND 
-        ${CMAKE_COMMAND} -E copy geary ${CMAKE_BINARY_DIR}/
+        ${CMAKE_COMMAND} -E copy ${CMAKE_PROJECT_NAME} ${CMAKE_BINARY_DIR}/
 )
 
 # GSettings
-# This needs to be here and not in desktop/CMakeLists.txt in order for Geary to run in the build
+# This needs to be here and not in desktop/CMakeLists.txt in order for Mail to run in the build
 # directory
 include(GSettings)
-add_schemas(geary ${GSETTINGS_DIR} ${CMAKE_INSTALL_PREFIX})
+add_schemas(${CMAKE_PROJECT_NAME} ${GSETTINGS_DIR} ${CMAKE_INSTALL_PREFIX})
 
 # Console app
 #################################################
-vala_precompile(CONSOLE_VALA_C geary-console
+vala_precompile(CONSOLE_VALA_C ${CMAKE_PROJECT_NAME}-console
     ${CONSOLE_SRC}
 PACKAGES
     ${CONSOLE_PACKAGES}
     ${ENGINE_PACKAGES}
 CUSTOM_VAPIS
-    "${CMAKE_BINARY_DIR}/src/geary-static.vapi"
+    "${CMAKE_BINARY_DIR}/src/${CMAKE_PROJECT_NAME}-static.vapi"
 OPTIONS
     ${VALAC_OPTIONS}
     --vapidir=${CMAKE_BINARY_DIR}/src
 )
 
-add_executable(geary-console ${CONSOLE_VALA_C})
-target_link_libraries(geary-console ${DEPS_LIBRARIES} gthread-2.0 geary-static)
+add_executable(${CMAKE_PROJECT_NAME}-console ${CONSOLE_VALA_C})
+target_link_libraries(${CMAKE_PROJECT_NAME}-console ${DEPS_LIBRARIES} gthread-2.0 ${CMAKE_PROJECT_NAME}-static)
 add_custom_command(
     TARGET
-        geary-console
+        ${CMAKE_PROJECT_NAME}-console
     POST_BUILD
     COMMAND 
-        ${CMAKE_COMMAND} -E copy geary-console ${CMAKE_BINARY_DIR}/
+        ${CMAKE_COMMAND} -E copy ${CMAKE_PROJECT_NAME}-console ${CMAKE_BINARY_DIR}/
 )
 
 # Mailer app
 #################################################
-vala_precompile(MAILER_VALA_C geary-mailer
+vala_precompile(MAILER_VALA_C ${CMAKE_PROJECT_NAME}-mailer
     ${MAILER_SRC}
 PACKAGES
     ${ENGINE_PACKAGES}
 CUSTOM_VAPIS
-    "${CMAKE_BINARY_DIR}/src/geary-static.vapi"
+    "${CMAKE_BINARY_DIR}/src/${CMAKE_PROJECT_NAME}-static.vapi"
 OPTIONS
     ${VALAC_OPTIONS}
     --vapidir=${CMAKE_BINARY_DIR}/src
 )
 
-add_executable(geary-mailer ${MAILER_VALA_C})
-target_link_libraries(geary-mailer ${DEPS_LIBRARIES} gthread-2.0 geary-static)
+add_executable(${CMAKE_PROJECT_NAME}-mailer ${MAILER_VALA_C})
+target_link_libraries(${CMAKE_PROJECT_NAME}-mailer ${DEPS_LIBRARIES} gthread-2.0 ${CMAKE_PROJECT_NAME}-static)
 add_custom_command(
     TARGET
-        geary-mailer
+        ${CMAKE_PROJECT_NAME}-mailer
     POST_BUILD
     COMMAND 
-        ${CMAKE_COMMAND} -E copy geary-mailer ${CMAKE_BINARY_DIR}/
+        ${CMAKE_COMMAND} -E copy ${CMAKE_PROJECT_NAME}-mailer ${CMAKE_BINARY_DIR}/
 )
 
 # Valadoc
@@ -726,7 +726,7 @@
     WORKING_DIRECTORY
         ${CMAKE_SOURCE_DIR}/src
     COMMAND
-        ${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
+        ${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
 )
 
 ## Make clean: remove copied files
@@ -735,8 +735,8 @@
     DIRECTORY ..
     APPEND
     PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
-        geary
-        geary-console
+        ${CMAKE_PROJECT_NAME}
+        ${CMAKE_PROJECT_NAME}-console
         geary-mailer
 )
 
 
=== modified file 'src/client/application/geary-application.vala'
--- src/client/application/geary-application.vala	2016-02-09 18:34:21 +0000
+++ src/client/application/geary-application.vala	2016-02-17 01:22:00 +0000
@@ -13,7 +13,7 @@
 
 public class GearyApplication : Gtk.Application {
     public const string NAME = "Mail";
-    public const string PRGNAME = "geary";
+    public const string PRGNAME = "pantheon-mail";
     public const string APP_ID = "org.pantheon.mail";
     public const string COPYRIGHT = _("2011-2015 Yorba Foundation\n© 2016 elementary LLC.");
     public const string WEBSITE = "https://elementary.io";
@@ -231,11 +231,11 @@
     }
     
     public File get_user_data_directory() {
-        return File.new_for_path(Environment.get_user_data_dir()).get_child("geary");
+        return File.new_for_path(Environment.get_user_data_dir()).get_child("pantheon-mail");
     }
     
     public File get_user_config_directory() {
-        return File.new_for_path(Environment.get_user_config_dir()).get_child("geary");
+        return File.new_for_path(Environment.get_user_config_dir()).get_child("pantheon-mail");
     }
     
     /**
@@ -246,9 +246,9 @@
      */
     public File get_resource_directory() {
         if (get_install_dir() != null)
-            return get_install_dir().get_child("share").get_child("geary");
+            return get_install_dir().get_child("share").get_child("pantheon-mail");
         else
-            return File.new_for_path(SOURCE_ROOT_DIR);
+            return File.new_for_path(SOURCE_ROOT_DIR + "/data");
     }
     
     // Returns the directory the application is currently executing from.
@@ -259,8 +259,8 @@
     public File? get_desktop_file() {
         File? install_dir = get_install_dir();
         File desktop_file = (install_dir != null)
-            ? install_dir.get_child("share").get_child("applications").get_child("geary.desktop")
-            : File.new_for_path(SOURCE_ROOT_DIR).get_child("build").get_child("desktop").get_child("geary.desktop");
+            ? install_dir.get_child("share").get_child("applications").get_child("pantheon-mail.desktop")
+            : File.new_for_path(SOURCE_ROOT_DIR).get_child("build").get_child("desktop").get_child("pantheon-mail.desktop");
         
         return desktop_file.query_exists() ? desktop_file : null;
     }
@@ -343,7 +343,7 @@
         }
         
         // Give asynchronous destroy_async() a chance to complete, but to avoid bug(s) where
-        // Geary hangs at exit, shut the whole thing down if destroy_async() takes too long to
+        // Mail hangs at exit, shut the whole thing down if destroy_async() takes too long to
         // complete
         int64 start_usec = get_monotonic_time();
         destroy_async.begin();
@@ -352,7 +352,7 @@
             
             int64 delta_usec = get_monotonic_time() - start_usec;
             if (delta_usec >= FORCE_SHUTDOWN_USEC) {
-                debug("Forcing shutdown of Geary, %ss passed...", (delta_usec / USEC_PER_SEC).to_string());
+                debug("Forcing shutdown of Mail, %ss passed...", (delta_usec / USEC_PER_SEC).to_string());
                 
                 break;
             }