translations/qtwitter_ca_ES.ts translations/qtwitter_cs_CZ.ts translations/qtwitter_de_DE.ts translations/qtwitter_es_ES.ts translations/qtwitter_fr_FR.ts translations/qtwitter_it_IT.ts translations/qtwitter_ja_JP.ts translations/qtwitter_nb_NO.ts translations/qtwitter_pl_PL.ts translations/qtwitter_pt_BR.ts translations/translations.pri translations/translations.pro @@ -1,16 +1,26 @@ -TOP = $${PWD} -DEFINES += HAVE_OAUTH +isEmpty(COMMON_PRI) { + COMMON_PRI = 1 -APP_NAME = qtwitter + APP_NAME = qtwitter + TOP = $${PWD} -unix:!mac { - UNAME = $$system(uname -m) - contains( UNAME, x86_64 ): LIB_SUFFIX = 64 -} + isEmpty( PREFIX ):INSTALL_PREFIX = /usr + else:INSTALL_PREFIX = $${PREFIX} + + SHARE_DIR = $${INSTALL_PREFIX}/share/$${APP_NAME} + + DEFINES += SHARE_DIR='\\\"$${SHARE_DIR}\\\"' + DEFINES += HAVE_OAUTH -UI_DIR = $${TOP}/tmp -MOC_DIR = $${TOP}/tmp -RCC_DIR = $${TOP}/tmp -OBJECTS_DIR = $${TOP}/tmp -INCLUDEPATH += $${TOP} $${TOP}/tmp -DESTDIR = $${TOP}/build + unix:!mac { + UNAME = $$system(uname -m) + contains( UNAME, x86_64 ): LIB_SUFFIX = 64 + } + + UI_DIR = $${TOP}/tmp + MOC_DIR = $${TOP}/tmp + RCC_DIR = $${TOP}/tmp + OBJECTS_DIR = $${TOP}/tmp + INCLUDEPATH += $${TOP} $${TOP}/tmp + DESTDIR = $${TOP}/build +} common.pri @@ -1,4 +1,5 @@ include(../common.pri) +include($${TOP}/translations/translations.pri) TEMPLATE = lib CONFIG += plugin @@ -7,7 +8,7 @@ mac: DESTDIR = $${DESTDIR}/$${APP_NAME}.app/Contents/plugins else: DESTDIR = $${DESTDIR}/plugins # install -isEmpty( PREFIX ):INSTALL_PREFIX = /usr +isEmpty( PREFIX ):INSTALL_PREFIX = /usr/local else:INSTALL_PREFIX = $${PREFIX} target.path = $${INSTALL_PREFIX}/lib$${LIB_SUFFIX}/$${APP_NAME}/plugins INSTALLS += target plugins/plugins.pri @@ -5,6 +5,7 @@ CONFIG += oauth # sets the TOP variable to the root source code dir include(../common.pri) +include($${TOP}/translations/translations.pri) include($${TOP}/twitterapi/twitterapi.pri) include(src/dbus/dbus.pri) include(src/oauth/oauth.pri) @@ -68,37 +69,10 @@ FORMS += ui/mainwindow.ui \ ui/userinfopopup.ui \ ui/dmdialog.ui \ ui/welcomedialog.ui -TRANSLATIONS += loc/qtwitter_ca_ES.ts \ - loc/qtwitter_de_DE.ts \ - loc/qtwitter_es_ES.ts \ - loc/qtwitter_ja_JP.ts \ - loc/qtwitter_it_IT.ts \ - loc/qtwitter_fr_FR.ts \ - loc/qtwitter_nb_NO.ts \ - loc/qtwitter_pl_PL.ts \ - loc/qtwitter_pt_BR.ts \ - loc/qtwitter_cs_CZ.ts - -linux-* { - RESOURCES = res/resources_x11.qrc -} else { - RESOURCES = res/resources.qrc -} -#linux-* { -# RESOURCES = res/resources_x11.qrc -# i18n.commands = lrelease $${_PRO_FILE_} && mkdir -p $${_PRO_FILE_PWD_}/res/loc && mv $${_PRO_FILE_PWD_}/loc/*.qm $${_PRO_FILE_PWD_}/res/loc -# QMAKE_EXTRA_TARGETS += i18n -# PRE_TARGETDEPS += i18n -#} else { -# # systems other than linux provide translations inside the binary -# # - they have to exist at compile time -# system("lrelease $${_PRO_FILE_} && mkdir -p $${_PRO_FILE_PWD_}/res/loc && mv $${_PRO_FILE_PWD_}/loc/*.qm $${_PRO_FILE_PWD_}/res/loc") -# RESOURCES = res/resources.qrc -#} +RESOURCES = res/resources.qrc INCLUDEPATH += src - macx { ICON = macx/qtwitter.icns QMAKE_INFO_PLIST = macx/Info.plist @@ -108,19 +82,10 @@ macx { else:unix { LIBS += -L$${DESTDIR} \ -Wl,-rpath,$${DESTDIR} \ - $$TWITTERAPI_LIB \ - $$URLSHORTENER_LIB - isEmpty( PREFIX ):INSTALL_PREFIX = /usr - else:INSTALL_PREFIX = $${PREFIX} + $$TWITTERAPI_LIB target.path = $${INSTALL_PREFIX}/bin - SHARE_DIR = $${INSTALL_PREFIX}/share/$${TARGET} PLUGINS_DIR = $${INSTALL_PREFIX}/lib$${LIB_SUFFIX}/$${TARGET}/plugins - DEFINES += SHARE_DIR='\\\"$${SHARE_DIR}\\\"' DEFINES += PLUGINS_DIR='\\\"$${PLUGINS_DIR}\\\"' - translations.path = $${SHARE_DIR}/loc - translations.files = $${TRANSLATIONS} - translations.files ~= s/\.ts/.qm/g - translations.files ~= s!^loc!res/loc!g icons.path = $${INSTALL_PREFIX}/share/icons/scalable/apps icons.files = x11/icons/scalable/qtwitter.svg icons16.path = $${INSTALL_PREFIX}/share/icons/hicolor/16x16/apps @@ -140,7 +105,6 @@ else:unix { desktop.path = $${INSTALL_PREFIX}/share/applications desktop.files = x11/qtwitter.desktop INSTALLS += target \ - translations \ icons \ icons16 \ icons22 \ @@ -155,6 +119,4 @@ else:win32 { RC_FILE = win32/qtwitter.rc LIBS += -L$${DESTDIR} \ $$TWITTERAPI_LIB \ - $$URLSHORTENER_LIB \ - $$QOAUTH_LIB } qtwitter-app/qtwitter-app.pro @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/" > + <qresource prefix="/"> <file>icons/accepted_48.png</file> <file>icons/add_48.png</file> <file>icons/cancel_48.png</file> @@ -17,14 +17,5 @@ <file>icons/twitter_48.png</file> <file>icons/warning_16.png</file> <file>icons/warning_48.png</file> - <file>loc/qtwitter_ca_ES.qm</file> - <file>loc/qtwitter_de_DE.qm</file> - <file>loc/qtwitter_es_ES.qm</file> - <file>loc/qtwitter_fr_FR.qm</file> - <file>loc/qtwitter_ja_JP.qm</file> - <file>loc/qtwitter_pl_PL.qm</file> - <file>loc/qtwitter_pt_BR.qm</file> - <file>loc/qtwitter_it_IT.qm</file> - <file>loc/qtwitter_cs_CZ.qm</file> </qresource> </RCC> qtwitter-app/res/resources.qrc @@ -1,3 +1,3 @@ TEMPLATE = subdirs -SUBDIRS = twitterapi qtwitter-app plugins +SUBDIRS = translations twitterapi qtwitter-app plugins CONFIG += ordered qtwitter.pro qtwitter-app/loc/qtwitter_ca_ES.ts qtwitter-app/loc/qtwitter_cs_CZ.ts qtwitter-app/loc/qtwitter_de_DE.ts qtwitter-app/loc/qtwitter_es_ES.ts qtwitter-app/loc/qtwitter_fr_FR.ts qtwitter-app/loc/qtwitter_it_IT.ts qtwitter-app/loc/qtwitter_ja_JP.ts qtwitter-app/loc/qtwitter_nb_NO.ts qtwitter-app/loc/qtwitter_pl_PL.ts qtwitter-app/loc/qtwitter_pt_BR.ts qtwitter-app/res/loc/qtwitter_ca_ES.qm qtwitter-app/res/loc/qtwitter_cs_CZ.qm qtwitter-app/res/loc/qtwitter_de_DE.qm qtwitter-app/res/loc/qtwitter_es_ES.qm qtwitter-app/res/loc/qtwitter_fr_FR.qm qtwitter-app/res/loc/qtwitter_it_IT.qm qtwitter-app/res/loc/qtwitter_ja_JP.qm qtwitter-app/res/loc/qtwitter_nb_NO.qm qtwitter-app/res/loc/qtwitter_pl_PL.qm qtwitter-app/res/loc/qtwitter_pt_BR.qm qtwitter-app/res/resources_x11.qrc 1b3a614d8c40afb7fa3acd6d26175be6c7f833a2 Dominik Kapusta d@ayoy.net http://github.com/ayoy/qtwitter/commit/a8ba1ac6553787c51f258fd6962da7ed3ec9c4e2 a8ba1ac6553787c51f258fd6962da7ed3ec9c4e2 2009-10-25T12:35:08-07:00 2009-10-25T12:35:08-07:00 Provided automatic generation of qm files. The translations directory contains all the ts files and a project file providing methods to generate qm files. It's executed before everything else and the qms installation is provided there. Unified resource files with removed qms. To be checked and fixed on Windows and OS X. 0f88c3b2843960843723643e6ad93b0e92bc27db Dominik Kapusta d@ayoy.net