Update kdevelop-base to 3.4.0

KDevelop 3.4.0 closes more than 500 bugs. There is an impressive list of
additional features including improved Qt 4 support, new debugging
abilities, more attractive default user interface layout and improvements
for C++, Ruby and PHP support.

pkg includes post 3.4.0 fixes for a QMake parser bug.
This commit is contained in:
markd 2007-03-24 14:01:26 +00:00
parent 31b5d01e00
commit 0978d36ff9
25 changed files with 6374 additions and 101 deletions

View file

@ -1,11 +1,12 @@
# $NetBSD: Makefile,v 1.61 2007/02/22 19:26:21 wiz Exp $
# $NetBSD: Makefile,v 1.62 2007/03/24 14:01:26 markd Exp $
DISTNAME= kdevelop-3.3.6
PKGNAME= kdevelop-base-3.3.6
DISTNAME= kdevelop-3.4.0
PKGNAME= kdevelop-base-3.4.0
CATEGORIES= devel kde
HOMEPAGE= http://www.kdevelop.org/
COMMENT= Base modules for IDE for Unix/X11/KDE
MASTER_SITES= ${MASTER_SITE_KDE:=kdevelop-3.4.0/src/}
.include "../../meta-pkgs/kde3/Makefile.kde3"

View file

@ -1,19 +1,14 @@
@comment $NetBSD: PLIST,v 1.19 2007/01/26 03:30:26 markd Exp $
@comment $NetBSD: PLIST,v 1.20 2007/03/24 14:01:28 markd Exp $
bin/kdevassistant
bin/kdevdesigner
bin/kdevelop
bin/kdevelop-htdig
bin/kdevprj2kdevelop
bin/kdevprofileeditor
bin/r++
include/kdevelop/buildtools/base/kdevbuildtool.h
include/kdevelop/buildtools/parsers/qmake/qmakeast.h
include/kdevelop/buildtools/parsers/qmake/qmakeastvisitor.h
include/kdevelop/buildtools/parsers/qmake/qmakedriver.h
include/kdevelop/buildtools/projectmanager/interfaces/kdevprojectbuilder.h
include/kdevelop/buildtools/projectmanager/interfaces/kdevprojecteditor.h
include/kdevelop/buildtools/projectmanager/interfaces/kdevprojectimporter.h
include/kdevelop/buildtools/projectmanager/interfaces/kdevprojectmodel.h
include/kdevelop/buildtools/widgets/addenvvardlg.h
include/kdevelop/buildtools/widgets/addfilesdialog.h
include/kdevelop/buildtools/widgets/environmentvariableswidget.h
@ -30,10 +25,13 @@ include/kdevelop/buildtools/widgets/subclassesdlgbase.h
include/kdevelop/catalog/catalog.h
include/kdevelop/catalog/tag.h
include/kdevelop/cppparser/ast.h
include/kdevelop/cppparser/cachemanager.h
include/kdevelop/cppparser/driver.h
include/kdevelop/cppparser/errors.h
include/kdevelop/cppparser/lexer.h
include/kdevelop/cppparser/lexercache.h
include/kdevelop/cppparser/lookup.h
include/kdevelop/cppparser/macro.h
include/kdevelop/cppparser/parser.h
include/kdevelop/cppparser/tree_parser.h
include/kdevelop/interfaces/KDevCoreIface.h
@ -41,6 +39,7 @@ include/kdevelop/interfaces/KDevPartControllerIface.h
include/kdevelop/interfaces/codemodel.h
include/kdevelop/interfaces/codemodel_treeparser.h
include/kdevelop/interfaces/codemodel_utils.h
include/kdevelop/interfaces/extensions/codebrowserfrontend.h
include/kdevelop/interfaces/extensions/dcop/KDevAppFrontendIface.h
include/kdevelop/interfaces/extensions/dcop/KDevMakeFrontendIface.h
include/kdevelop/interfaces/extensions/kdevappfrontend.h
@ -51,6 +50,7 @@ include/kdevelop/interfaces/extensions/kdevsourceformatter.h
include/kdevelop/interfaces/extensions/kdevversioncontrol.h
include/kdevelop/interfaces/extras/kdevcompileroptions.h
include/kdevelop/interfaces/extras/kdevvcsintegrator.h
include/kdevelop/interfaces/hashedstring.h
include/kdevelop/interfaces/katedocumentmanagerinterface.h
include/kdevelop/interfaces/kdevapi.h
include/kdevelop/interfaces/kdevcoderepository.h
@ -111,9 +111,8 @@ include/kdevelop/shell/generalinfowidgetbase.h
include/kdevelop/shell/languageselectwidget.h
include/kdevelop/shell/mainwindowshare.h
include/kdevelop/shell/mimewarningdialog.h
include/kdevelop/shell/newmainwindow.h
include/kdevelop/shell/multibuffer.h
include/kdevelop/shell/partcontroller.h
include/kdevelop/shell/partselectwidget.h
include/kdevelop/shell/plugincontroller.h
include/kdevelop/shell/profileengine/profile.h
include/kdevelop/shell/profileengine/profileengine.h
@ -132,6 +131,7 @@ include/kdevelop/util/filetemplate.h
include/kdevelop/util/kscriptactionmanager.h
include/kdevelop/util/rurl.h
include/kdevelop/util/urlutil.h
include/kdevelop/widgets/fancylistviewitem.h
include/kdevelop/widgets/flagboxes.h
include/kdevelop/widgets/kcomboview.h
include/kdevelop/widgets/kdevhtmlpart.h
@ -144,6 +144,7 @@ include/kdevelop/widgets/resizablecombo.h
include/kinterfacedesigner/designer.h
lib/kconf_update_bin/kdev-gen-settings-kconf_update
lib/kde3/kio_chm.la
lib/kde3/kio_csharpdoc.la
lib/kde3/kio_perldoc.la
lib/kde3/kio_pydoc.la
lib/kde3/libclearcaseintegrator.la
@ -168,7 +169,9 @@ lib/kde3/libkdevbookmarks.la
lib/kde3/libkdevclassview.la
lib/kde3/libkdevclearcase.la
lib/kde3/libkdevcppsupport.la
lib/kde3/libkdevcsharpsupport.la
lib/kde3/libkdevctags2.la
lib/kde3/libkdevcustompcsimporter.la
lib/kde3/libkdevcustomproject.la
lib/kde3/libkdevcvsservice.la
lib/kde3/libkdevdccoptions.la
@ -189,12 +192,9 @@ lib/kde3/libkdevfortransupport.la
lib/kde3/libkdevfpcoptions.la
lib/kde3/libkdevfullscreen.la
lib/kde3/libkdevgccoptions.la
lib/kde3/libkdevghcoptions.la
lib/kde3/libkdevgrepview.la
lib/kde3/libkdevhaskellproject.la
lib/kde3/libkdevhaskellsupport.la
lib/kde3/libkdevjavadebugger.la
lib/kde3/libkdevjavasupport.la
lib/kde3/libkdevkdelibsimporter.la
lib/kde3/libkdevkonsoleview.la
lib/kde3/libkdevmakeview.la
lib/kde3/libkdevopenwith.la
@ -205,8 +205,9 @@ lib/kde3/libkdevperforce.la
lib/kde3/libkdevperlsupport.la
lib/kde3/libkdevpgioptions.la
lib/kde3/libkdevphpsupport.la
lib/kde3/libkdevprojectmanager.la
lib/kde3/libkdevpythonsupport.la
lib/kde3/libkdevqt4importer.la
lib/kde3/libkdevqtimporter.la
lib/kde3/libkdevquickopen.la
lib/kde3/libkdevrbdebugger.la
lib/kde3/libkdevregexptest.la
@ -214,7 +215,6 @@ lib/kde3/libkdevreplace.la
lib/kde3/libkdevrubysupport.la
lib/kde3/libkdevscripting.la
lib/kde3/libkdevscriptproject.la
lib/kde3/libkdevsecurity.la
lib/kde3/libkdevsnippet.la
lib/kde3/libkdevsqlsupport.la
lib/kde3/libkdevsubversion.la
@ -226,33 +226,25 @@ lib/kde3/libkdevuichooser.la
lib/kde3/libkdevvalgrind.la
lib/kde3/libkdevvcsmanager.la
lib/kde3/libperforceintegrator.la
lib/kde3/libqeditorpart.la
lib/kde3/libsubversionintegrator.la
lib/libd.la
lib/libdesignerintegration.la
lib/libdocumentation_interfaces.la
lib/libkdevautomakeimporter.la
lib/libgdbmi_parser.la
lib/libkdevbuildbase.la
lib/libkdevbuildtoolswidgets.la
lib/libkdevcatalog.la
lib/libkdevcppparser.la
lib/libkdevcustomimporter.la
lib/libkdevcustompcsimporter.la
lib/libkdevelop.la
lib/libkdevextras.la
lib/libkdevkdelibsimporter.la
lib/libkdevmakebuilder.la
lib/libkdevpropertyeditor.la
lib/libkdevqmakeparser.la
lib/libkdevqtimporter.la
lib/libkdevshell.la
lib/libkdevwidgets.la
lib/libkinterfacedesigner.la
lib/liblang_debugger.la
lib/liblang_interfaces.la
lib/libprofileengine.la
lib/libprojectmanager_interfaces.la
lib/libqmakeimporter.la
share/applications/kde/kdevassistant.desktop
share/applications/kde/kdevdesigner.desktop
share/applications/kde/kdevelop.desktop
@ -261,14 +253,12 @@ share/applications/kde/kdevelop_kde_cpp.desktop
share/applications/kde/kdevelop_ruby.desktop
share/applications/kde/kdevelop_scripting.desktop
share/desktop-directories/kde-development-kdevelop.directory
share/doc/kde/HTML/en/kde_app_devel/CMakeLists.txt
share/doc/kde/HTML/en/kde_app_devel/appwizard.png
share/doc/kde/HTML/en/kde_app_devel/common
share/doc/kde/HTML/en/kde_app_devel/index.cache.bz2
share/doc/kde/HTML/en/kde_app_devel/index.docbook
share/doc/kde/HTML/en/kde_app_devel/kscribblefiles.png
share/doc/kde/HTML/en/kdevelop-apidocs/common
share/doc/kde/HTML/en/kdevelop/CMakeLists.txt
share/doc/kde/HTML/en/kdevelop/SF-general.png
share/doc/kde/HTML/en/kdevelop/SF-indent.png
share/doc/kde/HTML/en/kdevelop/SF-other.png
@ -284,6 +274,10 @@ share/doc/kde/HTML/en/kdevelop/automake-manager.png
share/doc/kde/HTML/en/kdevelop/automake-subproject-popup.png
share/doc/kde/HTML/en/kdevelop/automake-target-popup.png
share/doc/kde/HTML/en/kdevelop/automakemanager.png
share/doc/kde/HTML/en/kdevelop/build-commands.png
share/doc/kde/HTML/en/kdevelop/build-configurations.png
share/doc/kde/HTML/en/kdevelop/build-menu-automake.png
share/doc/kde/HTML/en/kdevelop/build-menu.png
share/doc/kde/HTML/en/kdevelop/class-browsers.docbook
share/doc/kde/HTML/en/kdevelop/classview.png
share/doc/kde/HTML/en/kdevelop/commands.docbook
@ -302,15 +296,25 @@ share/doc/kde/HTML/en/kdevelop/configure-docu-devhelp.png
share/doc/kde/HTML/en/kdevelop/configure-docu-dox.png
share/doc/kde/HTML/en/kdevelop/configure-docu-edit.png
share/doc/kde/HTML/en/kdevelop/configure-docu-general.png
share/doc/kde/HTML/en/kdevelop/configure-docu-indexgen.png
share/doc/kde/HTML/en/kdevelop/configure-docu-toc.png
share/doc/kde/HTML/en/kdevelop/configure-editor.png
share/doc/kde/HTML/en/kdevelop/configure-file-selector.png
share/doc/kde/HTML/en/kdevelop/configure-file-templates.png
share/doc/kde/HTML/en/kdevelop/configure-general.png
share/doc/kde/HTML/en/kdevelop/configure-project-buildconfig.png
share/doc/kde/HTML/en/kdevelop/configure-project-configure.png
share/doc/kde/HTML/en/kdevelop/configure-project-cpp.png
share/doc/kde/HTML/en/kdevelop/configure-project-cppoptions.png
share/doc/kde/HTML/en/kdevelop/configure-project-doc.png
share/doc/kde/HTML/en/kdevelop/configure-project-make.png
share/doc/kde/HTML/en/kdevelop/configure-project-run.png
share/doc/kde/HTML/en/kdevelop/configure-select.png
share/doc/kde/HTML/en/kdevelop/configure-snippets.png
share/doc/kde/HTML/en/kdevelop/create-new-project-cvs.png
share/doc/kde/HTML/en/kdevelop/create-new-project.png
share/doc/kde/HTML/en/kdevelop/createnewproject.png
share/doc/kde/HTML/en/kdevelop/createnewprojectoptions.png
share/doc/kde/HTML/en/kdevelop/credits.docbook
share/doc/kde/HTML/en/kdevelop/cvs.docbook
share/doc/kde/HTML/en/kdevelop/debugger.docbook
@ -320,18 +324,31 @@ share/doc/kde/HTML/en/kdevelop/doctree.png
share/doc/kde/HTML/en/kdevelop/doctreeview.png
share/doc/kde/HTML/en/kdevelop/documentation.docbook
share/doc/kde/HTML/en/kdevelop/documents-contents.png
share/doc/kde/HTML/en/kdevelop/documents-search.png
share/doc/kde/HTML/en/kdevelop/edit-doctree-TOC-entry.png
share/doc/kde/HTML/en/kdevelop/editing.docbook
share/doc/kde/HTML/en/kdevelop/editor-ctags-lookup.png
share/doc/kde/HTML/en/kdevelop/editor-ctags-menu.png
share/doc/kde/HTML/en/kdevelop/editor-ctags-regenerate.png
share/doc/kde/HTML/en/kdevelop/editor-find-menu.png
share/doc/kde/HTML/en/kdevelop/editor-search-doc.png
share/doc/kde/HTML/en/kdevelop/editor-switch-header.png
share/doc/kde/HTML/en/kdevelop/empty-ide.png
share/doc/kde/HTML/en/kdevelop/file-browsers.docbook
share/doc/kde/HTML/en/kdevelop/file-list-close-selected.png
share/doc/kde/HTML/en/kdevelop/file-list-session-create.png
share/doc/kde/HTML/en/kdevelop/file-list-session-default.png
share/doc/kde/HTML/en/kdevelop/file-selector.png
share/doc/kde/HTML/en/kdevelop/filetree.png
share/doc/kde/HTML/en/kdevelop/find-in-files.png
share/doc/kde/HTML/en/kdevelop/folded-tabs.png
share/doc/kde/HTML/en/kdevelop/getting-started.docbook
share/doc/kde/HTML/en/kdevelop/hello-world-app.png
share/doc/kde/HTML/en/kdevelop/importdirectory.png
share/doc/kde/HTML/en/kdevelop/index.cache.bz2
share/doc/kde/HTML/en/kdevelop/index.docbook
share/doc/kde/HTML/en/kdevelop/kdcop_browsing.png
share/doc/kde/HTML/en/kdevelop/kdevdesigner.png
share/doc/kde/HTML/en/kdevelop/kdevelop-ideal-mode-0.png
share/doc/kde/HTML/en/kdevelop/kdevelop-ideal-mode.png
share/doc/kde/HTML/en/kdevelop/kdevelop-install.docbook
@ -346,13 +363,26 @@ share/doc/kde/HTML/en/kdevelop/nutshell.docbook
share/doc/kde/HTML/en/kdevelop/open-project.png
share/doc/kde/HTML/en/kdevelop/open-recent-project.png
share/doc/kde/HTML/en/kdevelop/plugin-tools.docbook
share/doc/kde/HTML/en/kdevelop/problem-report-all-todos.png
share/doc/kde/HTML/en/kdevelop/problem-report-marks.png
share/doc/kde/HTML/en/kdevelop/problem-report-todo.png
share/doc/kde/HTML/en/kdevelop/project-advanced.docbook
share/doc/kde/HTML/en/kdevelop/project-management.docbook
share/doc/kde/HTML/en/kdevelop/raw-project-warning.png
share/doc/kde/HTML/en/kdevelop/run-button.png
share/doc/kde/HTML/en/kdevelop/script_location.png
share/doc/kde/HTML/en/kdevelop/select-user-interface-0.png
share/doc/kde/HTML/en/kdevelop/select-user-interface.png
share/doc/kde/HTML/en/kdevelop/setup.docbook
share/doc/kde/HTML/en/kdevelop/split-source-header-navigate.png
share/doc/kde/HTML/en/kdevelop/split-source-header.png
share/doc/kde/HTML/en/kdevelop/split-windows.png
share/doc/kde/HTML/en/kdevelop/split-workspace.png
share/doc/kde/HTML/en/kdevelop/survey-manual.docbook
share/doc/kde/HTML/en/kdevelop/tutorial-debug-tree.png
share/doc/kde/HTML/en/kdevelop/tutorial-hello-new.png
share/doc/kde/HTML/en/kdevelop/tutorial-hello-options.png
share/doc/kde/HTML/en/kdevelop/tutorial-new-project.png
share/doc/kde/HTML/en/kdevelop/unixdev.docbook
share/doc/kde/HTML/en/kdevelop/wrong-project-location.png
share/icons/hicolor/16x16/actions/breakpoint_add.png
@ -380,6 +410,7 @@ share/kde/apps/kdevabbrev/sources/qt_classes
share/kde/apps/kdevabbrev/templates/cpptemplates
share/kde/apps/kdevabbrev/templates/pascaltemplates
share/kde/apps/kdevabbrev/templates/phptemplates
share/kde/apps/kdevabbrev/templates/rubytemplates
share/kde/apps/kdevadaproject/kdevadaproject.rc
share/kde/apps/kdevadasupport/kdevadasupport.rc
share/kde/apps/kdevantproject/kdevantproject.rc
@ -420,12 +451,8 @@ share/kde/apps/kdevappwizard/fpchello.png
share/kde/apps/kdevappwizard/fpchello.tar.gz
share/kde/apps/kdevappwizard/fpcsharedlib.png
share/kde/apps/kdevappwizard/fpcsharedlib.tar.gz
share/kde/apps/kdevappwizard/gnomeapp.png
share/kde/apps/kdevappwizard/gnomeapp.tar.gz
share/kde/apps/kdevappwizard/gtk2mmapp.png
share/kde/apps/kdevappwizard/gtk2mmapp.tar.gz
share/kde/apps/kdevappwizard/haskellhello.png
share/kde/apps/kdevappwizard/haskellhello.tar.gz
share/kde/apps/kdevappwizard/importfiles/ada.kdevelop
share/kde/apps/kdevappwizard/importfiles/c-auto.kdevelop
share/kde/apps/kdevappwizard/importfiles/c.kdevelop
@ -442,6 +469,7 @@ share/kde/apps/kdevappwizard/importfiles/pascal.kdevelop
share/kde/apps/kdevappwizard/importfiles/perl.kdevelop
share/kde/apps/kdevappwizard/importfiles/php.kdevelop
share/kde/apps/kdevappwizard/importfiles/python.kdevelop
share/kde/apps/kdevappwizard/importfiles/qt4qmake.kdevelop
share/kde/apps/kdevappwizard/importfiles/qtqmake.kdevelop
share/kde/apps/kdevappwizard/importfiles/qttmake.kdevelop
share/kde/apps/kdevappwizard/importfiles/ruby.kdevelop
@ -461,6 +489,7 @@ share/kde/apps/kdevappwizard/imports/pascal
share/kde/apps/kdevappwizard/imports/perl
share/kde/apps/kdevappwizard/imports/php
share/kde/apps/kdevappwizard/imports/python
share/kde/apps/kdevappwizard/imports/qt4qmake
share/kde/apps/kdevappwizard/imports/qtqmake
share/kde/apps/kdevappwizard/imports/qttmake
share/kde/apps/kdevappwizard/imports/ruby
@ -476,12 +505,10 @@ share/kde/apps/kdevappwizard/kateplugin.png
share/kde/apps/kdevappwizard/kateplugin.tar.gz
share/kde/apps/kdevappwizard/kateplugin2.png
share/kde/apps/kdevappwizard/kateplugin2.tar.gz
share/kde/apps/kdevappwizard/kbearimportfilter.png
share/kde/apps/kdevappwizard/kbearimportfilter.tar.gz
share/kde/apps/kdevappwizard/kbearplugin.png
share/kde/apps/kdevappwizard/kbearplugin.tar.gz
share/kde/apps/kdevappwizard/kcmodule.png
share/kde/apps/kdevappwizard/kcmodule.tar.gz
share/kde/apps/kdevappwizard/kconfig35.png
share/kde/apps/kdevappwizard/kconfig35.tar.gz
share/kde/apps/kdevappwizard/kdedcop.png
share/kde/apps/kdevappwizard/kdedcop.tar.gz
share/kde/apps/kdevappwizard/kdevappwizard.rc
@ -553,6 +580,10 @@ share/kde/apps/kdevappwizard/qmakeapp.png
share/kde/apps/kdevappwizard/qmakeapp.tar.gz
share/kde/apps/kdevappwizard/qmakesimple.png
share/kde/apps/kdevappwizard/qmakesimple.tar.gz
share/kde/apps/kdevappwizard/qt4hello.png
share/kde/apps/kdevappwizard/qt4hello.tar.gz
share/kde/apps/kdevappwizard/qt4makeapp.png
share/kde/apps/kdevappwizard/qt4makeapp.tar.gz
share/kde/apps/kdevappwizard/qtopiaapp.png
share/kde/apps/kdevappwizard/qtopiaapp.tar.gz
share/kde/apps/kdevappwizard/qtruby.png
@ -569,7 +600,6 @@ share/kde/apps/kdevappwizard/superwaba.png
share/kde/apps/kdevappwizard/superwaba.tar.gz
share/kde/apps/kdevappwizard/template-common/Artistic
share/kde/apps/kdevappwizard/template-common/COPYING
share/kde/apps/kdevappwizard/template-common/COPYING-DOCS
share/kde/apps/kdevappwizard/template-common/COPYING.LIB
share/kde/apps/kdevappwizard/template-common/LICENSE.BSD
share/kde/apps/kdevappwizard/template-common/LICENSE.QPL
@ -624,18 +654,15 @@ share/kde/apps/kdevappwizard/templates/fortranhello.kdevtemplate
share/kde/apps/kdevappwizard/templates/fpcgtk.kdevtemplate
share/kde/apps/kdevappwizard/templates/fpchello.kdevtemplate
share/kde/apps/kdevappwizard/templates/fpcsharedlib.kdevtemplate
share/kde/apps/kdevappwizard/templates/gnomeapp.kdevtemplate
share/kde/apps/kdevappwizard/templates/gtk2mmapp.kdevtemplate
share/kde/apps/kdevappwizard/templates/haskellhello.kdevtemplate
share/kde/apps/kdevappwizard/templates/javahello.kdevtemplate
share/kde/apps/kdevappwizard/templates/kapp.kdevtemplate
share/kde/apps/kdevappwizard/templates/kappjava.kdevtemplate
share/kde/apps/kdevappwizard/templates/kappruby.kdevtemplate
share/kde/apps/kdevappwizard/templates/kateplugin.kdevtemplate
share/kde/apps/kdevappwizard/templates/kateplugin2.kdevtemplate
share/kde/apps/kdevappwizard/templates/kbearimportfilter.kdevtemplate
share/kde/apps/kdevappwizard/templates/kbearplugin.kdevtemplate
share/kde/apps/kdevappwizard/templates/kcmodule.kdevtemplate
share/kde/apps/kdevappwizard/templates/kconfig35.kdevtemplate
share/kde/apps/kdevappwizard/templates/kdedcop.kdevtemplate
share/kde/apps/kdevappwizard/templates/kdevlang.kdevtemplate
share/kde/apps/kdevappwizard/templates/kdevpart.kdevtemplate
@ -671,6 +698,8 @@ share/kde/apps/kdevappwizard/templates/pythonhello.kdevtemplate
share/kde/apps/kdevappwizard/templates/pytk.kdevtemplate
share/kde/apps/kdevappwizard/templates/qmakeapp.kdevtemplate
share/kde/apps/kdevappwizard/templates/qmakesimple.kdevtemplate
share/kde/apps/kdevappwizard/templates/qt4hello.kdevtemplate
share/kde/apps/kdevappwizard/templates/qt4makeapp.kdevtemplate
share/kde/apps/kdevappwizard/templates/qtopiaapp.kdevtemplate
share/kde/apps/kdevappwizard/templates/qtruby.kdevtemplate
share/kde/apps/kdevappwizard/templates/qtrubyapp.kdevtemplate
@ -729,10 +758,13 @@ share/kde/apps/kdevcppsupport/newclass/gtk_header
share/kde/apps/kdevcppsupport/newclass/gtk_source
share/kde/apps/kdevcppsupport/newclass/objc_header
share/kde/apps/kdevcppsupport/newclass/objc_source
share/kde/apps/kdevcppsupport/subclassing/subclass_qt4_template.cpp
share/kde/apps/kdevcppsupport/subclassing/subclass_qt4_template.h
share/kde/apps/kdevcppsupport/subclassing/subclass_template.cpp
share/kde/apps/kdevcppsupport/subclassing/subclass_template.h
share/kde/apps/kdevcppsupport/templates/default.cpp
share/kde/apps/kdevcppsupport/templates/default.h
share/kde/apps/kdevcsharpsupport/kdevcsharpsupport.rc
share/kde/apps/kdevctags2/kdevpart_ctags2.rc
share/kde/apps/kdevcustomproject/kdevcustomproject.rc
share/kde/apps/kdevcvsservice/buildcvs.sh
@ -994,11 +1026,10 @@ share/kde/apps/kdevdocumentation/tocs/fortran_bugs_gcc.toc
share/kde/apps/kdevdocumentation/tocs/gnome1.toc
share/kde/apps/kdevdocumentation/tocs/gnustep.toc
share/kde/apps/kdevdocumentation/tocs/gtk_bugs.toc
share/kde/apps/kdevdocumentation/tocs/haskell.toc
share/kde/apps/kdevdocumentation/tocs/haskell_bugs_ghc.toc
share/kde/apps/kdevdocumentation/tocs/java_bugs_gcc.toc
share/kde/apps/kdevdocumentation/tocs/java_bugs_sun.toc
share/kde/apps/kdevdocumentation/tocs/kde2book.toc
share/kde/apps/kdevdocumentation/tocs/kdetemplates.toc
share/kde/apps/kdevdocumentation/tocs/kdev3api.toc
share/kde/apps/kdevdocumentation/tocs/libc.toc
share/kde/apps/kdevdocumentation/tocs/libstdc++.toc
@ -1032,10 +1063,15 @@ share/kde/apps/kdevelop/icons/hicolor/16x16/actions/methodnew.png
share/kde/apps/kdevelop/icons/hicolor/16x16/actions/newwidget.png
share/kde/apps/kdevelop/icons/hicolor/16x16/actions/project_open.png
share/kde/apps/kdevelop/icons/hicolor/16x16/actions/qmake_app.png
share/kde/apps/kdevelop/icons/hicolor/16x16/actions/qmake_app_disabled.png
share/kde/apps/kdevelop/icons/hicolor/16x16/actions/qmake_func_scope.png
share/kde/apps/kdevelop/icons/hicolor/16x16/actions/qmake_inc_scope.png
share/kde/apps/kdevelop/icons/hicolor/16x16/actions/qmake_lib.png
share/kde/apps/kdevelop/icons/hicolor/16x16/actions/qmake_lib_disabled.png
share/kde/apps/kdevelop/icons/hicolor/16x16/actions/qmake_scope.png
share/kde/apps/kdevelop/icons/hicolor/16x16/actions/qmake_scopenew.png
share/kde/apps/kdevelop/icons/hicolor/16x16/actions/qmake_sub.png
share/kde/apps/kdevelop/icons/hicolor/16x16/actions/qmake_sub_disabled.png
share/kde/apps/kdevelop/icons/hicolor/16x16/actions/qmake_subclass.png
share/kde/apps/kdevelop/icons/hicolor/16x16/actions/qmake_ui_h.png
share/kde/apps/kdevelop/icons/hicolor/16x16/actions/qmakerun.png
@ -1097,7 +1133,6 @@ share/kde/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/profi
share/kde/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/profile.config
share/kde/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/FortranIDE/fortran.appwizard
share/kde/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/FortranIDE/profile.config
share/kde/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/HaskellIDE/haskell.appwizard
share/kde/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/HaskellIDE/profile.config
share/kde/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/JavaIDE/java.appwizard
share/kde/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/JavaIDE/profile.config
@ -1106,6 +1141,7 @@ share/kde/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/PascalIDE/profile.confi
share/kde/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/profile.config
share/kde/apps/kdevelop/profiles/IDE/DatabaseIDE/profile.config
share/kde/apps/kdevelop/profiles/IDE/DatabaseIDE/sql.appwizard
share/kde/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/CSharpIDE/csharp.appwizard
share/kde/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/PHPIDE/php.appwizard
share/kde/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/PHPIDE/profile.config
share/kde/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/PerlIDE/perl.appwizard
@ -1121,11 +1157,11 @@ share/kde/apps/kdevelop/profiles/IDE/profile.config
share/kde/apps/kdevelop/profiles/KDevAssistant/profile.config
share/kde/apps/kdevelop/profiles/profile.config
share/kde/apps/kdevelop/profiles/projectprofiles
share/kde/apps/kdevfilecreate/file-templates/F
share/kde/apps/kdevfilecreate/file-templates/adb
share/kde/apps/kdevfilecreate/file-templates/ads
share/kde/apps/kdevfilecreate/file-templates/c
share/kde/apps/kdevfilecreate/file-templates/cpp
share/kde/apps/kdevfilecreate/file-templates/css
share/kde/apps/kdevfilecreate/file-templates/dox
share/kde/apps/kdevfilecreate/file-templates/dpr
share/kde/apps/kdevfilecreate/file-templates/f
@ -1136,8 +1172,8 @@ share/kde/apps/kdevfilecreate/file-templates/for
share/kde/apps/kdevfilecreate/file-templates/fpp
share/kde/apps/kdevfilecreate/file-templates/ftn
share/kde/apps/kdevfilecreate/file-templates/h
share/kde/apps/kdevfilecreate/file-templates/hs
share/kde/apps/kdevfilecreate/file-templates/java
share/kde/apps/kdevfilecreate/file-templates/js
share/kde/apps/kdevfilecreate/file-templates/l
share/kde/apps/kdevfilecreate/file-templates/ll
share/kde/apps/kdevfilecreate/file-templates/pas-program
@ -1148,17 +1184,25 @@ share/kde/apps/kdevfilecreate/file-templates/pm
share/kde/apps/kdevfilecreate/file-templates/pp-program
share/kde/apps/kdevfilecreate/file-templates/pp-unit
share/kde/apps/kdevfilecreate/file-templates/py
share/kde/apps/kdevfilecreate/file-templates/qrc
share/kde/apps/kdevfilecreate/file-templates/rb
share/kde/apps/kdevfilecreate/file-templates/rhtml
share/kde/apps/kdevfilecreate/file-templates/rjs
share/kde/apps/kdevfilecreate/file-templates/rxml
share/kde/apps/kdevfilecreate/file-templates/ts
share/kde/apps/kdevfilecreate/file-templates/ui
share/kde/apps/kdevfilecreate/file-templates/ui-confdialog
share/kde/apps/kdevfilecreate/file-templates/ui-dialog
share/kde/apps/kdevfilecreate/file-templates/ui-dialog-qt4
share/kde/apps/kdevfilecreate/file-templates/ui-dialogb
share/kde/apps/kdevfilecreate/file-templates/ui-dialogb-qt4
share/kde/apps/kdevfilecreate/file-templates/ui-dialogr
share/kde/apps/kdevfilecreate/file-templates/ui-dialogr-qt4
share/kde/apps/kdevfilecreate/file-templates/ui-mainwin
share/kde/apps/kdevfilecreate/file-templates/ui-mainwin-qt4
share/kde/apps/kdevfilecreate/file-templates/ui-tabdialog
share/kde/apps/kdevfilecreate/file-templates/ui-widget
share/kde/apps/kdevfilecreate/file-templates/ui-widget-qt4
share/kde/apps/kdevfilecreate/file-templates/ui-wizard
share/kde/apps/kdevfilecreate/file-templates/y
share/kde/apps/kdevfilecreate/file-templates/yy
@ -1170,9 +1214,6 @@ share/kde/apps/kdevfortransupport/kdevfortransupport.rc
share/kde/apps/kdevfullscreen/kdevpart_fullscreen.rc
share/kde/apps/kdevgrepview/icons/hicolor/22x22/actions/grep.png
share/kde/apps/kdevgrepview/kdevgrepview.rc
share/kde/apps/kdevhaskellproject/kdevhaskellproject.rc
share/kde/apps/kdevhaskellsupport/kdevhaskellsupport.rc
share/kde/apps/kdevjavadebugger/kdevjavadebugger.rc
share/kde/apps/kdevjavasupport/kdevjavasupport.rc
share/kde/apps/kdevmakeview/kdevmakeview.rc
share/kde/apps/kdevpartexplorer/kdevpartexplorer.rc
@ -1181,7 +1222,6 @@ share/kde/apps/kdevpascalsupport/kdevpascalsupport.rc
share/kde/apps/kdevperlsupport/kdevperlsupport.rc
share/kde/apps/kdevphpsupport/kdevphpsupport.rc
share/kde/apps/kdevphpsupport/phpfunctions
share/kde/apps/kdevprojectmanager/kdevprojectmanager.rc
share/kde/apps/kdevpythonsupport/kdevpythonsupport.rc
share/kde/apps/kdevquickopen/kdevpart_quickopen.rc
share/kde/apps/kdevrbdebugger/debuggee.rb
@ -1200,23 +1240,19 @@ share/kde/apps/kdevrubysupport/pics/ruby_config.png
share/kde/apps/kdevrubysupport/pics/ruby_run.png
share/kde/apps/kdevscripting/kdevscripting.rc
share/kde/apps/kdevscriptproject/kdevscriptproject.rc
share/kde/apps/kdevsecurity/patterns
share/kde/apps/kdevsqlsupport/kdevsqlsupport.rc
share/kde/apps/kdevtipofday/kdevpart_tipofday.rc
share/kde/apps/kdevtipofday/tips
share/kde/apps/kdevtools/kdevpart_tools.rc
share/kde/apps/kdevtrollproject/kdevtrollproject.rc
share/kde/apps/kdevvalgrind/kdevpart_valgrind.rc
share/kde/apps/kio_pydoc/kde_inspect.py
share/kde/apps/kio_pydoc/kde_pydoc.py
share/kde/apps/qeditorpart/highlight/highlighting.xml
share/kde/apps/qeditorpart/highlight/qt.xml
share/kde/apps/qeditorpart/qeditor_part.rc
share/kde/config/kdevassistantrc
share/kde/config/kdeveloprc
share/kde/mimelnk/application/x-kdevelop.desktop
share/kde/mimelnk/text/x-fortran.desktop
share/kde/services/chm.protocol
share/kde/services/csharpdoc.protocol
share/kde/services/docchmplugin.desktop
share/kde/services/doccustomplugin.desktop
share/kde/services/docdevhelpplugin.desktop
@ -1231,7 +1267,6 @@ share/kde/services/kdevantproject.desktop
share/kde/services/kdevappoutputview.desktop
share/kde/services/kdevappwizard.desktop
share/kde/services/kdevastyle.desktop
share/kde/services/kdevautomakeimporter.desktop
share/kde/services/kdevautoproject.desktop
share/kde/services/kdevbashsupport.desktop
share/kde/services/kdevbookmarks.desktop
@ -1239,9 +1274,9 @@ share/kde/services/kdevclassview.desktop
share/kde/services/kdevclearcase.desktop
share/kde/services/kdevclearcaseintegrator.desktop
share/kde/services/kdevcppsupport.desktop
share/kde/services/kdevcsharpsupport.desktop
share/kde/services/kdevcsupport.desktop
share/kde/services/kdevctags2.desktop
share/kde/services/kdevcustomimporter.desktop
share/kde/services/kdevcustomproject.desktop
share/kde/services/kdevcvsservice.desktop
share/kde/services/kdevcvsserviceintegrator.desktop
@ -1264,17 +1299,12 @@ share/kde/services/kdevfpcoptions.desktop
share/kde/services/kdevfullscreen.desktop
share/kde/services/kdevg77options.desktop
share/kde/services/kdevgccoptions.desktop
share/kde/services/kdevghcoptions.desktop
share/kde/services/kdevgppoptions.desktop
share/kde/services/kdevgrepview.desktop
share/kde/services/kdevhaskellproject.desktop
share/kde/services/kdevhaskellsupport.desktop
share/kde/services/kdevjavadebugger.desktop
share/kde/services/kdevjavasupport.desktop
share/kde/services/kdevkdeautoproject.desktop
share/kde/services/kdevkdelibsimporter.desktop
share/kde/services/kdevkonsoleview.desktop
share/kde/services/kdevmakebuilder.desktop
share/kde/services/kdevmakeview.desktop
share/kde/services/kdevopenwith.desktop
share/kde/services/kdevpartexplorer.desktop
@ -1287,9 +1317,8 @@ share/kde/services/kdevperlsupport.desktop
share/kde/services/kdevpgf77options.desktop
share/kde/services/kdevpghpfoptions.desktop
share/kde/services/kdevphpsupport.desktop
share/kde/services/kdevprojectmanager.desktop
share/kde/services/kdevpythonsupport.desktop
share/kde/services/kdevqmakeimporter.desktop
share/kde/services/kdevqt4importer.desktop
share/kde/services/kdevqtimporter.desktop
share/kde/services/kdevquickopen.desktop
share/kde/services/kdevrbdebugger.desktop
@ -1298,7 +1327,6 @@ share/kde/services/kdevreplace.desktop
share/kde/services/kdevrubysupport.desktop
share/kde/services/kdevscripting.desktop
share/kde/services/kdevscriptproject.desktop
share/kde/services/kdevsecurity.desktop
share/kde/services/kdevsnippet.desktop
share/kde/services/kdevsqlsupport.desktop
share/kde/services/kdevsubversion.desktop
@ -1313,8 +1341,8 @@ share/kde/services/kdevvalgrind.desktop
share/kde/services/kdevvcsmanager.desktop
share/kde/services/perldoc.protocol
share/kde/services/pydoc.protocol
share/kde/services/qeditor_part.desktop
share/kde/servicetypes/kdevelopappfrontend.desktop
share/kde/servicetypes/kdevelopcodebrowserfrontend.desktop
share/kde/servicetypes/kdevelopcompileroptions.desktop
share/kde/servicetypes/kdevelopcreatefile.desktop
share/kde/servicetypes/kdevelopdifffrontend.desktop
@ -1324,8 +1352,6 @@ share/kde/servicetypes/kdevelopmakefrontend.desktop
share/kde/servicetypes/kdeveloppcsimporter.desktop
share/kde/servicetypes/kdevelopplugin.desktop
share/kde/servicetypes/kdevelopproject.desktop
share/kde/servicetypes/kdevelopprojectbuilder.desktop
share/kde/servicetypes/kdevelopprojectimporter.desktop
share/kde/servicetypes/kdevelopsourceformatter.desktop
share/kde/servicetypes/kdevelopvcsintegrator.desktop
share/kde/servicetypes/kdevelopversioncontrol.desktop
@ -1334,8 +1360,6 @@ share/kde/servicetypes/kdevelopversioncontrol.desktop
@comment in kde: @dirrm share/kde/mimelnk/text
@comment in kde: @dirrm share/kde/mimelnk/application
@comment in kde: @dirrm share/kde/config
@dirrm share/kde/apps/qeditorpart/highlight
@dirrm share/kde/apps/qeditorpart
@dirrm share/kde/apps/kio_pydoc
@exec ${MKDIR} %D/share/kde/apps/kdevvcsmanager
@dirrm share/kde/apps/kdevvcsmanager
@ -1344,7 +1368,6 @@ share/kde/servicetypes/kdevelopversioncontrol.desktop
@dirrm share/kde/apps/kdevtools
@dirrm share/kde/apps/kdevtipofday
@dirrm share/kde/apps/kdevsqlsupport
@dirrm share/kde/apps/kdevsecurity
@dirrm share/kde/apps/kdevscriptproject
@dirrm share/kde/apps/kdevscripting
@dirrm share/kde/apps/kdevrubysupport/pics
@ -1358,7 +1381,6 @@ share/kde/servicetypes/kdevelopversioncontrol.desktop
@dirrm share/kde/apps/kdevrbdebugger
@dirrm share/kde/apps/kdevquickopen
@dirrm share/kde/apps/kdevpythonsupport
@dirrm share/kde/apps/kdevprojectmanager
@dirrm share/kde/apps/kdevphpsupport
@dirrm share/kde/apps/kdevperlsupport
@dirrm share/kde/apps/kdevpascalsupport
@ -1366,9 +1388,6 @@ share/kde/servicetypes/kdevelopversioncontrol.desktop
@dirrm share/kde/apps/kdevpartexplorer
@dirrm share/kde/apps/kdevmakeview
@dirrm share/kde/apps/kdevjavasupport
@dirrm share/kde/apps/kdevjavadebugger
@dirrm share/kde/apps/kdevhaskellsupport
@dirrm share/kde/apps/kdevhaskellproject
@dirrm share/kde/apps/kdevgrepview/icons/hicolor/22x22/actions
@dirrm share/kde/apps/kdevgrepview/icons/hicolor/22x22
@dirrm share/kde/apps/kdevgrepview/icons/hicolor
@ -1386,6 +1405,7 @@ share/kde/servicetypes/kdevelopversioncontrol.desktop
@dirrm share/kde/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/PythonIDE
@dirrm share/kde/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/PerlIDE
@dirrm share/kde/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/PHPIDE
@dirrm share/kde/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/CSharpIDE
@dirrm share/kde/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE
@dirrm share/kde/apps/kdevelop/profiles/IDE/DatabaseIDE
@dirrm share/kde/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/PascalIDE
@ -1433,6 +1453,7 @@ share/kde/servicetypes/kdevelopversioncontrol.desktop
@dirrm share/kde/apps/kdevcvsservice
@dirrm share/kde/apps/kdevcustomproject
@dirrm share/kde/apps/kdevctags2
@dirrm share/kde/apps/kdevcsharpsupport
@dirrm share/kde/apps/kdevcppsupport/templates
@dirrm share/kde/apps/kdevcppsupport/subclassing
@dirrm share/kde/apps/kdevcppsupport/newclass
@ -1473,6 +1494,7 @@ share/kde/servicetypes/kdevelopversioncontrol.desktop
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/actions
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/actions
@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/src/profileengine/lib/html
@dirrm share/doc/kde/HTML/en/kdevelop-apidocs/src/profileengine/lib/html
@dirrm share/doc/kde/HTML/en/kdevelop-apidocs/src/profileengine/lib
@ -1533,12 +1555,6 @@ share/kde/servicetypes/kdevelopversioncontrol.desktop
@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/languages/html
@dirrm share/doc/kde/HTML/en/kdevelop-apidocs/languages/html
@dirrm share/doc/kde/HTML/en/kdevelop-apidocs/languages
@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/projectmanager/interfaces/html
@dirrm share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/projectmanager/interfaces/html
@dirrm share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/projectmanager/interfaces
@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/projectmanager/html
@dirrm share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/projectmanager/html
@dirrm share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/projectmanager
@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/widgets/html
@dirrm share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/widgets/html
@dirrm share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/widgets
@ -1587,8 +1603,6 @@ share/kde/servicetypes/kdevelopversioncontrol.desktop
@dirrm include/kdevelop/cppparser
@dirrm include/kdevelop/catalog
@dirrm include/kdevelop/buildtools/widgets
@dirrm include/kdevelop/buildtools/projectmanager/interfaces
@dirrm include/kdevelop/buildtools/projectmanager
@dirrm include/kdevelop/buildtools/parsers/qmake
@dirrm include/kdevelop/buildtools/parsers
@dirrm include/kdevelop/buildtools/base

