diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeLists.txt | 242 | ||||
-rw-r--r-- | src/Makefile.in | 53 | ||||
-rw-r--r-- | src/code.l | 4 | ||||
-rw-r--r-- | src/commentcnv.l | 5 | ||||
-rw-r--r-- | src/commentscan.l | 5 | ||||
-rw-r--r-- | src/config.l | 3 | ||||
-rw-r--r-- | src/constexp.l | 4 | ||||
-rw-r--r-- | src/declinfo.l | 3 | ||||
-rw-r--r-- | src/defargs.l | 4 | ||||
-rw-r--r-- | src/doctokenizer.l | 4 | ||||
-rw-r--r-- | src/doxygen.cpp | 1 | ||||
-rw-r--r-- | src/doxygen.pro.in | 40 | ||||
-rw-r--r-- | src/formula.cpp | 2 | ||||
-rw-r--r-- | src/fortrancode.l | 4 | ||||
-rw-r--r-- | src/fortranscanner.l | 5 | ||||
-rwxr-xr-x | src/lang_cfg.py | 8 | ||||
-rw-r--r-- | src/libdoxycfg.pro.in | 27 | ||||
-rw-r--r-- | src/libdoxycfg.t.in | 53 | ||||
-rw-r--r-- | src/libdoxygen.pro.in | 243 | ||||
-rw-r--r-- | src/libdoxygen.t.in | 129 | ||||
-rw-r--r-- | src/pre.l | 6 | ||||
-rw-r--r-- | src/pycode.l | 4 | ||||
-rw-r--r-- | src/pyscanner.l | 5 | ||||
-rw-r--r-- | src/scanner.l | 5 | ||||
-rw-r--r-- | src/tclscanner.l | 4 | ||||
-rw-r--r-- | src/vhdlcode.l | 4 | ||||
-rw-r--r-- | src/xmlcode.l | 2 | ||||
-rw-r--r-- | src/xmlgen.cpp | 4 |
28 files changed, 280 insertions, 593 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..155bf77 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,242 @@ +# vim:ts=4:sw=4:expandtab:autoindent: + +include_directories( + ${CMAKE_SOURCE_DIR}/qtools + ${CMAKE_SOURCE_DIR}/libmd5 + ${CMAKE_SOURCE_DIR}/vhdlparser/ + ${CMAKE_SOURCE_DIR}/src + ${CLANG_INCLUDEDIR} + ${GENERATED_SRC} +) + + +file(MAKE_DIRECTORY ${GENERATED_SRC}) +file(GLOB LANGUAGE_FILES "${CMAKE_SOURCE_DIR}/src/translator_??.h") + +# instead of increasebuffer.py +add_definitions(-DYY_BUF_SIZE=262144 -DYY_READ_BUF_SIZE=262144) + +# generate settings.h +file(GENERATE OUTPUT ${GENERATED_SRC}/settings.h +CONTENT "#ifndef SETTINGS_H +#define SETTINGS_H +#define USE_SQLITE3 ${sqlite3} +#define USE_LIBCLANG ${clang} +#define IS_SUPPORTED(x) \\ + ((USE_SQLITE3 && strcmp(\"USE_SQLITE3\",(x))==0) || \\ + (USE_LIBCLANG && strcmp(\"USE_LIBCLANG\",(x))==0) || \\ + 0) +#endif" ) +set_source_files_properties(${GENERATED_SRC}/settings.h PROPERTIES GENERATED 1) + + +# generate version.cpp +file(GENERATE OUTPUT ${GENERATED_SRC}/version.cpp + CONTENT "char versionString[]=\"${VERSION}\";" +) +set_source_files_properties(${GENERATED_SRC}/version.cpp PROPERTIES GENERATED 1) + + +# configoptions.cpp +add_custom_command( + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -cpp ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configoptions.cpp + DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py + OUTPUT ${GENERATED_SRC}/configoptions.cpp +) +set_source_files_properties(${GENERATED_SRC}/configoptions.cpp PROPERTIES GENERATED 1) + + +# ce_parse.h +add_custom_command( + COMMAND ${BISON_EXECUTABLE} -l -d -p ce_parsexpYY ${CMAKE_SOURCE_DIR}/src/constexp.y -o ce_parse.c + DEPENDS ${CMAKE_SOURCE_DIR}/src/constexp.y + OUTPUT ${GENERATED_SRC}/ce_parse.h + WORKING_DIRECTORY ${GENERATED_SRC} +) +set_source_files_properties(${GENERATED_SRC}/ce_parse.h PROPERTIES GENERATED 1) + +# lang_cfg.h +add_custom_command( + COMMENT "Generating ${GENERATED_SRC}/lang_cfg.h" + COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/lang_cfg.cmake ${LANG_CODES} 2> ${GENERATED_SRC}/lang_cfg.h + DEPENDS ${LANGUAGE_FILES} + OUTPUT ${GENERATED_SRC}/lang_cfg.h +) +set_source_files_properties(${GENERATED_SRC}/lang_cfg.h PROPERTIES GENERATED 1) + +# all resource files +file(GLOB RESOURCES ${CMAKE_SOURCE_DIR}/templates/*/*) + +# resources.cpp +add_custom_command( + COMMENT "Generating ${GENERATED_SRC}/resources.cpp" + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/res2cc_cmd.py ${CMAKE_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp + DEPENDS ${RESOURCES} + OUTPUT ${GENERATED_SRC}/resources.cpp +) +set_source_files_properties(${GENERATED_SRC}/resources.cpp PROPERTIES GENERATED 1) + +# layout_default.xml +add_custom_command( + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/to_c_cmd.py < ${CMAKE_SOURCE_DIR}/src/layout_default.xml > ${GENERATED_SRC}/layout_default.xml.h + DEPENDS ${CMAKE_SOURCE_DIR}/src/layout_default.xml + OUTPUT ${GENERATED_SRC}/layout_default.xml.h +) +set_source_files_properties(${GENERATED_SRC}/layout_default.xml.h PROPERTIES GENERATED 1) + +# Targets for flex/bison generated files +FLEX_TARGET(scanner scanner.l ${GENERATED_SRC}/scanner.cpp COMPILE_FLAGS "-PscannerYY") +FLEX_TARGET(code code.l ${GENERATED_SRC}/code.cpp COMPILE_FLAGS "-PcodeYY") +FLEX_TARGET(pyscanner pyscanner.l ${GENERATED_SRC}/pyscanner.cpp COMPILE_FLAGS "-PpyscannerYY") +FLEX_TARGET(pycode pycode.l ${GENERATED_SRC}/pycode.cpp COMPILE_FLAGS "-PpycodeYY") +FLEX_TARGET(fortranscanner fortranscanner.l ${GENERATED_SRC}/fortranscanner.cpp COMPILE_FLAGS "-PfortranscannerYY -i") +FLEX_TARGET(fortrancode fortrancode.l ${GENERATED_SRC}/fortrancode.cpp COMPILE_FLAGS "-PfortrancodeYY -i") +FLEX_TARGET(vhdlcode vhdlcode.l ${GENERATED_SRC}/vhdlcode.cpp COMPILE_FLAGS "-PvhdlcodeYY -i") +FLEX_TARGET(tclscanner tclscanner.l ${GENERATED_SRC}/tclscanner.cpp COMPILE_FLAGS "-PtclscannerYY -i") +FLEX_TARGET(pre pre.l ${GENERATED_SRC}/pre.cpp COMPILE_FLAGS "-PpreYY") +FLEX_TARGET(declinfo declinfo.l ${GENERATED_SRC}/declinfo.cpp COMPILE_FLAGS "-PdeclinfoYY") +FLEX_TARGET(defargs defargs.l ${GENERATED_SRC}/defargs.cpp COMPILE_FLAGS "-PdefargsYY") +FLEX_TARGET(doctokenizer doctokenizer.l ${GENERATED_SRC}/doctokenizer.cpp COMPILE_FLAGS "-PdoctokenizerYY") +FLEX_TARGET(commentcnv commentcnv.l ${GENERATED_SRC}/commentcnv.cpp COMPILE_FLAGS "-PcommentcnvYY") +FLEX_TARGET(commentscan commentscan.l ${GENERATED_SRC}/commentscan.cpp COMPILE_FLAGS "-PcommentscanYY") +FLEX_TARGET(constexp constexp.l ${GENERATED_SRC}/constexp.cpp COMPILE_FLAGS "-PconstexpYY") +FLEX_TARGET(xmlcode xmlcode.l ${GENERATED_SRC}/xmlcode.cpp COMPILE_FLAGS "-PxmlcodeYY") +FLEX_TARGET(config config.l ${GENERATED_SRC}/config.cpp COMPILE_FLAGS "-PconfigYY") + +BISON_TARGET(vhdlparser vhdlparser.y ${GENERATED_SRC}/vhdlparser.cpp COMPILE_FLAGS "-l -p vhdlscannerYY") +BISON_TARGET(constexp constexp.y ${GENERATED_SRC}/ce_parse.cpp COMPILE_FLAGS "-l -p constexpYY") + +add_library(doxycfg + ${GENERATED_SRC}/lang_cfg.h + ${GENERATED_SRC}/config.cpp + ${GENERATED_SRC}/configoptions.cpp + portable.cpp + portable_c.c +) + +add_library(_doxygen + # custom generated files + ${GENERATED_SRC}/lang_cfg.h + ${GENERATED_SRC}/settings.h + ${GENERATED_SRC}/layout_default.xml.h + ${GENERATED_SRC}/version.cpp + ${GENERATED_SRC}/ce_parse.h + ${GENERATED_SRC}/resources.cpp + # generated by flex/bison + ${GENERATED_SRC}/scanner.cpp + ${GENERATED_SRC}/code.cpp + ${GENERATED_SRC}/pyscanner.cpp + ${GENERATED_SRC}/pycode.cpp + ${GENERATED_SRC}/fortranscanner.cpp + ${GENERATED_SRC}/fortrancode.cpp + ${GENERATED_SRC}/vhdlcode.cpp + ${GENERATED_SRC}/tclscanner.cpp + ${GENERATED_SRC}/pre.cpp + ${GENERATED_SRC}/declinfo.cpp + ${GENERATED_SRC}/defargs.cpp + ${GENERATED_SRC}/doctokenizer.cpp + ${GENERATED_SRC}/commentcnv.cpp + ${GENERATED_SRC}/commentscan.cpp + ${GENERATED_SRC}/constexp.cpp + ${GENERATED_SRC}/xmlcode.cpp + # + ${GENERATED_SRC}/ce_parse.cpp + # + plantuml.cpp + arguments.cpp + cite.cpp + clangparser.cpp + fileparser.cpp + classdef.cpp + classlist.cpp + cmdmapper.cpp + condparser.cpp + context.cpp + cppvalue.cpp + debug.cpp + defgen.cpp + define.cpp + definition.cpp + diagram.cpp + dirdef.cpp + docparser.cpp + docsets.cpp + dot.cpp + doxygen.cpp + eclipsehelp.cpp + entry.cpp + filedef.cpp + filename.cpp + formula.cpp + ftextstream.cpp + ftvhelp.cpp + groupdef.cpp + htags.cpp + htmldocvisitor.cpp + htmlentity.cpp + resourcemgr.cpp + htmlgen.cpp + htmlhelp.cpp + image.cpp + index.cpp + language.cpp + latexdocvisitor.cpp + latexgen.cpp + layout.cpp + lodepng.cpp + logos.cpp + mandocvisitor.cpp + mangen.cpp + sqlite3gen.cpp + markdown.cpp + marshal.cpp + memberdef.cpp + membergroup.cpp + memberlist.cpp + membername.cpp + message.cpp + msc.cpp + dia.cpp + namespacedef.cpp + objcache.cpp + outputgen.cpp + outputlist.cpp + pagedef.cpp + perlmodgen.cpp + qhp.cpp + qhpxmlwriter.cpp + reflist.cpp + rtfdocvisitor.cpp + rtfgen.cpp + rtfstyle.cpp + searchindex.cpp + store.cpp + tagreader.cpp + template.cpp + textdocvisitor.cpp + tooltip.cpp + util.cpp + vhdldocgen.cpp + vhdljjparser.cpp + xmldocvisitor.cpp + xmlgen.cpp + docbookvisitor.cpp + docbookgen.cpp +) + +add_executable(doxygen main.cpp) +target_link_libraries(doxygen + _doxygen + doxycfg + qtools + md5 + vhdlparser + ${SQLITE3_LIBRARIES} + ${ICONV_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ${EXTRA_LIBS} + ${CLANG_LIBS} +) + +install(TARGETS doxygen DESTINATION bin) + diff --git a/src/Makefile.in b/src/Makefile.in deleted file mode 100644 index ac7efaa..0000000 --- a/src/Makefile.in +++ /dev/null @@ -1,53 +0,0 @@ - -# -# -# -# Copyright (C) 1997-2015 by Dimitri van Heesch. -# -# Permission to use, copy, modify, and distribute this software and its -# documentation under the terms of the GNU General Public License is hereby -# granted. No representations are made about the suitability of this software -# for any purpose. It is provided "as is" without express or implied warranty. -# See the GNU General Public License for more details. -# -# Documents produced by Doxygen are derivative works derived from the -# input used in their production; they are not affected by this license. -# - -GENERATED_SRC = ../generated_src/doxygen - -all: Makefile.libdoxygen Makefile.libdoxycfg Makefile.doxygen Makefile - $(MAKE) -f Makefile.libdoxycfg $@ - $(MAKE) -f Makefile.libdoxygen $@ - $(MAKE) -f Makefile.doxygen $@ - -Makefile.libdoxygen: libdoxygen.pro libdoxygen.t - $(ENV) $(PERL) "$(TMAKE)" libdoxygen.pro >Makefile.libdoxygen - echo 'HEADERS += ' `ls -1 translator_??.h` >>Makefile.libdoxygen - -Makefile.libdoxycfg: libdoxycfg.pro libdoxycfg.t - $(ENV) $(PERL) "$(TMAKE)" libdoxycfg.pro >Makefile.libdoxycfg - -Makefile.doxygen: doxygen.pro - $(ENV) $(PERL) "$(TMAKE)" doxygen.pro >Makefile.doxygen - -tmake: - $(ENV) $(PERL) "$(TMAKE)" libdoxygen.pro >Makefile.libdoxygen - $(ENV) $(PERL) "$(TMAKE)" libdoxycfg.pro >Makefile.libdoxycfg - $(ENV) $(PERL) "$(TMAKE)" doxygen.pro >Makefile.doxygen - -# clean objects -clean: Makefile.libdoxygen Makefile.libdoxycfg Makefile.doxygen - $(MAKE) -f Makefile.libdoxygen clean - $(MAKE) -f Makefile.libdoxycfg clean - $(MAKE) -f Makefile.doxygen clean - -# also clean flex/bison generated files -distclean: clean - -cd $(GENERATED_SRC) && $(RM) scanner.cpp code.cpp config.cpp pre.cpp constexp.cpp \ - ce_parse.cpp ce_parse.h tag.cpp commentscan.cpp \ - declinfo.cpp defargs.cpp commentcnv.cpp doctokenizer.cpp \ - pycode.cpp pyscanner.cpp fortrancode.cpp fortranscanner.cpp \ - xmlcode.cpp vhdlscanner.cpp vhdlcode.cpp tclscanner.cpp - -FORCE: @@ -14,7 +14,7 @@ * input used in their production; they are not affected by this license. * */ - +%option never-interactive %{ /* @@ -46,7 +46,7 @@ //#define DBG_CTX(x) fprintf x #define DBG_CTX(x) do { } while(0) -#define YY_NEVER_INTERACTIVE 1 +#define YY_NO_UNISTD_H 1 #define CLASSBLOCK (int *)4 #define SCOPEBLOCK (int *)8 diff --git a/src/commentcnv.l b/src/commentcnv.l index 979e6ee..8823b68 100644 --- a/src/commentcnv.l +++ b/src/commentcnv.l @@ -14,11 +14,9 @@ * input used in their production; they are not affected by this license. * */ - +%option never-interactive %{ -#define YY_NEVER_INTERACTIVE 1 - #include <stdio.h> #include <stdlib.h> @@ -39,6 +37,7 @@ #include <assert.h> #define YY_NO_INPUT 1 +#define YY_NO_UNISTD_H 1 #define ADDCHAR(c) g_outBuf->addChar(c) #define ADDARRAY(a,s) g_outBuf->addArray(a,s) diff --git a/src/commentscan.l b/src/commentscan.l index 54adbd8..3546277 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -12,7 +12,8 @@ * input used in their production; they are not affected by this license. * */ - + +%option never-interactive %{ /* @@ -26,7 +27,6 @@ #include <qarray.h> #include <qstack.h> #include <qregexp.h> -#include <unistd.h> #include <qfile.h> #include "scanner.h" @@ -49,6 +49,7 @@ #include "formula.h" #define YY_NO_INPUT 1 +#define YY_NO_UNISTD_H 1 // forward declarations static bool handleBrief(const QCString &); diff --git a/src/config.l b/src/config.l index 2ed9973..1bbe320 100644 --- a/src/config.l +++ b/src/config.l @@ -9,7 +9,7 @@ * See the GNU General Public License for more details. * */ - +%option never-interactive %{ /* @@ -45,6 +45,7 @@ #undef Config_getBool #define YY_NO_INPUT 1 +#define YY_NO_UNISTD_H 1 // use in-class definitions #define Config_getString(val) getString(__FILE__,__LINE__,val) diff --git a/src/constexp.l b/src/constexp.l index f1f8cd4..e3ff3f1 100644 --- a/src/constexp.l +++ b/src/constexp.l @@ -15,7 +15,7 @@ * input used in their production; they are not affected by this license. * */ - +%option never-interactive %{ #include "constexp.h" @@ -23,8 +23,8 @@ #include "ce_parse.h" // generated header file #include "message.h" -#define YY_NEVER_INTERACTIVE 1 #define YY_NO_INPUT 1 +#define YY_NO_UNISTD_H 1 QCString g_strToken; CPPValue g_resultValue; diff --git a/src/declinfo.l b/src/declinfo.l index b7689c7..0f24d9e 100644 --- a/src/declinfo.l +++ b/src/declinfo.l @@ -14,7 +14,7 @@ * input used in their production; they are not affected by this license. * */ - +%option never-interactive %{ /* @@ -30,6 +30,7 @@ #include "message.h" #define YY_NO_INPUT 1 +#define YY_NO_UNISTD_H 1 /* ----------------------------------------------------------------- * diff --git a/src/defargs.l b/src/defargs.l index 40a77fb..e0b30fa 100644 --- a/src/defargs.l +++ b/src/defargs.l @@ -39,7 +39,7 @@ * type, and the matchArgumentList in util.cpp is be used to * further determine the correct separation. */ - +%option never-interactive %{ /* @@ -57,8 +57,8 @@ #include "arguments.h" #include "message.h" -#define YY_NEVER_INTERACTIVE 1 #define YY_NO_INPUT 1 +#define YY_NO_UNISTD_H 1 /* ----------------------------------------------------------------- * state variables diff --git a/src/doctokenizer.l b/src/doctokenizer.l index c642fc1..31d583c 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -16,7 +16,7 @@ * */ - +%option never-interactive %{ #include <ctype.h> @@ -37,8 +37,8 @@ #include "doxygen.h" #include "portable.h" -#define YY_NEVER_INTERACTIVE 1 #define YY_NO_INPUT 1 +#define YY_NO_UNISTD_H 1 //-------------------------------------------------------------------------- diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 20d12a8..5c991cb 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -25,7 +25,6 @@ #include <stdlib.h> #include <sys/stat.h> #include <qtextcodec.h> -#include <unistd.h> #include <errno.h> #include <qptrdict.h> #include <qtextstream.h> diff --git a/src/doxygen.pro.in b/src/doxygen.pro.in deleted file mode 100644 index 72410a6..0000000 --- a/src/doxygen.pro.in +++ /dev/null @@ -1,40 +0,0 @@ -# -# -# -# Copyright (C) 1997-2015 by Dimitri van Heesch. -# -# Permission to use, copy, modify, and distribute this software and its -# documentation under the terms of the GNU General Public License is hereby -# granted. No representations are made about the suitability of this software -# for any purpose. It is provided "as is" without express or implied warranty. -# See the GNU General Public License for more details. -# -# Documents produced by Doxygen are derivative works derived from the -# input used in their production; they are not affected by this license. -# -# TMake project file for doxygen - -TEMPLATE = app.t -CONFIG = console warn_on $extraopts -HEADERS = doxygen.h -SOURCES = main.cpp -unix:LIBS += -L../lib -ldoxygen -lvhdlparser -ldoxycfg -lqtools -lmd5 -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%% -win32:INCLUDEPATH += . -win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lvhdlparser -lqtools -lmd5 -lpthread -llibiconv -lole32 %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%% -win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib vhdlparser.lib shell32.lib iconv.lib -win32-msvc:TMAKE_LFLAGS += /LIBPATH:..\lib -win32-borland:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib vhdlparser.lib shell32.lib iconv.lib -win32-borland:TMAKE_LFLAGS += -L..\lib -L$(BCB)\lib\psdk -win32:TMAKE_CXXFLAGS += -DQT_NODLL -win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lvhdlparser -lqtools -lmd5 -liconv -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%% -Wl,--as-needed -lole32 -win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti -DEPENDPATH += ../generated_src/doxygen -INCLUDEPATH += ../qtools ../libmd5 . ../vhdlparser -DESTDIR = ../bin -TARGET = doxygen -unix:TARGETDEPS = ../lib/libdoxygen.a ../lib/libdoxycfg.a -win32:TARGETDEPS = ..\lib\doxygen.lib ..\lib\doxycfg.lib -win32-g++:TARGETDEPS = ../lib/libdoxygen.a ../lib/libdoxycfg.a -win32-mingw:TARGETDEPS = ../lib/libdoxygen.a ../lib/libdoxycfg.a -OBJECTS_DIR = ../objects/doxygen - diff --git a/src/formula.cpp b/src/formula.cpp index 7b8d346..ad37782 100644 --- a/src/formula.cpp +++ b/src/formula.cpp @@ -15,8 +15,6 @@ */ #include <stdlib.h> -#include <unistd.h> - #include <qfile.h> #include <qfileinfo.h> #include <qtextstream.h> diff --git a/src/fortrancode.l b/src/fortrancode.l index bf50835..af1a82e 100644 --- a/src/fortrancode.l +++ b/src/fortrancode.l @@ -23,7 +23,7 @@ - links to interface functions - references to variables **/ - +%option never-interactive %{ /* @@ -56,9 +56,9 @@ //#define DBG_CTX(x) fprintf x #define DBG_CTX(x) do { } while(0) -#define YY_NEVER_INTERACTIVE 1 #define YY_NO_TOP_STATE 1 #define YY_NO_INPUT 1 +#define YY_NO_UNISTD_H 1 /* * For fixed formatted code position 6 is of importance (continuation character). diff --git a/src/fortranscanner.l b/src/fortranscanner.l index 094bfb1..cbe13fd 100644 --- a/src/fortranscanner.l +++ b/src/fortranscanner.l @@ -37,7 +37,7 @@ * * - Must track yyLineNr when using REJECT, unput() or similar commands. */ - +%option never-interactive %{ #include <stdio.h> @@ -48,7 +48,6 @@ #include <qarray.h> #include <qstack.h> #include <qregexp.h> -#include <unistd.h> #include <qfile.h> #include <qmap.h> @@ -69,8 +68,8 @@ //#define DBG_CTX(x) fprintf x #define DBG_CTX(x) do { } while(0) -#define YY_NEVER_INTERACTIVE 1 #define YY_NO_INPUT 1 +#define YY_NO_UNISTD_H 1 enum ScanVar { V_IGNORE, V_VARIABLE, V_PARAMETER, V_RESULT}; enum InterfaceType { IF_NONE, IF_SPECIFIC, IF_GENERIC, IF_ABSTRACT }; diff --git a/src/lang_cfg.py b/src/lang_cfg.py deleted file mode 100755 index efed05f..0000000 --- a/src/lang_cfg.py +++ /dev/null @@ -1,8 +0,0 @@ -import sys - -if (len(sys.argv) > 1): - if (sys.argv[1] == "ENONLY"): - print("#define ENGLISH_ONLY") - else: - for x in range(1, len(sys.argv)): - print("#define LANG_%s"%(sys.argv[x])) diff --git a/src/libdoxycfg.pro.in b/src/libdoxycfg.pro.in deleted file mode 100644 index 2812cd2..0000000 --- a/src/libdoxycfg.pro.in +++ /dev/null @@ -1,27 +0,0 @@ -# -# -# -# Copyright (C) 1997-2015 by Dimitri van Heesch. -# -# Permission to use, copy, modify, and distribute this software and its -# documentation under the terms of the GNU General Public License is hereby -# granted. No representations are made about the suitability of this software -# for any purpose. It is provided "as is" without express or implied warranty. -# See the GNU General Public License for more details. -# -# Documents produced by Doxygen are derivative works derived from the -# input used in their production; they are not affected by this license. -# -# TMake project file for doxygen - -TEMPLATE = libdoxycfg.t -CONFIG = console warn_on staticlib $extraopts -HEADERS = config.h configoptions.h portable.h -SOURCES = ../generated_src/doxygen/config.cpp ../generated_src/doxygen/configoptions.cpp portable.cpp portable_c.c -win32:TMAKE_CXXFLAGS += -DQT_NODLL -win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti -DEPENDPATH += ../generated_src/doxygen -INCLUDEPATH += ../generated_src/doxygen . ../qtools -DESTDIR = ../lib -TARGET = doxycfg -OBJECTS_DIR = ../objects/doxygen diff --git a/src/libdoxycfg.t.in b/src/libdoxycfg.t.in deleted file mode 100644 index 33dd0d4..0000000 --- a/src/libdoxycfg.t.in +++ /dev/null @@ -1,53 +0,0 @@ -# -# -# -# Copyright (C) 1997-2015 by Dimitri van Heesch. -# -# Permission to use, copy, modify, and distribute this software and its -# documentation under the terms of the GNU General Public License is hereby -# granted. No representations are made about the suitability of this software -# for any purpose. It is provided "as is" without express or implied warranty. -# See the GNU General Public License for more details. -# -# Documents produced by Doxygen are derivative works derived from the -# input used in their production; they are not affected by this license. -#! -#! doxygen.t: This is a custom template for building Doxygen -#! -#$ IncludeTemplate("lib.t"); - -LEX = %%FLEX%% -YACC = %%BISON%% -PYTHON = %%PYTHON%% - -#${ -sub GenerateDep { - my($obj,$src,$dep) = @_; - my(@objv,$srcv,$i,$s,$o,$d,$c); - @objv = split(/\s+/,$obj); - @srcv = split(/\s+/,$src); - for $i ( 0..$#objv ) { - $s = $srcv[$i]; - $o = $objv[$i]; - next if $s eq ""; - $text .= $o . ": " . $s; - $text .= " ${linebreak}\n\t\t" . $dep if $dep ne ""; - if ( $moc_output{$s} ne "" ) { - $text .= " ${linebreak}\n\t\t" . $moc_output{$s}; - } - $d = &make_depend($s); - $text .= " ${linebreak}\n\t\t" . $d if $d ne ""; - $text .= "\n"; - } - chop $text; -} -#$} - -#################### - -#$ GenerateDep("../generated_src/doxygen/config.cpp","config.l"); - $(LEX) -PconfigYY -t config.l >../generated_src/doxygen/config.cpp - -../generated_src/doxygen/configoptions.cpp: config.xml configgen.py - $(PYTHON) configgen.py -cpp config.xml >../generated_src/doxygen/configoptions.cpp - diff --git a/src/libdoxygen.pro.in b/src/libdoxygen.pro.in deleted file mode 100644 index 3680f97..0000000 --- a/src/libdoxygen.pro.in +++ /dev/null @@ -1,243 +0,0 @@ -# -# -# -# Copyright (C) 1997-2015 by Dimitri van Heesch. -# -# Permission to use, copy, modify, and distribute this software and its -# documentation under the terms of the GNU General Public License is hereby -# granted. No representations are made about the suitability of this software -# for any purpose. It is provided "as is" without express or implied warranty. -# See the GNU General Public License for more details. -# -# Documents produced by Doxygen are derivative works derived from the -# input used in their production; they are not affected by this license. -# -# TMake project file for doxygen - -TEMPLATE = libdoxygen.t -CONFIG = console warn_on staticlib $extraopts -HEADERS = arguments.h \ - bufstr.h \ - cite.h \ - clangparser.h \ - classdef.h \ - classlist.h \ - cmdmapper.h \ - code.h \ - commentcnv.h \ - commentscan.h \ - condparser.h \ - config.h \ - context.h \ - constexp.h \ - cppvalue.h \ - debug.h \ - declinfo.h \ - defargs.h \ - defgen.h \ - define.h \ - definition.h \ - diagram.h \ - dirdef.h \ - docparser.h \ - docsets.h \ - doctokenizer.h \ - docvisitor.h \ - dot.h \ - doxygen.h \ - eclipsehelp.h \ - entry.h \ - example.h \ - filedef.h \ - filename.h \ - fileparser.h \ - formula.h \ - ftextstream.h \ - ftvhelp.h \ - groupdef.h \ - htags.h \ - htmlattrib.h \ - htmldocvisitor.h \ - htmlgen.h \ - htmlhelp.h \ - htmlentity.h \ - image.h \ - index.h \ - language.h \ - latexdocvisitor.h \ - latexgen.h \ - layout.h \ - logos.h \ - mandocvisitor.h \ - mangen.h \ - sqlite3gen.h \ - markdown.h \ - marshal.h \ - memberdef.h \ - membergroup.h \ - memberlist.h \ - membername.h \ - message.h \ - msc.h \ - dia.h \ - namespacedef.h \ - objcache.h \ - outputgen.h \ - outputlist.h \ - pagedef.h \ - perlmodgen.h \ - lodepng.h \ - plantuml.h \ - pre.h \ - printdocvisitor.h \ - pycode.h \ - pyscanner.h \ - fortrancode.h \ - fortranscanner.h \ - xmlscanner.h \ - qhp.h \ - qhpxmlwriter.h \ - reflist.h \ - resourcemgr.h \ - rtfdocvisitor.h \ - rtfgen.h \ - rtfstyle.h \ - scanner.h \ - searchindex.h \ - section.h \ - sortdict.h \ - store.h \ - tagreader.h \ - tclscanner.h \ - template.h \ - textdocvisitor.h \ - tooltip.h \ - translator.h \ - translator_adapter.h \ - util.h \ - version.h \ - vhdlcode.h \ - vhdldocgen.h \ - xmldocvisitor.h \ - xmlgen.h \ - docbookvisitor.h \ - docbookgen.h \ - xmlcode.h \ - vhdljjparser.h - - -SOURCES = arguments.cpp \ - cite.cpp \ - clangparser.cpp \ - classdef.cpp \ - classlist.cpp \ - cmdmapper.cpp \ - condparser.cpp \ - context.cpp \ - cppvalue.cpp \ - debug.cpp \ - defgen.cpp \ - define.cpp \ - definition.cpp \ - diagram.cpp \ - dirdef.cpp \ - docparser.cpp \ - docsets.cpp \ - dot.cpp \ - doxygen.cpp \ - eclipsehelp.cpp \ - entry.cpp \ - filedef.cpp \ - filename.cpp \ - fileparser.cpp \ - formula.cpp \ - ftextstream.cpp \ - ftvhelp.cpp \ - groupdef.cpp \ - htags.cpp \ - htmldocvisitor.cpp \ - htmlgen.cpp \ - htmlhelp.cpp \ - htmlentity.cpp \ - image.cpp \ - index.cpp \ - language.cpp \ - latexdocvisitor.cpp \ - latexgen.cpp \ - layout.cpp \ - lodepng.cpp \ - logos.cpp \ - plantuml.cpp \ - mandocvisitor.cpp \ - mangen.cpp \ - sqlite3gen.cpp \ - markdown.cpp \ - marshal.cpp \ - memberdef.cpp \ - membergroup.cpp \ - memberlist.cpp \ - membername.cpp \ - message.cpp \ - msc.cpp \ - dia.cpp \ - namespacedef.cpp \ - objcache.cpp \ - outputgen.cpp \ - outputlist.cpp \ - pagedef.cpp \ - perlmodgen.cpp \ - qhp.cpp \ - qhpxmlwriter.cpp \ - reflist.cpp \ - resourcemgr.cpp \ - rtfdocvisitor.cpp \ - rtfgen.cpp \ - rtfstyle.cpp \ - searchindex.cpp \ - store.cpp \ - tagreader.cpp \ - template.cpp \ - textdocvisitor.cpp \ - tooltip.cpp \ - util.cpp \ - vhdldocgen.cpp \ - xmldocvisitor.cpp \ - xmlgen.cpp \ - docbookvisitor.cpp \ - docbookgen.cpp \ - vhdljjparser.cpp \ - ../generated_src/doxygen/ce_parse.cpp \ - ../generated_src/doxygen/constexp.cpp \ - ../generated_src/doxygen/vhdlcode.cpp \ - ../generated_src/doxygen/code.cpp \ - ../generated_src/doxygen/commentcnv.cpp \ - ../generated_src/doxygen/commentscan.cpp \ - ../generated_src/doxygen/declinfo.cpp \ - ../generated_src/doxygen/defargs.cpp \ - ../generated_src/doxygen/doctokenizer.cpp \ - ../generated_src/doxygen/pre.cpp \ - ../generated_src/doxygen/pycode.cpp \ - ../generated_src/doxygen/xmlcode.cpp \ - ../generated_src/doxygen/pyscanner.cpp \ - ../generated_src/doxygen/scanner.cpp \ - ../generated_src/doxygen/tclscanner.cpp \ - ../generated_src/doxygen/fortrancode.cpp \ - ../generated_src/doxygen/fortranscanner.cpp \ - ../generated_src/doxygen/version.cpp \ - ../generated_src/doxygen/resources.cpp - - - -win32:TMAKE_CXXFLAGS += -DQT_NODLL -win32-msvc:TMAKE_CXXFLAGS += -Zm200 -win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -linux-g++:TMAKE_CXXFLAGS += -fno-exceptions -INCLUDEPATH += ../generated_src/doxygen ../src ../qtools ../libmd5 ../vhdlparser -INCLUDEPATH += %%SQLITE3_INC%% -INCLUDEPATH += %%LIBCLANG_INC%% -DEPENDPATH += ../generated_src/doxygen ../qtools ../libmd5 ../vhdlparser -win32:INCLUDEPATH += . -DESTDIR = ../lib -TARGET = doxygen -OBJECTS_DIR = ../objects/doxygen - diff --git a/src/libdoxygen.t.in b/src/libdoxygen.t.in deleted file mode 100644 index a9195bc..0000000 --- a/src/libdoxygen.t.in +++ /dev/null @@ -1,129 +0,0 @@ -# -# -# -# Copyright (C) 1997-2015 by Dimitri van Heesch. -# -# Permission to use, copy, modify, and distribute this software and its -# documentation under the terms of the GNU General Public License is hereby -# granted. No representations are made about the suitability of this software -# for any purpose. It is provided "as is" without express or implied warranty. -# See the GNU General Public License for more details. -# -# Documents produced by Doxygen are derivative works derived from the -# input used in their production; they are not affected by this license. -#! -#! doxygen.t: This is a custom template for building Doxygen -#! -#$ IncludeTemplate("lib.t"); - -LEX = %%FLEX%% -YACC = %%BISON%% -PYTHON = %%PYTHON%% -PERL = %%PERL%% -INCBUFSIZE = $(PYTHON) increasebuffer.py -GENERATED_SRC = ../generated_src/doxygen -GENERATED_OBJ = ../objects/doxygen - -#${ -sub GenerateDep { - my($obj,$src,@deps) = @_; - my(@objv,$srcv,$i,$s,$o,$d,$c); - @objv = split(/\s+/,$obj); - @srcv = split(/\s+/,$src); - for $i ( 0..$#objv ) { - $s = $srcv[$i]; - $o = $objv[$i]; - next if $s eq ""; - $text .= $o . ": " . $s; - foreach my $dep (@deps) { - $text .= " ${linebreak}\n\t\t" . $dep if $dep ne ""; - } - if ( $moc_output{$s} ne "" ) { - $text .= " ${linebreak}\n\t\t" . $moc_output{$s}; - } - $d = &make_depend($s); - $text .= " ${linebreak}\n\t\t" . $d if $d ne ""; - $text .= "\n"; - } - chop $text; -} -sub GenerateLex { - my($name,$caseOpt) = @_; - $text = "\t\$(LEX) "; - if ($caseOpt) { - $text .= "-i "; - } - $text .= "-P".$name."YY -t ".$name.".l | \$(INCBUFSIZE) > \$(GENERATED_SRC)/".$name.".cpp"; -} -#$} - -#################### - -#$ GenerateDep("\$(GENERATED_SRC)/scanner.cpp","scanner.l"); -#$ GenerateLex("scanner",0); - -#$ GenerateDep("\$(GENERATED_SRC)/code.cpp","code.l"); -#$ GenerateLex("code",0); - -#$ GenerateDep("\$(GENERATED_SRC)/pyscanner.cpp","pyscanner.l"); -#$ GenerateLex("pyscanner",0); - -#$ GenerateDep("\$(GENERATED_SRC)/pycode.cpp","pycode.l"); -#$ GenerateLex("pycode",0); - -#$ GenerateDep("\$(GENERATED_SRC)/xmlcode.cpp","xmlcode.l"); -#$ GenerateLex("xmlcode",0); - -#$ GenerateDep("\$(GENERATED_SRC)/fortranscanner.cpp","fortranscanner.l"); -#$ GenerateLex("fortranscanner",1); - -#$ GenerateDep("\$(GENERATED_SRC)/fortrancode.cpp","fortrancode.l"); -#$ GenerateLex("fortrancode",1); - -#$ GenerateDep("\$(GENERATED_SRC)/vhdlcode.cpp","vhdlcode.l"); -#$ GenerateLex("vhdlcode",1); - -#$ GenerateDep("\$(GENERATED_SRC)/tclscanner.cpp","tclscanner.l"); -#$ GenerateLex("tclscanner",1); - -#$ GenerateDep("\$(GENERATED_SRC)/pre.cpp","pre.l"); -#$ GenerateLex("pre",0); - -#$ GenerateDep("\$(GENERATED_SRC)/declinfo.cpp","declinfo.l"); -#$ GenerateLex("declinfo",0); - -#$ GenerateDep("\$(GENERATED_SRC)/defargs.cpp","defargs.l"); -#$ GenerateLex("defargs",0); - -#$ GenerateDep("\$(GENERATED_SRC)/doctokenizer.cpp","doctokenizer.l"); -#$ GenerateLex("doctokenizer",0); - -#$ GenerateDep("\$(GENERATED_SRC)/commentcnv.cpp","commentcnv.l"); -#$ GenerateLex("commentcnv",0); - -#$ GenerateDep("\$(GENERATED_SRC)/commentscan.cpp","commentscan.l"); -#$ GenerateLex("commentscan",0); - -#$ GenerateDep("\$(GENERATED_SRC)/constexp.cpp","constexp.l","\$(GENERATED_SRC)/ce_parse.h"); -#$ GenerateLex("constexp",0); - -#$ GenerateDep("\$(GENERATED_SRC)/ce_parse.cpp","constexp.y"); - $(YACC) -l -p constexpYY constexp.y -o \$(GENERATED_SRC)/ce_parse.cpp - -#$ GenerateDep("\$(GENERATED_SRC)/ce_parse.h","constexp.y"); - $(YACC) -l -d -p ce_parsexpYY constexp.y -o \$(GENERATED_SRC)/ce_parse.c - -rm $(GENERATED_SRC)/ce_parse.c - -#$ GenerateDep("layout.cpp","\$(GENERATED_SRC)/layout_default.xml.h"); - -$(GENERATED_SRC)/version.cpp: ../configure - $(PYTHON) version.py $(GENERATED_SRC) - -TO_C_CMD=$(PYTHON) to_c_cmd.py < $< > $@ - -$(GENERATED_SRC)/layout_default.xml.h: layout_default.xml - $(TO_C_CMD) - -../generated_src/doxygen/resources.cpp: res2cc_cmd.py $(wildcard ../templates/html/*) $(wildcard ../templates/xml) $(wildcard ../templates/latex) - $(PYTHON) res2cc_cmd.py ../templates ../generated_src/doxygen/resources.cpp - @@ -14,7 +14,7 @@ * input used in their production; they are not affected by this license. * */ - +%option never-interactive %{ /* @@ -54,12 +54,12 @@ #include "memberdef.h" #include "membername.h" +#define YY_NO_UNISTD_H 1 + // Toggle for some debugging info //#define DBG_CTX(x) fprintf x #define DBG_CTX(x) do { } while(0) -#define YY_NEVER_INTERACTIVE 1 - struct CondCtx { CondCtx(int line,QCString id,bool b) diff --git a/src/pycode.l b/src/pycode.l index 306acab..3c41a69 100644 --- a/src/pycode.l +++ b/src/pycode.l @@ -21,7 +21,7 @@ * taught by Peter H. Froehlich <phf@acm.org>. */ - +%option never-interactive %{ #include <stdio.h> @@ -48,8 +48,8 @@ //#define DBG_CTX(x) fprintf x #define DBG_CTX(x) do { } while(0) -#define YY_NEVER_INTERACTIVE 1 #define YY_NO_INPUT 1 +#define YY_NO_UNISTD_H 1 static ClassSDict g_codeClassSDict(17); static QCString g_curClassName; diff --git a/src/pyscanner.l b/src/pyscanner.l index 775b0a4..8332a36 100644 --- a/src/pyscanner.l +++ b/src/pyscanner.l @@ -21,7 +21,7 @@ * taught by Peter H. Froehlich <phf@acm.org>. */ - +%option never-interactive %{ /* @@ -35,7 +35,6 @@ #include <qarray.h> #include <qstack.h> #include <qregexp.h> -#include <unistd.h> #include <qfile.h> #include <qfileinfo.h> @@ -55,8 +54,8 @@ //#define DBG_CTX(x) fprintf x #define DBG_CTX(x) do { } while(0) -#define YY_NEVER_INTERACTIVE 1 #define YY_NO_INPUT 1 +#define YY_NO_UNISTD_H 1 /* ----------------------------------------------------------------- * diff --git a/src/scanner.l b/src/scanner.l index 4f8cdd8..6fb4631 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -14,7 +14,7 @@ * input used in their production; they are not affected by this license. * */ - +%option never-interactive %{ /* @@ -28,7 +28,6 @@ #include <qarray.h> #include <qstack.h> #include <qregexp.h> -#include <unistd.h> #include <qfile.h> #include "scanner.h" @@ -45,8 +44,8 @@ #include "clangparser.h" -#define YY_NEVER_INTERACTIVE 1 #define YY_NO_INPUT 1 +#define YY_NO_UNISTD_H 1 /* ----------------------------------------------------------------- * diff --git a/src/tclscanner.l b/src/tclscanner.l index 7befd40..5e249a6 100644 --- a/src/tclscanner.l +++ b/src/tclscanner.l @@ -14,12 +14,12 @@ * input used in their production; they are not affected by this license. * */ +%option never-interactive %{ #include <stdio.h> #include <stdlib.h> #include <assert.h> #include <ctype.h> -#include <unistd.h> #include <qstring.h> #include <qstringlist.h> @@ -51,8 +51,8 @@ #include "namespacedef.h" #include "filedef.h" -#define YY_NEVER_INTERACTIVE 1 #define YY_NO_INPUT 1 +#define YY_NO_UNISTD_H 1 #define MAX_INCLUDE_DEPTH 10 diff --git a/src/vhdlcode.l b/src/vhdlcode.l index 0de0966..369ae48 100644 --- a/src/vhdlcode.l +++ b/src/vhdlcode.l @@ -17,7 +17,7 @@ * written by M. Kreis * supports VHDL-87/93/2008 ******************************************************************************/ - +%option never-interactive %{ /* @@ -44,8 +44,8 @@ #include "filedef.h" #include "tooltip.h" -#define YY_NEVER_INTERACTIVE 1 #define YY_NO_INPUT 1 +#define YY_NO_UNISTD_H 1 // Toggle for some debugging info //#define DBG_CTX(x) fprintf x diff --git a/src/xmlcode.l b/src/xmlcode.l index 772f919..15b5d7e 100644 --- a/src/xmlcode.l +++ b/src/xmlcode.l @@ -17,6 +17,7 @@ * written by Weston Thayer ******************************************************************************/ +%option never-interactive %{ #include <stdio.h> @@ -35,6 +36,7 @@ #define YY_NEVER_INTERACTIVE 1 #define YY_NO_INPUT 1 +#define YY_NO_UNISTD_H 1 static CodeOutputInterface * g_code; static QCString g_curClassName; diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp index bdb0d0e..467ebe4 100644 --- a/src/xmlgen.cpp +++ b/src/xmlgen.cpp @@ -986,7 +986,7 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De FileDef *bodyDef = md->getBodyDef(); if (bodyDef) { - t << " bodyfile=\"" << bodyDef->absFilePath() << "\""; + t << " bodyfile=\"" << stripFromPath(bodyDef->absFilePath()) << "\""; } t << " bodystart=\"" << md->getStartBodyLine() << "\" bodyend=\"" << md->getEndBodyLine() << "\""; @@ -1412,7 +1412,7 @@ static void generateXMLForClass(ClassDef *cd,FTextStream &ti) FileDef *bodyDef = cd->getBodyDef(); if (bodyDef) { - t << " bodyfile=\"" << bodyDef->absFilePath() << "\""; + t << " bodyfile=\"" << stripFromPath(bodyDef->absFilePath()) << "\""; } t << " bodystart=\"" << cd->getStartBodyLine() << "\" bodyend=\"" << cd->getEndBodyLine() << "\""; |