From 3e2a7a56c07b3a2c62740ac46026e776e84f3137 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Tue, 28 Dec 2021 10:35:39 +0100 Subject: rbutil: Remove qmake project files. To build it configure with cmake from utils/ folder. Change-Id: I43fab2df1768e1a055e46ec5712e3a45fefef5a9 --- utils/rbutilqt/rbutilqt.pri | 229 ------------------------- utils/rbutilqt/rbutilqt.pro | 248 --------------------------- utils/rbutilqt/test/test-compareversion.pro | 37 ---- utils/rbutilqt/test/test-httpget.pro | 31 ---- utils/rbutilqt/test/test-playerbuildinfo.pro | 35 ---- utils/rbutilqt/test/test-rockboxinfo.pro | 30 ---- 6 files changed, 610 deletions(-) delete mode 100644 utils/rbutilqt/rbutilqt.pri delete mode 100644 utils/rbutilqt/rbutilqt.pro delete mode 100644 utils/rbutilqt/test/test-compareversion.pro delete mode 100644 utils/rbutilqt/test/test-httpget.pro delete mode 100644 utils/rbutilqt/test/test-playerbuildinfo.pro delete mode 100644 utils/rbutilqt/test/test-rockboxinfo.pro (limited to 'utils/rbutilqt') diff --git a/utils/rbutilqt/rbutilqt.pri b/utils/rbutilqt/rbutilqt.pri deleted file mode 100644 index 13d74ef8a4..0000000000 --- a/utils/rbutilqt/rbutilqt.pri +++ /dev/null @@ -1,229 +0,0 @@ -# -# __________ __ ___. -# Open \______ \ ____ ____ | | _\_ |__ _______ ___ -# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / -# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < -# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ -# \/ \/ \/ \/ \/ -# $Id$ -# -# All files in this archive are subject to the GNU General Public License. -# See the file COPYING in the source tree root for full license agreement. -# -# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# KIND, either express or implied. -# - - -# common files -SOURCES += \ - gui/infowidget.cpp \ - rbutilqt.cpp \ - main.cpp \ - base/httpget.cpp \ - configure.cpp \ - base/zipinstaller.cpp \ - progressloggergui.cpp \ - installtalkwindow.cpp \ - base/talkfile.cpp \ - base/talkgenerator.cpp \ - base/autodetection.cpp \ - themesinstallwindow.cpp \ - base/uninstall.cpp \ - uninstallwindow.cpp \ - base/utils.cpp \ - preview.cpp \ - base/encoderbase.cpp \ - base/encoderrbspeex.cpp \ - base/encoderlame.cpp \ - base/encoderexe.cpp \ - encttscfggui.cpp \ - base/encttssettings.cpp \ - base/ttsbase.cpp \ - base/ttsexes.cpp \ - base/ttssapi.cpp \ - base/ttsfestival.cpp \ - ../../tools/wavtrim.c \ - ../../tools/voicefont.c \ - base/voicefile.cpp \ - createvoicewindow.cpp \ - base/rbsettings.cpp \ - base/system.cpp \ - sysinfo.cpp \ - systrace.cpp \ - base/bootloaderinstallbase.cpp \ - base/bootloaderinstallbspatch.cpp \ - base/bootloaderinstallhelper.cpp \ - base/bootloaderinstallmi4.cpp \ - base/bootloaderinstallhex.cpp \ - base/bootloaderinstallipod.cpp \ - base/bootloaderinstallsansa.cpp \ - base/bootloaderinstallfile.cpp \ - base/bootloaderinstallchinachip.cpp \ - base/bootloaderinstallams.cpp \ - base/bootloaderinstalltcc.cpp \ - base/bootloaderinstallmpio.cpp \ - base/bootloaderinstallimx.cpp \ - base/bootloaderinstalls5l.cpp \ - base/rockboxinfo.cpp \ - ../../tools/mkboot.c \ - ../../tools/iriver.c \ - base/ziputil.cpp \ - gui/comboboxviewdelegate.cpp \ - gui/selectiveinstallwidget.cpp \ - gui/backupdialog.cpp \ - gui/changelog.cpp \ - mspack/cabd.c \ - mspack/lzxd.c \ - mspack/mszipd.c \ - mspack/qtmd.c \ - mspack/system-mspack.c \ - base/mspackutil.cpp \ - base/archiveutil.cpp \ - base/playerbuildinfo.cpp - - -HEADERS += \ - gui/infowidget.h \ - rbutilqt.h \ - base/httpget.h \ - configure.h \ - version.h \ - base/zipinstaller.h \ - installtalkwindow.h \ - base/talkfile.h \ - base/talkgenerator.h \ - base/autodetection.h \ - base/progressloggerinterface.h \ - progressloggergui.h \ - irivertools/h100sums.h \ - irivertools/h120sums.h \ - irivertools/h300sums.h \ - themesinstallwindow.h \ - base/uninstall.h \ - uninstallwindow.h \ - base/utils.h \ - preview.h \ - base/encoderbase.h \ - base/encoderrbspeex.h \ - base/encoderlame.h \ - base/encoderexe.h \ - encttscfggui.h \ - base/encttssettings.h \ - base/ttsbase.h \ - base/ttsexes.h \ - base/ttsespeak.h \ - base/ttsespeakng.h \ - base/ttsflite.h \ - base/ttsfestival.h \ - base/ttsmimic.h \ - base/ttsswift.h \ - base/ttssapi.h \ - base/ttssapi4.h \ - base/ttsmssp.h \ - ../../tools/wavtrim.h \ - ../../tools/voicefont.h \ - base/voicefile.h \ - createvoicewindow.h \ - base/rbsettings.h \ - sysinfo.h \ - base/system.h \ - systrace.h \ - base/bootloaderinstallbase.h \ - base/bootloaderinstallbspatch.h \ - base/bootloaderinstallhelper.h \ - base/bootloaderinstallmi4.h \ - base/bootloaderinstallhex.h \ - base/bootloaderinstallipod.h \ - base/bootloaderinstallsansa.h \ - base/bootloaderinstallfile.h \ - base/bootloaderinstallchinachip.h \ - base/bootloaderinstallams.h \ - base/bootloaderinstalltcc.h \ - base/bootloaderinstallmpio.h \ - base/bootloaderinstallimx.h \ - base/bootloaderinstalls5l.h \ - base/rockboxinfo.h \ - ../../tools/mkboot.h \ - ../../tools/iriver.h \ - base/ziputil.h \ - lame/lame.h \ - gui/comboboxviewdelegate.h \ - gui/selectiveinstallwidget.h \ - gui/backupdialog.h \ - gui/changelog.h \ - mspack/cab.h \ - mspack/chm.h \ - mspack/des.h \ - mspack/hlp.h \ - mspack/kwaj.h \ - mspack/lit.h \ - mspack/lzss.h \ - mspack/lzx.h \ - mspack/mspack.h \ - mspack/mszip.h \ - mspack/qtm.h \ - mspack/readbits.h \ - mspack/readhuff.h \ - mspack/sha.h \ - mspack/system-mspack.h \ - mspack/szdd.h \ - base/mspackutil.h \ - base/archiveutil.h \ - base/playerbuildinfo.h - - -FORMS += \ - gui/infowidgetfrm.ui \ - rbutilqtfrm.ui \ - aboutbox.ui \ - progressloggerfrm.ui \ - configurefrm.ui \ - installtalkfrm.ui \ - themesinstallfrm.ui \ - uninstallfrm.ui \ - previewfrm.ui \ - createvoicefrm.ui \ - sysinfofrm.ui \ - systracefrm.ui \ - gui/selectiveinstallwidgetfrm.ui \ - gui/backupdialogfrm.ui \ - gui/changelogfrm.ui - - -TRANSLATIONS += \ - lang/rbutil_cs.ts \ - lang/rbutil_de.ts \ - lang/rbutil_fi.ts \ - lang/rbutil_fr.ts \ - lang/rbutil_gr.ts \ - lang/rbutil_he.ts \ - lang/rbutil_it.ts \ - lang/rbutil_ja.ts \ - lang/rbutil_nl.ts \ - lang/rbutil_pl.ts \ - lang/rbutil_pt.ts \ - lang/rbutil_pt_BR.ts \ - lang/rbutil_ru.ts \ - lang/rbutil_tr.ts \ - lang/rbutil_zh_CN.ts \ - lang/rbutil_zh_TW.ts \ - -RESOURCES += $$_PRO_FILE_PWD_/rbutilqt.qrc -!dbg { - RESOURCES += $$_PRO_FILE_PWD_/lang/rbutilqt-lang.qrc -} -# windows specific files -win32 { - RC_FILE = rbutilqt.rc - RESOURCES += $$_PRO_FILE_PWD_/rbutilqt-win.qrc -} - -# mac specific files -macx { - SOURCES += base/ttscarbon.cpp - HEADERS += base/ttscarbon.h - QMAKE_INFO_PLIST = Info.plist - RC_FILE = icons/rbutilqt.icns -} - diff --git a/utils/rbutilqt/rbutilqt.pro b/utils/rbutilqt/rbutilqt.pro deleted file mode 100644 index f172e231bf..0000000000 --- a/utils/rbutilqt/rbutilqt.pro +++ /dev/null @@ -1,248 +0,0 @@ -# -# __________ __ ___. -# Open \______ \ ____ ____ | | _\_ |__ _______ ___ -# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / -# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < -# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ -# \/ \/ \/ \/ \/ -# -# All files in this archive are subject to the GNU General Public License. -# See the file COPYING in the source tree root for full license agreement. -# -# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# KIND, either express or implied. -# - -# The external Makefiles use ar to create libs. To allow cross-compiling pass -# the ar that matches the current gcc. Since qmake doesn't provide a variable -# holding the correct ar without any additions we need to figure it ourselves -# here. -# Only do this if CC is gcc. Also, do this before ccache support is enabled. -contains(QMAKE_CC,($$find(QMAKE_CC,.*gcc.*))) { - EXTRALIBS_OPTS = "EXTRALIBS_AR=\""$$replace(QMAKE_CC,gcc.*,ar)\" -} -# ccache -unix:!mac:!noccache { - CCACHE = $$system(which ccache) - !isEmpty(CCACHE) { - message("using ccache at $$CCACHE") - QMAKE_CXX = ccache $$QMAKE_CXX - QMAKE_CC = ccache $$QMAKE_CC - } -} -MACHINEFLAGS = $$find(QMAKE_CFLAGS, -m[63][42]) -EXTRALIBS_OPTS += EXTRALIBS_CC=\"$$QMAKE_CC\" -EXTRALIBS_OPTS += EXTRALIBS_CXX=\"$$QMAKE_CXX\" -EXTRALIBS_OPTS += EXTRALIB_CFLAGS=\"$$MACHINEFLAGS\" -EXTRALIBS_OPTS += EXTRALIB_CXXFLAGS=\"$$MACHINEFLAGS\" -macx { -# on recent macOS we need to pass isysroot to the libs, otherwise it won't find -# the standard libaries. This is caused by the passed compiler (doesn't rely on -# default compiler but passed full path) - EXTRALIBS_OPTS += EXTRALIB_ISYSROOT=\"$$QMAKE_MAC_SDK.macosx.Path\" -} - -MYBUILDDIR = $$OUT_PWD/build/ -MYLIBBUILDDIR = $$MYBUILDDIR/libs/ -OBJECTS_DIR = $$MYBUILDDIR/o -UI_DIR = $$MYBUILDDIR/ui -MOC_DIR = $$MYBUILDDIR/moc -RCC_DIR = $$MYBUILDDIR/rcc - -!silent { - VERBOSE = "V=1" -} else { - VERBOSE = -} - -# check version of Qt installation -contains(QT_MAJOR_VERSION, 4) { - error("Qt 4 is not supported anymore.") -} - -RBBASE_DIR = $$_PRO_FILE_PWD_ -RBBASE_DIR = $$replace(RBBASE_DIR,/utils/rbutilqt,) - -message("using Rockbox basedir $$RBBASE_DIR") - -# check for system speex. Add a custom rule for pre-building librbspeex if not -# found. Newer versions of speex are split up into libspeex and libspeexdsp, -# and some distributions package them separately. Check for both and fall back -# to librbspeex if not found. -# NOTE: keep adding the linker option after -lrbspeex, otherwise linker errors -# occur if the linker defaults to --as-needed -# (see http://www.gentoo.org/proj/en/qa/asneeded.xml) -# -# Always use our own copy when building statically. Don't search for libspeex -# on Mac, since we don't deploy statically there. -!static:unix:!mac { - LIBSPEEX = $$system(pkg-config --silence-errors --libs speex speexdsp) -} - -extralibs.commands = $$SILENT \ - $(MAKE) -f $$RBBASE_DIR/utils/rbutilqt/Makefile.libs \ - $$VERBOSE \ - SYS_SPEEX=\"$$LIBSPEEX\" \ - BUILD_DIR=$$MYLIBBUILDDIR/ \ - TARGET_DIR=$$MYLIBBUILDDIR \ - RBBASE_DIR=$$RBBASE_DIR \ - $$EXTRALIBS_OPTS \ - libs -# Note: order is important for RBLIBS! The libs are appended to the linker -# flags in this order, put libucl at the end. -RBLIBS = rbspeex ipodpatcher sansapatcher mkamsboot mktccboot \ - mkmpioboot chinachippatcher mkimxboot mks5lboot bspatch ucl \ - rbtomcrypt -# NOTE: Our copy of libbzip2 has to use the name "bz2" to match up with the -# distro name. Otherwise cross compiling would end up linking two copies of -# bzip2 using different names, causing symbol clashes. Using the same name -# makes the compiler pick the one he likes. -RBLIBS += bz2 -!win32-msvc* { - QMAKE_EXTRA_TARGETS += extralibs - PRE_TARGETDEPS += extralibs -} -win32-msvc* { - INCLUDEPATH += msvc - LIBS += -L$$_PRO_FILE_PWD_/msvc - LIBS += -ladvapi32 # required for MSVC / Qt Creator combination -} - -# rule for creating ctags file -tags.commands = ctags -R --c++-kinds=+p --fields=+iaS --extra=+q $(SOURCES) -tags.depends = $(SOURCES) -QMAKE_EXTRA_TARGETS += tags - -# add a custom rule for making the translations -LRELEASE = $$[QT_INSTALL_BINS]/lrelease - -win32:!cross:!exists($$LRELEASE) { - LRELEASE = $$[QT_INSTALL_BINS]/lrelease.exe -} -lrelease.commands = $$LRELEASE -silent $$_PRO_FILE_ -QMAKE_EXTRA_TARGETS += lrelease -exists($$LRELEASE) { - message("using lrelease at $$LRELEASE") - PRE_TARGETDEPS += lrelease -} -!exists($$LRELEASE) { - warning("could not find lrelease. Skipping translations.") -} - -# Needed by QT on Win -INCLUDEPATH += $$_PRO_FILE_PWD_ $$_PRO_FILE_PWD_/irivertools \ - $$_PRO_FILE_PWD_/zlib $$_PRO_FILE_PWD_/base \ - $$_PRO_FILE_PWD_/zlib $$_PRO_FILE_PWD_/gui -INCLUDEPATH += $$RBBASE_DIR/utils/ipodpatcher $$RBBASE_DIR/utils/sansapatcher \ - $$RBBASE_DIR/tools/rbspeex $$RBBASE_DIR/tools -INCLUDEPATH += logger - -DEPENDPATH = $$INCLUDEPATH - -LIBS += -L$$OUT_PWD -L$$MYLIBBUILDDIR -# append all RBLIBS to LIBS -for(rblib, RBLIBS) { - LIBS += -l$$rblib -} - -LIBS += -lz - -# Add a (possibly found) libspeex now, don't do this before -lrbspeex! -!static:!isEmpty(LIBSPEEX) { - LIBS += $$LIBSPEEX -} - -TEMPLATE = app -TARGET = RockboxUtility -QT += network widgets svg - -message("Qt$$QT_MAJOR_VERSION found") -lessThan(QT_MAJOR_VERSION, 6) { - QT += multimedia -} -if (greaterThan(QT_MAJOR_VERSION, 5)) { - QT += core5compat -} - -CONFIG += c++11 - -dbg { - CONFIG += debug thread qt warn_on - DEFINES += DBG - message("creating debug version") -} -!dbg { - CONFIG += release thread qt - DEFINES += NODEBUG - message("creating release version") -} - -DEFINES += RBUTIL _LARGEFILE64_SOURCE -DEFINES += QT_DEPRECATED_WARNINGS - -# platform specific -win32 { - # use MinGW's implementation of stdio functions for extended format string - # support. - DEFINES += __USE_MINGW_ANSI_STDIO=1 - DEFINES += _CRT_SECURE_NO_WARNINGS - DEFINES += UNICODE - LIBS += -lsetupapi -lnetapi32 -} -win32:static { - QMAKE_LFLAGS += -static-libgcc -static-libstdc++ -} -unix:!static:!macx { - LIBS += -lusb-1.0 -} - -unix:!macx:static { - # force statically linking of libusb. Libraries that are appended - # later will get linked dynamically again. - LIBS += -Wl,-Bstatic -lusb-1.0 -Wl,-Bdynamic -} - -macx { - QMAKE_MAC_SDK=macosx - contains(QT_MAJOR_VERSION, 5) { - greaterThan(QT_MINOR_VERSION, 5) { - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7 - message("Qt 5.6+ detected: setting deploy target to 10.7") - } - !greaterThan(QT_MINOR_VERSION, 5) { - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 - message("Qt up to 5.5 detected: setting deploy target to 10.6") - } - } - - CONFIG += x86 - LIBS += -L/usr/local/lib \ - -framework IOKit -framework CoreFoundation -framework Carbon \ - -framework SystemConfiguration -framework CoreServices - INCLUDEPATH += /usr/local/include - - # rule for creating a dmg file - dmg.commands = hdiutil create -ov -srcfolder RockboxUtility.app/ RockboxUtility.dmg - QMAKE_EXTRA_TARGETS += dmg -} - -static { - if(equals(QT_MAJOR_VERSION, 5) : lessThan(QT_MINOR_VERSION, 4)) { - QTPLUGIN += qtaccessiblewidgets - LIBS += -L$$(QT_BUILD_TREE)/plugins/accessible -lqtaccessiblewidgets - } - LIBS += -L. - DEFINES += STATIC - message("using static plugin") -} - -unix { - target.path = /usr/local/bin - INSTALLS += target -} - - -# source files are separate. -include(rbutilqt.pri) -include(quazip/quazip.pri) -include(logger/logger.pri) diff --git a/utils/rbutilqt/test/test-compareversion.pro b/utils/rbutilqt/test/test-compareversion.pro deleted file mode 100644 index c8e5a899ac..0000000000 --- a/utils/rbutilqt/test/test-compareversion.pro +++ /dev/null @@ -1,37 +0,0 @@ -# -# __________ __ ___. -# Open \______ \ ____ ____ | | _\_ |__ _______ ___ -# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / -# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < -# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ -# \/ \/ \/ \/ \/ -# $Id$ -# -# All files in this archive are subject to the GNU General Public License. -# See the file COPYING in the source tree root for full license agreement. -# -# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# KIND, either express or implied. -# - -# Test: Utils::compareVersionStrings(). -# - -QT += testlib - -TEMPLATE = app -TARGET = test-compareversion -INCLUDEPATH += . ../base stubs - -# Input -SOURCES += \ - test-compareversion.cpp \ - stubs/stubs-compareversion.cpp \ - ../base/utils.cpp - -HEADERS += \ - ../base/rbsettings.h \ - ../base/playerbuildinfo.h \ - ../base/rockboxinfo.h \ - ../base/utils.h - diff --git a/utils/rbutilqt/test/test-httpget.pro b/utils/rbutilqt/test/test-httpget.pro deleted file mode 100644 index 3189ad2266..0000000000 --- a/utils/rbutilqt/test/test-httpget.pro +++ /dev/null @@ -1,31 +0,0 @@ -# -# __________ __ ___. -# Open \______ \ ____ ____ | | _\_ |__ _______ ___ -# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / -# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < -# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ -# \/ \/ \/ \/ \/ -# -# All files in this archive are subject to the GNU General Public License. -# See the file COPYING in the source tree root for full license agreement. -# -# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# KIND, either express or implied. -# - -# -include(tests.pri) - -TEMPLATE = app -TARGET = test-httpget -INCLUDEPATH += . ../base stubs -QT += network - -# Input -SOURCES += \ - test-httpget.cpp - -SOURCES += ../base/httpget.cpp - -HEADERS += ../base/httpget.h - diff --git a/utils/rbutilqt/test/test-playerbuildinfo.pro b/utils/rbutilqt/test/test-playerbuildinfo.pro deleted file mode 100644 index 724da59162..0000000000 --- a/utils/rbutilqt/test/test-playerbuildinfo.pro +++ /dev/null @@ -1,35 +0,0 @@ -# -# __________ __ ___. -# Open \______ \ ____ ____ | | _\_ |__ _______ ___ -# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / -# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < -# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ -# \/ \/ \/ \/ \/ -# -# All files in this archive are subject to the GNU General Public License. -# See the file COPYING in the source tree root for full license agreement. -# -# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# KIND, either express or implied. -# - -# - -QT += testlib - -TEMPLATE = app -TARGET = test-playerbuildinfo -INCLUDEPATH += . ../base stubs - -# Input -SOURCES += \ - test-playerbuildinfo.cpp \ - stubs/stubs-playerbuildinfo.cpp \ - ../base/playerbuildinfo.cpp - -HEADERS += \ - ../base/rbsettings.h \ - ../base/rockboxinfo.h \ - ../base/systeminfo.h \ - -RESOURCES += ../rbutilqt.qrc diff --git a/utils/rbutilqt/test/test-rockboxinfo.pro b/utils/rbutilqt/test/test-rockboxinfo.pro deleted file mode 100644 index 88bc83a5b7..0000000000 --- a/utils/rbutilqt/test/test-rockboxinfo.pro +++ /dev/null @@ -1,30 +0,0 @@ -# -# __________ __ ___. -# Open \______ \ ____ ____ | | _\_ |__ _______ ___ -# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / -# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < -# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ -# \/ \/ \/ \/ \/ -# -# All files in this archive are subject to the GNU General Public License. -# See the file COPYING in the source tree root for full license agreement. -# -# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# KIND, either express or implied. -# - -# -QT += testlib - -TEMPLATE = app -TARGET = test-rockboxinfo -INCLUDEPATH += . ../base stubs - -# Input -SOURCES += \ - test-rockboxinfo.cpp \ - ../base/rockboxinfo.cpp - -HEADERS += \ - ../base/rockboxinfo.h - -- cgit v1.2.3