View file

@ -1,8 +1,28 @@
$NetBSD: distinfo,v 1.28 2007/01/26 03:30:26 markd Exp $
$NetBSD: distinfo,v 1.29 2007/03/24 14:01:28 markd Exp $
SHA1 (kdevelop-3.3.6.tar.bz2) = 90d56409cf1108b4469c1ce98e7517dc46633eb9
RMD160 (kdevelop-3.3.6.tar.bz2) = 1a1356e9eb015b2947cd64ba9ba223479d1ef3a4
Size (kdevelop-3.3.6.tar.bz2) = 8176547 bytes
SHA1 (kdevelop-3.4.0.tar.bz2) = d72f01ae6a0d3200339345d3557ada5c5f99112d
RMD160 (kdevelop-3.4.0.tar.bz2) = 7a3fb362e456965f5c35f2a8a3293178d596c845
Size (kdevelop-3.4.0.tar.bz2) = 9158370 bytes
SHA1 (patch-aa) = ea4ceb43d826297610b19c1cd2c538fa486b2b22
SHA1 (patch-ab) = 19d7b806fd3a5cd0c6cee76f434ea965ad3f01a9
SHA1 (patch-af) = ed3d61bb5dbaa22516088e8591db1fa41e913016
SHA1 (patch-ag) = 6ab90c041962bf999f3cfb2a704e91e2a2f205ba
SHA1 (patch-ah) = fec4ba7d20ca75c2a4dc5942270cab899776a741
SHA1 (patch-ai) = d9cb0dd2c6ad1e03350073599bcb25691aa6d49d
SHA1 (patch-ba) = bbe66f1f163d7f6f90e38caba2689abf7b9830a6
SHA1 (patch-bb) = dc7507bd324f12b8854c55270d4dd65273d5828b
SHA1 (patch-bc) = 17215f7346ab82993b10ea6d6341693ffa5fbe10
SHA1 (patch-bd) = ae24ff52158d29e50ef93dc94e009bb3f12a928e
SHA1 (patch-be) = cc2d17c9f31907fd38e56f9718b7ac593ca0f247
SHA1 (patch-bf) = 1fc4b3f79e30ad9cc38c985bb1255ed35b004193
SHA1 (patch-bg) = 7b76658d4dc9e2d9b2099dc3f68045c85b802d90
SHA1 (patch-bh) = 5af1b3c7477c5d45a1af59e8d5aa51829d431fa8
SHA1 (patch-bi) = fa46b78ac1ef6fbe216642b56720e17ab60cdaa5
SHA1 (patch-bj) = df480cd6fb831a71fa9e0d53ead5cd9d0d13d4cc
SHA1 (patch-bk) = bfca9d1879643d28faae6cd55c88e91561063d02
SHA1 (patch-bl) = 344003b4d9d400cb3e6a513d052f78ba2ef44488
SHA1 (patch-bm) = c57e5af762edf4212bf1bae31033635ca81f1dea
SHA1 (patch-bn) = a0eb654833e7dbe8c5143d99abf79a1ce533235a
SHA1 (patch-bo) = 669a4f76dab36f9902534dc44d8a871739a1446d
SHA1 (patch-bp) = 0ec5808b91906d16d9ca528867ce4ff5f9d7fa8c
SHA1 (patch-bq) = 060e02bd33f4db75300f0b9c3eb416924ec35cc1
SHA1 (patch-br) = 01866aacb2700e1b6af644dd5a29f97eb04b7d77

