Skip to content

Commit

Permalink
merge with master
Browse files Browse the repository at this point in the history
  • Loading branch information
naxuroqa committed Jul 6, 2014
2 parents b7a9692 + bcbe842 commit 721a505
Show file tree
Hide file tree
Showing 93 changed files with 6,693 additions and 1,962 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ compiler:
before_install:
- sudo apt-add-repository -y ppa:vala-team/ppa
- sudo apt-get update -qq > /dev/null
- sudo apt-get install -qq valac cmake libgtk-3-dev check libjson-glib-dev libsqlite3-dev yasm > /dev/null
- sudo apt-get install -qq valac cmake libgtk-3-dev check libjson-glib-dev libsqlite3-dev yasm libqrencode-dev > /dev/null

before_script:
#installing libsodium, needed for Core
Expand Down Expand Up @@ -55,6 +55,6 @@ before_script:
script:
- mkdir build
- cd build
- cmake -DDJBDNS_DIRECTORY="../djbdns-1.05" ..
- cmake -DDJBDNS_DIRECTORY="../djbdns-1.05" -DENABLE_QR_ENCODE=ON ..
- make -j3
- sudo make install
24 changes: 12 additions & 12 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)
PROJECT(Venom C)

LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)

SET(VENOM_VERSION_MAJOR 0)
SET(VENOM_VERSION_MINOR 2)
Expand All @@ -36,6 +36,8 @@ MESSAGE("Venom version ${VENOM_VERSION}")

OPTION( FORCE_32BIT "Set to ON to force 32bit build" OFF )
OPTION( BUILD_STATIC_EXECUTABLES "" OFF)
OPTION( ENABLE_QR_ENCODE "Set to ON to enable QR codes" OFF )
OPTION( ENABLE_DJBDNS "Set to ON to use djbdns to resolve tox dns ids (mandatory for glib <= 2.32)" OFF )

#check architecture
IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
Expand All @@ -53,29 +55,27 @@ ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(ARCHITECTURE 32)
ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)

#put binary in root on windows
IF(WIN32)
SET(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION .)
ELSE(WIN32)
SET(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION bin)
ENDIF(WIN32)

IF(BUILD_STATIC_EXECUTABLES)
SET(CMAKE_EXE_LINKER_FLAGS "-static -static-libgcc")
SET(CMAKE_FIND_LIBRARY_SUFFIXES .a)
SET(CMAKE_EXE_LINK_DYNAMIC_C_FLAGS) # remove -Wl,-Bdynamic
SET(CMAKE_SHARED_LIBRARY_C_FLAGS) # remove -fPIC
SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS) # remove -rdynamic
ENDIF(BUILD_STATIC_EXECUTABLES)

SET(COMMON_DATA_DIR share)
SET(VENOM_THEME_INSTALL_DESTINATION "${COMMON_DATA_DIR}/venom/theme")

#i18n
INCLUDE(Gettext)
SET(GETTEXT_PACKAGE "Venom")
#FIXME make this work for portable installations at runtime
SET(GETTEXT_PATH "${CMAKE_INSTALL_PREFIX}/${COMMON_DATA_DIR}/locale")

ADD_SUBDIRECTORY(misc)
ADD_SUBDIRECTORY(icons)
ADD_SUBDIRECTORY(theme)

ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(po)

INCLUDE(${CMAKE_SOURCE_DIR}/cmake/cpack.cmake)
INCLUDE(CPackDefines)

