Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'remove_extra_data' into 'master'
Remove extra data etc

See merge request mer-core/libmlocale!5
  • Loading branch information
pvuorela committed Mar 15, 2019
2 parents 5c837bd + f90d203 commit c12b609
Show file tree
Hide file tree
Showing 178 changed files with 43 additions and 31,198 deletions.
17 changes: 3 additions & 14 deletions benchmarks/common_top.pri
Expand Up @@ -16,24 +16,13 @@ QT += testlib
TEMPLATE = app
# DEFINES += QT_NO_DEBUG_OUTPUT
DEFINES += UNIT_TEST
equals(QT_MAJOR_VERSION, 4): target.path = $$[QT_INSTALL_LIBS]/libmlocale-benchmarks
equals(QT_MAJOR_VERSION, 5): target.path = $$[QT_INSTALL_LIBS]/libmlocale-benchmarks5
target.path = $$[QT_INSTALL_LIBS]/libmlocale-benchmarks5
INSTALLS += target

equals(QT_MAJOR_VERSION, 4): LIBS += $$mAddLibrary(mlocale)
equals(QT_MAJOR_VERSION, 5): LIBS += $$mAddLibrary(mlocale5)
LIBS += $$mAddLibrary(mlocale5)

support_files.files =
equals(QT_MAJOR_VERSION, 4): support_files.path = $$[QT_INSTALL_LIBS]/libmlocale-benchmarks
equals(QT_MAJOR_VERSION, 5): support_files.path = $$[QT_INSTALL_LIBS]/libmlocale-benchmarks5
support_files.path = $$[QT_INSTALL_LIBS]/libmlocale-benchmarks5
INSTALLS += support_files

CONFIG-=app_bundle

equals(QT_MAJOR_VERSION, 4): DEFINES += '\'QTEST_GUILESS_MAIN(TestObject)=\
int main(int argc, char *argv[]) \
{ \
QCoreApplication app(argc, argv); \
TestObject tc; \
return QTest::qExec(&tc, argc, argv); \
}\''
3 changes: 0 additions & 3 deletions benchmarks/pt_mcalendar/pt_mcalendar.cpp
Expand Up @@ -29,9 +29,6 @@ using ML10N::MCalendar;

