Prevent translation conversion script being called multiple times on Windows
FossilOrigin-Name: b82bb671d80df48d001b639dcf58f6016cc3ab84
This commit is contained in:
Kostas
parent
5a4ed73777
commit
c7c51a7809
300
fuel.pro
300
fuel.pro
@ -1,149 +1,151 @@
|
||||
#-------------------------------------------------
|
||||
# Fuel
|
||||
#-------------------------------------------------
|
||||
|
||||
QT = core gui webkit
|
||||
|
||||
contains(QT_VERSION, ^5\\..*) {
|
||||
QT += widgets webkitwidgets
|
||||
QT -= quick multimediawidgets opengl printsupport qml multimedia positioning sensors
|
||||
}
|
||||
|
||||
TARGET = Fuel
|
||||
TEMPLATE = app
|
||||
|
||||
win32 {
|
||||
RC_FILE = rsrc/fuel.rc
|
||||
LIBS += -luser32 -lshell32 -luuid
|
||||
system(intl\convert.bat)
|
||||
}
|
||||
|
||||
macx {
|
||||
ICON = rsrc/icons/fuel.icns
|
||||
}
|
||||
|
||||
# FreeBSD needs explicit paths to Qt install
|
||||
unix:freebsd {
|
||||
INCLUDEPATH += /usr/local/include
|
||||
LIBS += -L/usr/local/lib
|
||||
}
|
||||
|
||||
unix:!macx {
|
||||
TARGET = fuel
|
||||
ICON = rsrc/icons/fuel.png
|
||||
PREFIX = /usr
|
||||
BINDIR = $$PREFIX/bin
|
||||
DATADIR = $$PREFIX/share
|
||||
target.path = $$BINDIR
|
||||
|
||||
desktop.path = $$DATADIR/applications
|
||||
desktop.files += rsrc/fuel.desktop
|
||||
|
||||
icon.path = $$DATADIR/icons/hicolor/256x256/apps
|
||||
icon.files += rsrc/icons/fuel.png
|
||||
|
||||
INSTALLS += target desktop icon
|
||||
system(intl/convert.sh)
|
||||
}
|
||||
|
||||
|
||||
INCLUDEPATH += src
|
||||
|
||||
SOURCES += src/main.cpp\
|
||||
src/MainWindow.cpp \
|
||||
src/CommitDialog.cpp \
|
||||
src/FileActionDialog.cpp \
|
||||
src/SettingsDialog.cpp \
|
||||
src/FslSettingsDialog.cpp \
|
||||
src/CloneDialog.cpp \
|
||||
src/RevisionDialog.cpp \
|
||||
src/Utils.cpp \
|
||||
src/FileTableView.cpp \
|
||||
src/LoggedProcess.cpp \
|
||||
src/BrowserWidget.cpp \
|
||||
src/CustomWebView.cpp \
|
||||
src/Fossil.cpp \
|
||||
src/Workspace.cpp \
|
||||
src/SearchBox.cpp \
|
||||
src/Settings.cpp \
|
||||
src/RemoteDialog.cpp \
|
||||
src/AboutDialog.cpp
|
||||
|
||||
HEADERS += src/MainWindow.h \
|
||||
src/CommitDialog.h \
|
||||
src/FileActionDialog.h \
|
||||
src/SettingsDialog.h \
|
||||
src/FslSettingsDialog.h \
|
||||
src/CloneDialog.h \
|
||||
src/RevisionDialog.h \
|
||||
src/Utils.h \
|
||||
src/FileTableView.h \
|
||||
src/LoggedProcess.h \
|
||||
src/BrowserWidget.h \
|
||||
src/CustomWebView.h \
|
||||
src/Fossil.h \
|
||||
src/Workspace.h \
|
||||
src/SearchBox.h \
|
||||
src/Settings.h \
|
||||
src/RemoteDialog.h \
|
||||
src/AboutDialog.h
|
||||
|
||||
FORMS += ui/MainWindow.ui \
|
||||
ui/CommitDialog.ui \
|
||||
ui/FileActionDialog.ui \
|
||||
ui/SettingsDialog.ui \
|
||||
ui/FslSettingsDialog.ui \
|
||||
ui/CloneDialog.ui \
|
||||
ui/BrowserWidget.ui \
|
||||
ui/RevisionDialog.ui \
|
||||
ui/RemoteDialog.ui \
|
||||
ui/AboutDialog.ui
|
||||
|
||||
RESOURCES += \
|
||||
rsrc/resources.qrc
|
||||
|
||||
# QtKeychain
|
||||
SOURCES += ext/qtkeychain/keychain.cpp
|
||||
|
||||
HEADERS += ext/qtkeychain/keychain.h \
|
||||
ext/qtkeychain/keychain_p.h \
|
||||
ext/qtkeychain/qkeychain_export.h
|
||||
|
||||
DEFINES += QKEYCHAIN_STATICLIB
|
||||
|
||||
unix:!macx {
|
||||
QT += dbus
|
||||
|
||||
SOURCES += ext/qtkeychain/keychain_unix.cpp \
|
||||
ext/qtkeychain/gnomekeyring.cpp
|
||||
|
||||
HEADERS += ext/qtkeychain/gnomekeyring_p.h
|
||||
DBUS_INTERFACES += ext/qtkeychain/org.kde.KWallet.xml
|
||||
}
|
||||
|
||||
macx {
|
||||
SOURCES += ext/qtkeychain/keychain_mac.cpp
|
||||
LIBS += -framework CoreFoundation -framework Security
|
||||
}
|
||||
|
||||
win32 {
|
||||
SOURCES += ext/qtkeychain/keychain_win.cpp
|
||||
LIBS += -lCrypt32
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
CODECFORTR = UTF-8
|
||||
|
||||
TRANSLATIONS += \
|
||||
intl/en_US.ts \
|
||||
intl/el_GR.ts \
|
||||
intl/de_DE.ts \
|
||||
intl/es_ES.ts \
|
||||
intl/fr_FR.ts \
|
||||
intl/ru_RU.ts \
|
||||
intl/pt_PT.ts \
|
||||
intl/it_IT.ts \
|
||||
intl/nl_NL.ts \
|
||||
intl/ko_KO.ts \
|
||||
#-------------------------------------------------
|
||||
# Fuel
|
||||
#-------------------------------------------------
|
||||
|
||||
QT = core gui webkit
|
||||
|
||||
contains(QT_VERSION, ^5\\..*) {
|
||||
QT += widgets webkitwidgets
|
||||
QT -= quick multimediawidgets opengl printsupport qml multimedia positioning sensors
|
||||
}
|
||||
|
||||
TARGET = Fuel
|
||||
TEMPLATE = app
|
||||
|
||||
win32 {
|
||||
RC_FILE = rsrc/fuel.rc
|
||||
LIBS += -luser32 -lshell32 -luuid
|
||||
|
||||
# Prevent batch file being called multiple times
|
||||
!build_pass:system(intl\convert.bat)
|
||||
}
|
||||
|
||||
macx {
|
||||
ICON = rsrc/icons/fuel.icns
|
||||
}
|
||||
|
||||
# FreeBSD needs explicit paths to Qt install
|
||||
unix:freebsd {
|
||||
INCLUDEPATH += /usr/local/include
|
||||
LIBS += -L/usr/local/lib
|
||||
}
|
||||
|
||||
unix:!macx {
|
||||
TARGET = fuel
|
||||
ICON = rsrc/icons/fuel.png
|
||||
PREFIX = /usr
|
||||
BINDIR = $$PREFIX/bin
|
||||
DATADIR = $$PREFIX/share
|
||||
target.path = $$BINDIR
|
||||
|
||||
desktop.path = $$DATADIR/applications
|
||||
desktop.files += rsrc/fuel.desktop
|
||||
|
||||
icon.path = $$DATADIR/icons/hicolor/256x256/apps
|
||||
icon.files += rsrc/icons/fuel.png
|
||||
|
||||
INSTALLS += target desktop icon
|
||||
system(intl/convert.sh)
|
||||
}
|
||||
|
||||
|
||||
INCLUDEPATH += src
|
||||
|
||||
SOURCES += src/main.cpp\
|
||||
src/MainWindow.cpp \
|
||||
src/CommitDialog.cpp \
|
||||
src/FileActionDialog.cpp \
|
||||
src/SettingsDialog.cpp \
|
||||
src/FslSettingsDialog.cpp \
|
||||
src/CloneDialog.cpp \
|
||||
src/RevisionDialog.cpp \
|
||||
src/Utils.cpp \
|
||||
src/FileTableView.cpp \
|
||||
src/LoggedProcess.cpp \
|
||||
src/BrowserWidget.cpp \
|
||||
src/CustomWebView.cpp \
|
||||
src/Fossil.cpp \
|
||||
src/Workspace.cpp \
|
||||
src/SearchBox.cpp \
|
||||
src/Settings.cpp \
|
||||
src/RemoteDialog.cpp \
|
||||
src/AboutDialog.cpp
|
||||
|
||||
HEADERS += src/MainWindow.h \
|
||||
src/CommitDialog.h \
|
||||
src/FileActionDialog.h \
|
||||
src/SettingsDialog.h \
|
||||
src/FslSettingsDialog.h \
|
||||
src/CloneDialog.h \
|
||||
src/RevisionDialog.h \
|
||||
src/Utils.h \
|
||||
src/FileTableView.h \
|
||||
src/LoggedProcess.h \
|
||||
src/BrowserWidget.h \
|
||||
src/CustomWebView.h \
|
||||
src/Fossil.h \
|
||||
src/Workspace.h \
|
||||
src/SearchBox.h \
|
||||
src/Settings.h \
|
||||
src/RemoteDialog.h \
|
||||
src/AboutDialog.h
|
||||
|
||||
FORMS += ui/MainWindow.ui \
|
||||
ui/CommitDialog.ui \
|
||||
ui/FileActionDialog.ui \
|
||||
ui/SettingsDialog.ui \
|
||||
ui/FslSettingsDialog.ui \
|
||||
ui/CloneDialog.ui \
|
||||
ui/BrowserWidget.ui \
|
||||
ui/RevisionDialog.ui \
|
||||
ui/RemoteDialog.ui \
|
||||
ui/AboutDialog.ui
|
||||
|
||||
RESOURCES += \
|
||||
rsrc/resources.qrc
|
||||
|
||||
# QtKeychain
|
||||
SOURCES += ext/qtkeychain/keychain.cpp
|
||||
|
||||
HEADERS += ext/qtkeychain/keychain.h \
|
||||
ext/qtkeychain/keychain_p.h \
|
||||
ext/qtkeychain/qkeychain_export.h
|
||||
|
||||
DEFINES += QKEYCHAIN_STATICLIB
|
||||
|
||||
unix:!macx {
|
||||
QT += dbus
|
||||
|
||||
SOURCES += ext/qtkeychain/keychain_unix.cpp \
|
||||
ext/qtkeychain/gnomekeyring.cpp
|
||||
|
||||
HEADERS += ext/qtkeychain/gnomekeyring_p.h
|
||||
DBUS_INTERFACES += ext/qtkeychain/org.kde.KWallet.xml
|
||||
}
|
||||
|
||||
macx {
|
||||
SOURCES += ext/qtkeychain/keychain_mac.cpp
|
||||
LIBS += -framework CoreFoundation -framework Security
|
||||
}
|
||||
|
||||
win32 {
|
||||
SOURCES += ext/qtkeychain/keychain_win.cpp
|
||||
LIBS += -lCrypt32
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
CODECFORTR = UTF-8
|
||||
|
||||
TRANSLATIONS += \
|
||||
intl/en_US.ts \
|
||||
intl/el_GR.ts \
|
||||
intl/de_DE.ts \
|
||||
intl/es_ES.ts \
|
||||
intl/fr_FR.ts \
|
||||
intl/ru_RU.ts \
|
||||
intl/pt_PT.ts \
|
||||
intl/it_IT.ts \
|
||||
intl/nl_NL.ts \
|
||||
intl/ko_KO.ts \
|
||||
|
||||
12
manifest
12
manifest
@ -1,5 +1,5 @@
|
||||
C RemoteDialog:\sFixed\sincorrect\sparsing\sfor\slocal\srepositories\nRemoteDialog/CloneDialog:\sUI\sTweaks\n\n
|
||||
D 2015-08-26T21:02:25.634
|
||||
C Prevent\stranslation\sconversion\sscript\sbeing\scalled\smultiple\stimes\son\sWindows
|
||||
D 2015-08-27T09:11:23.023
|
||||
F .fossil-settings/manifest a09a968bf05a50058f3ad50132730b719bc39e76
|
||||
F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
|
||||
F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
|
||||
@ -38,7 +38,7 @@ F ext/qtkeychain/qkeychain_export.h d756528188ef9bf3c4461ecc80048f06c362b54b
|
||||
F ext/qtkeychain/testclient.cpp cb1290a9584b627306a7bfdf1c02a8bbae503f5f
|
||||
F ext/qtkeychain/translations/qtkeychain_de.ts 0a70c8205c066c30ed8172f0670942de1fc5eede
|
||||
F ext/qtkeychain/translations/qtkeychain_ro.ts f16939382fd1a047b0692426bc82847347f14b32
|
||||
F fuel.pro e753acacfb6a7e2b7ff33586e872269e6febda90
|
||||
F fuel.pro 13e5a8ca66923cb7b9583296b1427ccb2f75782a
|
||||
F intl/convert.bat ce14bb3b45b162186a73d1cfa6f2a8e832cdeddc x
|
||||
F intl/convert.sh ac6edc8d99b575601cf9c6b85b18c9e25875b6e0 x
|
||||
F intl/de_DE.ts e2faceab920ac60c97bbc6fba038e261d51fc741
|
||||
@ -261,7 +261,7 @@ F ui/MainWindow.ui e2a18caa7482b3ee0dff477592cdc9574b35fe4f
|
||||
F ui/RemoteDialog.ui 424b2d4a3d0162f84fdccf6af02c1cfce07a06f5
|
||||
F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd
|
||||
F ui/SettingsDialog.ui 2e1b6ce7a49100088c5649292c1319e62e0302e1
|
||||
P 2e0cbf44fd99ae2c1155857c79d0c09be9897483
|
||||
R 299d60964206bb133a79ab33106d5571
|
||||
P 9dd99f7de54ad40a15d80f9bf9af82a367c24302
|
||||
R 0a6bec5bab899cd94ca1caa001c07656
|
||||
U Kostas
|
||||
Z 15cc90ea1c477295b23c8c549ce6a6f7
|
||||
Z 169730d38bbb5a74dcedcc4ddd79bdfb
|
||||
|
||||
@ -1 +1 @@
|
||||
9dd99f7de54ad40a15d80f9bf9af82a367c24302
|
||||
b82bb671d80df48d001b639dcf58f6016cc3ab84
|
||||
Loading…
x
Reference in New Issue
Block a user