# vim:set ts=2 sw=2 et:
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ a cross-platform graphical user interface for [Tox](https://github.com/irungento
Installing
----------

- Grab a [stable](https://github.com/naxuroqa/Venom/releases) or [nightly](http://download.tox.im) binary for Windows
- Build it from source (Read [INSTALL.md](INSTALL.md) for instructions)
- Grab a [stable](https://github.com/naxuroqa/Venom/releases) or [nightly](https://wiki.tox.im/Binaries)

Contributing
------------
Expand All @@ -18,7 +17,7 @@ Contributing

Contact
-------
- Visit our IRC channel `#tox` on [freenode](http://freenode.net/)
- Visit our IRC channel `#tox` on [freenode](https://freenode.net/)
[![Visit our IRC channel](https://kiwiirc.com/buttons/irc.freenode.net/tox.png)](https://kiwiirc.com/client/irc.freenode.net/?theme=basic#tox)
- write an email to [naxuroqa@gmail.com](mailto:naxuroqa@gmail.com)

Expand Down
10 changes: 8 additions & 2 deletions cmake/cpack.cmake → cmake/CPackDefines.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ ELSE(ARCHITECTURE EQUAL 32)
SET(CPACK_RPM_PACKAGE_ARCHITECTURE x86_64)
ENDIF(ARCHITECTURE EQUAL 32)

# optional features
IF(${ENABLE_QR_ENCODE})
SET(DEBIAN_PACKAGE_DEPENDS_OPT ${DEBIAN_PACKAGE_DEPENDS_OPT} ", libqrencode3 (>=3.1.1)")
SET(RPM_PACKAGE_DEPENDS_OPT ${RPM_PACKAGE_DEPENDS_OPT} ", qrencode-libs >= 3.1.1")
ENDIF()

# Basic settings
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${VENOM_SHORT_DESCRIPTION}")
SET(CPACK_PACKAGE_EXECUTABLES "venom;Venom")
Expand Down Expand Up @@ -104,15 +110,15 @@ DeleteRegKey HKCR \\\"tox\\\"
")
# .deb
# libtoxcore ommitted, since we are most likely linking it statically
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libgtk-3-0 (>= 3.4.1), libjson-glib-1.0-0 (>= 0.14.2), libsqlite3-0 (>= 3.7.9), libnotify4 (>= 0.7.3)")
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libgtk-3-0 (>= 3.4.1), libjson-glib-1.0-0 (>= 0.14.2), libsqlite3-0 (>= 3.7.9), libnotify4 (>= 0.7.3) ${DEBIAN_PACKAGE_DEPENDS_OPT}")
SET(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
SET(CPACK_DEBIAN_PACKAGE_SECTION "web")
SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE "${VENOM_WEBSITE}")

# .rpm
SET(CPACK_RPM_PACKAGE_LICENSE "GPLv3")
SET(CPACK_RPM_PACKAGE_GROUP "Applications/Internet")
SET(CPACK_RPM_PACKAGE_REQUIRES "gtk3 >= 3.4.1, json-glib >= 0.14.2, sqlite >= 3.7.9, libnotify >= 0.7.3")
SET(CPACK_RPM_PACKAGE_REQUIRES "gtk3 >= 3.4.1, json-glib >= 0.14.2, sqlite >= 3.7.9, libnotify >= 0.7.3 ${RPM_PACKAGE_DEPENDS_OPT}")
# Default: some cpack comment, overwrite if needed
#SET(CPACK_RPM_CHANGELOG_FILE "")
SET(CPACK_RPM_PACKAGE_RELEASE 1)
Expand Down
1 change: 1 addition & 0 deletions cmake/modules/FindDJBDns.cmake → cmake/FindDJBDns.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,6 @@ ELSE(DJBDNS_LIBRARIES AND DJBDNS_INCLUDE_DIRS)
${DJBDNS_SOCKET_LIBRARY}
)
SET(DJBDNS_INCLUDE_DIRS ${DJBDNS_INCLUDE_DIR})
SET(DJBDNS_CFLAGS "-I${DJBDNS_INCLUDE_DIR}")
MARK_AS_ADVANCED(DJBDNS_INCLUDE_DIRS DJBDNS_LIBRARIES)
ENDIF(DJBDNS_LIBRARIES AND DJBDNS_INCLUDE_DIRS)
File renamed without changes.
File renamed without changes.
176 changes: 176 additions & 0 deletions cmake/Gettext.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
# Gettext support: Create/Update pot file and
#
# To use: INCLUDE(Gettext)
#
# Most of the gettext support code is from FindGettext.cmake of cmake,
# but it is included here because:
#
# 1. Some system like RHEL5 does not have FindGettext.cmake
# 2. Bug of GETTEXT_CREATE_TRANSLATIONS make it unable to be include in 'All'
# 3. It does not support xgettext
#
#===================================================================
# Constants:
# XGETTEXT_OPTIONS_DEFAULT: Default xgettext option:
#===================================================================
# Variables:
# XGETTEXT_OPTIONS: Options pass to xgettext
# Default: XGETTEXT_OPTIONS_DEFAULT
# GETTEXT_MSGMERGE_EXECUTABLE: the full path to the msgmerge tool.
# GETTEXT_MSGFMT_EXECUTABLE: the full path to the msgfmt tool.
# GETTEXT_FOUND: True if gettext has been found.
# XGETTEXT_EXECUTABLE: the full path to the xgettext.
# XGETTEXT_FOUND: True if xgettext has been found.
#
#===================================================================
# Macros:
# GETTEXT_CREATE_POT(potFile
# [OPTION xgettext_options]
# SRC list_of_source_file_that_contains_msgid
# )
#
# Generate .pot file.
# OPTION xgettext_options: Override XGETTEXT_OPTIONS
#
# * Produced targets: pot_file
#
#-------------------------------------------------------------------
# GETTEXT_CREATE_TRANSLATIONS ( outputFile [ALL] locale1 ... localeN
# [COMMENT comment] )
#
# This will create a target "translations" which will convert the
# given input po files into the binary output mo file. If the
# ALL option is used, the translations will also be created when
# building the default target.
#
# * Produced targets: translations
#-------------------------------------------------------------------

FIND_PROGRAM(GETTEXT_MSGMERGE_EXECUTABLE msgmerge)
FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt)
FIND_PROGRAM(GETTEXT_MSGCAT_EXECUTABLE msgcat)
FIND_PROGRAM(XGETTEXT_EXECUTABLE xgettext)

SET(XGETTEXT_OPTIONS_DEFAULT
--language=C --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 -s
--escape --add-comments="/" --package-name=${PROJECT_NAME} --package-version=${VERSION})

IF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE AND GETTEXT_MSGCAT_EXECUTABLE)
SET(GETTEXT_FOUND TRUE)
ELSE (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE)
SET(GETTEXT_FOUND FALSE)
IF (GetText_REQUIRED)
MESSAGE(FATAL_ERROR "GetText not found")
ENDIF (GetText_REQUIRED)
ENDIF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE AND GETTEXT_MSGCAT_EXECUTABLE)

IF(XGETTEXT_EXECUTABLE)
SET(XGETTEXT_FOUND TRUE)
ELSE(XGETTEXT_EXECUTABLE)
MESSAGE(STATUS "xgettext not found.")
SET(XGETTTEXT_FOUND FALSE)
ENDIF(XGETTEXT_EXECUTABLE)

IF(NOT DEFINED XGETTEXT_OPTIONS)
SET(XGETTEXT_OPTIONS ${XGETTEXT_OPTIONS_DEFAULT})
ENDIF(NOT DEFINED XGETTEXT_OPTIONS)

IF(XGETTEXT_FOUND)
MACRO(GETTEXT_CREATE_POT _potFile _pot_options )
SET(_xgettext_options_list)
SET(_src_list)
SET(_src_list_abs)
SET(_glade_list)
SET(_glade_list_abs)
SET(_stage "SRC")
FOREACH(_pot_option ${_pot_options} ${ARGN})
IF(_pot_option STREQUAL "OPTION")
SET(_stage "OPTION")
ELSEIF(_pot_option STREQUAL "SRC")
SET(_stage "SRC")
ELSEIF(_pot_option STREQUAL "GLADE")
SET(_stage "GLADE")
ELSE(_pot_option STREQUAL "OPTION")
IF(_stage STREQUAL "OPTION")
SET(_xgettext_options_list ${_xgettext_options_list} ${_pot_option})
ELSEIF(_stage STREQUAL "GLADE")
FILE(RELATIVE_PATH _relFile ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/${_pot_option})
GET_FILENAME_COMPONENT(_absFile ${_pot_option} ABSOLUTE)
SET(_glade_list ${_glade_list} ${_relFile})
SET(_glade_list_abs ${_glade_list_abs} ${_absFile})
ELSEIF(_stage STREQUAL "SRC")
FILE(RELATIVE_PATH _relFile ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${_pot_option})
GET_FILENAME_COMPONENT(_absFile ${_pot_option} ABSOLUTE)
SET(_src_list ${_src_list} ${_relFile})
SET(_src_list_abs ${_src_list_abs} ${_absFile})
ENDIF(_stage STREQUAL "OPTION")
ENDIF(_pot_option STREQUAL "OPTION")
ENDFOREACH(_pot_option ${_pot_options} ${ARGN})

IF (_xgettext_options_list)
SET(_xgettext_options ${_xgettext_options_list})
ELSE(_xgettext_options_list)
SET(_xgettext_options ${XGETTEXT_OPTIONS})
ENDIF(_xgettext_options_list)

#MESSAGE("${XGETTEXT_EXECUTABLE} ${_xgettext_options_list} -o ${_potFile} ${_src_list}")
ADD_CUSTOM_COMMAND(OUTPUT pot_file
COMMAND ${XGETTEXT_EXECUTABLE} ${_xgettext_options} -o ${_potFile} ${_src_list}
DEPENDS ${_src_list_abs} ${GLADE_FILES}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)

ADD_CUSTOM_TARGET(pot_file
COMMAND ${XGETTEXT_EXECUTABLE} ${_xgettext_options_list} -o _source.pot ${_src_list}
COMMAND ${XGETTEXT_EXECUTABLE} --language=Glade --omit-header -o _glade.pot ${_glade_list}
COMMAND ${GETTEXT_MSGCAT_EXECUTABLE} -o ${_potFile} --use-first _source.pot _glade.pot
DEPENDS ${_src_list_abs}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Extract translatable messages to ${_potFile}"
)
ENDMACRO(GETTEXT_CREATE_POT _potFile _pot_options)


MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstLang)
SET(_gmoFiles)
GET_FILENAME_COMPONENT(_potBasename ${_potFile} NAME_WE)
GET_FILENAME_COMPONENT(_absPotFile ${_potFile} ABSOLUTE)

SET(_addToAll)
SET(_is_comment FALSE)

FOREACH (_currentLang ${_firstLang} ${ARGN})
IF(_currentLang STREQUAL "ALL")
SET(_addToAll "ALL")
ELSEIF(_currentLang STREQUAL "COMMENT")
SET(_is_comment TRUE)
ELSEIF(_is_comment)
SET(_is_comment FALSE)
SET(_comment ${_currentLang})
ELSE()
SET(_lang ${_currentLang})
GET_FILENAME_COMPONENT(_absFile ${_currentLang}.po ABSOLUTE)
GET_FILENAME_COMPONENT(_abs_PATH ${_absFile} PATH)
SET(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.mo)

#MESSAGE("_absFile=${_absFile} _abs_PATH=${_abs_PATH} _lang=${_lang} curr_bin=${CMAKE_CURRENT_BINARY_DIR}")
ADD_CUSTOM_COMMAND(
OUTPUT ${_gmoFile}
COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_absFile} ${_absPotFile}
COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_absFile}
DEPENDS ${_absPotFile} ${_absFile}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)

INSTALL(FILES ${_gmoFile} DESTINATION share/locale/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo)
SET(_gmoFiles ${_gmoFiles} ${_gmoFile})
ENDIF()
ENDFOREACH (_currentLang )

IF(DEFINED _comment)
ADD_CUSTOM_TARGET(translations ${_addToAll} DEPENDS ${_gmoFiles} COMMENT ${_comment})
ELSE(DEFINED _comment)
ADD_CUSTOM_TARGET(translations ${_addToAll} DEPENDS ${_gmoFiles})
ENDIF(DEFINED _comment)
ENDMACRO(GETTEXT_CREATE_TRANSLATIONS )
ENDIF(XGETTEXT_FOUND)
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 721a505

Please sign in to comment.