void Pt_MCalendar::initTestCase()
{
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
#endif
QProcess process;
process.start("sh -c \"dpkg -s libicu44 | grep Version | perl -pe 's/^Version:[[:space:]]*([^[[:space:]]+)$/$1/g'\"");
if (!process.waitForFinished()) {
Expand Down
3 changes: 0 additions & 3 deletions benchmarks/pt_mcharsetdetector/pt_mcharsetdetector.cpp
Expand Up @@ -24,9 +24,6 @@ using ML10N::MCharsetMatch;

void Pt_MCharsetDetector::initTestCase()
{
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
#endif
}

void Pt_MCharsetDetector::cleanupTestCase()
Expand Down
3 changes: 0 additions & 3 deletions benchmarks/pt_mlocale/pt_mlocale.cpp
Expand Up @@ -26,9 +26,6 @@ using ML10N::MCollator;

void Pt_MLocale::initTestCase()
{
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
#endif
QProcess process;
#ifdef HAVE_ICU
process.start("sh -c \"dpkg -s libicu44 | grep Version | perl -pe 's/^Version:[[:space:]]*([^[[:space:]]+)$/$1/g'\"");
Expand Down
3 changes: 0 additions & 3 deletions benchmarks/pt_mlocationdatabase/pt_mlocationdatabase.cpp
Expand Up @@ -28,9 +28,6 @@ using ML10N::MLocationDatabase;

void Pt_MLocationDatabase::initTestCase()
{
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
#endif
}

void Pt_MLocationDatabase::cleanupTestCase()
Expand Down
3 changes: 1 addition & 2 deletions benchmarks/shell.pri
Expand Up @@ -4,8 +4,7 @@ shell_scripts.CONFIG += no_check_exist

include(../mkspecs/common.pri)

equals(QT_MAJOR_VERSION, 4): shell_scripts.path += $$ML_INSTALL_DATA/libmlocale-benchmarks
equals(QT_MAJOR_VERSION, 5): shell_scripts.path += $$ML_INSTALL_DATA/libmlocale-benchmarks5
shell_scripts.path += $$ML_INSTALL_DATA/libmlocale-benchmarks5
shell_scripts.depends = FORCE

INSTALLS += \
Expand Down
6 changes: 3 additions & 3 deletions configure
Expand Up @@ -501,7 +501,7 @@ fi

# substitute prefix in .pc files
MEEGOTOUCH_PC_DIR="$outpath/src/data"
MEEGOTOUCH_PC_FILES="mlocale mlocale5"
MEEGOTOUCH_PC_FILES="mlocale5"

# make sure the directory exists
if [ ! -d $MEEGOTOUCH_PC_DIR ]; then
Expand Down Expand Up @@ -551,8 +551,8 @@ if [ -z "$QMAKE_BIN" ]; then
fi

# now check for qt version
QT_MAJOR_VERSION_NEEDED=4
QT_MINOR_VERSION_NEEDED=7
QT_MAJOR_VERSION_NEEDED=5
QT_MINOR_VERSION_NEEDED=0

QT_VERSION=$($QMAKE_BIN -query QT_VERSION)

Expand Down
9 changes: 3 additions & 6 deletions mkspecs/features/mlocale_defines.prf.in
Expand Up @@ -28,13 +28,10 @@ win32 {
ML_INSTALL_BIN = $$ML_PREFIX/bin
ML_INSTALL_LIBS = $$ML_LIBDIR
ML_INSTALL_DATA = $$ML_PREFIX/share
equals(QT_MAJOR_VERSION, 4): ML_INSTALL_HEADERS = $$ML_PREFIX/include/mlocale
equals(QT_MAJOR_VERSION, 5): ML_INSTALL_HEADERS = $$ML_PREFIX/include/mlocale5
equals(QT_MAJOR_VERSION, 4): ML_TRANSLATION_DIR = $$ML_INSTALL_DATA/l10n/mlocale
equals(QT_MAJOR_VERSION, 5): ML_TRANSLATION_DIR = $$ML_INSTALL_DATA/l10n/mlocale5
ML_INSTALL_HEADERS = $$ML_PREFIX/include/mlocale5
ML_TRANSLATION_DIR = $$ML_INSTALL_DATA/l10n/mlocale5

equals(QT_MAJOR_VERSION, 4): unix|win32: ML_ICUEXTRADATA_DIR = $$ML_INSTALL_DATA/mlocale/icu
equals(QT_MAJOR_VERSION, 5): unix|win32: ML_ICUEXTRADATA_DIR = $$ML_INSTALL_DATA/mlocale5/icu
ML_ICUEXTRADATA_DIR = $$ML_INSTALL_DATA/mlocale5/icu
win32: ML_INSTALL_LIBS = $$ML_PREFIX/bin

defineReplace(mAddLibrary) {
Expand Down
5 changes: 0 additions & 5 deletions projects.pro
@@ -1,7 +1,3 @@
#####################################################################
# DirectUI project file
#####################################################################

CONFIG += ordered
TEMPLATE = subdirs

Expand All @@ -22,7 +18,6 @@ isEqual( IN_PWD, $${OUT_PWD} ) {

SUBDIRS += \
src \
src/icu-extradata \
benchmarks \
tests \

Expand Down
2 changes: 0 additions & 2 deletions rpm/libmlocale-qt5.spec
Expand Up @@ -67,8 +67,6 @@ export QT_SELECT=5
%defattr(-,root,root,-)
%doc LICENSE.LGPL
%{_libdir}/*.so.*
%dir %{_datadir}/mlocale5
%{_datadir}/mlocale5/icu

%files devel
%defattr(-,root,root,-)
Expand Down
11 changes: 0 additions & 11 deletions src/data/mlocale.pc.in

This file was deleted.

22 changes: 0 additions & 22 deletions src/icu-extradata/data/ar.txt

This file was deleted.

7 changes: 0 additions & 7 deletions src/icu-extradata/data/ar_AE.txt

This file was deleted.

53 changes: 0 additions & 53 deletions src/icu-extradata/data/ar_IQ.txt

This file was deleted.

53 changes: 0 additions & 53 deletions src/icu-extradata/data/ar_LB.txt

This file was deleted.

22 changes: 0 additions & 22 deletions src/icu-extradata/data/ar_QA.txt

This file was deleted.

22 changes: 0 additions & 22 deletions src/icu-extradata/data/ar_SA.txt

This file was deleted.

27 changes: 0 additions & 27 deletions src/icu-extradata/data/ar_SY.txt

This file was deleted.

22 changes: 0 additions & 22 deletions src/icu-extradata/data/ar_TN.txt

This file was deleted.

0 comments on commit c12b609

Please sign in to comment.