View file

@ -0,0 +1,17 @@
$NetBSD: patch-aa,v 1.8 2007/03/24 14:01:28 markd Exp $
--- configure.orig 2007-03-15 23:28:41.000000000 +1300
+++ configure
@@ -34106,9 +34106,9 @@ fi
test -n "$TAR" && break
done
-test -n "$TAR" || TAR="
-tar=${tar-"${am_missing_run}"}
-"
+#test -n "$TAR" || TAR="
+#tar=${tar-"${am_missing_run}"}
+#"
# Extract the first word of "gzip", so it can be a program name with args.
set dummy gzip; ac_word=$2

View file

@ -1,13 +0,0 @@
$NetBSD: patch-af,v 1.2 2005/03/23 22:38:45 markd Exp $
--- languages/haskell/Makefile.in.orig 2005-03-05 01:48:00.000000000 +1300
+++ languages/haskell/Makefile.in
@@ -432,7 +432,7 @@ INCLUDES = -I$(top_srcdir)/lib/antlr -I$
SUBDIRS = app_templates file_templates compiler doc
kde_module_LTLIBRARIES = libkdevhaskellsupport.la
-libkdevhaskellsupport_la_LDFLAGS = $(LEXLIB) $(all_libraries) $(KDE_PLUGIN)
+libkdevhaskellsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
libkdevhaskellsupport_la_LIBADD = $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la
libkdevhaskellsupport_la_SOURCES = haskellsupport_part.cpp
#>- METASOURCES = AUTO

