From f4c8bcd1c75499d8271f2fcc9743e1b8eae5aff3 Mon Sep 17 00:00:00 2001 From: Petr Vanek Date: Sun, 28 Nov 2010 20:45:15 +0100 Subject: [PATCH] build cleanup; make dist; various readmes updated --- AUTHORS | 3 +++ CMakeLists.txt | 22 ++++++++++++++++++ INSTALL | 57 ++++++++++++++++------------------------------ TODO | 10 -------- lib/CMakeLists.txt | 31 +++++++++++++------------ lib/lib.pro | 48 -------------------------------------- qtermwidget.pro | 4 ---- src/src.pro | 28 ----------------------- 8 files changed, 61 insertions(+), 142 deletions(-) delete mode 100644 lib/lib.pro delete mode 100644 qtermwidget.pro delete mode 100644 src/src.pro diff --git a/AUTHORS b/AUTHORS index bd80983..afd543c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,6 @@ +current contact: + petr@scribus.info + Project author: e_k@users.sourceforge.net diff --git a/CMakeLists.txt b/CMakeLists.txt index cbab9bd..871441d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,30 @@ cmake_minimum_required( VERSION 2.4 ) #| Project project( qtermwidget ) +#| Library Versioning +#| Libraries are not versioned by default +set ( qtermwidget_VERSION_MAJOR "0" ) +set ( qtermwidget_VERSION_MINOR "2" ) +set ( qtermwidget_VERSION_PATCH "0" ) +set ( qtermwidget_VERSION + "${qtermwidget_VERSION_MAJOR}.${qtermwidget_VERSION_MINOR}.${qtermwidget_VERSION_PATCH}" +) + subdirs( lib src ) + +# make dist custom target +SET(CPACK_PACKAGE_NAME "qtermwidget") +# TODO/FIXME: versioning from player subdir... I don't know why it's separated... +SET(CPACK_PACKAGE_VERSION ${qtermwidget_VERSION}) +SET(CPACK_SOURCE_GENERATOR "TGZ;TBZ2") +SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") +SET(CPACK_IGNORE_FILES "/CVS/;/\\\\.svn/;/\\\\.git/;\\\\.swp$;\\\\.#;/#;\\\\.tar.gz$;/CMakeFiles/;CMakeCache.txt;\\\\.qm$;/build/;\\\\.diff$;.DS_Store'") +SET(CPACK_SOURCE_IGNORE_FILES ${CPACK_IGNORE_FILES}) +INCLUDE(CPack) +# simulate autotools' "make dist" +add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) + diff --git a/INSTALL b/INSTALL index bcb456c..f0db4e5 100644 --- a/INSTALL +++ b/INSTALL @@ -1,41 +1,22 @@ -Requirements -============ -Created with QT4.3.4 -Tested with QT4.3.2 -Maybe should work with other QT4 versions - -Basic Installation -================== +Requirements: - These are generic installation instructions. + Qt4 + cmake - There is no 'configure' shell script, `cause this package is just -a draft. And it intended for developers rather then for end-users. -There is a 'qtermwidget.pro' file provided instead. -This file is used for generating Makefiles in each appropriate -directory via 'qmake' program. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `qmake'. - - 2. Type `make' to compile the package. - - 3. You can remove the program binaries and object files from the - source code directory by typing `make clean'. - - 4. You can remove generated Makefiles form the directory - by typing `make distclean'. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking. You can -provide additional options by modifying the appropriate *.pro files -according to qmake manual. - -Installation -================== - Installation not defined yet. +Supported (tested) platforms: + + Linux + *BSD + Mac OS X +Build: + + "out of source buld" is strongly recomended (and fully supported) + http://www.cmake.org/Wiki/CMake_FAQ#Out-of-source_build_trees + + 1) cd builddir + 2) cmake path/to/sourcetree + 3) make + 4) optional: make install + + Read cmake docs to fine tune the build process (CMAKE_INSTALL_PREFIX...) diff --git a/TODO b/TODO index c3cb62c..e69de29 100644 --- a/TODO +++ b/TODO @@ -1,10 +0,0 @@ -Global - - provide more compatibility for vttest - -Package - - migrate to autotools if needed - -Source - - provide more options for customization - - clean unused code - - add some QT3 support features if needed diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index c6196a9..890daa6 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -40,12 +40,19 @@ ENDIF (NOT LIB_SUFFIX) set ( SRCS TerminalCharacterDecoder.cpp KeyboardTranslator.cpp - Screen.cpp History.cpp BlockArray.cpp konsole_wcwidth.cpp + Screen.cpp History.cpp + BlockArray.cpp + konsole_wcwidth.cpp ScreenWindow.cpp Emulation.cpp - Vt102Emulation.cpp TerminalDisplay.cpp Filter.cpp - Pty.cpp kpty.cpp k3process.cpp k3processcontroller.cpp - Session.cpp ShellCommand.cpp + Vt102Emulation.cpp + TerminalDisplay.cpp + Filter.cpp + Pty.cpp kpty.cpp + k3process.cpp + k3processcontroller.cpp + Session.cpp + ShellCommand.cpp qtermwidget.cpp ) @@ -54,8 +61,12 @@ set ( SRCS set ( HDRS ScreenWindow.h Emulation.h - Vt102Emulation.h TerminalDisplay.h Filter.h - Pty.h k3process.h k3processcontroller.h + Vt102Emulation.h + TerminalDisplay.h + Filter.h + Pty.h + k3process.h + k3processcontroller.h Session.h qtermwidget.h ) @@ -70,14 +81,6 @@ set ( LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/../. ) -#| Library Versioning -#| Libraries are not versioned by default -set ( qtermwidget_VERSION_MAJOR "0" ) -set ( qtermwidget_VERSION_MINOR "1" ) -set ( qtermwidget_VERSION_PATCH "0" ) -set ( qtermwidget_VERSION - "${qtermwidget_VERSION_MAJOR}.${qtermwidget_VERSION_MINOR}.${qtermwidget_VERSION_PATCH}" -) #| Qt4 Required Options add_definitions ( -Wall ) diff --git a/lib/lib.pro b/lib/lib.pro deleted file mode 100644 index 2484498..0000000 --- a/lib/lib.pro +++ /dev/null @@ -1,48 +0,0 @@ -TEMPLATE = lib -VERSION = 0.1.0 -DESTDIR = .. - -TARGET = qtermwidget - -CONFIG += qt debug_and_release warn_on build_all dll staticlib #dll - -QT += core gui - -MOC_DIR = ../.moc - -CONFIG(debug, debug|release) { - OBJECTS_DIR = ../.objs_d - TARGET = qtermwidget_d -} else { - OBJECTS_DIR = ../.objs - TARGET = qtermwidget -} - -DEFINES += HAVE_POSIX_OPENPT -#or DEFINES += HAVE_GETPT - -HEADERS = TerminalCharacterDecoder.h Character.h CharacterColor.h \ - KeyboardTranslator.h \ - ExtendedDefaultTranslator.h \ - Screen.h History.h BlockArray.h konsole_wcwidth.h \ - ScreenWindow.h \ - Emulation.h \ - Vt102Emulation.h TerminalDisplay.h Filter.h LineFont.h \ - Pty.h kpty.h kpty_p.h k3process.h k3processcontroller.h \ - Session.h ShellCommand.h \ - qtermwidget.h - -SOURCES = TerminalCharacterDecoder.cpp \ - KeyboardTranslator.cpp \ - Screen.cpp History.cpp BlockArray.cpp konsole_wcwidth.cpp \ - ScreenWindow.cpp \ - Emulation.cpp \ - Vt102Emulation.cpp TerminalDisplay.cpp Filter.cpp \ - Pty.cpp kpty.cpp k3process.cpp k3processcontroller.cpp \ - Session.cpp ShellCommand.cpp \ - qtermwidget.cpp - - - - - \ No newline at end of file diff --git a/qtermwidget.pro b/qtermwidget.pro deleted file mode 100644 index 1b59cb9..0000000 --- a/qtermwidget.pro +++ /dev/null @@ -1,4 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = lib src - -OPTIONS += ordered \ No newline at end of file diff --git a/src/src.pro b/src/src.pro deleted file mode 100644 index 8d1a0b9..0000000 --- a/src/src.pro +++ /dev/null @@ -1,28 +0,0 @@ -TEMPLATE = app -DESTDIR = .. - -CONFIG += qt debug_and_release warn_on build_all - -QT += core gui - -MOC_DIR = ../.moc - -CONFIG(debug, debug|release) { - OBJECTS_DIR = ../.objs_d - TARGET = consoleq_d - LIBS += -L.. ../libqtermwidget_d.a -# LIBS += -lqtermwidget -} else { - OBJECTS_DIR = ../.objs - TARGET = consoleq - LIBS += -L.. ../libqtermwidget.a -} - -SOURCES = main.cpp - -INCLUDEPATH = ../lib - -#LIBS += -L.. -lqtermwidget - - - \ No newline at end of file