mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-10-22 10:46:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup build scripts

Browse source
This commit is contained in:
Chocobo1 2018-12-21 18:31:49 +08:00
parent 8aa2789ded
commit 6bd5d0b8e9
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
4 changed files with 21 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
configure vendored
View file

@ -8433,21 +8433,17 @@ fi
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: Running qmake to generate the makefile..." >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: Running qmake to generate the makefile..." >&5
$as_echo "$as_me: Running qmake to generate the makefile..." >&6;} $as_echo "$as_me: Running qmake to generate the makefile..." >&6;}
CONFDIR="$( cd "$( dirname "$0" )" && pwd )" TOPDIR="$(cd "$(dirname "$0")" && pwd)"
$QT_QMAKE -r "$TOPDIR/qbittorrent.pro" "QMAKE_LRELEASE=$QMAKE_LRELEASE"
$QT_QMAKE -r $CONFDIR/qbittorrent.pro "QMAKE_LRELEASE=$QMAKE_LRELEASE" qmake_ret="$?"
ret="$?"
$as_echo $as_echo
if test "x$ret" = "x0"; then : if test "x$qmake_ret" != "x0"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: Good, your configure finished." >&5 as_fn_error $? "$QT_QMAKE failed to generate the makefile" "$LINENO" 5
$as_echo "$as_me: Good, your configure finished." >&6;}
else
as_fn_error $? "Failed running $QT_QMAKE to generate the makefile" "$LINENO" 5
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: Good, the configure finished." >&5
$as_echo "$as_me: Good, the configure finished." >&6;}
$as_echo $as_echo

17
configure.ac
View file

@ -292,17 +292,14 @@ AC_OUTPUT(conf.pri)
AS_IF([test "x$enable_systemd" = "xyes"], AS_IF([test "x$enable_systemd" = "xyes"],
[AC_OUTPUT(dist/unix/systemd/qbittorrent-nox@.service)]) [AC_OUTPUT(dist/unix/systemd/qbittorrent-nox@.service)])
AC_MSG_NOTICE([Running qmake to generate the makefile...]) AC_MSG_NOTICE([Running qmake to generate the makefile...])
CONFDIR="$( cd "$( dirname "$0" )" && pwd )" TOPDIR="$(cd "$(dirname "$0")" && pwd)"
$QT_QMAKE -r "$TOPDIR/qbittorrent.pro" "QMAKE_LRELEASE=$QMAKE_LRELEASE"
$QT_QMAKE -r [$CONFDIR]/qbittorrent.pro "QMAKE_LRELEASE=$QMAKE_LRELEASE" qmake_ret="$?"
ret="$?"
AS_ECHO() AS_ECHO()
AS_IF([test "x$ret" = "x0"], AS_IF([test "x$qmake_ret" != "x0"],
[AC_MSG_NOTICE([Good, your configure finished.])], [AC_MSG_ERROR([$QT_QMAKE failed to generate the makefile])])
[AC_MSG_ERROR([Failed running $QT_QMAKE to generate the makefile])])
AC_MSG_NOTICE([Good, the configure finished.])
AS_ECHO() AS_ECHO()

6
macxconf.pri
View file

@ -1,11 +1,9 @@
# Generated by the configure file
# Ignore any WARNING about 'conf.pri' missing during configure. The file should be found during make.
# If not there will be a WARNING again.
# The first path is used when the source is being build by packagers (pbuilder/sbuild/etc) # The first path is used when the source is being build by packagers (pbuilder/sbuild/etc)
# The second path is used when you manually run the configure script in the root folder (eg when using qt creator) # The second path is used when you manually run the configure script in the root folder (eg when using qt creator)
exists($$OUT_PWD/../conf.pri) { exists($$OUT_PWD/../conf.pri) {
include($$OUT_PWD/../conf.pri) include($$OUT_PWD/../conf.pri)
} else { }
else {
include(conf.pri) include(conf.pri)
} }

9
unixconf.pri
View file

@ -1,11 +1,9 @@
# Generated by the configure file
# Ignore any WARNING about 'conf.pri' missing during configure. The file should be found during make.
# If not there will be a WARNING again.
# The first path is used when the source is being build by packagers (pbuilder/sbuild/etc) # The first path is used when the source is being build by packagers (pbuilder/sbuild/etc)
# The second path is used when you manually run the configure script in the root folder (eg when using qt creator) # The second path is used when you manually run the configure script in the root folder (eg when using qt creator)
exists($$OUT_PWD/../conf.pri) { exists($$OUT_PWD/../conf.pri) {
include($$OUT_PWD/../conf.pri) include($$OUT_PWD/../conf.pri)
} else { }
else {
include(conf.pri) include(conf.pri)
} }
@ -18,7 +16,8 @@ QMAKE_CXXFLAGS += -Wall -Wextra -Wpedantic -Wformat-security
# Man page # Man page
nogui { nogui {
man.files = ../doc/qbittorrent-nox.1 man.files = ../doc/qbittorrent-nox.1
} else { }
else {
man.files = ../doc/qbittorrent.1 man.files = ../doc/qbittorrent.1
} }