View file

@ -0,0 +1,13 @@
$NetBSD: patch-ah,v 1.1 2007/03/24 14:01:29 markd Exp $
--- admin/cvs.sh.orig 2007-03-21 23:41:28.000000000 +1200
+++ admin/cvs.sh
@@ -6,6 +6,8 @@
# It defines a shell function for each known target
# and then does a case to call the correct function.
+exit 0
+
unset MAKEFLAGS
call_and_fix_autoconf()

View file

@ -0,0 +1,13 @@
$NetBSD: patch-ai,v 1.1 2007/03/24 14:01:29 markd Exp $
--- vcs/clearcase/clearcasemanipulator.cpp.orig 2007-01-26 04:41:45.000000000 +1300
+++ vcs/clearcase/clearcasemanipulator.cpp
@@ -20,7 +20,7 @@
#include <libgen.h>
#include <errno.h>
-#if defined(Q_OS_MACX) || defined(MACOSX)
+#if defined(Q_OS_MACX) || defined(MACOSX) || defined(__NetBSD__)
//this function is taken from GNU libc
//it does not exist on macos
int getline(char **lineptr, size_t *n, FILE *stream)

View file

@ -0,0 +1,78 @@
$NetBSD: patch-ba,v 1.1 2007/03/24 14:01:29 markd Exp $
--- buildtools/lib/parsers/qmake/tests/runner.cpp.orig 2007-01-26 04:42:02.000000000 +1300
+++ buildtools/lib/parsers/qmake/tests/runner.cpp
@@ -17,10 +17,26 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#include <qmakeast.h>
-#include <qmakeastvisitor.h>
-#include <qmakedriver.h>
+
+#include <cstdlib>
+#include <iostream>
+#include <stdio.h>
+#include "qmakedriver.h"
+#include "qmakeastvisitor.h"
+
+#include <qstring.h>
+
#include <kdebug.h>
+#include <kcmdlineargs.h>
+#include <kurl.h>
+
+static const KCmdLineOptions options[] =
+{
+ {"silent", "Enable Parser debug output", 0},
+ {"!debug", "Disable output of the generated AST", 0},
+ {"!+files", "QMake project files", 0}
+};
+
class PrintAST : QMake::ASTVisitor
{
@@ -120,14 +136,30 @@ private:
};
int main(int argc, char *argv[])
{
- QMake::ProjectAST *projectAST;
- int ret;
- if (argc > 1)
+ KCmdLineArgs::init( argc, argv, "QMake Parser", "qmake-parser", "Parse QMake project files", "1.0.0");
+ KCmdLineArgs::addCmdLineOptions(options);
+
+ KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+
+ if( args->count() < 1 )
+ {
+ KCmdLineArgs::usage(0);
+ }
+
+ int debug = 0;
+ bool silent = false;
+
+ if( args->isSet("silent") )
+ silent = true;
+ if( args->isSet("debug") )
+ debug = 1;
+ for( int i = 0 ; i < args->count() ; i++ )
{
- ret = QMake::Driver::parseFile(argv[1], &projectAST);
+ QMake::ProjectAST *projectAST;
+ int ret = QMake::Driver::parseFile(argv[1], &projectAST, debug);
PrintAST pa;
if ( ret == 0 )
- if ((argc < 3) || ((argc == 3) && (strcmp(argv[2], "--silent") != 0)))
+ if ( !silent )
{
pa.processProject(projectAST);
QString profile;
@@ -136,6 +168,5 @@ int main(int argc, char *argv[])
}
return ret;
}
- else
- return 0;
+ return 0;
}

View file

