From edb1363893216a5262bce2d8e14560411561ac5c Mon Sep 17 00:00:00 2001 From: glixx Date: Thu, 27 Jun 2019 07:55:18 +0300 Subject: [PATCH] install all langs by qmake always --- BUILD.md | 82 ++++++++++++++++++------------------ CMakeLists.txt | 1 - README.md | 2 +- ReleaseNotes.txt | 4 +- TODO.md | 2 +- license.txt | 30 +++++++------- pianobooster.pro | 105 ++--------------------------------------------- 7 files changed, 63 insertions(+), 163 deletions(-) diff --git a/BUILD.md b/BUILD.md index 6aeff5d..6d4db5f 100644 --- a/BUILD.md +++ b/BUILD.md @@ -1,85 +1,85 @@ # Linux - Ensure that the build required packages are installed. Full list of them you can find [here](pkgs). +Ensure that the build required packages are installed. Full list of them you can find [here](pkgs). - Then type: +Then type: - ```cmake .``` +```cmake .``` - ```make``` +```make``` - Finally as root type: +Finally as root type: - ```make install -C build``` +```make install -C build``` - (The pianobooster binary executable is now in the "build" subdirectory.) +(The pianobooster binary executable is now in the "build" subdirectory.) - To build a debug version create a dir called "debug" and change to that dir and then type: +To build a debug version create a dir called "debug" and change to that dir and then type: - ```cmake -DCMAKE_BUILD_TYPE=Debug .``` +```cmake -DCMAKE_BUILD_TYPE=Debug .``` - (Alternatively you can use qmake followed by make.) +(Alternatively you can use qmake followed by make.) - See [DEB](pkgs/deb) for more details. +See [DEB](pkgs/deb) for more details. - See [RPM](pkgs/rpm/pianobooster.spec) for more details. +See [RPM](pkgs/rpm/pianobooster.spec) for more details. - See [ARCH](pkgs/arch/PKGBUILD) for more details. +See [ARCH](pkgs/arch/PKGBUILD) for more details. # macOS - Install latest Xcode (from Apple Developer Connection, free registration required). +Install latest Xcode (from Apple Developer Connection, free registration required). - Install CMake and QT libraries via Homebrew: +Install CMake and QT libraries via Homebrew: - ```$ brew install cmake qt5``` +```$ brew install cmake qt5``` - Generate XCode project file via CMake: +Generate XCode project file via CMake: - ```$ cmake -G Xcode . -DCMAKE_PREFIX_PATH=$(brew --prefix qt)``` +```$ cmake -G Xcode . -DCMAKE_PREFIX_PATH=$(brew --prefix qt)``` - Open the project file in XCode, set whatever options you like (universal or single architecture, - debug or release etc.) and compile. +Open the project file in XCode, set whatever options you like (universal or single architecture, +debug or release etc.) and compile. - To make a self contained application bundle use QT's macdeployqt tool (included in QT 4.5.0). +To make a self contained application bundle use QT's macdeployqt tool (included in QT 4.5.0). - It's recommends to build with disabled USE_FTGL. +It's recommends to build with disabled USE_FTGL. # Windows - To compile in Windows install the Open Source version of Qt and CMake and optionally Geany. - When installing Qt select the option to download and install the MinGW compiler. Open the - Qt Command Prompt and then change to the "PianoBooster" directory and then type the - command below: +To compile in Windows install the Open Source version of Qt and CMake and optionally Geany. +When installing Qt select the option to download and install the MinGW compiler. Open the +Qt Command Prompt and then change to the "PianoBooster" directory and then type the +command below: - ```"C:\Program Files\CMake 2.6\bin\cmake.exe" -G "MinGW Makefiles" .``` +```"C:\Program Files\CMake 2.6\bin\cmake.exe" -G "MinGW Makefiles" .``` - Once this is completed type: +Once this is completed type: - ```make``` +```make``` - Or alternatively you can install QtCreator and then open the pianobooster.pro. +Or alternatively you can install QtCreator and then open the pianobooster.pro. - It's recommends to build with disabled USE_FTGL to fix notes drawing. +It's recommends to build with disabled USE_FTGL to fix notes drawing. # Build options - **USE_FTGL**: link with ftgl; enabled by default; disabling disable notes localization. +**USE_FTGL**: link with ftgl; enabled by default; disabling disable notes localization. - **NO_DOCS**: do not install documents; disabled by default. +**NO_DOCS**: do not install documents; disabled by default. - **WITH_MAN**: install man page; disabled by default. +**WITH_MAN**: install man page; disabled by default. - **WITH_TIMIDITY**: install desktop file and wrapper script for timidity; disabled by default. +**WITH_TIMIDITY**: install desktop file and wrapper script for timidity; disabled by default. - **WITH_FLUIDSYNTH**: install desktop file and wrapper script for fluidsynth; disabled by default. +**WITH_FLUIDSYNTH**: install desktop file and wrapper script for fluidsynth; disabled by default. - **INSTALL_ALL_LANGS**: install all languages; disabled by default for cmake and enabled for qmake. +**INSTALL_ALL_LANGS**: install all languages; disabled by default for cmake and always enabled for qmake. - **USE_SYSTEM_RTMIDI**: build with system (not bundled) rtmidi; disabled by default. +**USE_SYSTEM_RTMIDI**: build with system (not bundled) rtmidi; disabled by default. - **USE_FLUIDSYNTH**: enable setting for fluidsynth in GUI; disabled by default. +**USE_FLUIDSYNTH**: enable setting for fluidsynth in GUI; disabled by default. - **USE_SYSTEM_FONT**: do not use and do not install bundled font, use system font instead; enabled by default. +**USE_SYSTEM_FONT**: do not use and do not install bundled font, use system font instead; enabled by default. - **USE_FONT**: build with specified font; null by default. +**USE_FONT**: build with specified font; null by default. diff --git a/CMakeLists.txt b/CMakeLists.txt index ee2ad53..8432a84 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,5 +6,4 @@ endif(COMMAND cmake_policy) # set project's name PROJECT( pianobooster ) - ADD_SUBDIRECTORY(src build) diff --git a/README.md b/README.md index 3f78158..2c6891a 100644 --- a/README.md +++ b/README.md @@ -205,4 +205,4 @@ We are looking for musicians to make music for pianobooster. It can be education PLATFORMS ========= -We support Linux and Windows platforms. We do not have macOS developers at the moment. +We support Linux and Windows platforms. We do not have macOS, FreeBSD developers at the moment. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 6a38123..d6b1fbc 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -19,9 +19,9 @@ v0.7.0: - Fix segfault on the next start of program after playing corrupted midi file - Fix midi input/output devices detection - RtMidi: version 4.0.0 -- Fix reading position of main window +- Fix reading saved position of main window - Fix music and translations installation -- Qmake is alternative for Cmake +- Qmake is alternative for Cmake (Linux, Windows) - Fix macOS building v0.6.8: (11 May 2018) diff --git a/TODO.md b/TODO.md index d0878bb..ec1256c 100644 --- a/TODO.md +++ b/TODO.md @@ -29,7 +29,7 @@ Piano Booster To Do tasks (in no particular order) # DIFFICULT - Reduce the midi timing jitter by: - 3. Move the conductor realtime engine so it runs in it own thread. + 1. Move the conductor realtime engine so it runs in it own thread. - Show the rests in each bar. - Add note beams. - Show a graph of how your playing has improved over time. diff --git a/license.txt b/license.txt index b9f42a4..5fa08ad 100644 --- a/license.txt +++ b/license.txt @@ -1,23 +1,23 @@ - Copyright (c) 2008-2013 Louis J. Barman, all rights reserved - Copyright (c) 2018-2019 Fabien Givors, all rights reserved +Copyright (c) 2008-2013 Louis J. Barman, all rights reserved +Copyright (c) 2018-2019 Fabien Givors, all rights reserved - The PianoBooster application +The PianoBooster application - PianoBooster is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. +PianoBooster is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. - PianoBooster is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +PianoBooster is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with PianoBooster. If not, see . +You should have received a copy of the GNU General Public License +along with PianoBooster. If not, see . - The Piano Booster Documentation and Music are released under the - Creative Commons License (CC-BY). +The Piano Booster Documentation and Music are released under the +Creative Commons License (CC-BY). Contributors: - Christian Prinoth diff --git a/pianobooster.pro b/pianobooster.pro index aa42dcd..35d087c 100755 --- a/pianobooster.pro +++ b/pianobooster.pro @@ -10,110 +10,11 @@ isEmpty(NO_DOCS): NO_DOCS="OFF" isEmpty(WITH_MAN): WITH_MAN="OFF" isEmpty(WITH_TIMIDITY): WITH_TIMIDITY="OFF" isEmpty(WITH_FLUIDSYNTH): WITH_FLUIDSYNTH="OFF" -isEmpty(INSTALL_ALL_LANGS): INSTALL_ALL_LANGS="OFF" -TRANSLATIONS = translations/pianobooster_af.ts \ - translations/pianobooster_am.ts \ - translations/pianobooster_ar.ts \ - translations/pianobooster_as.ts \ - translations/pianobooster_ast.ts \ - translations/pianobooster_az.ts \ - translations/pianobooster_be.ts \ - translations/pianobooster_bg.ts \ - translations/pianobooster_blank.ts \ - translations/pianobooster_bn.ts \ - translations/pianobooster_br.ts \ - translations/pianobooster_bs_BA.ts \ - translations/pianobooster_bs.ts \ - translations/pianobooster_ca.ts \ - translations/pianobooster_crh.ts \ - translations/pianobooster_csb.ts \ - translations/pianobooster_cs.ts \ - translations/pianobooster_cy.ts \ - translations/pianobooster_da.ts \ - translations/pianobooster_de.ts \ - translations/pianobooster_dz.ts \ - translations/pianobooster_el.ts \ - translations/pianobooster_eo.ts \ - translations/pianobooster_es.ts \ - translations/pianobooster_et.ts \ - translations/pianobooster_eu.ts \ - translations/pianobooster_fa.ts \ - translations/pianobooster_fi.ts \ - translations/pianobooster_fo.ts \ - translations/pianobooster_frp.ts \ - translations/pianobooster_fr.ts \ - translations/pianobooster_fur.ts \ - translations/pianobooster_fy.ts \ - translations/pianobooster_ga.ts \ - translations/pianobooster_gd.ts \ - translations/pianobooster_gl.ts \ - translations/pianobooster_gu.ts \ - translations/pianobooster_he.ts \ - translations/pianobooster_hi.ts \ - translations/pianobooster_hr.ts \ - translations/pianobooster_hu.ts \ - translations/pianobooster_hy.ts \ - translations/pianobooster_id.ts \ - translations/pianobooster_is.ts \ - translations/pianobooster_it.ts \ - translations/pianobooster_ja.ts \ - translations/pianobooster_ka.ts \ - translations/pianobooster_kk.ts \ - translations/pianobooster_kn.ts \ - translations/pianobooster_ko.ts \ - translations/pianobooster_ks.ts \ - translations/pianobooster_ku.ts \ - translations/pianobooster_lt.ts \ - translations/pianobooster_lv.ts \ - translations/pianobooster_mai.ts \ - translations/pianobooster_mg.ts \ - translations/pianobooster_mi.ts \ - translations/pianobooster_ml.ts \ - translations/pianobooster_mn.ts \ - translations/pianobooster_mr.ts \ - translations/pianobooster_ms.ts \ - translations/pianobooster_my.ts \ - translations/pianobooster_nb.ts \ - translations/pianobooster_nds.ts \ - translations/pianobooster_ne.ts \ - translations/pianobooster_nl.ts \ - translations/pianobooster_nn.ts \ - translations/pianobooster_oc.ts \ - translations/pianobooster_or.ts \ - translations/pianobooster_pa.ts \ - translations/pianobooster_pl.ts \ - translations/pianobooster_ps.ts \ - translations/pianobooster_pt_BR.ts \ - translations/pianobooster_pt.ts \ - translations/pianobooster_ro.ts \ - translations/pianobooster_ru.ts \ - translations/pianobooster_se.ts \ - translations/pianobooster_si.ts \ - translations/pianobooster_sk.ts \ - translations/pianobooster_sl.ts \ - translations/pianobooster_sq.ts \ - translations/pianobooster_sr@latin.ts \ - translations/pianobooster_sr.ts \ - translations/pianobooster_sv.ts \ - translations/pianobooster_ta.ts \ - translations/pianobooster_te.ts \ - translations/pianobooster_tg.ts \ - translations/pianobooster_th.ts \ - translations/pianobooster_tr.ts \ - translations/pianobooster_tt.ts \ - translations/pianobooster_uk.ts \ - translations/pianobooster_uz.ts \ - translations/pianobooster_vi.ts \ - translations/pianobooster_wa.ts \ - translations/pianobooster_xh.ts \ - translations/pianobooster_zh_HK.ts \ - translations/pianobooster_zh.ts +# install all languages always +INSTALL_ALL_LANGS="ON" -contains(INSTALL_ALL_LANGS, ON){ - message(building with all languages) - TRANSLATIONS = $$files(translations/*.ts) -} +TRANSLATIONS = $$files(translations/*.ts) USE_FLUIDSYNTH { # Note The FLUIDSYNTH_INPLACE_DIR dir is used mainly used when compiling on windows