From 8d464ea223453d6228556e39cc64c9a1704222c8 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Sat, 25 Jul 2015 11:35:30 -0400 Subject: [PATCH] Cleanup root directory Per #2201 --- CMakeLists.txt | 12 +- INSTALL | 15 +++ INSTALL.Qt5 | 12 -- COPYING => LICENSE.txt | 0 README | 110 ------------------- TODO | 32 ------ build_mingw32 => cmake/scripts/build_mingw32 | 0 build_mingw64 => cmake/scripts/build_mingw64 | 0 configure | 6 - lmms.rc.in => data/lmms.rc.in | 0 lmms.spec.in => data/lmms.spec.in | 0 AUTHORS => doc/AUTHORS | 0 lmms.1 => doc/lmms.1 | 0 src/CMakeLists.txt | 2 +- lmmsconfig.h.in => src/lmmsconfig.h.in | 0 lmmsversion.h.in => src/lmmsversion.h.in | 0 16 files changed, 22 insertions(+), 167 deletions(-) delete mode 100644 INSTALL.Qt5 rename COPYING => LICENSE.txt (100%) delete mode 100644 README delete mode 100644 TODO rename build_mingw32 => cmake/scripts/build_mingw32 (100%) rename build_mingw64 => cmake/scripts/build_mingw64 (100%) delete mode 100755 configure rename lmms.rc.in => data/lmms.rc.in (100%) rename lmms.spec.in => data/lmms.spec.in (100%) rename AUTHORS => doc/AUTHORS (100%) rename lmms.1 => doc/lmms.1 (100%) rename lmmsconfig.h.in => src/lmmsconfig.h.in (100%) rename lmmsversion.h.in => src/lmmsversion.h.in (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 56097a167ff..a26e719087b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -362,9 +362,9 @@ ENDIF(LMMS_BUILD_WIN32) PKG_CHECK_MODULES(SAMPLERATE REQUIRED samplerate>=0.1.8) -CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/lmmsconfig.h.in" "${CMAKE_BINARY_DIR}/lmmsconfig.h") -CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/lmmsversion.h.in" "${CMAKE_BINARY_DIR}/lmmsversion.h") -CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/lmms.rc.in" "${CMAKE_BINARY_DIR}/lmms.rc") +CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/src/lmmsconfig.h.in" "${CMAKE_BINARY_DIR}/lmmsconfig.h") +CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/src/lmmsversion.h.in" "${CMAKE_BINARY_DIR}/lmmsversion.h") +CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/data/lmms.rc.in" "${CMAKE_BINARY_DIR}/lmms.rc") CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc.in" "${CMAKE_BINARY_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc") # set compiler flags @@ -451,8 +451,8 @@ ADD_SUBDIRECTORY(data) ADD_SUBDIRECTORY(doc) ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/lmms.1.gz" - COMMAND gzip -c "\"${CMAKE_SOURCE_DIR}/lmms.1\"" > "\"${CMAKE_BINARY_DIR}/lmms.1.gz\"" - DEPENDS "${CMAKE_SOURCE_DIR}/lmms.1" + COMMAND gzip -c "\"${CMAKE_SOURCE_DIR}/doc/lmms.1\"" > "\"${CMAKE_BINARY_DIR}/lmms.1.gz\"" + DEPENDS "${CMAKE_SOURCE_DIR}/doc/lmms.1" COMMENT "Generating lmms.1.gz") ADD_CUSTOM_TARGET(manpage ALL @@ -494,7 +494,7 @@ ADD_CUSTOM_TARGET(dist COMMAND make clean COMMAND rm -rf "${TMP}" COMMAND mkdir -p "${TMP}" - COMMAND cp AUTHORS build_mingw32 build_mingw64 CMakeLists.txt configure COPYING INSTALL lmms.1 lmms.rc.in lmms.spec.in lmmsconfig.h.in lmmsversion.h.in README TODO "${TMP}" + COMMAND cp AUTHORS build_mingw32 build_mingw64 CMakeLists.txt configure COPYING INSTALL README TODO "${TMP}" COMMAND cp -r buildtools cmake data doc include plugins src "${TMP}" COMMAND rm -rf `find "${TMP}" -name cmake_install.cmake` `find "${TMP}" -name Makefile` `find "${TMP}" -type d -name CMakeFiles` "${TMP}/CMakeCache.txt" COMMAND tar cjf lmms-${VERSION}-src.tar.bz2 "${TMP}" diff --git a/INSTALL b/INSTALL index 29cfd59b618..1b4ad19c755 100644 --- a/INSTALL +++ b/INSTALL @@ -31,3 +31,18 @@ If you want to supply an install prefix to cmake, add the flag: Where can be /usr, /usr/local, /opt, etc. The default is /usr/local. + + +Building with QT5 + +First of all please note that CMake >= 2.8.11 is required for building with +Qt5 support. In order to build LMMS with Qt5, add the following flag when +invoking cmake: + +-DWANT_QT5=ON + +If your Qt5 installation does not reside in standard installation paths, +additionally pass e.g. + +-DCMAKE_PREFIX_PATH=/opt/qt53/ + diff --git a/INSTALL.Qt5 b/INSTALL.Qt5 deleted file mode 100644 index e2f12a23b14..00000000000 --- a/INSTALL.Qt5 +++ /dev/null @@ -1,12 +0,0 @@ -First of all please note that CMake >= 2.8.11 is required for building with -Qt5 support. In order to build LMMS with Qt5, add the following flag when -invoking cmake: - --DWANT_QT5=ON - -If your Qt5 installation does not reside in standard installation paths, -additionally pass e.g. - --DCMAKE_PREFIX_PATH=/opt/qt53/ - - diff --git a/COPYING b/LICENSE.txt similarity index 100% rename from COPYING rename to LICENSE.txt diff --git a/README b/README deleted file mode 100644 index 990719f9a84..00000000000 --- a/README +++ /dev/null @@ -1,110 +0,0 @@ -LMMS 1.1.0 -=========== - -Copyright (c) 2004-2015 by LMMS developers - - -This program 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 2 of the License, or (at your option) -any later version. - -This program 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 this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - - -What is LMMS? --------------- - -LMMS is a free cross-platform alternative to commercial programs like FL Studio -(R), which allow you to produce music with your computer. This includes the -creation of melodies and beats, the synthesis and mixing of sounds, and -arranging of samples. You can have fun with your MIDI-keyboard and much more; -all in a user-friendly and modern interface. - - -Features ---------- - - * Song-Editor for composing songs - * A Beat+Bassline-Editor for creating beats and basslines - * An easy-to-use Piano-Roll for editing patterns and melodies - * An FX mixer with 64 FX channels and arbitrary number of effects allow unlimited mixing possibilities - * Many powerful instrument and effect-plugins out of the box - * Full user-defined track-based automation and computer-controlled automation sources - * Compatible with many standards such as SoundFont2, VST(i), LADSPA, GUS Patches, and full MIDI support - * Import of MIDI and FLP (Fruityloops(R) Project) files - - -Requirements ------------- - -The most important requirement is for sure a fast computer, so don't try to get -LMMS working on a pentium I with 60 MHz... ;-) Therefore you should have at -least 500 MHz, but for really enjoying LMMS less than 1 GHz makes no sense... - - -Required libraries: - -- Qt >= 4.3.0 with devel-files (4.4.x recommended) - -Optional, but strongly recommended: -- JACK with devel-files -- libvorbis & libogg with devel-files -- libalsa with devel-files -- SDL with devel-files -- libsamplerate >= 0.1.7 with devel-files -- libsndfile with devel-files -- WINE + WINE-devel-files -- stk, libstk + libstk-dev -- libfluidsynth with devel files -- fftw3 with devel-files -- libfltk1.3 with devel-files (needed by ZynAddSubFx) - -For compiling you should have an up to date GCC with g++. - -If you have problems with compiling or running LMMS, find any bug or have -suggestions and so on, please feel free to e-mail me (for mail-address see -below)! - - - -Building ---------- - -See INSTALL for information on how to build LMMS. - - - - -Join LMMS-development ----------------------- - -If you are interested in LMMS, its programming, artwork, testing, writing -demo songs, (and improving this README...) or something like that, -you're welcome to participate in the development of LMMS! - -The project homepage of LMMS, mailing lists and a list of things you can do -can be found at - -http://lmms.io/ - - -Details on development can be found in the Wiki: - -https://github.com/LMMS/lmms/wiki - - -Before coding a new big feature, please ALWAYS file an issue at -https://github.com/LMMS/lmms/issues/new for your idea and suggestions about your -feature and about the intended implementation or post to the LMMS developers -mailing list (lmms-devel@lists.sourceforge.net) and wait for replies! -Maybe there are different ideas, improvements, hints or maybe your feature is -not welcome/needed at the moment. diff --git a/TODO b/TODO deleted file mode 100644 index 795a1876bf4..00000000000 --- a/TODO +++ /dev/null @@ -1,32 +0,0 @@ -Version 0.4.x -============= - -- save tco-settings in trackContentWidget::saveSettings() etc. instead of - track::... -- resample sample-track-tcos when exporting at different samplerate -- message to user when importing unsupported MIDI-file (track-count = 0) -- piano roll: mouse cursor isn't updated correctly in selection mode - (from resizing note edit area) -- when you add vestige, have it automatically pop the find VST plugin dialog -- try to make vestige-plugin-dlls relative -- select all MIDI devices by default when you bring up the "connect to controller" - window and wait for first event - then uncheck all other MIDI devices that no - events were detected from -- load asdlol.mmpz. if you render it without playing it, or if you play it - the first time, you hear unwanted artifacts. (solution: apply automation - before playing) -- autosave every 30s (configurable!) and offer recovery at startup after crash -- speed up painting of sampleTCO -- do not process effects when playing frozen patterns -- copy-pasted automation patterns have to be manually linked back to - their knob for some reason -- improve TrackLabelButton: split 80%-20% (80%=name, 20%=button showing a popup - menu with track operations, make the midi input a top-level menu item) -- when you click and drag a mixer bar, it doesn't click and drag, it sets - absolutely. this is annoying - - -See TODO file in master branch and/or the TODO list in the Wiki for details -regarding the development series. - - diff --git a/build_mingw32 b/cmake/scripts/build_mingw32 similarity index 100% rename from build_mingw32 rename to cmake/scripts/build_mingw32 diff --git a/build_mingw64 b/cmake/scripts/build_mingw64 similarity index 100% rename from build_mingw64 rename to cmake/scripts/build_mingw64 diff --git a/configure b/configure deleted file mode 100755 index d9ec51ddca6..00000000000 --- a/configure +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -echo "Usage of configure & Co is deprecated! Please see the INSTALL file:" -echo "" - -cat INSTALL diff --git a/lmms.rc.in b/data/lmms.rc.in similarity index 100% rename from lmms.rc.in rename to data/lmms.rc.in diff --git a/lmms.spec.in b/data/lmms.spec.in similarity index 100% rename from lmms.spec.in rename to data/lmms.spec.in diff --git a/AUTHORS b/doc/AUTHORS similarity index 100% rename from AUTHORS rename to doc/AUTHORS diff --git a/lmms.1 b/doc/lmms.1 similarity index 100% rename from lmms.1 rename to doc/lmms.1 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 318e3371e59..536027a1074 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -31,7 +31,7 @@ IF(WIN32) DEPENDS "${CMAKE_BINARY_DIR}/lmms.rc") ENDIF() -SET(lmms_EMBEDDED_RESOURCES "${CMAKE_SOURCE_DIR}/AUTHORS" "${CMAKE_SOURCE_DIR}/COPYING" "${CONTRIBUTORS}") +SET(lmms_EMBEDDED_RESOURCES "${CMAKE_SOURCE_DIR}/doc/AUTHORS" "${CMAKE_SOURCE_DIR}/LICENSE.txt" "${CONTRIBUTORS}") SET(LMMS_ER_H "${CMAKE_CURRENT_BINARY_DIR}/embedded_resources.h") ADD_CUSTOM_COMMAND(OUTPUT "${LMMS_ER_H}" COMMAND "${BIN2RES}" ARGS ${lmms_EMBEDDED_RESOURCES} > "\"${LMMS_ER_H}\"" DEPENDS bin2res) diff --git a/lmmsconfig.h.in b/src/lmmsconfig.h.in similarity index 100% rename from lmmsconfig.h.in rename to src/lmmsconfig.h.in diff --git a/lmmsversion.h.in b/src/lmmsversion.h.in similarity index 100% rename from lmmsversion.h.in rename to src/lmmsversion.h.in