@ -0,0 +1,13 @@
$NetBSD: patch-bb,v 1.1 2007/03/24 14:01:30 markd Exp $
--- buildtools/lib/parsers/qmake/tests/viewer.cpp.orig 2007-01-26 04:42:02.000000000 +1300
+++ buildtools/lib/parsers/qmake/tests/viewer.cpp
@@ -78,7 +78,7 @@ void Viewer::files_currentChanged(QListB
source->setText(str.read());
f.close();
- int result = QMake::Driver::parseFile(item->text().ascii(), &projectAST);
+ int result = QMake::Driver::parseFile(item->text().ascii(), &projectAST, 0);
if (projectAST && (result == 0))
{
processAST(projectAST);

View file

@ -0,0 +1,150 @@
$NetBSD: patch-bc,v 1.1 2007/03/24 14:01:30 markd Exp $
--- buildtools/lib/parsers/qmake/location.hh.orig 2007-03-22 00:44:35.000000000 +1200
+++ buildtools/lib/parsers/qmake/location.hh
@@ -0,0 +1,145 @@
+/* A Bison parser, made by GNU Bison 2.3. */
+
+/* Locations for Bison parsers in C++
+
+ Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+
+ 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, 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. */
+
+/* As a special exception, you may create a larger work that contains
+ part or all of the Bison parser skeleton and distribute that work
+ under terms of your choice, so long as that work isn't itself a
+ parser generator using the skeleton or a modified version thereof
+ as a parser skeleton. Alternatively, if you modify or redistribute
+ the parser skeleton itself, you may (at your option) remove this
+ special exception, which will cause the skeleton and the resulting
+ Bison output files to be licensed under the GNU General Public
+ License without this special exception.
+
+ This special exception was added by the Free Software Foundation in
+ version 2.2 of Bison. */
+
+/**
+ ** \file location.hh
+ ** Define the QMake::location class.
+ */
+
+#ifndef BISON_LOCATION_HH
+# define BISON_LOCATION_HH
+
+# include <iostream>
+# include <string>
+# include "position.hh"
+
+namespace QMake
+{
+
+ /// Abstract a location.
+ class location
+ {
+ public:
+
+ /// Construct a location.
+ location ()
+ : begin (), end ()
+ {
+ }
+
+
+ /// Initialization.
+ inline void initialize (std::string* fn)
+ {
+ begin.initialize (fn);
+ end = begin;
+ }
+
+ /** \name Line and Column related manipulators
+ ** \{ */
+ public:
+ /// Reset initial location to final location.
+ inline void step ()
+ {
+ begin = end;
+ }
+
+ /// Extend the current location to the COUNT next columns.
+ inline void columns (unsigned int count = 1)
+ {
+ end += count;
+ }
+
+ /// Extend the current location to the COUNT next lines.
+ inline void lines (unsigned int count = 1)
+ {
+ end.lines (count);
+ }
+ /** \} */
+
+
+ public:
+ /// Beginning of the located region.
+ position begin;
+ /// End of the located region.
+ position end;
+ };
+
+ /// Join two location objects to create a location.
+ inline const location operator+ (const location& begin, const location& end)
+ {
+ location res = begin;
+ res.end = end.end;
+ return res;
+ }
+
+ /// Add two location objects.
+ inline const location operator+ (const location& begin, unsigned int width)
+ {
+ location res = begin;
+ res.columns (width);
+ return res;
+ }
+
+ /// Add and assign a location.
+ inline location& operator+= (location& res, unsigned int width)
+ {
+ res.columns (width);
+ return res;
+ }
+
+ /** \brief Intercept output stream redirection.
+ ** \param ostr the destination output stream
+ ** \param loc a reference to the location to redirect
+ **
+ ** Avoid duplicate information.
+ */
+ inline std::ostream& operator<< (std::ostream& ostr, const location& loc)
+ {
+ position last = loc.end - 1;
+ ostr << loc.begin;
+ if (last.filename
+ && (!loc.begin.filename
+ || *loc.begin.filename != *last.filename))
+ ostr << '-' << last;
+ else if (loc.begin.line != last.line)
+ ostr << '-' << last.line << '.' << last.column;
+ else if (loc.begin.column != last.column)
+ ostr << '-' << last.column;
+ return ostr;
+ }
+
+}
+
+#endif // not BISON_LOCATION_HH

View file

@ -0,0 +1,36 @@
$NetBSD: patch-bd,v 1.1 2007/03/24 14:01:30 markd Exp $
--- buildtools/lib/parsers/qmake/Makefile.am.orig 2007-01-26 04:42:02.000000000 +1300
+++ buildtools/lib/parsers/qmake/Makefile.am
@@ -10,22 +10,20 @@ INCLUDES = -I$(top_srcdir)/lib/interface
METASOURCES = AUTO
lib_LTLIBRARIES = libkdevqmakeparser.la
libkdevqmakeparser_la_LDFLAGS = -no-undefined $(all_libraries) $(LIB_KIO)
-libkdevqmakeparser_la_SOURCES = qmakeast.cpp qmakedriver.cpp qmake_yacc.cpp \
- qmakeastvisitor.cpp
+libkdevqmakeparser_la_SOURCES = qmake_lex.cpp qmake_yacc.cpp qmakeast.cpp \
+ qmakeastvisitor.cpp qmakedriver.cpp
kdevelopbuildtoolsincludedir = $(includedir)/kdevelop/buildtools/parsers/qmake
kdevelopbuildtoolsinclude_HEADERS = qmakeast.h qmakedriver.h qmakeastvisitor.h
parser:
cd $(srcdir) ; \
- bison -d qmake.yy -o qmake_yacc.cpp ; \
- mv -f qmake_yacc.hpp qmake_yacc.h ; \
+ bison -d qmake.yy -oqmake_yacc.cpp ; \
flex -oqmake_lex.cpp qmake.ll
parser_dbg:
cd $(srcdir) ; \
- bison -d qmake.yy -r all -k -t -o qmake_yacc.cpp ; \
- mv -f qmake_yacc.hpp qmake_yacc.h ; \
+ bison -d qmake.yy -r all -k -t -oqmake_yacc.cpp ; \
flex -d -oqmake_lex.cpp qmake.ll
EXTRA_DIST = qmake.yy qmake.ll
@@ -35,3 +33,4 @@ DOXYGEN_PROJECTNAME = KDevelop QMake par
DOXYGEN_DOCDIRPREFIX = kdevparser
include ../../../../Doxyfile.am
+noinst_HEADERS = qmake_lex.h

View file

@ -0,0 +1,147 @@
$NetBSD: patch-be,v 1.1 2007/03/24 14:01:30 markd Exp $
--- buildtools/lib/parsers/qmake/position.hh.orig 2007-03-22 00:44:35.000000000 +1200
+++ buildtools/lib/parsers/qmake/position.hh
@@ -0,0 +1,142 @@
+/* A Bison parser, made by GNU Bison 2.3. */
+
+/* Positions for Bison parsers in C++
+
+ Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+
+ 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, 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. */
+
+/* As a special exception, you may create a larger work that contains
+ part or all of the Bison parser skeleton and distribute that work
+ under terms of your choice, so long as that work isn't itself a
+ parser generator using the skeleton or a modified version thereof
+ as a parser skeleton. Alternatively, if you modify or redistribute
+ the parser skeleton itself, you may (at your option) remove this
+ special exception, which will cause the skeleton and the resulting
+ Bison output files to be licensed under the GNU General Public
+ License without this special exception.
+
+ This special exception was added by the Free Software Foundation in
+ version 2.2 of Bison. */
+
+/**
+ ** \file position.hh
+ ** Define the QMake::position class.
+ */
+
+#ifndef BISON_POSITION_HH
+# define BISON_POSITION_HH
+
+# include <iostream>
+# include <string>
+
+namespace QMake
+{
+ /// Abstract a position.
+ class position
+ {
+ public:
+
+ /// Construct a position.
+ position ()
+ : filename (0), line (1), column (0)
+ {
+ }
+
+
+ /// Initialization.
+ inline void initialize (std::string* fn)
+ {
+ filename = fn;
+ line = 1;
+ column = 0;
+ }
+
+ /** \name Line and Column related manipulators
+ ** \{ */
+ public:
+ /// (line related) Advance to the COUNT next lines.
+ inline void lines (int count = 1)
+ {
+ column = 0;
+ line += count;
+ }
+
+ /// (column related) Advance to the COUNT next columns.
+ inline void columns (int count = 1)
+ {
+ int leftmost = 0;
+ int current = column;
+ if (leftmost <= current + count)
+ column += count;
+ else
+ column = 0;
+ }
+ /** \} */
+
+ public:
+ /// File name to which this position refers.
+ std::string* filename;
+ /// Current line number.
+ unsigned int line;
+ /// Current column number.
+ unsigned int column;
+ };
+
+ /// Add and assign a position.
+ inline const position&
+ operator+= (position& res, const int width)
+ {
+ res.columns (width);
+ return res;
+ }
+
+ /// Add two position objects.
+ inline const position
+ operator+ (const position& begin, const int width)
+ {
+ position res = begin;
+ return res += width;
+ }
+
+ /// Add and assign a position.
+ inline const position&
+ operator-= (position& res, const int width)
+ {
+ return res += -width;
+ }
+
+ /// Add two position objects.
+ inline const position
+ operator- (const position& begin, const int width)
+ {
+ return begin + -width;
+ }
+
+ /** \brief Intercept output stream redirection.
+ ** \param ostr the destination output stream
+ ** \param pos a reference to the position to redirect
+ */
+ inline std::ostream&
+ operator<< (std::ostream& ostr, const position& pos)
+ {
+ if (pos.filename)
+ ostr << *pos.filename << ':';
+ return ostr << pos.line << '.' << pos.column;
+ }
+
+}
+#endif // not BISON_POSITION_HH

View file

@ -0,0 +1,94 @@
$NetBSD: patch-bf,v 1.1 2007/03/24 14:01:30 markd Exp $
--- buildtools/lib/parsers/qmake/qmakedriver.cpp.orig 2007-01-26 04:42:02.000000000 +1300
+++ buildtools/lib/parsers/qmake/qmakedriver.cpp
@@ -20,57 +20,67 @@
#include "qmakedriver.h"
#include "qmakeast.h"
-#include <stdio.h>
#include <qvaluestack.h>
#include <kio/netaccess.h>
-extern FILE *yyin, *yyout;
-extern int yyparse();
-extern int yydebug;
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-extern YY_BUFFER_STATE yy_scan_string(const char*);
-extern void yy_delete_buffer(YY_BUFFER_STATE);
-extern QValueStack<QMake::ProjectAST *> projects;
+#include <iostream>
+#include <fstream>
+#include <sstream>
+
+#include "qmake_lex.h"
+#include "qmake_yacc.hpp"
namespace QMake {
-int Driver::parseFile(const char *fileName, ProjectAST **ast)
+int Driver::parseFile(const char *fileName, ProjectAST **ast, int debug)
{
- yyin = fopen(fileName, "r");
- if (yyin == 0)
+ std::ifstream inf( fileName, std::ios::in );
+ if ( !inf.is_open() )
{
*ast = 0;
return 1;
}
// yydebug = 1;
- int ret = yyparse();
- *ast = projects.top();
+ Lexer l(&inf);
+ l.set_debug(debug);
+ int depth = 0;
+ QValueStack<ProjectAST*> stack;
+ Parser p(&l, stack, depth);
+ p.set_debug_level(debug);
+ int ret = p.parse();
+ *ast = stack.top();
(*ast)->setFileName(fileName);
return ret;
}
-int Driver::parseFile(QString fileName, ProjectAST **ast)
+int Driver::parseFile(QString fileName, ProjectAST **ast, int debug)
{
- return parseFile(fileName.ascii(), ast);
+ return parseFile(fileName.ascii(), ast, debug);
}
-int Driver::parseFile(KURL fileName, ProjectAST **ast)
+int Driver::parseFile(KURL fileName, ProjectAST **ast, int debug)
{
QString tmpFile;
int ret = 0;
if (KIO::NetAccess::download(fileName, tmpFile, 0))
- ret = parseFile(tmpFile, ast);
+ ret = parseFile(tmpFile, ast, debug);
KIO::NetAccess::removeTempFile(tmpFile);
return ret;
}
-int Driver::parseString( const char* string, ProjectAST **ast )
+int Driver::parseString( const char* string, ProjectAST **ast, int debug )
{
- YY_BUFFER_STATE state = yy_scan_string( string );
- int ret = yyparse();
- *ast = projects.top();
+ std::istringstream ins;
+ ins.str(string);
+ Lexer l(&ins);
+ l.set_debug(debug);
+ int depth = 0;
+ QValueStack<ProjectAST*> stack;
+ Parser p(&l, stack, depth);
+ p.set_debug_level(debug);
+ int ret = p.parse();
+ *ast = stack.top();
(*ast)->setFileName("");
- yy_delete_buffer( state );
return ret;
}

View file

@ -0,0 +1,49 @@
$NetBSD: patch-bg,v 1.1 2007/03/24 14:01:30 markd Exp $
--- buildtools/lib/parsers/qmake/qmakedriver.h.orig 2007-01-26 04:42:02.000000000 +1300
+++ buildtools/lib/parsers/qmake/qmakedriver.h
@@ -20,10 +20,8 @@
#ifndef QMAKEQMAKEDRIVER_H
#define QMAKEQMAKEDRIVER_H
-#include "qmakeast.h"
-
-#include <qvaluelist.h>
-#include <kurl.h>
+class QString;
+class KURL;
namespace QMake {
@@ -45,26 +43,11 @@ public:
initialize it on its own.
@return The result of parsing. Result is 0 on success and <> 0 on failure.
*/
- static int parseFile(const char *fileName, ProjectAST **ast);
- static int parseFile(QString fileName, ProjectAST **ast);
- static int parseFile(KURL fileName, ProjectAST **ast);
- static int parseString(const char* string, ProjectAST **ast);
-
-/* template<class Op>
- static void walkAST(Op &op, const ProjectAST *ast)
- {
-// op(ast);
- for (QValueList<QMake::AST*>::const_iterator it = ast->statements.constBegin();
- it != ast->statements.constEnd(); ++it)
- {
- const AST *child = *it;
- if (child->nodeType() == AST::ProjectAST)
- walkAST<Op>(op, static_cast<const QMake::ProjectAST*>(child));
- else
- op(child);
- }
- }
-*/
+ static int parseFile(const char *fileName, ProjectAST **ast, int debug);
+ static int parseFile(QString fileName, ProjectAST **ast, int debug);
+ static int parseFile(KURL fileName, ProjectAST **ast, int debug);
+ static int parseString(const char* string, ProjectAST **ast, int debug);
+
};
}

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,50 @@
$NetBSD: patch-bi,v 1.1 2007/03/24 14:01:31 markd Exp $
--- buildtools/lib/parsers/qmake/qmake_lex.h.orig 2007-03-22 00:44:35.000000000 +1200
+++ buildtools/lib/parsers/qmake/qmake_lex.h
@@ -0,0 +1,45 @@
+/* KDevelop QMake Support
+ *
+ * Copyright 2007 Andreas Pakulat <apaku@gmx.de>
+ *
+ * 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.
+ */
+#ifndef QMAKE_LEX_H
+#define QMAKE_LEX_H
+
+#include "qmake_yacc.hpp"
+#include <iostream>
+
+#ifndef DONT_INCLUDE_FLEXLEXER
+#include "FlexLexer.h"
+#endif
+
+namespace QMake
+{
+ class Lexer : public yyFlexLexer
+ {
+ public:
+ Lexer( std::istream* argin = 0, std::ostream* argout = 0 );
+ int yylex( QMake::Parser::semantic_type* yylval );
+ int yylex();
+ private:
+ QMake::Parser::semantic_type* mylval;
+ };
+}
+
+#endif
+
+// kate: space-indent on; indent-width 4; tab-width: 4; replace-tabs on; auto-insert-doxygen on

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,108 @@
$NetBSD: patch-bk,v 1.1 2007/03/24 14:01:31 markd Exp $
--- buildtools/lib/parsers/qmake/qmake_yacc.h.orig 2007-01-26 04:42:02.000000000 +1300
+++ buildtools/lib/parsers/qmake/qmake_yacc.h
@@ -1,103 +0,0 @@
-/* A Bison parser, made by GNU Bison 2.3. */
-
-/* Skeleton interface for Bison's Yacc-like parsers in C
-
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
-
- 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, 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. */
-
-/* As a special exception, you may create a larger work that contains
- part or all of the Bison parser skeleton and distribute that work
- under terms of your choice, so long as that work isn't itself a
- parser generator using the skeleton or a modified version thereof
- as a parser skeleton. Alternatively, if you modify or redistribute
- the parser skeleton itself, you may (at your option) remove this
- special exception, which will cause the skeleton and the resulting
- Bison output files to be licensed under the GNU General Public
- License without this special exception.
-
- This special exception was added by the Free Software Foundation in
- version 2.2 of Bison. */
-
-/* Tokens. */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
- /* Put the tokens into the symbol table, so that GDB and other debuggers
- know about them. */
- enum yytokentype {
- ID_SIMPLE = 258,
- EQ = 259,
- PLUSEQ = 260,
- MINUSQE = 261,
- STAREQ = 262,
- TILDEEQ = 263,
- LBRACE = 264,
- RBRACE = 265,
- COLON = 266,
- NUMSIGN = 267,
- NEWLINE = 268,
- NUMBER = 269,
- COMMENT = 270,
- CONT = 271,
- RCURLY = 272,
- LCURLY = 273,
- ID_ARGS = 274,
- LIST_COMMENT = 275,
- LIST_COMMENT_WITHOUT_NEWLINE = 276,
- QUOTED_VARIABLE_VALUE = 277,
- VARIABLE_VALUE = 278,
- INDENT = 279,
- LIST_WS = 280
- };
-#endif
-/* Tokens. */
-#define ID_SIMPLE 258
-#define EQ 259
-#define PLUSEQ 260
-#define MINUSQE 261
-#define STAREQ 262
-#define TILDEEQ 263
-#define LBRACE 264
-#define RBRACE 265
-#define COLON 266
-#define NUMSIGN 267
-#define NEWLINE 268
-#define NUMBER 269
-#define COMMENT 270
-#define CONT 271
-#define RCURLY 272
-#define LCURLY 273
-#define ID_ARGS 274
-#define LIST_COMMENT 275
-#define LIST_COMMENT_WITHOUT_NEWLINE 276
-#define QUOTED_VARIABLE_VALUE 277
-#define VARIABLE_VALUE 278
-#define INDENT 279
-#define LIST_WS 280
-
-
-
-
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef int YYSTYPE;
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
-#endif
-
-extern YYSTYPE yylval;
-

View file

@ -0,0 +1,426 @@
$NetBSD: patch-bl,v 1.1 2007/03/24 14:01:31 markd Exp $
--- buildtools/lib/parsers/qmake/qmake_yacc.hpp.orig 2007-03-22 00:44:35.000000000 +1200
+++ buildtools/lib/parsers/qmake/qmake_yacc.hpp
@@ -0,0 +1,421 @@
+/* A Bison parser, made by GNU Bison 2.3. */
+
+/* Skeleton interface for Bison LALR(1) parsers in C++
+
+ Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+
+ 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, 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. */
+
+/* As a special exception, you may create a larger work that contains
+ part or all of the Bison parser skeleton and distribute that work
+ under terms of your choice, so long as that work isn't itself a
+ parser generator using the skeleton or a modified version thereof
+ as a parser skeleton. Alternatively, if you modify or redistribute
+ the parser skeleton itself, you may (at your option) remove this
+ special exception, which will cause the skeleton and the resulting
+ Bison output files to be licensed under the GNU General Public
+ License without this special exception.
+
+ This special exception was added by the Free Software Foundation in
+ version 2.2 of Bison. */
+
+/* C++ LALR(1) parser skeleton written by Akim Demaille. */
+
+#ifndef PARSER_HEADER_H
+# define PARSER_HEADER_H
+
+#include <string>
+#include <iostream>
+#include "stack.hh"
+
+namespace QMake
+{
+ class position;
+ class location;
+}
+
+/* First part of user declarations. */
+#line 1 "qmake.yy"
+
+/***************************************************************************
+ * Copyright (C) 2005 by Alexander Dymo *
+ * adymo@kdevelop.org *
+ * Copyright (C) 2006 by Andreas Pakulat *
+ * apaku@gmx.de *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU Library 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 Library General Public *
+ * License along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+
+/**
+@file qmake.yy
+QMake Parser
+
+Simple LALR parser which builds the syntax tree (see @ref QMake::AST).
+
+@todo Recognize comments after statements like:
+SOURCES = foo #regognize me
+
+@fixme Parser fails on files that do not end with a newline
+@fixme 1 shift/reduce conflict in "line_body" rule
+*/
+
+#include <qvaluestack.h>
+#include "qmakeast.h"
+#include <qregexp.h>
+
+#define YYSTYPE_IS_DECLARED
+
+namespace QMake
+{
+ class Lexer;
+
+/**
+The yylval type.
+*/
+struct Result {
+ Result(): node(0) {}
+
+ /**Type of semantic value for simple grammar rules.*/
+ QString value;
+ /**Type of semantic value for grammar rules which are parts of AST.*/
+ AST *node;
+ /**Type of semantic value for "multiline_values" grammar rule.
+ Each line of multiline value is stored as a string in the list.
+
+ For example we have in .pro file:
+ @code
+ SOURCE = foo1.cpp \
+ foo2.cpp \
+ foo3.cpp foo4.cpp
+ @endcode
+ The string list will be populated with three strings:
+ <pre>
+ foo1.cpp
+ foo2.cpp
+ foo3.cpp foo4.cpp
+ </pre>
+ */
+ QStringList values;
+ QString indent;
+};
+
+#define YYSTYPE Result
+typedef Result YYSTYPE;
+}
+
+extern int QMakelex( QMake::Result* yylval, QMake::Lexer* lexer );
+
+/**
+The stack to store ProjectAST pointers when a new child
+ProjectAST is created and filled with statements.
+
+Parser creates root ProjectAST for a .pro file, pushes it onto the stack and starts
+adding statements. Each statement is added as a child StatementAST to the ProjectAST
+currently on the top in the stack.
+
+When a scope or function scope statement is parsed, the child ProjectAST is created
+and pushed onto the stack. Therefore all statements which belong to the scope
+or function scope are added as childs to their direct parent (scope or function scope).
+*/
+//QValueStack<ProjectAST*> projects;
+
+/**
+The current depth of AST node is stored here.
+AST depth is important to know because automatic indentation can
+be easily implemented (the parser itself looses all information
+about indentation).
+*/
+// int depth = 0;
+
+/*
+To debug this parser, put the line below into the next bison file section.
+Don't forget to uncomment "yydebug = 1" line in qmakedriver.cpp.
+%debug
+*/
+
+
+/* Line 35 of lalr1.cc. */
+#line 165 "qmake_yacc.hpp"
+
+#include "location.hh"
+
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages. */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table. */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+ If N is 0, then set CURRENT to the empty location which ends
+ the previous symbol: RHS[0] (always defined). */
+
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N) \
+do { \
+ if (N) \
+ { \
+ (Current).begin = (Rhs)[1].begin; \
+ (Current).end = (Rhs)[N].end; \
+ } \
+ else \
+ { \
+ (Current).begin = (Current).end = (Rhs)[0].end; \
+ } \
+} while (false)
+#endif
+
+namespace QMake
+{
+
+ /// A Bison parser.
+ class Parser
+ {
+ public:
+ /// Symbol semantic values.
+#ifndef YYSTYPE
+ typedef int semantic_type;
+#else
+ typedef YYSTYPE semantic_type;
+#endif
+ /// Symbol locations.
+ typedef location location_type;
+ /// Tokens.
+ struct token
+ {
+ /* Tokens. */
+ enum yytokentype {
+ ID_SIMPLE = 258,
+ EQ = 259,
+ PLUSEQ = 260,
+ MINUSEQ = 261,
+ STAREQ = 262,
+ TILDEEQ = 263,
+ LBRACE = 264,
+ RBRACE = 265,
+ COLON = 266,
+ NUMSIGN = 267,
+ NEWLINE = 268,
+ NUMBER = 269,
+ COMMENT = 270,
+ CONT = 271,
+ RCURLY = 272,
+ LCURLY = 273,
+ ID_ARGS = 274,
+ LIST_COMMENT = 275,
+ LIST_COMMENT_WITHOUT_NEWLINE = 276,
+ QUOTED_VARIABLE_VALUE = 277,
+ VARIABLE_VALUE = 278,
+ INDENT = 279,
+ LIST_WS = 280
+ };
+
+ };
+ /// Token type.
+ typedef token::yytokentype token_type;
+
+ /// Build a parser object.
+ Parser (QMake::Lexer* lexer_yyarg, QValueStack<ProjectAST*>& projects_yyarg, int depth_yyarg);
+ virtual ~Parser ();
+
+ /// Parse.
+ /// \returns 0 iff parsing succeeded.
+ virtual int parse ();
+
+ /// The current debugging stream.
+ std::ostream& debug_stream () const;
+ /// Set the current debugging stream.
+ void set_debug_stream (std::ostream &);
+
+ /// Type for debugging levels.
+ typedef int debug_level_type;
+ /// The current debugging level.
+ debug_level_type debug_level () const;
+ /// Set the current debugging level.
+ void set_debug_level (debug_level_type l);
+
+ private:
+ /// Report a syntax error.
+ /// \param loc where the syntax error is found.
+ /// \param msg a description of the syntax error.
+ virtual void error (const location_type& loc, const std::string& msg);
+
+ /// Generate an error message.
+ /// \param state the state where the error occurred.
+ /// \param tok the look-ahead token.
+ virtual std::string yysyntax_error_ (int yystate);
+
+#if YYDEBUG
+ /// \brief Report a symbol value on the debug stream.
+ /// \param yytype The token type.
+ /// \param yyvaluep Its semantic value.
+ /// \param yylocationp Its location.
+ virtual void yy_symbol_value_print_ (int yytype,
+ const semantic_type* yyvaluep,
+ const location_type* yylocationp);
+ /// \brief Report a symbol on the debug stream.
+ /// \param yytype The token type.
+ /// \param yyvaluep Its semantic value.
+ /// \param yylocationp Its location.
+ virtual void yy_symbol_print_ (int yytype,
+ const semantic_type* yyvaluep,
+ const location_type* yylocationp);
+#endif /* ! YYDEBUG */
+
+
+ /// State numbers.
+ typedef int state_type;
+ /// State stack type.
+ typedef stack<state_type> state_stack_type;
+ /// Semantic value stack type.
+ typedef stack<semantic_type> semantic_stack_type;
+ /// location stack type.
+ typedef stack<location_type> location_stack_type;
+
+ /// The state stack.
+ state_stack_type yystate_stack_;
+ /// The semantic value stack.
+ semantic_stack_type yysemantic_stack_;
+ /// The location stack.
+ location_stack_type yylocation_stack_;
+
+ /// Internal symbol numbers.
+ typedef unsigned char token_number_type;
+ /* Tables. */
+ /// For a state, the index in \a yytable_ of its portion.
+ static const signed char yypact_[];
+ static const signed char yypact_ninf_;
+
+ /// For a state, default rule to reduce.
+ /// Unless\a yytable_ specifies something else to do.
+ /// Zero means the default is an error.
+ static const unsigned char yydefact_[];
+
+ static const signed char yypgoto_[];
+ static const signed char yydefgoto_[];
+
+ /// What to do in a state.
+ /// \a yytable_[yypact_[s]]: what to do in state \a s.
+ /// - if positive, shift that token.
+ /// - if negative, reduce the rule which number is the opposite.
+ /// - if zero, do what YYDEFACT says.
+ static const unsigned char yytable_[];
+ static const signed char yytable_ninf_;
+
+ static const unsigned char yycheck_[];
+
+ /// For a state, its accessing symbol.
+ static const unsigned char yystos_[];
+
+ /// For a rule, its LHS.
+ static const unsigned char yyr1_[];
+ /// For a rule, its RHS length.
+ static const unsigned char yyr2_[];
+
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+ /// For a symbol, its name in clear.
+ static const char* const yytname_[];
+#endif
+
+#if YYERROR_VERBOSE
+ /// Convert the symbol name \a n to a form suitable for a diagnostic.
+ virtual std::string yytnamerr_ (const char *n);
+#endif
+
+#if YYDEBUG
+ /// A type to store symbol numbers and -1.
+ typedef signed char rhs_number_type;
+ /// A `-1'-separated list of the rules' RHS.
+ static const rhs_number_type yyrhs_[];
+ /// For each rule, the index of the first RHS symbol in \a yyrhs_.
+ static const unsigned char yyprhs_[];
+ /// For each rule, its source line number.
+ static const unsigned short int yyrline_[];
+ /// For each scanner token number, its symbol number.
+ static const unsigned short int yytoken_number_[];
+ /// Report on the debug stream that the rule \a r is going to be reduced.
+ virtual void yy_reduce_print_ (int r);
+ /// Print the state stack on the debug stream.
+ virtual void yystack_print_ ();
+#endif
+
+ /// Convert a scanner token number \a t to a symbol number.
+ token_number_type yytranslate_ (int t);
+
+ /// \brief Reclaim the memory associated to a symbol.
+ /// \param yymsg Why this token is reclaimed.
+ /// \param yytype The symbol type.
+ /// \param yyvaluep Its semantic value.
+ /// \param yylocationp Its location.
+ inline void yydestruct_ (const char* yymsg,
+ int yytype,
+ semantic_type* yyvaluep,
+ location_type* yylocationp);
+
+ /// Pop \a n symbols the three stacks.
+ inline void yypop_ (unsigned int n = 1);
+
+ /* Constants. */
+ static const int yyeof_;
+ /* LAST_ -- Last index in TABLE_. */
+ static const int yylast_;
+ static const int yynnts_;
+ static const int yyempty_;
+ static const int yyfinal_;
+ static const int yyterror_;
+ static const int yyerrcode_;
+ static const int yyntokens_;
+ static const unsigned int yyuser_token_number_max_;
+ static const token_number_type yyundef_token_;
+
+ /* Debugging. */
+ int yydebug_;
+ std::ostream* yycdebug_;
+
+
+ /* User arguments. */
+ QMake::Lexer* lexer;
+ QValueStack<ProjectAST*>& projects;
+ int depth;
+ };
+}
+
+
+#endif /* ! defined PARSER_HEADER_H */

View file

@ -0,0 +1,101 @@
$NetBSD: patch-bm,v 1.1 2007/03/24 14:01:31 markd Exp $
--- buildtools/lib/parsers/qmake/qmake.yy.orig 2007-01-26 04:42:02.000000000 +1300
+++ buildtools/lib/parsers/qmake/qmake.yy
@@ -2,6 +2,8 @@
/***************************************************************************
* Copyright (C) 2005 by Alexander Dymo *
* adymo@kdevelop.org *
+ * Copyright (C) 2006 by Andreas Pakulat *
+ * apaku@gmx.de *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU Library General Public License as *
@@ -38,7 +40,9 @@ SOURCES = foo #regognize me
#define YYSTYPE_IS_DECLARED
-using namespace QMake;
+namespace QMake
+{
+ class Lexer;
/**
The yylval type.
@@ -70,13 +74,11 @@ struct Result {
QString indent;
};
+#define YYSTYPE Result
typedef Result YYSTYPE;
-
-void yyerror(const char *str) {
- printf("%s\n", str);
}
-int yylex();
+extern int QMakelex( QMake::Result* yylval, QMake::Lexer* lexer );
/**
The stack to store ProjectAST pointers when a new child
@@ -90,7 +92,7 @@ When a scope or function scope statement
and pushed onto the stack. Therefore all statements which belong to the scope
or function scope are added as childs to their direct parent (scope or function scope).
*/
-QValueStack<ProjectAST*> projects;
+//QValueStack<ProjectAST*> projects;
/**
The current depth of AST node is stored here.
@@ -98,7 +100,7 @@ AST depth is important to know because a
be easily implemented (the parser itself looses all information
about indentation).
*/
-int depth = 0;
+// int depth = 0;
/*
To debug this parser, put the line below into the next bison file section.
@@ -107,10 +109,19 @@ Don't forget to uncomment "yydebug = 1"
*/
%}
+%skeleton "lalr1.cc"
+%define "parser_class_name" "Parser"
+%name-prefix="QMake"
+%parse-param { QMake::Lexer* lexer }
+%parse-param { QValueStack<ProjectAST*>& projects }
+%parse-param { int depth }
+%lex-param { QMake::Lexer* lexer }
+%start project
+
%token ID_SIMPLE
%token EQ
%token PLUSEQ
-%token MINUSQE
+%token MINUSEQ
%token STAREQ
%token TILDEEQ
%token LBRACE
@@ -228,7 +239,7 @@ variable_value : VARIABLE_VALUE { $<
| QUOTED_VARIABLE_VALUE { $<value>$ = $<value>1; }
;
-operator : EQ | PLUSEQ | MINUSQE | STAREQ | TILDEEQ
+operator : EQ | PLUSEQ | MINUSEQ | STAREQ | TILDEEQ
;
scope : ID_SIMPLE
@@ -315,4 +326,11 @@ emptyline : NEWLINE
%%
-#include "qmake_lex.cpp"
+
+namespace QMake
+{
+ void Parser::error(const location_type& /*l*/, const std::string& m)
+ {
+ std::cerr << m << std::endl;
+ }
+}

View file

@ -0,0 +1,134 @@
$NetBSD: patch-bn,v 1.1 2007/03/24 14:01:32 markd Exp $
--- buildtools/lib/parsers/qmake/stack.hh.orig 2007-03-22 00:44:35.000000000 +1200
+++ buildtools/lib/parsers/qmake/stack.hh
@@ -0,0 +1,129 @@
+/* A Bison parser, made by GNU Bison 2.3. */
+
+/* Stack handling for Bison parsers in C++
+
+ Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+
+ 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, 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. */
+
+/* As a special exception, you may create a larger work that contains
+ part or all of the Bison parser skeleton and distribute that work
+ under terms of your choice, so long as that work isn't itself a
+ parser generator using the skeleton or a modified version thereof
+ as a parser skeleton. Alternatively, if you modify or redistribute
+ the parser skeleton itself, you may (at your option) remove this
+ special exception, which will cause the skeleton and the resulting
+ Bison output files to be licensed under the GNU General Public
+ License without this special exception.
+
+ This special exception was added by the Free Software Foundation in
+ version 2.2 of Bison. */
+
+#ifndef BISON_STACK_HH
+# define BISON_STACK_HH
+
+#include <deque>
+
+namespace QMake
+{
+ template <class T, class S = std::deque<T> >
+ class stack
+ {
+ public:
+
+ // Hide our reversed order.
+ typedef typename S::reverse_iterator iterator;
+ typedef typename S::const_reverse_iterator const_iterator;
+
+ stack () : seq_ ()
+ {
+ }
+
+ stack (unsigned int n) : seq_ (n)
+ {
+ }
+
+ inline
+ T&
+ operator [] (unsigned int i)
+ {
+ return seq_[i];
+ }
+
+ inline
+ const T&
+ operator [] (unsigned int i) const
+ {
+ return seq_[i];
+ }
+
+ inline
+ void
+ push (const T& t)
+ {
+ seq_.push_front (t);
+ }
+
+ inline
+ void
+ pop (unsigned int n = 1)
+ {
+ for (; n; --n)
+ seq_.pop_front ();
+ }
+
+ inline
+ unsigned int
+ height () const
+ {
+ return seq_.size ();
+ }
+
+ inline const_iterator begin () const { return seq_.rbegin (); }
+ inline const_iterator end () const { return seq_.rend (); }
+
+ private:
+
+ S seq_;
+ };
+
+ /// Present a slice of the top of a stack.
+ template <class T, class S = stack<T> >
+ class slice
+ {
+ public:
+
+ slice (const S& stack,
+ unsigned int range) : stack_ (stack),
+ range_ (range)
+ {
+ }
+
+ inline
+ const T&
+ operator [] (unsigned int i) const
+ {
+ return stack_[range_ - i];
+ }
+
+ private:
+
+ const S& stack_;
+ unsigned int range_;
+ };
+}
+
+#endif // not BISON_STACK_HH

View file

@ -0,0 +1,13 @@
$NetBSD: patch-bo,v 1.1 2007/03/24 14:01:32 markd Exp $
--- buildtools/qmake/scope.cpp.orig 2007-01-26 04:42:06.000000000 +1300
+++ buildtools/qmake/scope.cpp
@@ -147,7 +147,7 @@ Scope::Scope( unsigned int num, Scope* p
bool Scope::loadFromFile( const QString& filename )
{
- if ( !QFileInfo(filename).exists() || QMake::Driver::parseFile( filename, &m_root ) != 0 )
+ if ( !QFileInfo(filename).exists() || QMake::Driver::parseFile( filename, &m_root, 0 ) != 0 )
{
kdDebug( 9024 ) << "Couldn't parse project: " << filename << endl;
m_root = 0;

View file

@ -0,0 +1,225 @@
$NetBSD: patch-bp,v 1.1 2007/03/24 14:01:32 markd Exp $
--- buildtools/lib/parsers/qmake/qmake.ll.orig 2007-01-26 04:42:02.000000000 +1300
+++ buildtools/lib/parsers/qmake/qmake.ll
@@ -19,9 +19,12 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#include <qmake_yacc.h>
#include <stdlib.h>
+#define DONT_INCLUDE_FLEXLEXER
+
+#include "qmake_lex.h"
+
/**
@file qmake.ll
QMake Lexer
@@ -48,6 +51,9 @@ To debug this lexer, put the line below
%}
%option noyywrap
+%option yylineno
+%option c++
+%option yyclass="QMake::Lexer"
%x list
%x list_with_comment
@@ -55,69 +61,160 @@ To debug this lexer, put the line below
delim [ \t]
ws {delim}+
-begin_ws ^{delim}+[^\n\t ]
+begin_ws ^{delim}+[^\r\n\t ]
quote "\""
-var_value [^\n\t ]*[^\n\t \\]
+var_value [^\r\n\t ]*[^\r\n\t \\]
quoted_var_value {quote}({var_value}|[\t ])({var_value}|[\t ])*{quote}
letter [A-Za-z]
digit [0-9]
id_simple ({digit}|{letter}|\!|-|_|\*|\$)({letter}|{digit}|\||\!|-|_|\*|\$|\.|\+|\-)*
-id_args [^\n]*\)
+id_args [^\r\n]*\)
number {digit}+
comment #.*
-comment_cont {ws}*#.*\n
+comment_cont {ws}*#.*(\n|\r|\r\n)
comment_cont_nn {ws}*#.*
-cont \\{ws}*\n
+cont \\{ws}*(\n|\r|\r\n)
%%
-<INITIAL>{ws} {}
-<list,list_with_comment>{ws} { yylval.value = yytext; return LIST_WS; }
-<list,list_with_comment>{begin_ws} {
- yylval.value = yytext;
- unput(char(yylval.value.at(yylval.value.length()-1).latin1()));
- yylval.value = yylval.value.mid(0, yylval.value.length()-1);
- return INDENT;
+<INITIAL>{ws} {}
+
+<list,list_with_comment>{ws} {
+ mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ return Parser::token::token::LIST_WS;
}
-<list,list_with_comment,INITIAL>{cont} { BEGIN(list); return CONT; }
-{id_simple} { yylval.value = yytext; return (ID_SIMPLE); }
+<list,list_with_comment>{begin_ws} {
+ mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ unput(char(mylval->value.at(mylval->value.length()-1).latin1()));
+ mylval->value = mylval->value.mid(0, mylval->value.length()-1);
+ return Parser::token::token::INDENT;
+}
+
+<list,list_with_comment,INITIAL>{cont} {
+ BEGIN(list);
+ return Parser::token::token::CONT;
+}
+{id_simple} {
+ mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ return (Parser::token::token::ID_SIMPLE);
+}
<list_with_comment>{comment_cont_nn} {
- yylval.value = yytext;
+ mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
BEGIN(list);
- return (LIST_COMMENT_WITHOUT_NEWLINE);
+ return (Parser::token::token::LIST_COMMENT_WITHOUT_NEWLINE);
}
<list>{comment_cont} {
- yylval.value = yytext;
+ mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
BEGIN(list);
- return (LIST_COMMENT);
+ return (Parser::token::token::LIST_COMMENT);
}
<funcargs>{id_args} {
- yylval.value = yytext;
- yylval.value = yylval.value.mid(0, yylval.value.length()-1);
+ mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ mylval->value = mylval->value.mid(0, mylval->value.length()-1);
unput(')');
BEGIN(INITIAL);
- return (ID_ARGS);
+ return (Parser::token::token::ID_ARGS);
}
-<list,list_with_comment>{var_value} { BEGIN(list_with_comment); yylval.value = yytext; return VARIABLE_VALUE; }
-<list,list_with_comment>{quoted_var_value} { BEGIN(list_with_comment); yylval.value = yytext; return QUOTED_VARIABLE_VALUE; }
+<list,list_with_comment>{var_value} {
+ BEGIN(list_with_comment);
+ mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ return Parser::token::token::VARIABLE_VALUE;
+}
+
+<list,list_with_comment>{quoted_var_value} {
+ BEGIN(list_with_comment);
+ mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ return Parser::token::token::QUOTED_VARIABLE_VALUE;
+}
+
+"=" {
+BEGIN(list);
+mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+return Parser::token::token::EQ;
+}
+
+"+=" {
+ BEGIN(list);
+ mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ return Parser::token::token::PLUSEQ;
+}
+
+"-=" {
+ BEGIN(list);
+ mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ return Parser::token::token::MINUSEQ;
+}
+
+"*=" {
+ BEGIN(list);
+ mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ return Parser::token::token::STAREQ;
+}
+
+"~=" {
+ BEGIN(list);
+ mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ return Parser::token::token::TILDEEQ;
+}
+
+"{" {
+ return Parser::token::token::LCURLY;
+}
+
+":"{delim}*"{" {
+ return Parser::token::token::LCURLY;
+}
+
+"}" {
+ return Parser::token::token::RCURLY;
+}
+
+"(" {
+ BEGIN(funcargs);
+ return Parser::token::token::LBRACE;
+}
+
+<funcargs,INITIAL>")" {
+ BEGIN(INITIAL);
+ return Parser::token::token::RBRACE;
+}
+
+":" {
+ mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ return Parser::token::token::COLON;
+}
-"=" { BEGIN(list); yylval.value = yytext; return EQ; }
-"+=" { BEGIN(list); yylval.value = yytext; return PLUSEQ; }
-"-=" { BEGIN(list); yylval.value = yytext; return MINUSQE; }
-"*=" { BEGIN(list); yylval.value = yytext; return STAREQ; }
-"~=" { BEGIN(list); yylval.value = yytext; return TILDEEQ; }
-"{" { return LCURLY; }
-":"{delim}*"{" { return LCURLY; }
-"}" { return RCURLY; }
-"(" { BEGIN(funcargs); return LBRACE; }
-<funcargs,INITIAL>")" { BEGIN(INITIAL); return RBRACE; }
-":" { yylval.value = yytext; return COLON; }
-<list,list_with_comment,INITIAL>"\n" { BEGIN(INITIAL); return NEWLINE; }
+<list,list_with_comment,INITIAL>"\n" {
+ BEGIN(INITIAL);
+ return Parser::token::token::NEWLINE;
+}
-{comment} { yylval.value = yytext; return (COMMENT); }
+{comment} {
+ mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ return (Parser::token::token::COMMENT);
+}
%%
+namespace QMake
+{
+ Lexer::Lexer( std::istream* argin, std::ostream* argout )
+ : yyFlexLexer(argin, argout), mylval(0)
+ {
+ }
+
+ int Lexer::yylex( QMake::Parser::semantic_type* yylval )
+ {
+ mylval = yylval;
+ return yylex();
+ }
+}
+
+int QMakelex( QMake::Parser::semantic_type* yylval, QMake::Lexer* lexer)
+{
+ return lexer->yylex( yylval );
+}
+

View file

@ -0,0 +1,50 @@
$NetBSD: patch-bq,v 1.1 2007/03/24 14:01:32 markd Exp $
--- buildtools/lib/parsers/qmake/Makefile.in.orig 2007-01-26 04:48:03.000000000 +1300
+++ buildtools/lib/parsers/qmake/Makefile.in
@@ -70,13 +70,13 @@ am__installdirs = "$(DESTDIR)$(libdir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libkdevqmakeparser_la_LIBADD =
-am_libkdevqmakeparser_la_OBJECTS = qmakeast.lo qmakedriver.lo \
- qmake_yacc.lo qmakeastvisitor.lo
+am_libkdevqmakeparser_la_OBJECTS = qmake_lex.lo qmake_yacc.lo qmakeast.lo \
+ qmakeastvisitor.lo qmakedriver.lo
#>- libkdevqmakeparser_la_OBJECTS = $(am_libkdevqmakeparser_la_OBJECTS)
#>+ 5
libkdevqmakeparser_la_final_OBJECTS = libkdevqmakeparser_la.all_cpp.lo
-libkdevqmakeparser_la_nofinal_OBJECTS = qmakeast.lo qmakedriver.lo \
- qmake_yacc.lo qmakeastvisitor.lo
+libkdevqmakeparser_la_nofinal_OBJECTS = qmake_lex.lo qmake_yacc.lo qmakeast.lo \
+ qmakeastvisitor.lo qmakedriver.lo
@KDE_USE_FINAL_FALSE@libkdevqmakeparser_la_OBJECTS = $(libkdevqmakeparser_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE@libkdevqmakeparser_la_OBJECTS = $(libkdevqmakeparser_la_final_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -420,8 +420,8 @@ lib_LTLIBRARIES = libkdevqmakeparser.la
#>- libkdevqmakeparser_la_LDFLAGS = -no-undefined $(all_libraries) $(LIB_KIO)
#>+ 1
libkdevqmakeparser_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries) $(LIB_KIO)
-libkdevqmakeparser_la_SOURCES = qmakeast.cpp qmakedriver.cpp qmake_yacc.cpp \
- qmakeastvisitor.cpp
+libkdevqmakeparser_la_SOURCES = qmake_lex.cpp qmake_yacc.cpp qmakeast.cpp \
+ qmakeastvisitor.cpp qmakedriver.cpp
kdevelopbuildtoolsincludedir = $(includedir)/kdevelop/buildtools/parsers/qmake
kdevelopbuildtoolsinclude_HEADERS = qmakeast.h qmakedriver.h qmakeastvisitor.h
@@ -753,14 +753,12 @@ uninstall-am: uninstall-info-am \
parser:
cd $(srcdir) ; \
- bison -d qmake.yy -o qmake_yacc.cpp ; \
- mv -f qmake_yacc.hpp qmake_yacc.h ; \
+ bison -d qmake.yy -oqmake_yacc.cpp ; \
flex -oqmake_lex.cpp qmake.ll
parser_dbg:
cd $(srcdir) ; \
- bison -d qmake.yy -r all -k -t -o qmake_yacc.cpp ; \
- mv -f qmake_yacc.hpp qmake_yacc.h ; \
+ bison -d qmake.yy -r all -k -t -oqmake_yacc.cpp ; \
flex -d -oqmake_lex.cpp qmake.ll
apidox-am-yes:
@if test -z "$(DOXYGEN_EMPTY)"; then \

View file

@ -0,0 +1,210 @@
$NetBSD: patch-br,v 1.1 2007/03/24 14:01:32 markd Exp $
--- buildtools/lib/parsers/qmake/FlexLexer.h.orig 2007-03-24 23:25:01.000000000 +1200
+++ buildtools/lib/parsers/qmake/FlexLexer.h
@@ -0,0 +1,205 @@
+
+// -*-C++-*-
+// FlexLexer.h -- define interfaces for lexical analyzer classes generated
+// by flex
+
+// Copyright (c) 1993 The Regents of the University of California.
+// All rights reserved.
+//
+// This code is derived from software contributed to Berkeley by
+// Kent Williams and Tom Epperly.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+
+// Neither the name of the University nor the names of its contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
+
+// THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE.
+
+// This file defines FlexLexer, an abstract class which specifies the
+// external interface provided to flex C++ lexer objects, and yyFlexLexer,
+// which defines a particular lexer class.
+//
+// If you want to create multiple lexer classes, you use the -P flag
+// to rename each yyFlexLexer to some other xxFlexLexer. You then
+// include <FlexLexer.h> in your other sources once per lexer class:
+//
+// #undef yyFlexLexer
+// #define yyFlexLexer xxFlexLexer
+// #include <FlexLexer.h>
+//
+// #undef yyFlexLexer
+// #define yyFlexLexer zzFlexLexer
+// #include <FlexLexer.h>
+// ...
+
+#ifndef __FLEX_LEXER_H
+// Never included before - need to define base class.
+#define __FLEX_LEXER_H
+
+#include <iostream>
+# ifndef FLEX_STD
+# define FLEX_STD std::
+# endif
+
+extern "C++" {
+
+struct yy_buffer_state;
+typedef int yy_state_type;
+
+class FlexLexer {
+public:
+ virtual ~FlexLexer() { }
+
+ const char* YYText() const { return yytext; }
+ int YYLeng() const { return yyleng; }
+
+ virtual void
+ yy_switch_to_buffer( struct yy_buffer_state* new_buffer ) = 0;
+ virtual struct yy_buffer_state*
+ yy_create_buffer( FLEX_STD istream* s, int size ) = 0;
+ virtual void yy_delete_buffer( struct yy_buffer_state* b ) = 0;
+ virtual void yyrestart( FLEX_STD istream* s ) = 0;
+
+ virtual int yylex() = 0;
+
+ // Call yylex with new input/output sources.
+ int yylex( FLEX_STD istream* new_in, FLEX_STD ostream* new_out = 0 )
+ {
+ switch_streams( new_in, new_out );
+ return yylex();
+ }
+
+ // Switch to new input/output streams. A nil stream pointer
+ // indicates "keep the current one".
+ virtual void switch_streams( FLEX_STD istream* new_in = 0,
+ FLEX_STD ostream* new_out = 0 ) = 0;
+
+ int lineno() const { return yylineno; }
+
+ int debug() const { return yy_flex_debug; }
+ void set_debug( int flag ) { yy_flex_debug = flag; }
+
+protected:
+ char* yytext;
+ int yyleng;
+ int yylineno; // only maintained if you use %option yylineno
+ int yy_flex_debug; // only has effect with -d or "%option debug"
+};
+
+}
+#endif
+
+#if defined(yyFlexLexer) || ! defined(yyFlexLexerOnce)
+// Either this is the first time through (yyFlexLexerOnce not defined),
+// or this is a repeated include to define a different flavor of
+// yyFlexLexer, as discussed in the flex man page.
+#define yyFlexLexerOnce
+
+extern "C++" {
+
+class yyFlexLexer : public FlexLexer {
+public:
+ // arg_yyin and arg_yyout default to the cin and cout, but we
+ // only make that assignment when initializing in yylex().
+ yyFlexLexer( FLEX_STD istream* arg_yyin = 0, FLEX_STD ostream* arg_yyout = 0 );
+
+ virtual ~yyFlexLexer();
+
+ void yy_switch_to_buffer( struct yy_buffer_state* new_buffer );
+ struct yy_buffer_state* yy_create_buffer( FLEX_STD istream* s, int size );
+ void yy_delete_buffer( struct yy_buffer_state* b );
+ void yyrestart( FLEX_STD istream* s );
+
+ void yypush_buffer_state( struct yy_buffer_state* new_buffer );
+ void yypop_buffer_state(void);
+
+ virtual int yylex();
+ virtual void switch_streams( FLEX_STD istream* new_in, FLEX_STD ostream* new_out );
+
+protected:
+ virtual int LexerInput( char* buf, int max_size );
+ virtual void LexerOutput( const char* buf, int size );
+ virtual void LexerError( const char* msg );
+
+ void yyunput( int c, char* buf_ptr );
+ int yyinput();
+
+ void yy_load_buffer_state();
+ void yy_init_buffer( struct yy_buffer_state* b, FLEX_STD istream* s );
+ void yy_flush_buffer( struct yy_buffer_state* b );
+
+ int yy_start_stack_ptr;
+ int yy_start_stack_depth;
+ int* yy_start_stack;
+
+ void yy_push_state( int new_state );
+ void yy_pop_state();
+ int yy_top_state();
+
+ yy_state_type yy_get_previous_state();
+ yy_state_type yy_try_NUL_trans( yy_state_type current_state );
+ int yy_get_next_buffer();
+
+ FLEX_STD istream* yyin; // input source for default LexerInput
+ FLEX_STD ostream* yyout; // output sink for default LexerOutput
+
+ // yy_hold_char holds the character lost when yytext is formed.
+ char yy_hold_char;
+
+ // Number of characters read into yy_ch_buf.
+ int yy_n_chars;
+
+ // Points to current character in buffer.
+ char* yy_c_buf_p;
+
+ int yy_init; // whether we need to initialize
+ int yy_start; // start state number
+
+ // Flag which is used to allow yywrap()'s to do buffer switches
+ // instead of setting up a fresh yyin. A bit of a hack ...
+ int yy_did_buffer_switch_on_eof;
+
+
+ size_t yy_buffer_stack_top; /**< index of top of stack. */
+ size_t yy_buffer_stack_max; /**< capacity of stack. */
+ struct yy_buffer_state ** yy_buffer_stack; /**< Stack as an array. */
+ void yyensure_buffer_stack(void);
+
+ // The following are not always needed, but may be depending
+ // on use of certain flex features (like REJECT or yymore()).
+
+ yy_state_type yy_last_accepting_state;
+ char* yy_last_accepting_cpos;
+
+ yy_state_type* yy_state_buf;
+ yy_state_type* yy_state_ptr;
+
+ char* yy_full_match;
+ int* yy_full_state;
+ int yy_full_lp;
+
+ int yy_lp;
+ int yy_looking_for_trail_begin;
+
+ int yy_more_flag;
+ int yy_more_len;
+ int yy_more_offset;
+ int yy_prev_more_offset;
+};
+
+}
+
+#endif