Mercurial > octave-nkf
changeset 15629:8be78ddca5dc
Removed cmake support and pyqt support as well as CVS support.
| author | Jacob Dawid <jacob.dawid@googlemail.com> |
|---|---|
| date | Mon, 23 Jan 2012 12:25:07 +0100 |
| parents | e67d0d06c18b |
| children | e32ff0a000a8 |
| files | CMakeLists.txt CVS/Entries CVS/Entries.Log CVS/Repository CVS/Root lib/CMakeLists.txt lib/CVS/Entries lib/CVS/Entries.Log lib/CVS/Repository lib/CVS/Root pyqt4/CVS/Entries pyqt4/CVS/Repository pyqt4/CVS/Root pyqt4/README pyqt4/config.py pyqt4/config.py.in pyqt4/qtermwidget.sip pyqt4/qtermwidgetconfig.py pyqt4/test.py qterminal.pro qtermwidget.pro src/CMakeLists.txt src/CVS/Entries src/CVS/Repository src/CVS/Root |
| diffstat | 23 files changed, 4 insertions(+), 407 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Mon Jan 23 12:22:13 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -###| Cmake qtermwidget |### - -#| Setting required version -cmake_minimum_required( VERSION 2.4 ) - -#| Project -project( qtermwidget ) - -subdirs( - lib - src -) -
--- a/CVS/Entries Mon Jan 23 12:22:13 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -/AUTHORS/1.2/Fri Sep 19 20:18:07 2008// -/CMakeLists.txt/1.1/Fri Sep 19 20:18:08 2008// -/COPYING/1.1.1.1/Sat May 10 21:27:49 2008// -/Changelog/1.1/Wed Jul 30 22:09:09 2008// -/INSTALL/1.1.1.1/Sat May 10 21:27:49 2008// -/README/1.3/Wed Jul 30 22:09:09 2008// -/TODO/1.2/Tue May 27 08:34:53 2008// -/qtermwidget.pro/1.1.1.1/Sat May 10 21:27:49 2008// -D
--- a/CVS/Entries.Log Mon Jan 23 12:22:13 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -A D/lib//// -A D/pyqt4//// -A D/src////
--- a/CVS/Repository Mon Jan 23 12:22:13 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -qtermwidget
--- a/CVS/Root Mon Jan 23 12:22:13 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -:pserver:anonymous@qtermwidget.cvs.sourceforge.net:/cvsroot/qtermwidget
--- a/lib/CMakeLists.txt Mon Jan 23 12:22:13 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,87 +0,0 @@ -###| CMAKE qtermwidget/lib |### - -#| 2.6 is out, but most distros only have 2.4 -cmake_minimum_required ( VERSION 2.4 ) - -#| Project -project ( qtermwidget ) - -#| Sources -set ( SRCS - 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 -) - -#| Headers -#| Only the Headers that need to be moc'd go here -set ( HDRS - ScreenWindow.h - Emulation.h - Vt102Emulation.h TerminalDisplay.h Filter.h - Pty.h k3process.h k3processcontroller.h - Session.h - qtermwidget.h -) - -#| Library Output -#| CMake supports out-of-source builds, so the binary dir is not -#| necessarily the same as the source directory -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 ) -find_package ( Qt4 REQUIRED ) # Finds Qt4 on the system -include ( ${QT_USE_FILE} ) # Includes Qt4 headers and libraries (the above command is needed first) -QT4_WRAP_CPP ( MOC_SRCS ${HDRS} ) # Moc's the headers -#include ( ${CMAKE_BINARY_DIR} ) # For including the heades generated by ui files - -#| qtermwidget specific -include_directories ( ${PROJECT_SOURCE_DIR} ) # You mark some of the headers as global, so I just add the source directory to the includes - -#| Defines -add_definitions ( -DHAVE_POSIX_OPENPT ) -#add_definitions( -DHAVE_GETPT ) - -#| Create the Library -#add_library( qtermwidget STATIC ${SRCS} ${MOC_SRCS} ) -add_library ( qtermwidget SHARED ${SRCS} ${MOC_SRCS} ) - -#| Set Build Type -set ( CMAKE_BUILD_TYPE - #"release" - "relwithdebinfo" # Default - #"debug" - #"debugfull" -) - -#| Library Properties -set_target_properties ( qtermwidget PROPERTIES - #OUTPUT_NAME "alternateName" - #PREFIX "lib" - SOVERSION ${qtermwidget_VERSION_MAJOR} - #SUFFIX "so" - VERSION ${qtermwidget_VERSION} -) - -#| Link Qt4 Libraries -target_link_libraries ( qtermwidget ${QT_LIBRARIES} ) - -install(TARGETS qtermwidget DESTINATION lib)
--- a/lib/CVS/Entries Mon Jan 23 12:22:13 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -/BlockArray.cpp/1.3/Mon Apr 26 03:24:09 2010// -/BlockArray.h/1.2/Wed May 14 19:36:48 2008// -/CMakeLists.txt/1.2/Mon Apr 26 03:24:10 2010// -/Character.h/1.2/Wed May 14 19:36:48 2008// -/CharacterColor.h/1.3/Mon Apr 26 03:24:10 2010// -/ColorTables.h/1.2/Fri Jun 6 09:17:25 2008// -/DefaultTranslatorText.h/1.1.1.1/Sat May 10 21:27:57 2008// -/Emulation.cpp/1.2/Wed May 14 19:36:49 2008// -/Emulation.h/1.2/Wed May 14 19:36:49 2008// -/ExtendedDefaultTranslator.h/1.1.1.1/Sat May 10 21:27:52 2008// -/Filter.cpp/1.2/Wed May 14 19:36:50 2008// -/Filter.h/1.2/Wed May 14 19:36:50 2008// -/History.cpp/1.2/Wed May 14 19:36:50 2008// -/History.h/1.2/Wed May 14 19:36:50 2008// -/KeyboardTranslator.cpp/1.2/Wed May 14 19:36:50 2008// -/KeyboardTranslator.h/1.2/Wed May 14 19:36:50 2008// -/LineFont.h/1.1.1.1/Sat May 10 21:27:49 2008// -/LineFont.src/1.1.1.1/Sat May 10 21:27:52 2008// -/Pty.cpp/1.2/Wed May 14 19:36:50 2008// -/Pty.h/1.2/Wed May 14 19:36:51 2008// -/README/1.1.1.1/Sat May 10 21:27:52 2008// -/Screen.cpp/1.3/Mon Apr 26 03:24:10 2010// -/Screen.h/1.2/Wed May 14 19:36:51 2008// -/ScreenWindow.cpp/1.2/Wed May 14 19:36:52 2008// -/ScreenWindow.h/1.2/Wed May 14 19:36:52 2008// -/Session.cpp/1.4/Thu Apr 30 03:22:50 2009// -/Session.h/1.2/Wed May 14 19:36:52 2008// -/ShellCommand.cpp/1.3/Fri May 23 12:30:35 2008// -/ShellCommand.h/1.2/Wed May 14 19:36:53 2008// -/TerminalCharacterDecoder.cpp/1.2/Wed May 14 19:36:53 2008// -/TerminalCharacterDecoder.h/1.2/Wed May 14 19:36:53 2008// -/TerminalDisplay.cpp/1.9/Mon Jan 3 16:09:24 2011// -/TerminalDisplay.h/1.5/Mon Jan 3 16:09:24 2011// -/Vt102Emulation.cpp/1.3/Thu Apr 30 03:22:50 2009// -/Vt102Emulation.h/1.2/Wed May 14 19:36:53 2008// -/default.keytab/1.1.1.1/Sat May 10 21:27:55 2008// -/k3process.cpp/1.3/Mon Apr 26 03:24:10 2010// -/k3process.h/1.2/Wed May 14 19:36:53 2008// -/k3processcontroller.cpp/1.3/Mon Apr 26 03:24:10 2010// -/k3processcontroller.h/1.2/Wed May 14 19:36:54 2008// -/konsole_wcwidth.cpp/1.1.1.1/Sat May 10 21:27:51 2008// -/konsole_wcwidth.h/1.2/Wed May 14 19:36:54 2008// -/kpty.cpp/1.4/Mon Apr 26 03:24:10 2010// -/kpty.h/1.2/Wed May 14 19:36:54 2008// -/kpty_p.h/1.3/Mon Apr 26 03:24:10 2010// -/lib.pro/1.3/Sat Nov 29 23:17:11 2008// -/qtermwidget.cpp/1.13/Mon Jan 3 16:09:24 2011// -/qtermwidget.h/1.14/Mon Jan 3 16:09:24 2011// -D
--- a/lib/CVS/Entries.Log Mon Jan 23 12:22:13 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -A D/kb-layouts////
--- a/lib/CVS/Repository Mon Jan 23 12:22:13 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -qtermwidget/lib
--- a/lib/CVS/Root Mon Jan 23 12:22:13 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -:pserver:anonymous@qtermwidget.cvs.sourceforge.net:/cvsroot/qtermwidget
--- a/pyqt4/CVS/Entries Mon Jan 23 12:22:13 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -/README/1.2/Mon Apr 26 03:24:10 2010// -/config.py/1.1/Thu Apr 30 03:22:51 2009// -/config.py.in/1.1/Thu Apr 30 03:22:51 2009// -/qtermwidget.sip/1.1/Thu Apr 30 03:22:51 2009// -/qtermwidgetconfig.py/1.1/Thu Apr 30 03:22:51 2009// -/test.py/1.1/Thu Apr 30 03:22:51 2009// -D
--- a/pyqt4/CVS/Repository Mon Jan 23 12:22:13 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -qtermwidget/pyqt4
--- a/pyqt4/CVS/Root Mon Jan 23 12:22:13 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -:pserver:anonymous@qtermwidget.cvs.sourceforge.net:/cvsroot/qtermwidget
--- a/pyqt4/README Mon Jan 23 12:22:13 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -PyQt4 Bindings for QTermWidget - -By Piotr "Riklaunim" Maliński <riklaunim@gmail.com>, - Alexander Slesarev <alex.slesarev@gmail.com> - -PyQt4 QTermWidget Bindings License: GPL3 - -INSTALL: -1. Download QTermWidget from http://qtermwidget.sourceforge.net/. -2. Compile and install it: - $ cmake . - $ make - $ sudo make install -If `make install` command will not work just copy the qtermwidget.so* files to /usr/lib directory. -3. Install PyQt4 and PyQt4-devel if not yet installed. -4. Configure, compile and install bindings. Execute in terminal in the qtermwidget bindings folder: - -$ python config.py -$ make -$ sudo make install - -5. You can run ./test.py to test the installed module. -
--- a/pyqt4/config.py Mon Jan 23 12:22:13 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,85 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -# PyQt4 bindings for th QTermWidget project. -# -# Copyright (C) 2009 Piotr "Riklaunim" Maliński <riklaunim@gmail.com>, -# Alexander Slesarev <alex.slesarev@gmail.com> -# -# 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 3 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, see <http://www.gnu.org/licenses/>. - -import os -import sipconfig -from PyQt4 import pyqtconfig - -# The name of the SIP build file generated by SIP and used by the build -# system. -build_file = "qtermwidget.sbf" - -# Get the PyQt configuration information. -config = pyqtconfig.Configuration() - -# Get the extra SIP flags needed by the imported qt module. Note that -# this normally only includes those flags (-x and -t) that relate to SIP's -# versioning system. -qt_sip_flags = config.pyqt_sip_flags - -# Run SIP to generate the code. Note that we tell SIP where to find the qt -# module's specification files using the -I flag. -os.system(" ".join([config.sip_bin, "-c", ".", "-b", build_file, "-I", - config.pyqt_sip_dir, qt_sip_flags, "qtermwidget.sip"])) - -# We are going to install the SIP specification file for this module and -# its configuration module. -installs = [] - -installs.append(["qtermwidget.sip", os.path.join(config.default_sip_dir, - "qtermwidget")]) - -installs.append(["qtermwidgetconfig.py", config.default_mod_dir]) - -# Create the Makefile. The QtModuleMakefile class provided by the -# pyqtconfig module takes care of all the extra preprocessor, compiler and -# linker flags needed by the Qt library. -makefile = pyqtconfig.QtGuiModuleMakefile( - configuration = config, - build_file = build_file, - installs = installs) - -# Add the library we are wrapping. The name doesn't include any platform -# specific prefixes or extensions (e.g. the "lib" prefix on UNIX, or the -# ".dll" extension on Windows). -makefile.extra_lib_dirs.append("..") -makefile.extra_libs = ["qtermwidget"] - -# Generate the Makefile itself. -makefile.generate() - -# Now we create the configuration module. This is done by merging a Python -# dictionary (whose values are normally determined dynamically) with a -# (static) template. -content = { - # Publish where the SIP specifications for this module will be - # installed. - "qtermwidget_sip_dir": config.default_sip_dir, - - # Publish the set of SIP flags needed by this module. As these are the - # same flags needed by the qt module we could leave it out, but this - # allows us to change the flags at a later date without breaking - # scripts that import the configuration module. - "qtermwidget_sip_flags": qt_sip_flags} - -# This creates the qtermwidgetconfig.py module from the qtermwidgetconfig.py.in -# template and the dictionary. -sipconfig.create_config_module("qtermwidgetconfig.py", "config.py.in", content)
--- a/pyqt4/qtermwidget.sip Mon Jan 23 12:22:13 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -%Module QTermWidget 0 - -%Import QtCore/QtCoremod.sip -%Import QtGui/QtGuimod.sip - - -class QTermWidget : QWidget { - -%TypeHeaderCode -#include <../lib/qtermwidget.h> -%End - -public: - QTermWidget(int startnow = 1, QWidget *parent = 0); - ~QTermWidget(); - enum ScrollBarPosition - { - NoScrollBar=0, - ScrollBarLeft=1, - ScrollBarRight=2 - }; - void setTerminalFont(QFont &font); - void setArgs(QStringList &args); - void setTextCodec(QTextCodec *codec); - void setColorScheme(int scheme); - void setSize(int h, int v); - void setHistorySize(int lines); - void setScrollBarPosition(ScrollBarPosition); - void sendText(QString &text); -protected: - void resizeEvent(QResizeEvent *e); -private: - void *createTermWidget(int startnow, void *parent); - -};
--- a/pyqt4/test.py Mon Jan 23 12:22:13 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -# PyQt4 bindings for th QTermWidget project. -# -# Copyright (C) 2009 Piotr "Riklaunim" Maliński <riklaunim@gmail.com>, -# Alexander Slesarev <alex.slesarev@gmail.com> -# -# 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 3 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, see <http://www.gnu.org/licenses/>. - -import sys -from PyQt4 import Qt -import QTermWidget - -a = Qt.QApplication(sys.argv) -w = QTermWidget.QTermWidget() - -w.show() -a.exec_()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/qterminal.pro Mon Jan 23 12:25:07 2012 +0100 @@ -0,0 +1,4 @@ +TEMPLATE = subdirs +SUBDIRS = lib src + +OPTIONS += ordered \ No newline at end of file
--- a/qtermwidget.pro Mon Jan 23 12:22:13 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = lib src - -OPTIONS += ordered \ No newline at end of file
--- a/src/CMakeLists.txt Mon Jan 23 12:22:13 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -###| CMAKE qtermwidget/src |### - -#| Set required version of cmake -cmake_minimum_required ( VERSION 2.4 ) - -#| Project -project ( test ) - -#| Sources -set ( SRCS - main.cpp -) - -#| qtermwidget Library -include_directories ( - ${PROJECT_SOURCE_DIR}/../lib -) - -set(QTERMWIDGET_LIB qtermwidget) -link_directories(${PROJECT_BINARY_DIR}/../) - -#| Qt4 Required Options -add_definitions ( -Wall ) -find_package ( Qt4 REQUIRED ) # Finds Qt4 on the system -include ( ${QT_USE_FILE} ) # Includes Qt4 headers and libraries (the above command is needed first) -QT4_WRAP_CPP ( MOC_SRCS ${HDRS} ) # Moc's the headers - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - -#| Create the Library -add_executable ( test ${SRCS} ) - -#| Set Build Type -set ( CMAKE_BUILD_TYPE - #"release" - "relwithdebinfo" # Default - #"debug" - #"debugfull" -) - -#| Link Qt4 Libraries -target_link_libraries ( test ${QT_LIBRARIES} ) - -#| Link qtermwidget Library -target_link_libraries ( test ${QTERMWIDGET_LIB} ) -
--- a/src/CVS/Entries Mon Jan 23 12:22:13 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -/CMakeLists.txt/1.3/Mon Apr 26 03:24:10 2010// -/README/1.1.1.1/Sat May 10 21:27:57 2008// -/main.cpp/1.10/Mon Dec 27 10:53:59 2010// -/src.pro/1.2/Sat Nov 29 23:17:11 2008// -D