diff options
335 files changed, 1746 insertions, 11354 deletions
@@ -7,54 +7,11 @@ *.orig *.pro -/.makeconfig -/.tmakeconfig -/VERSION -/src/libdoxycfg.t -/src/libdoxygen.t /packages/rpm/doxygen.spec -/libmd5/Makefile -/libmd5/Makefile.libmd5 -/qtools/Makefile -/qtools/Makefile.qtools -/vhdlparser/Makefile -/vhdlparser/Makefile.vhdlparser -/src/Makefile.doxygen -/src/Makefile.libdoxycfg -/src/Makefile.libdoxygen -/addon/doxysearch/Makefile -/addon/doxysearch/Makefile.doxyindexer -/addon/doxysearch/Makefile.doxysearch -/addon/doxmlparser/examples/metrics/Makefile -/addon/doxmlparser/examples/metrics/Makefile.metrics -/addon/doxmlparser/src/Makefile -/addon/doxmlparser/src/Makefile.doxmlparser -/addon/doxmlparser/test/Makefile -/addon/doxyapp/Makefile -/addon/doxyapp/Makefile.doxyapp -/addon/doxywizard/Makefile -/addon/doxywizard/Makefile.doxywizard -/addon/doxmlparser/objects -/addon/doxmlparser/lib -/addon/doxmlparser/test/Makefile.xmlparse -/addon/doxmlparser/test/xmlparse.exe -/addon/doxmlparser/examples/metrics/obj -/addon/doxmlparser/examples/metrics/metrics.exe *.idb *.pdb -/examples/Makefile -/Makefile -/bin -/lib -/generated_src -/objects -/moc -/rcc -/src/Makefile - -/doc/Makefile /doc/translator_report.txt /doc/config.doc /doc/language.doc diff --git a/.travis.yml b/.travis.yml index 1206c68..b6976ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,13 @@ compiler: - gcc before_install: - sudo apt-get update -qq - - sudo apt-get install -qq texlive texlive-extra-utils libxml2-utils perl + - sudo apt-get install -qq texlive texlive-extra-utils texlive-latex-extra libxml2-utils + - wget -qO- http://www.cmake.org/files/v3.1/cmake-3.1.0-Linux-x86_64.tar.gz | tar xvz + script: - - ./configure --with-doxywizard + - mkdir build + - cd build + - ../cmake-3.1.0-Linux-x86_64/bin/cmake -G "Unix Makefiles" -Dbuild_doc=ON -Dbuild_wizard=ON .. - make - make docs - - make test + - make tests diff --git a/BUILD.txt b/BUILD.txt new file mode 100644 index 0000000..a507beb --- /dev/null +++ b/BUILD.txt @@ -0,0 +1,51 @@ +Doxygen uses cmake (http://www.cmake.org/) to build executables for various platforms. + +The first step is to create a build directory where the output should be stored. +Doxygen directory can be fully build outside of the source tree. + +The second step is to invoke cmake from within the build directory with the desired generator. + +For Linux/Unix systems do the following + + mkdir build + cd build + cmake -G "Unix Makefiles" path/to/root/of/doxygen/source/tree + make + +This also works for MacOSX, but if XCode is installed you can also generate an XCode project file + + cmake -G XCode path/to/root/of/doxygen/source/tree + +For Windows one can generate a Visual Studio project using + + cmake -G "Visual Studio 12 2013" path\to\root\of\doxygen\source\tree + +(this is for Visual Studio 12, there are typically also generators for other versions of +Visual Studio or other compiler environments like MinGW) + +Doxygen's cmake configuration provides a number of options: +- build_wizard Build the GUI frontend for doxygen. +- build_app Example showing how to embed doxygen in an application. +- build_xmlparser Example showing how to parse doxygen's XML output. +- build_search Build external search tools (doxysearch and doxyindexer) +- build_doc Build user manual +- use_sqlite3 Add support for sqlite3 output [experimental]. +- use_libclang Add support for libclang parsing. +- win_static Link with /MT in stead of /MD on windows + +An option can be turned on, by adding -D<option>=ON as a command line option, this can be +done when generating the initial build files, but also afterwards, i.e. to enable building +of the documentation after an initial cmake -G run, do + + cmake -Dbuild_doc=ON path/to/root/of/doxygen/source/tree + +To turn the option off use + + cmake -Dbuild_doc=OFF path/to/root/of/doxygen/source/tree + +To see the current value is of the various options, you can run + + cmake -L path/to/root/of/doxygen/source/tree + +The build target for building the documentation is 'docs' and the build target for +the regression tests is 'tests' diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..d203959 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,128 @@ +# vim:ts=4:sw=4:expandtab:autoindent: +# +# 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. + +cmake_minimum_required(VERSION 3.0) +project(doxygen) + +option(build_wizard "Build the GUI frontend for doxygen." OFF) +option(build_app "Example showing how to embed doxygen in an application." OFF) +option(build_xmlparser "Example showing how to parse doxygen's XML output." OFF) +option(build_search "Build external search tools (doxysearch and doxyindexer)" OFF) +option(build_doc "Build user manual" OFF) +option(use_sqlite3 "Add support for sqlite3 output [experimental]." OFF) +option(use_libclang "Add support for libclang parsing." OFF) +option(win_static "Link with /MT in stead of /MD on windows" OFF) +option(english_only "Only compile in support for the English language" OFF) + +list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") +set(SOURCE "${CMAKE_SOURCE_DIR}") +include(version) + +set(sqlite3 "0" CACHE INTERNAL "used in settings.h") +set(clang "0" CACHE INTERNAL "used in settings.h") +if (use_sqlite3) + set(sqlite3 "1" CACHE INTERNAL "used in settings.h") +endif() +if (use_libclang) + set(clang "1" CACHE INTERNAL "used in settings.h") + find_package(LibClang REQUIRED) +endif() + +if (${CMAKE_SYSTEM} MATCHES "Darwin") + set(CMAKE_CXX_FLAGS "-Wno-deprecated-register -mmacosx-version-min=10.5 ${CMAKE_CXX_FLAGS}") + find_library(CORESERVICES_LIB CoreServices) + set(EXTRA_LIBS ${CORESERVICES_LIB}) +endif() + +if (WIN32) + set(ICONV_DIR "${CMAKE_SOURCE_DIR}/winbuild") + set(CMAKE_REQUIRED_DEFINITIONS "-DLIBICONV_STATIC") + add_definitions(-DLIBICONV_STATIC -D_CRT_SECURE_NO_WARNINGS) +endif() + +find_program(DOT NAMES dot) +find_package(PythonInterp REQUIRED) +find_package(FLEX REQUIRED) +find_package(BISON REQUIRED) +find_package(Threads) + +if (sqlite3) + find_package(SQLite3 REQUIRED) +endif() + +find_package(Iconv REQUIRED) +include_directories(${ICONV_INCLUDE_DIR}) + +#set(DOXYDOCS ${CMAKE_SOURCE_DIR}/doc CACHE INTERNAL "Path to doxygen docs") +set(DOC_INSTALL_DIR "share/doc/packages/doxygen" CACHE STRING "Relative path where to install the documentation") +set(EXAMPLE_DIR ${CMAKE_SOURCE_DIR}/examples) +set(DOXYDOCS ${PROJECT_BINARY_DIR}/doc) +set(ENV{DOXYGEN_DOCDIR} ${DOXYDOCS}) +set(GENERATED_SRC "${CMAKE_BINARY_DIR}/generated_src" CACHE INTERNAL "Stores generated files") +set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) +set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) +set(CUSTOM_INCLUDE_DIR "" CACHE FILEPATH "Extra include path") +set(CUSTOM_LINK_DIR "" CACHE FILEPATH "Extra library path") + +# gather lang codes for translation +if (english_only) # user only wants English + set(LANG_CODES "ENONLY") +else() # find languages based on available translator files + set(LANG_CODES "") + file(GLOB lang_files RELATIVE "${CMAKE_SOURCE_DIR}/src" "${CMAKE_SOURCE_DIR}/src/translator_??.h") + foreach (_lang ${lang_files}) + string(REGEX REPLACE "translator_(.*).h" "\\1" _lang_code ${_lang}) + string(TOUPPER ${_lang_code} lang_code) + list(APPEND LANG_CODES "${lang_code}") + endforeach() +endif() + +if (${CUSTOM_INCLUDE_DIR}) + include_directories(${CUSTOM_INCLUDE_DIR}) +endif() + +if (${CUSTOM_LINK_DIR}) + link_directories(${CUSTOM_LINK_DIR}) +endif() + +if (win_static) + set(CompilerFlags + CMAKE_CXX_FLAGS + CMAKE_CXX_FLAGS_DEBUG + CMAKE_CXX_FLAGS_RELEASE + CMAKE_CXX_FLAGS_MINSIZEREL + CMAKE_CXX_FLAGS_RELWITHDEBINFO + CMAKE_C_FLAGS + CMAKE_C_FLAGS_DEBUG + CMAKE_C_FLAGS_RELEASE + CMAKE_C_FLAGS_MINSIZEREL + CMAKE_C_FLAGS_RELWITHDEBINFO) + foreach(CompilerFlag ${CompilerFlags}) + string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}") + endforeach() +endif() + + +add_subdirectory(libmd5) +add_subdirectory(qtools) +add_subdirectory(vhdlparser) +add_subdirectory(src) +add_subdirectory(doc) + +add_subdirectory(addon/doxmlparser) +add_subdirectory(addon/doxyapp) +add_subdirectory(addon/doxysearch) +add_subdirectory(addon/doxywizard) + +enable_testing() +add_subdirectory(testing) diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index af7a76f..0000000 --- a/Makefile.in +++ /dev/null @@ -1,161 +0,0 @@ - -DESTDIR = - -doxywizard: - cd addon/doxywizard ; $(MAKE) - -doxysearch: - cd addon/doxysearch ; $(MAKE) - -doxmlparser: - cd addon/doxmlparser/src ; $(MAKE) - cd addon/doxmlparser/test ; $(MAKE) - cd addon/doxmlparser/examples/metrics ; $(MAKE) - -doxyapp: - cd addon/doxyapp ; $(MAKE) clean - -clean: FORCE - - cd examples ; $(MAKE) clean - - cd doc ; $(MAKE) clean - - cd qtools ; $(MAKE) clean - - cd src ; $(MAKE) clean - - cd libmd5 ; $(MAKE) clean - - cd vhdlparser ; $(MAKE) clean - -cd addon/doxywizard ; $(MAKE) clean - -cd addon/doxysearch ; $(MAKE) clean - -cd addon/doxyapp ; $(MAKE) clean - -cd addon/doxmlparser/src ; $(MAKE) clean - -cd addon/doxmlparser/test ; $(MAKE) clean - -cd addon/doxmlparser/examples/metrics ; $(MAKE) clean - -rm -f bin/doxy* - -rm -f objects/*/*.o - -distclean: clean - -cd src ; $(MAKE) distclean - -cd libmd5 ; $(MAKE) distclean - -cd vhdlparser ; $(MAKE) distclean - -cd qtools ; $(MAKE) distclean - -cd addon/doxywizard ; $(MAKE) distclean - -cd addon/doxysearch ; $(MAKE) distclean - -cd addon/doxyapp ; $(MAKE) distclean - -cd addon/doxmlparser/src ; $(MAKE) distclean - -cd addon/doxmlparser/test ; $(MAKE) distclean - -cd addon/doxmlparser/examples/metrics ; $(MAKE) distclean - -rm -rf lib - -rm -rf bin - -rm -rf objects - -rm -rf html - -rm -rf latex - -rm -rf man - -rm -rf docbook - -rm -rf perlmod - -rm -rf rtf - -rm -rf xml - -rm -f src/Makefile.doxygen src/Makefile.libdoxygen - -rm -f src/Makefile.libdoxycfg src/libdoxycfg.t src/libdoxygen.t - -rm -f libmd5/Makefile.libmd5 - -rm -f vhdlparser/Makefile.vhdlparser - -rm -f .makeconfig .tmakeconfig - -rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro vhdlparser/vhdlparser.pro - -rm -rf generated_src - -rm -f addon/doxywizard/doxywizard.pro - -rm -f VERSION - -rm -f packages/rpm/doxygen.spec - -rm -r addon/doxywizard/Makefile - -rm -f addon/doxysearch/Makefile - -rm -f addon/doxyapp/Makefile - -rm -f addon/doxmlparser/src/Makefile - -rm -f addon/doxmlparser/test/Makefile - -rm -f addon/doxmlparser/examples/metrics/Makefile - -rm -f qtools/Makefile src/Makefile examples/Makefile doc/Makefile - -rm -f Makefile - -DATE=$(shell date "+%B %Y") - -MAN1DIR = man/man1 - -install: doxywizard_install doxysearch_install - $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/bin - $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)$(INSTALL)/bin - $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/$(MAN1DIR) - cat doc/doxygen.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxygen.1 - $(INSTTOOL) -m 644 doxygen.1 $(DESTDIR)$(INSTALL)/$(MAN1DIR)/doxygen.1 - rm doxygen.1 - -install_docs: - $(INSTTOOL) -d $(DESTDIR)$(DOCDIR) - $(MAKE) -C examples - $(MAKE) -C doc - $(MAKE) -C latex - $(INSTTOOL) -m 644 latex/doxygen_manual.pdf $(DESTDIR)$(DOCDIR) - cp -r examples $(DESTDIR)$(DOCDIR) - cp -r html $(DESTDIR)$(DOCDIR) - -docs: FORCE - cd examples ; $(MAKE) - cd doc ; $(MAKE) - -pdf: docs - cd latex ; $(MAKE) - -DISTFILES = Doxyfile vhdlparser libmd5 addon tmake doc examples bin lib objects testing \ - qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \ - Makefile.win_make.in INSTALL LANGUAGE.HOWTO LICENSE PLATFORMS \ - VERSION README.md packages winbuild jquery templates - -archive: clean - tar zcvf dx`date +%y%m%d`.tgz $(DISTFILES) - -DISTDIR = doxygen-`echo $(VERSION) | tr - _` - -dist: clean - rm -rf $(DISTDIR) - mkdir $(DISTDIR) - cp -a $(DISTFILES) $(DISTDIR) - find $(DISTDIR) \( -name ".svn" \) -print0 | xargs -0 rm -rf - tar zcvf $(DISTDIR).src.tar.gz $(DISTDIR) - rm -rf $(DISTDIR) - -DISTDIR = doxygen-`echo $(VERSION) | tr - _` -rpm: dist - gzip -df $(DISTDIR).src.tar.gz - mkdir $(DISTDIR) - mkdir $(DISTDIR)/packages - mkdir $(DISTDIR)/packages/rpm - cp packages/rpm/doxygen.spec $(DISTDIR)/packages/rpm - rm -rf $(DISTDIR) - gzip -9v $(DISTDIR).src.tar - rpmbuild -ta %%WITHDOXYWIZARD%% $(DISTDIR).src.tar.gz - -rpmsrc: dist - gzip -df $(DISTDIR).src.tar.gz - mkdir $(DISTDIR) - mkdir $(DISTDIR)/packages - mkdir $(DISTDIR)/packages/rpm - cp packages/rpm/doxygen.spec $(DISTDIR)/packages/rpm - tar -rvf $(DISTDIR).src.tar $(DISTDIR)/packages/rpm/doxygen.spec - rm -rf $(DISTDIR) - gzip -9v $(DISTDIR).src.tar - rpmbuild -ts %%WITHDOXYWIZARD%% $(DISTDIR).src.tar.gz - -rpmbinary: dist - gzip -df $(DISTDIR).src.tar.gz - mkdir $(DISTDIR) - mkdir $(DISTDIR)/packages - mkdir $(DISTDIR)/packages/rpm - cp packages/rpm/doxygen.spec $(DISTDIR)/packages/rpm - tar -rvf $(DISTDIR).src.tar $(DISTDIR)/packages/rpm/doxygen.spec - rm -rf $(DISTDIR) - gzip -9v $(DISTDIR).src.tar - rpmbuild -tb %%WITHDOXYWIZARD%% $(DISTDIR).src.tar.gz - - -ctags: - ctags -R -f tags src addon/doxywizard qtools - -test: FORCE - make -C testing - -FORCE: - diff --git a/Makefile.win_make.in b/Makefile.win_make.in deleted file mode 100644 index 1218979..0000000 --- a/Makefile.win_make.in +++ /dev/null @@ -1,34 +0,0 @@ -all: src\version.cpp - set TMAKEPATH=$(TMAKEPATH) & cd qtools & $(MAKE) - set TMAKEPATH=$(TMAKEPATH) & cd libmd5 & $(MAKE) - set TMAKEPATH=$(TMAKEPATH) & cd src & $(MAKE) - -clean: - cd examples & $(MAKE) clean - cd doc & $(MAKE) clean - cd src & $(MAKE) clean - -del bin\doxy*.* - -del objects\*.o - -distclean: clean - -del src\Makefile.libdoxygen \ - src\Makefile.doxygen \ - src\Makefile.libdoxycfg \ - src\libdoxycfg.t src\libdoxygen.t - -del Makefile src\Makefile examples\Makefile doc\Makefile - -del src\libdoxygen.pro src\doxygen.pro src\libdoxycfg.pro - -del src\version.cpp - -realclean: distclean - -docs: - set TMAKEPATH=$(TMAKEPATH) & cd examples & $(MAKE) - set TMAKEPATH=$(TMAKEPATH) & cd doc & $(MAKE) - -ps: docs - cd latex & $(MAKE) - -src\version.cpp: Makefile - echo char versionString[]="""$(VERSION)"""; > src\version.cpp - -FORCE: diff --git a/Makefile.win_nmake.in b/Makefile.win_nmake.in deleted file mode 100644 index 069bb53..0000000 --- a/Makefile.win_nmake.in +++ /dev/null @@ -1,51 +0,0 @@ -all: src\version.cpp - set TMAKEPATH=$(TMAKEPATH) - cd qtools - $(MAKE) - cd .. - cd libmd5 - $(MAKE) - cd .. - cd src - $(MAKE) - -clean: FORCE - cd examples - $(MAKE) clean - cd .. - cd doc - $(MAKE) clean - cd .. - cd src - $(MAKE) clean - cd .. - -del bin\doxy*.* - -del objects\*.o - -distclean: clean - -del src\Makefile.libdoxygen \ - src\Makefile.doxygen \ - src\Makefile.libdoxycfg \ - src\libdoxycfg.t src\libdoxygen.t - -del Makefile src\Makefile examples\Makefile doc\Makefile - -del src\libdoxygen.pro src\doxygen.pro src\libdoxycfg.pro - -del src\version.cpp - -realclean: distclean - -docs: FORCE - cd examples - $(MAKE) - cd .. - cd doc - $(MAKE) - cd .. - -ps: docs - cd latex - $(MAKE) - -src\version.cpp: Makefile - echo char versionString[]="$(VERSION)"; > src\version.cpp - -FORCE: @@ -0,0 +1 @@ +1.8.9.1 diff --git a/addon/doxmlparser/CMakeLists.txt b/addon/doxmlparser/CMakeLists.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/addon/doxmlparser/CMakeLists.txt diff --git a/addon/doxmlparser/src/Makefile.in b/addon/doxmlparser/src/Makefile.in deleted file mode 100644 index 47d20c2..0000000 --- a/addon/doxmlparser/src/Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -all clean depend: Makefile.doxmlparser - $(MAKE) -f Makefile.doxmlparser $@ - -distclean: clean - $(RM) -rf Makefile.doxmlparser doxmlparser.pro Makefile obj - -realclean: distclean - -tmake: - $(ENV) $(PERL) $(TMAKE) doxmlparser.pro >Makefile.doxmlparser - -Makefile.doxmlparser: doxmlparser.pro - $(ENV) $(PERL) $(TMAKE) doxmlparser.pro >Makefile.doxmlparser - -install: diff --git a/addon/doxmlparser/src/doxmlparser.pro.in b/addon/doxmlparser/src/doxmlparser.pro.in deleted file mode 100644 index 2bbf326..0000000 --- a/addon/doxmlparser/src/doxmlparser.pro.in +++ /dev/null @@ -1,27 +0,0 @@ -TEMPLATE = lib.t -CONFIG = console staticlib warn_on $extraopts -HEADERS = basehandler.h mainhandler.h \ - compoundhandler.h sectionhandler.h \ - memberhandler.h paramhandler.h \ - dochandler.h linkedtexthandler.h \ - debug.h graphhandler.h stringimpl.h \ - loamhandler.h -SOURCES = mainhandler.cpp \ - compoundhandler.cpp sectionhandler.cpp \ - memberhandler.cpp paramhandler.cpp \ - dochandler.cpp linkedtexthandler.cpp \ - basehandler.cpp debug.cpp graphhandler.cpp \ - loamhandler.cpp -unix:LIBS += -L../../../lib -lqtools -win32:INCLUDEPATH += . -win32-mingw:LIBS += -L../../../lib -lqtools -win32-msvc:LIBS += qtools.lib shell32.lib -win32-msvc:TMAKE_LFLAGS += /LIBPATH:....\\..\lib -win32-borland:LIBS += qtools.lib doxycfg.lib shell32.lib -win32-borland:TMAKE_LFLAGS += -L..\..\..\lib -win32:TMAKE_CXXFLAGS += -DQT_NODLL -DESTDIR = ../../../lib -OBJECTS_DIR = ../../../objects/doxmlparser -TARGET = doxmlparser -INCLUDEPATH += ../../../qtools ../include - diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt new file mode 100644 index 0000000..a039762 --- /dev/null +++ b/addon/doxyapp/CMakeLists.txt @@ -0,0 +1,28 @@ +if (build_app) + +find_package(Iconv) + +include_directories( + ${CMAKE_SOURCE_DIR}/src + ${CMAKE_SOURCE_DIR}/qtools + ${ICONV_INCLUDE_DIR} +) + +add_executable(doxyapp +doxyapp.cpp +) +target_link_libraries(doxyapp +_doxygen +qtools +md5 +doxycfg +vhdlparser +${ICONV_LIBRARIES} +${CMAKE_THREAD_LIBS_INIT} +${SQLITE3_LIBRARIES} +${EXTRA_LIBS} +) + +install(TARGETS doxyapp DESTINATION bin) + +endif() diff --git a/addon/doxyapp/Makefile.in b/addon/doxyapp/Makefile.in deleted file mode 100644 index d0629d9..0000000 --- a/addon/doxyapp/Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ - -all clean depend distclean: Makefile.doxyapp - $(MAKE) -f Makefile.doxyapp $@ - -distclean: clean - $(RM) -rf Makefile doxyapp.pro Makefile.doxyapp - -realclean: distclean - -tmake: - $(ENV) $(PERL) "$(TMAKE)" doxyapp.pro >Makefile.doxyapp - -strip: - strip doxyapp - -Makefile.doxyapp: doxyapp.pro - $(ENV) $(PERL) "$(TMAKE)" doxyapp.pro >Makefile.doxyapp - -install: diff --git a/addon/doxyapp/doxyapp.pro.in b/addon/doxyapp/doxyapp.pro.in deleted file mode 100644 index 207967d..0000000 --- a/addon/doxyapp/doxyapp.pro.in +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app.t -CONFIG = console warn_on debug -HEADERS = -SOURCES = doxyapp.cpp -LIBS += -L../../lib -ldoxygen -lqtools -lmd5 -ldoxycfg -lvhdlparser -lpthread -liconv -DESTDIR = -OBJECTS_DIR = ../../objects/doxyapp -TARGET = ../../bin/doxyapp -INCLUDEPATH += ../../qtools ../../src -DEPENDPATH += ../../src -TARGETDEPS = ../../lib/libdoxygen.a - diff --git a/addon/doxypysql/search.py b/addon/doxypysql/search.py index d0c88c0..c185138 100755 --- a/addon/doxypysql/search.py +++ b/addon/doxypysql/search.py @@ -14,6 +14,7 @@ import sys import os import getopt import json +import re class MemberType: Define="0" @@ -28,6 +29,7 @@ class MemberType: DCOP="9" Property="10" Event="11" + File="12" class RequestType: References="9901" @@ -38,252 +40,253 @@ class RequestType: BaseClasses="9906" SubClasses="9907" -g_conn=None +g_use_regexp=False ############################################################################### -def escapeLike(val): - return 'LIKE "%' + val.replace("\\", "\\\\").replace("_", "\\_") \ - .replace("%", "\\%") + '%" ESCAPE "\\"' +# case-insensitive sqlite regexp function +def re_fn(expr, item): + reg = re.compile(expr, re.I) + return reg.search(item) is not None -def matchName(name): - if type(name) is str: - return "name "+escapeLike(name) - else: - return 'id=%d' %name - -def fileName(id_file): - if g_conn.execute("SELECT COUNT(*) FROM files WHERE id=?",[id_file]).fetchone()[0] > 1: - print "non-uniq fileid" - - for r in g_conn.execute("SELECT * FROM files WHERE id=?",[id_file]).fetchall(): - return r['name'] +def openDb(dbname): + if dbname == None: + dbname = "doxygen_sqlite3.db" - return "" + if not os.path.isfile(dbname): + raise BaseException("No such file %s" % dbname ) -def fileId(name): - if g_conn.execute("SELECT COUNT(*) FROM files WHERE name=?",[name]).fetchone()[0] > 1: - print "non-uniq file name" + conn = sqlite3.connect(dbname) + conn.execute('PRAGMA temp_store = MEMORY;') + conn.row_factory = sqlite3.Row + conn.create_function("REGEXP", 2, re_fn) + return conn +############################################################################### +class Finder: + def __init__(self,cn,name,row_type=str): + self.cn=cn + self.name=name + self.row_type=row_type + + def match(self,row): + if self.row_type is int: + return " id=?" + else: + if g_use_regexp == True: + return " REGEXP (?,%s)" %row + else: + return " %s=?" %row - for r in g_conn.execute("SELECT * FROM files WHERE name=?",[name]).fetchall(): - return r['id'] + def fileName(self,id_file): + if self.cn.execute("SELECT COUNT(*) FROM files WHERE rowid=?",[id_file]).fetchone()[0] > 1: + print >>sys.stderr,"WARNING: non-uniq fileid [%s]. Considering only the first match." % id_file - return -1 + for r in self.cn.execute("SELECT * FROM files WHERE rowid=?",[id_file]).fetchall(): + return r['name'] -############################################################################### + return "" -def findReferences(name): - o=[] + def fileId(self,name): + if self.cn.execute("SELECT COUNT(*) FROM files WHERE"+self.match("name"),[name]).fetchone()[0] > 1: + print >>sys.stderr,"WARNING: non-uniq file name [%s]. Considering only the first match." % name - cur = g_conn.cursor() - cur.execute("SELECT refid FROM memberdef WHERE name=?",[name]) - refids = cur.fetchall() + for r in self.cn.execute("SELECT rowid FROM files WHERE"+self.match("name"),[name]).fetchall(): + return r[0] - if len(refids) == 0: + return -1 +############################################################################### + def references(self): + o=[] + cur = self.cn.cursor() + cur.execute("SELECT refid FROM memberdef WHERE"+self.match("name"),[self.name]) + refids = cur.fetchall() + + if len(refids) == 0: + return o + + refid = refids[0]['refid'] + cur = self.cn.cursor() + #TODO:SELECT rowid from refids where refid=refid + for info in cur.execute("SELECT * FROM xrefs WHERE refid_dst LIKE '%"+refid+"%'"): + item={} + cur = self.cn.cursor() + for i2 in cur.execute("SELECT * FROM memberdef WHERE refid=?",[info['src']]): + item['name']=i2['name'] + item['src']=info['src'] + item['file']=self.fileName(info['id_file']) + item['line']=info['line'] + + o.append(item) return o - - refid = refids[0]['refid'] - cur = g_conn.cursor() - for info in cur.execute("SELECT * FROM xrefs WHERE dst LIKE '%"+refid+"%'"): - item={} - cur = g_conn.cursor() - for i2 in cur.execute("SELECT * FROM memberdef WHERE refid=?",[info['src']]): - item['name']=i2['name'] - item['src']=info['src'] - item['file']=fileName(info['id_file']) - item['line']=info['line'] - - o.append(item) - return o - - -def findFunction(name): - o=[] - for r in g_conn.execute('SELECT * FROM memberdef WHERE '+matchName(name)+' AND kind=?',[MemberType.Function]).fetchall(): - item={} - item['name'] = r['name'] - item['definition'] = r['definition'] - item['argsstring'] = r['argsstring'] - item['file'] = fileName(r['id_file']) - item['line'] = r['line'] - item['detaileddescription'] = r['detaileddescription'] - o.append(item) - return o - - -def findMacro(name): - o=[] - for r in g_conn.execute('SELECT * FROM memberdef WHERE '+matchName(name)+' AND kind=?',[MemberType.Define]).fetchall(): - item={} - item['name'] = r['name'] - if r['argsstring']: +############################################################################### + def function(self): + o=[] + c=self.cn.execute('SELECT * FROM memberdef WHERE'+self.match("name")+' AND kind=?',[self.name,MemberType.Function]) + for r in c.fetchall(): + item={} + item['name'] = r['name'] + item['definition'] = r['definition'] item['argsstring'] = r['argsstring'] - item['definition'] = r['initializer'] - item['file'] = fileName(r['id_file']) - item['line'] = r['line'] - o.append(item) - return o - - -def findTypedef(name): - o=[] - for r in g_conn.execute('SELECT * FROM memberdef WHERE '+matchName(name)+' AND kind=?',[MemberType.Typedef]).fetchall(): - item={} - item['name'] = r['name'] - item['definition'] = r['definition'] - item['file'] = fileName(r['id_file']) - item['line'] = r['line'] - o.append(item) - return o - - -def findVariable(name): - o=[] - for r in g_conn.execute('SELECT * FROM memberdef WHERE '+matchName(name)+' AND kind=?',[MemberType.Variable]).fetchall(): - item={} - item['name'] = r['name'] - item['definition'] = r['definition'] - item['file'] = fileName(r['id_file']) - item['line'] = r['line'] - o.append(item) - return o - -def findParams(name): - o=[] - for r in g_conn.execute('SELECT id FROM memberdef WHERE '+matchName(name)).fetchall(): - #a=("SELECT * FROM params where id=(SELECT id_param FROM memberdef_params where id_memberdef=?",[id_memberdef]) - item={} - item['id'] = r['id'] - o.append(item) - return o - - -def findStruct(name): - o=[] - for r in g_conn.execute('SELECT * FROM compounddef WHERE '+matchName(name)).fetchall(): - item={} - item['name'] = r['name'] - o.append(item) - return o - -def findIncluders(name): - o=[] - fid = fileId(name) - for r in g_conn.execute('SELECT * FROM includes WHERE id_dst=?',[fid]).fetchall(): - item={} - item['name'] = fileName(r['id_src']) - o.append(item) - return o - -def findIncludees(name): - o=[] - fid = fileId(name) - for r in g_conn.execute('SELECT * FROM includes WHERE id_src=?',[fid]).fetchall(): - item={} - item['name'] = r['dst'] - o.append(item) - return o - - -def findMembers(name): - o=[] - for r in g_conn.execute('SELECT * FROM memberdef WHERE scope LIKE "%'+name+'%";').fetchall(): - item={} - item['name'] = r['name'] - item['definition'] = r['definition'] - item['argsstring'] = r['argsstring'] - item['file'] = fileName(r['id_file']) - item['line'] = r['line'] - item['documentation'] = r['documentation'] - o.append(item) - return o - - -def findBaseClasses(name): - o=[] - for r in g_conn.execute('SELECT base FROM basecompoundref WHERE derived=?',[name]).fetchall(): - item={} - item['name'] = r['base'] - o.append(item) - return o - - -def findSubClasses(name): - o=[] - for r in g_conn.execute('SELECT derived FROM basecompoundref WHERE base=?',[name]).fetchall(): - item={} - item['name'] = r['derived'] - o.append(item) - return o - - + item['file'] = self.fileName(r['id_file']) + item['line'] = r['line'] + item['detaileddescription'] = r['detaileddescription'] + o.append(item) + return o ############################################################################### + def file(self): + o=[] + for r in self.cn.execute("SELECT rowid,* FROM files WHERE"+self.match("name"),[self.name]).fetchall(): + item={} + item['name'] = r['name'] + item['id'] = r['rowid'] + o.append(item) + return o -def usage(): - print """Usage: search.py [Options] -Options: - -h, --help - -d <D> Use database <D> for queries - -r <F> Search for references to <F> - -f <F> Search for definition of function <F> - -m <M> Search for definition of macro <M> - -t <T> Search for definition of type <T> - -v <V> Search for definition of variable <V> - -I <I> Get the includers of <I> - -i <I> Get the includees of <I> - -M <C> Get all members of class <C> - -B <C> Get the base classes of class <C> - -S <C> Get the sub classes of class <C> -""" - -def openDb(dbname): - global g_conn - - if dbname == None: - dbname = "doxygen_sqlite3.db" - - if not os.path.isfile(dbname): - raise BaseException("No such file %s" % dbname ) - - g_conn = sqlite3.connect(dbname) - g_conn.execute('PRAGMA temp_store = MEMORY;') - g_conn.row_factory = sqlite3.Row - ############################################################################### -def process(kind,o): + def macro(self): + o=[] + c=self.cn.execute('SELECT * FROM memberdef WHERE'+self.match("name")+' AND kind=?',[self.name,MemberType.Define]) + for r in c.fetchall(): + item={} + item['name'] = r['name'] + if r['argsstring']: + item['argsstring'] = r['argsstring'] + item['definition'] = r['initializer'] + item['file'] = self.fileName(r['id_file']) + item['line'] = r['line'] + o.append(item) + return o +############################################################################### + def typedef(self): + o=[] + c=self.cn.execute('SELECT * FROM memberdef WHERE'+self.match("name")+' AND kind=?',[self.name,MemberType.Typedef]) + for r in c.fetchall(): + item={} + item['name'] = r['name'] + item['definition'] = r['definition'] + item['file'] = self.fileName(r['id_file']) + item['line'] = r['line'] + o.append(item) + return o +############################################################################### + def variable(self): + o=[] + c=self.cn.execute('SELECT * FROM memberdef WHERE'+self.match("name")+' AND kind=?',[self.name,MemberType.Variable]) + for r in c.fetchall(): + item={} + item['name'] = r['name'] + item['definition'] = r['definition'] + item['file'] = self.fileName(r['id_file']) + item['line'] = r['line'] + o.append(item) + return o +############################################################################### + def params(self): + o=[] + c=self.cn.execute('SELECT id FROM memberdef WHERE'+self.match("name"),[self.name]) + for r in c.fetchall(): + #a=("SELECT * FROM params where id=(SELECT id_param FROM memberdef_params where id_memberdef=?",[id_memberdef]) + item={} + item['id'] = r['id'] + o.append(item) + return o +############################################################################### + def struct(self): + o=[] + c=self.cn.execute('SELECT * FROM compounddef WHERE'+self.match("name"),[self.name]) + for r in c.fetchall(): + item={} + item['name'] = r['name'] + o.append(item) + return o +############################################################################### + def includers(self): + o=[] + fid = self.fileId(self.name) + c=self.cn.execute('SELECT * FROM includes WHERE id_dst=?',[fid]) + for r in c.fetchall(): + item={} + item['name'] = self.fileName(r['id_src']) + o.append(item) + return o +############################################################################### + def includees(self): + o=[] + fid = self.fileId(self.name) + c=self.cn.execute('SELECT * FROM includes WHERE id_src=?',[fid]) + for r in c.fetchall(): + item={} + item['name'] = self.fileName(r['id_dst']) + o.append(item) + return o +############################################################################### + def members(self): + o=[] + c=self.cn.execute('SELECT * FROM memberdef WHERE'+self.match("scope"),[self.name]) + for r in c.fetchall(): + item={} + item['name'] = r['name'] + item['definition'] = r['definition'] + item['argsstring'] = r['argsstring'] + item['file'] = self.fileName(r['id_file']) + item['line'] = r['line'] + #item['documentation'] = r['documentation'] + o.append(item) + return o +############################################################################### + def baseClasses(self): + o=[] + c=self.cn.execute('SELECT base FROM basecompoundref WHERE'+self.match("derived"),[self.name]) + for r in c.fetchall(): + item={} + item['name'] = r['base'] + o.append(item) + return o +############################################################################### + def subClasses(self): + o=[] + c=self.cn.execute('SELECT derived FROM basecompoundref WHERE'+self.match("base"),[self.name]) + for r in c.fetchall(): + item={} + item['name'] = r['derived'] + o.append(item) + return o +############################################################################### +def process(f,kind): request_processors = { - MemberType.Function: findFunction, - MemberType.Define: findMacro, - MemberType.Variable: findVariable, - MemberType.Typedef: findTypedef, - RequestType.References: findReferences, - RequestType.Struct: findStruct, - RequestType.Includers: findIncluders, - RequestType.Includees: findIncludees, - RequestType.Members: findMembers, - RequestType.BaseClasses: findBaseClasses, - RequestType.SubClasses: findSubClasses + MemberType.Function: f.function, + MemberType.File: f.file, + MemberType.Define: f.macro, + MemberType.Variable: f.variable, + MemberType.Typedef: f.typedef, + RequestType.References: f.references, + RequestType.Struct: f.struct, + RequestType.Includers: f.includers, + RequestType.Includees: f.includees, + RequestType.Members: f.members, + RequestType.BaseClasses: f.baseClasses, + RequestType.SubClasses: f.subClasses } - return request_processors[kind](o) - - -def processHref(ref): + return request_processors[kind]() +############################################################################### +def processHref(cn,ref): j={} # is it in memberdef ? table="memberdef" - if ( g_conn.execute("SELECT count(*) from %s WHERE refid='%s'" % (table,ref) ).fetchone()[0] > 0 ): - for r in g_conn.execute("SELECT kind,id FROM %s WHERE refid='%s'" % (table,ref) ).fetchall(): - j=process(str(r['kind']),int(r['id'])) + if ( cn.execute("SELECT count(*) from %s WHERE refid=?"%table,[ref] ).fetchone()[0] > 0 ): + for r in cn.execute("SELECT kind,id FROM %s WHERE refid='%s'" % (table,ref) ).fetchall(): + f=Finder(cn,r['id'],int) + j=process(f,str(r['kind'])) # is it in compounddef ? table="compounddef" - if ( g_conn.execute("SELECT count(*) from %s WHERE refid='%s'" % (table,ref)).fetchone()[0] > 0 ): - for r in g_conn.execute("SELECT id FROM %s WHERE refid='%s'" % (table,ref) ).fetchall(): - j=process(RequestType.Struct,int(r['id'])) + if ( cn.execute("SELECT count(*) from %s WHERE refid=?"%table,[ref]).fetchone()[0] > 0 ): + for r in cn.execute("SELECT id FROM %s WHERE refid=?"%table,[ref] ).fetchall(): + f=Finder(cn,r['id'],int) + j=process(f,RequestType.Struct) return j - - +############################################################################### def serveCgi(): import cgi @@ -298,16 +301,33 @@ def serveCgi(): print '{"result": null, "error": "no refid given"}' sys.exit(0) - openDb('doxygen_sqlite3.db') + cn=openDb('doxygen_sqlite3.db') - j = processHref(ref) + j = processHref(cn,ref) print json.dumps({"result":j,"error":None}) - - +############################################################################### +def usage(): + print >>sys.stderr,"""Usage: search.py [Options] +Options: + -h, --help + -d <D> Use database <D> for queries. + -f <F> Search for definition of function <F>. + -m <M> Search for definition of macro <M>. + -r <F> Search for references to function <F>. + -t <T> Search for definition of type <T>. + -v <V> Search for definition of variable <V>. + -I <I> What files are including <I>. + -i <i> What files are included by <i>. + -B <C> Get the base classes of class <C>. + -M <C> Get all members of class <C>. + -S <C> Get the sub classes of class <C>. + -R Consider the search <term> to be a regex. +""" +############################################################################### def serveCli(argv): try: - opts, args = getopt.getopt(argv, "hr:I:i:d:f:m:t:v:H:M:B:S:",["help"]) + opts, args = getopt.getopt(argv, "hr:RI:i:d:f:m:t:v:H:M:B:S:F:",["help"]) except getopt.GetoptError: usage() sys.exit(1) @@ -315,6 +335,7 @@ def serveCli(argv): ref=None dbname=None j={} + global g_use_regexp for a, o in opts: if a in ('-h', '--help'): @@ -325,6 +346,9 @@ def serveCli(argv): continue elif a in ('-r'): kind=RequestType.References + elif a in ('-R'): + g_use_regexp=True + continue elif a in ('-I'): kind=RequestType.Includers elif a in ('-i'): @@ -337,6 +361,8 @@ def serveCli(argv): kind=RequestType.SubClasses elif a in ('-f'): kind=MemberType.Function + elif a in ('-F'): + kind=MemberType.File elif a in ('-m'): kind=MemberType.Define elif a in ('-t'): @@ -346,12 +372,13 @@ def serveCli(argv): elif a in ('-H'): ref = o - openDb(dbname) + cn=openDb(dbname) + f=Finder(cn,o) if ref != None: - j=processHref(ref) + j=processHref(cn,ref) else: - j=process(kind,o) - print json.dumps(j) + j=process(f,kind) + print json.dumps(j,indent=4) def main(argv): diff --git a/addon/doxysearch/CMakeLists.txt b/addon/doxysearch/CMakeLists.txt new file mode 100644 index 0000000..e3511aa --- /dev/null +++ b/addon/doxysearch/CMakeLists.txt @@ -0,0 +1,30 @@ +if (build_search) + +find_package(Xapian REQUIRED) +find_package(ZLIB REQUIRED) + +include_directories( + ${CMAKE_SOURCE_DIR}/qtools + ${XAPIAN_INCLUDE_DIR} + ${ZLIB_INCLUDE_DIRS} +) +add_executable(doxyindexer + doxyindexer.cpp +) +target_link_libraries(doxyindexer + ${XAPIAN_LIBRARIES} + ${ZLIB_LIBRARIES} + qtools +) + +add_executable(doxysearch.cgi + doxysearch.cpp +) +target_link_libraries(doxysearch.cgi + ${XAPIAN_LIBRARIES} + ${ZLIB_LIBRARIES} +) + +install(TARGETS doxyindexer doxysearch.cgi DESTINATION bin) + +endif() diff --git a/addon/doxysearch/Makefile.in b/addon/doxysearch/Makefile.in deleted file mode 100644 index 7daafee..0000000 --- a/addon/doxysearch/Makefile.in +++ /dev/null @@ -1,34 +0,0 @@ - -all clean depend: Makefile.doxysearch Makefile.doxyindexer - $(MAKE) -f Makefile.doxysearch $@ - $(MAKE) -f Makefile.doxyindexer $@ - -distclean: clean - $(RM) -rf Makefile doxysearch.pro Makefile.doxysearch - $(RM) -rf Makefile doxyindexer.pro Makefile.doxyindexer - -tmake: - $(ENV) $(PERL) "$(TMAKE)" doxysearch.pro >Makefile.doxysearch - $(ENV) $(PERL) "$(TMAKE)" doxyindexer.pro >Makefile.doxyindexer - -strip: - strip doxysearch - -Makefile.doxysearch: doxysearch.pro - $(ENV) $(PERL) "$(TMAKE)" doxysearch.pro >Makefile.doxysearch - -Makefile.doxyindexer: doxyindexer.pro - $(ENV) $(PERL) "$(TMAKE)" doxyindexer.pro >Makefile.doxyindexer - -install: - $(INSTTOOL) -d $(INSTALL)/bin - $(INSTTOOL) -m 755 ../../bin/doxysearch.cgi $(INSTALL)/bin - $(INSTTOOL) -m 755 ../../bin/doxyindexer $(INSTALL)/bin - $(INSTTOOL) -d $(INSTALL)/$(MAN1DIR) - cat ../../doc/doxyindexer.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxyindexer.1 - $(INSTTOOL) -m 644 doxyindexer.1 $(INSTALL)/$(MAN1DIR)/doxyindexer.1 - rm doxyindexer.1 - cat ../../doc/doxysearch.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxysearch.1 - $(INSTTOOL) -m 644 doxysearch.1 $(INSTALL)/$(MAN1DIR)/doxysearch.1 - rm doxysearch.1 - diff --git a/addon/doxysearch/doxyindexer.pro.in b/addon/doxysearch/doxyindexer.pro.in deleted file mode 100644 index c84a2ac..0000000 --- a/addon/doxysearch/doxyindexer.pro.in +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app.t -CONFIG = console warn_on static release -HEADERS = -SOURCES = doxyindexer.cpp -LIBS += -L../../lib -lxapian -lqtools -DESTDIR = -OBJECTS_DIR = ../../objects/doxyindexer -TARGET = ../../bin/doxyindexer -INCLUDEPATH += ../../qtools -DEPENDPATH += -TARGETDEPS = - diff --git a/addon/doxysearch/doxysearch.pro.in b/addon/doxysearch/doxysearch.pro.in deleted file mode 100644 index 702f5a4..0000000 --- a/addon/doxysearch/doxysearch.pro.in +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app.t -CONFIG = console warn_on debug cgi -HEADERS = -SOURCES = doxysearch.cpp -LIBS += -lxapian -DESTDIR = -OBJECTS_DIR = ../../objects/doxysearch -TARGET = ../../bin/doxysearch.cgi -INCLUDEPATH += -DEPENDPATH += -TARGETDEPS = - diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt new file mode 100644 index 0000000..055aac3 --- /dev/null +++ b/addon/doxywizard/CMakeLists.txt @@ -0,0 +1,80 @@ +if (build_wizard) + +include_directories( + . + ${CMAKE_SOURCE_DIR}/src + ${CMAKE_SOURCE_DIR}/qtools + ${GENERATED_SRC} +) + +set(GENERATED_SRC_WIZARD ${GENERATED_SRC}/doxywizard) +file(MAKE_DIRECTORY ${GENERATED_SRC_WIZARD}) + +add_definitions(-DQT_ARCH_X86_64 -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DUNICODE) +set(QT_USE_QTXML TRUE) +find_package(Qt4 REQUIRED) +include(${QT_USE_FILE}) + +# generate settings.h +file(GENERATE OUTPUT ${GENERATED_SRC_WIZARD}/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_WIZARD}/settings.h PROPERTIES GENERATED 1) + +# generate version.cpp +file(GENERATE OUTPUT ${GENERATED_SRC_WIZARD}/version.cpp + CONTENT "char versionString[]=\"${VERSION}\";" +) +set_source_files_properties(${GENERATED_SRC_WIZARD}/version.cpp PROPERTIES GENERATED 1) + +# generate configdoc.cpp +add_custom_command( +COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -wiz ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp +OUTPUT ${GENERATED_SRC_WIZARD}/configdoc.cpp +) +set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GENERATED 1) + +FLEX_TARGET(config_doxyw config_doxyw.l ${GENERATED_SRC_WIZARD}/config_doxyw.cpp COMPILE_FLAGS "-Pconfig_doxywYY") + +QT4_WRAP_CPP(doxywizard_MOC +doxywizard.h +expert.h +helplabel.h +inputint.h +inputbool.h +inputstring.h +inputstrlist.h +wizard.h +) + +QT4_ADD_RESOURCES(doxywizard_RESOURCES_RCC doxywizard.qrc) + +add_executable(doxywizard +doxywizard.cpp +expert.cpp +wizard.cpp +inputbool.cpp +inputstring.cpp +inputint.cpp +inputstrlist.cpp +${GENERATED_SRC_WIZARD}/settings.h +${GENERATED_SRC_WIZARD}/version.cpp +${GENERATED_SRC_WIZARD}/config_doxyw.cpp +${GENERATED_SRC_WIZARD}/configdoc.cpp +${doxywizard_MOC} +${doxywizard_RESOURCES_RCC} +) +target_link_libraries(doxywizard +${QT_LIBRARIES} +) + +install(TARGETS doxywizard DESTINATION bin) + +endif() diff --git a/addon/doxywizard/Makefile.in b/addon/doxywizard/Makefile.in deleted file mode 100644 index 79b885e..0000000 --- a/addon/doxywizard/Makefile.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. -# - -QMAKE=$(QTDIR)/bin/$(QMAKEEXE) $(MKSPECS) -INCBUFSIZE=$(PYTHON) ../../src/increasebuffer.py - -all: Makefile.doxywizard - $(MAKE) -f Makefile.doxywizard LEX=$(LEX) PYTHON=$(PYTHON) INCBUFSIZE="$(INCBUFSIZE)" - -Makefile.doxywizard: doxywizard.pro - $(QMAKE) doxywizard.pro -o Makefile.doxywizard - -qmake: - $(QMAKE) doxywizard.pro -o Makefile.doxywizard - -clean: Makefile.doxywizard - $(MAKE) -f Makefile.doxywizard clean - -distclean: Makefile.doxywizard - $(MAKE) -f Makefile.doxywizard distclean - $(RM) Makefile.doxywizard - -install: - $(INSTTOOL) -d $(INSTALL)/bin - $(INSTTOOL) -m 755 ../../bin/doxywizard $(INSTALL)/bin - $(INSTTOOL) -d $(INSTALL)/$(MAN1DIR) - cat ../../doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxywizard.1 - $(INSTTOOL) -m 644 doxywizard.1 $(INSTALL)/$(MAN1DIR)/doxywizard.1 - rm doxywizard.1 - -FORCE: diff --git a/addon/doxywizard/config_doxyw.l b/addon/doxywizard/config_doxyw.l index 6402674..3e1c59f 100644 --- a/addon/doxywizard/config_doxyw.l +++ b/addon/doxywizard/config_doxyw.l @@ -12,6 +12,7 @@ * */ +%option never-interactive %{ /* @@ -21,6 +22,8 @@ #include "input.h" #include <QtCore> +#define YY_NO_UNISTD_H 1 + #define MAX_INCLUDE_DEPTH 10 diff --git a/addon/doxywizard/doxywizard.pro.in b/addon/doxywizard/doxywizard.pro.in deleted file mode 100644 index 1ad36a9..0000000 --- a/addon/doxywizard/doxywizard.pro.in +++ /dev/null @@ -1,40 +0,0 @@ -###################################################################### -# Automatically generated by qmake (2.01a) zo okt 19 12:50:02 2008 -###################################################################### - -TEMPLATE = app -DESTDIR = ../../bin -TARGET = -DEPENDPATH += . -INCLUDEPATH += . ../../generated_src/doxywizard -QT += xml -CONFIG += $extraopts -OBJECTS_DIR = ../../objects/doxywizard -MOC_DIR = ../../moc/doxywizard -RCC_DIR = ../../rcc/doxywizard -DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII - -macx-g++ { - CONFIG += x86 x86_64 -} - -# Input -HEADERS += doxywizard.h version.h expert.h config.h helplabel.h \ - inputbool.h inputstring.h inputint.h inputstrlist.h wizard.h docintf.h -SOURCES += doxywizard.cpp expert.cpp wizard.cpp \ - inputbool.cpp inputstring.cpp inputint.cpp inputstrlist.cpp -RESOURCES += doxywizard.qrc -win32:RC_FILE += doxywizard.rc - -config.target = ../../generated_src/doxywizard/config_doxyw.cpp -config.commands = $(LEX) -Pconfig_doxywYY -t ../../addon/doxywizard/config_doxyw.l | $(PYTHON) ../../src/increasebuffer.py >../../generated_src/doxywizard/$*.cpp -config.depends = ../../addon/doxywizard/config_doxyw.l ../../src/increasebuffer.py -configdoc.target = ../../generated_src/doxywizard/configdoc.cpp -configdoc.commands = $(PYTHON) ../../src/configgen.py -wiz ../../src/config.xml > ../../generated_src/doxywizard/configdoc.cpp -configdoc.depends = ../../src/config.xml ../../src/configgen.py -version.target = ../../generated_src/doxywizard/version.cpp -version.commands = cd ../../src;$(PYTHON) version.py -version.depends = ../../configure -QMAKE_EXTRA_TARGETS += configdoc config version -GENERATED_SOURCES += $$configdoc.target $$config.target $$version.target - diff --git a/cmake/FindIconv.cmake b/cmake/FindIconv.cmake new file mode 100644 index 0000000..d96e3c0 --- /dev/null +++ b/cmake/FindIconv.cmake @@ -0,0 +1,126 @@ +# vim:ts=4:sw=4:expandtab:autoindent: +# +# The MIT License +# +# Copyright (c) 2008, 2009 Flusspferd contributors (see "CONTRIBUTORS" or +# http://flusspferd.org/contributors.txt) +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. +# + +Include(CheckFunctionExists) +include(CheckCXXSourceCompiles) + +if(ICONV_INCLUDE_DIR) + set(ICONV_FIND_QUIETLY TRUE) +endif() + +find_path(ICONV_INCLUDE_DIR iconv.h + HINTS + ${CMAKE_PREFIX_PATH} + ${ICONV_DIR} + $ENV{ICONV_DIR} + PATH_SUFFIXES include +) + +if(NOT ICONV_INCLUDE_DIR STREQUAL "ICONV_INCLUDE_DIR-NOTFOUND") + set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR}) + check_function_exists(iconv_open ICONV_IN_GLIBC) +endif() + +if(NOT ICONV_IN_GLIBC) + if (CMAKE_CL_64) + find_library(ICONV_LIBRARY + NAMES iconv64 + HINTS + ${CMAKE_PREFIX_PATH} + ${ICONV_DIR} + $ENV{ICONV_DIR} + PATH_SUFFIXES lib64 lib + ) + else() + find_library(ICONV_LIBRARY + NAMES iconv + HINTS + ${CMAKE_PREFIX_PATH} + ${ICONV_DIR} + $ENV{ICONV_DIR} + PATH_SUFFIXES lib64 lib + ) + endif() + set(ICONV_TEST ${ICONV_LIBRARY}) +else() + set(ICONV_TEST "In glibc") +endif() + +set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR}) +set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY}) +check_cxx_source_compiles( + "#include <iconv.h> + int main() { + iconv(iconv_t(-1), 0, 0, 0, 0); + }" + ICONV_COMPILES) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(ICONV DEFAULT_MSG ICONV_TEST ICONV_INCLUDE_DIR ICONV_COMPILES) + +if(ICONV_FOUND) + set(ICONV_LIBRARIES ${ICONV_LIBRARY}) +else(ICONV_FOUND) + set(ICONV_LIBRARIES) +endif(ICONV_FOUND) + +if(ICONV_FOUND) + set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR}) + set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES}) + + if (NOT DEFINED ICONV_ACCEPTS_NONCONST_INPUT) + # Display a useful message first time we come through here + message(STATUS "One (and only one) of the ICONV_ACCEPTS_... tests must pass") + endif() + check_cxx_source_compiles( + "#include <iconv.h> + int main() { + char *p = 0; + iconv(iconv_t(-1), &p, 0, 0, 0); + }" + ICONV_ACCEPTS_NONCONST_INPUT) + + check_cxx_source_compiles( + "#include <iconv.h> + int main() { + char const *p = 0; + iconv(iconv_t(-1), &p, 0, 0, 0); + }" + ICONV_ACCEPTS_CONST_INPUT) + + if (ICONV_LIBRARY) + list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY}) + list(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES) + endif() +endif() + +if(NOT ICONV_ACCEPTS_CONST_INPUT AND NOT ICONV_ACCEPTS_NONCONST_INPUT) + MESSAGE(FATAL_ERROR "Unable to determine iconv() signature") +elseif(ICONV_ACCEPTS_CONST_INPUT AND ICONV_ACCEPTS_NONCONST_INPUT) + MESSAGE(FATAL_ERROR "Unable to determine iconv() signature - both test cases passed!") +endif() + +mark_as_advanced(ICONV_LIBRARY ICONV_INCLUDE_DIR) diff --git a/cmake/FindLibClang.cmake b/cmake/FindLibClang.cmake new file mode 100644 index 0000000..2835b1f --- /dev/null +++ b/cmake/FindLibClang.cmake @@ -0,0 +1,51 @@ +if (NOT CLANG_ROOT) + set(CLANG_ROOT $ENV{CLANG_ROOT}) +endif () + +if (NOT LLVM_CONFIG) + set(LLVM_CONFIG $ENV{LLVM_CONFIG}) + if (NOT LLVM_CONFIG) + set(llvm_config_names llvm-config) + foreach(minor RANGE 9 1) + list(APPEND llvm_config_names "llvm-config3${minor}" "llvm-config-3.${minor}" "llvm-config-mp-3.${minor}") + endforeach () + find_program(LLVM_CONFIG NAMES ${llvm_config_names}) + endif () +endif () + +if (LLVM_CONFIG) + message(STATUS "llvm-config found at: ${LLVM_CONFIG}") +else () + message(FATAL_ERROR "Could NOT find llvm-config executable.") +endif () + +if (NOT EXISTS ${CLANG_INCLUDEDIR}) + execute_process(COMMAND ${LLVM_CONFIG} --includedir OUTPUT_VARIABLE CLANG_INCLUDEDIR OUTPUT_STRIP_TRAILING_WHITESPACE) + if (NOT EXISTS ${CLANG_INCLUDEDIR}) + message(FATAL_ERROR "Could NOT find clang includedir. You can fix this by setting CLANG_INCLUDEDIR in your shell or as a cmake variable.") + endif () +endif () + +if (NOT EXISTS ${CLANG_LIBDIR}) + execute_process(COMMAND ${LLVM_CONFIG} --libdir OUTPUT_VARIABLE CLANG_LIBDIR OUTPUT_STRIP_TRAILING_WHITESPACE) + if (NOT EXISTS ${CLANG_LIBDIR}) + message(FATAL_ERROR "Could NOT find clang libdir. You can fix this by setting CLANG_LIBDIR in your shell or as a cmake variable.") + endif () +endif () + +if (NOT CLANG_LIBS) + find_library(CLANG_LIB_HACK_CMAKECACHE_DOT_TEXT_BULLSHIT NAMES clang libclang ${CLANG_ROOT}/lib ${CLANG_LIBDIR} NO_DEFAULT_PATH) + if (NOT EXISTS ${CLANG_CLANG_LIB_HACK_CMAKECACHE_DOT_TEXT_BULLSHIT}) + find_library(CLANG_LIBS NAMES clang libclang) + if (NOT EXISTS ${CLANG_LIBS}) + set (CLANG_LIBS "-L${CLANG_LIBDIR}" "-lclang" "-Wl,-rpath,${CLANG_LIBDIR}") + endif () + else () + set(CLANG_LIBS "${CLANG_LIB_HACK_CMAKECACHE_DOT_TEXT_BULLSHIT}") + endif () +endif () + +execute_process(COMMAND ${LLVM_CONFIG} --version OUTPUT_VARIABLE CLANG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) +message("-- Using Clang ${CLANG_VERSION} from ${CLANG_LIBDIR} with LIBS ${CLANG_LIBS} and CXXFLAGS ${CLANG_CXXFLAGS}") + + diff --git a/cmake/FindSQLite3.cmake b/cmake/FindSQLite3.cmake new file mode 100644 index 0000000..77b8eb4 --- /dev/null +++ b/cmake/FindSQLite3.cmake @@ -0,0 +1,86 @@ +# - Try to find Sqlite3 +# Once done this will define +# +# SQLITE3_FOUND - system has Sqlite3 +# SQLITE3_INCLUDE_DIRS - the Sqlite3 include directory +# SQLITE3_LIBRARIES - Link these to use Sqlite3 +# SQLITE3_DEFINITIONS - Compiler switches required for using Sqlite3 +# +# Copyright (c) 2008 Andreas Schneider <mail@cynapses.org> +# +# Redistribution and use is allowed according to the terms of the New +# BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# + + +if (SQLITE3_LIBRARIES AND SQLITE3_INCLUDE_DIRS) + # in cache already + set(SQLITE3_FOUND TRUE) +else (SQLITE3_LIBRARIES AND SQLITE3_INCLUDE_DIRS) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) + include(UsePkgConfig) + pkgconfig(sqlite3 _SQLITE3_INCLUDEDIR _SQLITE3_LIBDIR _SQLITE3_LDFLAGS _SQLITE3_CFLAGS) + else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) + find_package(PkgConfig) + if (PKG_CONFIG_FOUND) + pkg_check_modules(_SQLITE3 sqlite3) + endif (PKG_CONFIG_FOUND) + endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) + find_path(SQLITE3_INCLUDE_DIR + NAMES + sqlite3.h + PATHS + ${_SQLITE3_INCLUDEDIR} + /usr/include + /usr/local/include + /opt/local/include + /sw/include + ) + + find_library(SQLITE3_LIBRARY + NAMES + sqlite3 + PATHS + ${_SQLITE3_LIBDIR} + /usr/lib + /usr/local/lib + /opt/local/lib + /sw/lib + ) + + if (SQLITE3_LIBRARY) + set(SQLITE3_FOUND TRUE) + endif (SQLITE3_LIBRARY) + + set(SQLITE3_INCLUDE_DIRS + ${SQLITE3_INCLUDE_DIR} + ) + + if (SQLITE3_FOUND) + set(SQLITE3_LIBRARIES + ${SQLITE3_LIBRARIES} + ${SQLITE3_LIBRARY} + ) + endif (SQLITE3_FOUND) + + if (SQLITE3_INCLUDE_DIRS AND SQLITE3_LIBRARIES) + set(SQLITE3_FOUND TRUE) + endif (SQLITE3_INCLUDE_DIRS AND SQLITE3_LIBRARIES) + + if (SQLITE3_FOUND) + if (NOT Sqlite3_FIND_QUIETLY) + message(STATUS "Found Sqlite3: ${SQLITE3_LIBRARIES}") + endif (NOT Sqlite3_FIND_QUIETLY) + else (SQLITE3_FOUND) + if (Sqlite3_FIND_REQUIRED) + message(FATAL_ERROR "Could not find Sqlite3") + endif (Sqlite3_FIND_REQUIRED) + endif (SQLITE3_FOUND) + + # show the SQLITE3_INCLUDE_DIRS and SQLITE3_LIBRARIES variables only in the advanced view + mark_as_advanced(SQLITE3_INCLUDE_DIRS SQLITE3_LIBRARIES) + +endif (SQLITE3_LIBRARIES AND SQLITE3_INCLUDE_DIRS) diff --git a/cmake/FindXapian.cmake b/cmake/FindXapian.cmake new file mode 100644 index 0000000..6109d7f --- /dev/null +++ b/cmake/FindXapian.cmake @@ -0,0 +1,42 @@ +# Find Xapian search engine library +# +# XAPIAN_FOUND - system has Xapian +# XAPIAN_INCLUDE_DIR - the Xapian include directory +# XAPIAN_LIBRARIES - the libraries needed to use Xapian +# +# Copyright © 2010 Harald Sitter <apachelogger@ubuntu.com> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if(XAPIAN_INCLUDE_DIR AND XAPIAN_LIBRARIES) + # Already in cache, be silent + set(Xapian_FIND_QUIETLY TRUE) +endif(XAPIAN_INCLUDE_DIR AND XAPIAN_LIBRARIES) + +FIND_PATH(XAPIAN_INCLUDE_DIR xapian/version.h) + +FIND_LIBRARY(XAPIAN_LIBRARIES NAMES xapian) + +IF(XAPIAN_INCLUDE_DIR AND XAPIAN_LIBRARIES) + SET(XAPIAN_FOUND TRUE) +ELSE(XAPIAN_INCLUDE_DIR AND XAPIAN_LIBRARIES) + SET(XAPIAN_FOUND FALSE) +ENDIF(XAPIAN_INCLUDE_DIR AND XAPIAN_LIBRARIES) + +IF(XAPIAN_FOUND) + IF(NOT Xapian_FIND_QUIETLY) + MESSAGE(STATUS "Found Xapian: ${XAPIAN_LIBRARIES}") + ENDIF(NOT Xapian_FIND_QUIETLY) +ELSE(XAPIAN_FOUND) + IF(Xapian_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find Xapian") + ENDIF(Xapian_FIND_REQUIRED) + IF(NOT Xapian_FIND_QUIETLY) + MESSAGE(STATUS "Could not find Xapian") + ENDIF(NOT Xapian_FIND_QUIETLY) +ENDIF(XAPIAN_FOUND) + +# show the XAPIAN_INCLUDE_DIR and XAPIAN_LIBRARIES variables only in the advanced view +MARK_AS_ADVANCED(XAPIAN_INCLUDE_DIR XAPIAN_LIBRARIES) + diff --git a/cmake/lang_cfg.cmake b/cmake/lang_cfg.cmake new file mode 100644 index 0000000..c57d3ed --- /dev/null +++ b/cmake/lang_cfg.cmake @@ -0,0 +1,11 @@ +if(${CMAKE_ARGC} GREATER 1) + if ("${CMAKE_ARGV3}" STREQUAL "ENONLY") + message("#define ENGLISH_ONLY") + else() + math(EXPR UPTO ${CMAKE_ARGC}-1) + foreach(i RANGE 3 ${UPTO}) + message("#define LANG_${CMAKE_ARGV${i}}") + endforeach() + endif() +endif() + diff --git a/cmake/run_translator.cmake b/cmake/run_translator.cmake new file mode 100644 index 0000000..618bb82 --- /dev/null +++ b/cmake/run_translator.cmake @@ -0,0 +1,5 @@ +include(${SOURCE}/cmake/version.cmake) +find_program(PYTHON NAMES python) +execute_process( + COMMAND ${PYTHON} ${CMAKE_SOURCE_DIR}/translator.py +) diff --git a/cmake/version.cmake b/cmake/version.cmake new file mode 100644 index 0000000..48de7b2 --- /dev/null +++ b/cmake/version.cmake @@ -0,0 +1,2 @@ +file (STRINGS "${SOURCE}/VERSION" VERSION) +set(ENV{VERSION} "${VERSION}") diff --git a/configure b/configure deleted file mode 100755 index 8d9f1bb..0000000 --- a/configure +++ /dev/null @@ -1,1003 +0,0 @@ -#!/bin/sh -# -# $Id$ -# -# Copyright (C) 1997-2014 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. -# -# shell script to configure doxygen - -doxygen_version_major=1 -doxygen_version_minor=8 -doxygen_version_revision=9.1 - -#NOTE: Setting version_mmn to "NO" will omit mmn info from the package. -doxygen_version_mmn=NO - -bin_dirs=`echo $PATH | sed -e "s/:/ /g"` - -f_debug=NO -f_shared=YES -f_make=NO -f_dot=NO -f_perl=NO -f_python=NO -f_plf_auto=NO -f_prefix=/usr/local -f_insttool=NO -f_english=NO -f_wizard=NO -f_app=NO -f_doxmlparser=NO -f_thread=NO -f_flex=NO -f_bison=NO -f_search=NO -f_sqlite3=NO -f_sqlite3static=NO -f_sqlite3_path=NO -f_libclang=NO -f_libclangstatic=NO - -# -# first setup the list with availabe languages, so we cannot forget any -# list will be in case as specified (f_langs) and in uppercase (f_ulangs) as used in the internal perl script -# -f_langs=`ls -1 src/translator_??.h | sed -e 's%src/translator_%%g' | sed -e 's/\.h//' | tr '\012' ','` - -while test -n "$1"; do - case $1 in - --prefix=*) - f_prefix=`echo $1 | sed 's/^--prefix=//'` - ;; - --prefix | -prefix) - shift; f_prefix=$1 - ;; - --docdir=*) - f_docdir=`echo $1 | sed 's/^--docdir=//'` - ;; - --docdir | -docdir) - shift; f_docdir=$1 - ;; - --shared | -shared) - f_shared=YES - ;; - --static | -static) - f_shared=NO - ;; - --release | -release) - f_debug=NO - ;; - --debug | -debug) - f_debug=YES - ;; - --english-only | -english-only) - f_english=YES - ;; - --enable-langs=*) - f_langs=`echo $1 | sed 's/^--enable-langs=//'` - ;; - --enable-langs | -enable-langs) - shift; f_langs=$1 - ;; - --platform=*) - f_platform=`echo $1 | sed 's/^--platform=//'` - ;; - --platform | -platform) - shift; f_platform=$1 - ;; - --make=*) - f_make=`echo $1 | sed 's/^--make=//'` - ;; - --make | -make) - shift; f_make=$1 - ;; - --dot=*) - f_dot=`echo $1 | sed 's/^--dot=//'` - ;; - --dot | -dot) - shift; f_dot=$1 - ;; - --python=*) - f_python=`echo $1 | sed 's/^--python=//'` - ;; - --python | -python) - shift; f_python=$1 - ;; - --perl=*) - f_perl=`echo $1 | sed 's/^--perl=//'` - ;; - --perl | -perl) - shift; f_perl=$1 - ;; - --flex=*) - f_flex=`echo $1 | sed 's/^--flex=//'` - ;; - --flex | -flex) - shift; f_flex=$1 - ;; - --bison=*) - f_bison=`echo $1 | sed 's/^--bison=//'` - ;; - --bison | -bison) - shift; f_bison=$1 - ;; - --install=*) - f_insttool=`echo $1 | sed 's/^--install=//'` - ;; - --install | -install) - shift; f_insttool=$1 - ;; - --with-doxywizard | -with-doxywizard) - f_wizard=YES - ;; - --with-doxyapp | -with-doxyapp) - f_app=YES - ;; - --with-doxmlparser | -with-doxmlparser) - f_doxmlparser=YES - ;; - --with-doxysearch | -with-doxysearch) - f_search=YES - ;; - --with-sqlite3 | -with-sqlite3) - f_sqlite3=YES - ;; - --with-sqlite3-static | -with-sqlite3-static) - f_sqlite3=YES - f_sqlite3static=YES - ;; - --sqlite3-path=*) - f_sqlite3_path=`echo $1 | sed 's/^--sqlite3-path=//'` - ;; - --sqlite3-path | -sqlite3-path) - shift; f_sqlite3_path=$1 - ;; - --with-libclang | -with-libclang) - f_libclang=YES - ;; - --with-libclang-static | -with-libclang-static) - f_libclang=YES - f_libclangstatic=YES - ;; - -h | -help | --help) - f_help=y - ;; - *) - echo $1: unknown argument - f_help=y - f_error=y - ;; - esac - shift -done - -if test "$f_help" = y; then - cat <<EOF -Usage: $0 [--help] [--shared] [--static] [--release] [--debug] [--python name] - [--perl name] [--flex name] [--bison name] [--make name] - [--dot name] [--platform target] [--prefix dir] [--docdir dir] - [--install name] [--english-only] [--enable-langs list] - [--with-sqlite3] [--with-sqlite3-static] [--sqlite3-path] - [--with-libclang] [--with-libclang-static] - [--with-doxywizard] [--with-doxysearch] [--with-doxyapp] - [--with-doxxmlparser] - -Options: - - --help Print this help - --shared | --static Build using shared or static linking - [default: shared] - --release | --debug Build for release or debug - [default: release] - --python name Use \`name' as the name of the python interpreter - [default: autodetect] - --perl name Use \`name' as the name of the perl interpreter - [default: autodetect] - --flex name Use \`name' as the name of the GNU lexical scanner - [default: autodetect] - --bison name Use \`name' as the name of the GNU compiler generator - [default: autodetect] - --make name Use \`name' as the name of the GNU make tool - [default: autodetect] - --dot name Use \`name' as the name of the dot tool that - is part of the Graphviz package. - [default: autodetect] - --platform target Do not detect platform but use \`target' instead. - See PLATFORMS for a list of possibilities - --prefix dir Installation prefix directory (doxygen will be - put in PREFIX/bin/doxygen) - [default: $f_prefix] - --docdir dir Documentation is installed in DOCDIR/ - [default: PREFIX/share/doc/packages/doxygen] - --install name Use \`name' as the name of the GNU install tool - [default: autodetect] - --english-only Include support for English only. - --enable-langs list Include support for output languages listed in list. - [default: $f_langs] - --with-sqlite3 Add support for sqlite3 output [experimental] - --with-libclang Add support for libclang parsing - --with-doxywizard Build the GUI frontend for doxygen. This - requires Qt version 4. - --with-doxysearch Build external search tools (doxysearch and doxyindexer) - requires Xapian library version 1.2 - --with-doxyapp Example showing how to embed doxygen in an application. - --with-doxmlparser Example showing how to parse doxygen's XML output. - -EOF - test "$f_error" = y && exit 1 - exit 0; -fi - -u_release=`(uname -r) 2>/dev/null` || u_release=unknown -u_system=`(uname -s) 2>/dev/null` || u_system=unknown - -if test -z "$f_platform"; then - f_platforms="`cat PLATFORMS`" - - case "$u_system:$u_release" in - AIX*) - f_platform=aix-xlc - ;; - BeOS*) - f_platform=beos-g++ - ;; - dgux:*) - f_platform=dgux-g++ - ;; - Darwin:*) - f_platform=macosx-c++ - if test "$f_insttool" = NO; then - f_insttool=/usr/bin/install - fi - ;; - FreeBSD:*) - f_platform=freebsd-g++ - if test "$f_insttool" = NO; then - f_insttool=/usr/bin/install - fi - ;; - NetBSD:*) - f_platform=netbsd-g++ - if test "$f_insttool" = NO; then - f_insttool=/usr/bin/install - fi - ;; - HP-UX:*) - f_platform=hpux-g++ - if test "$f_insttool" = NO; then - f_insttool=/usr/bin/install - fi - ;; - IRIX64:*) - f_platform=irix-64 - ;; - IRIX:*) - f_platform=irix-n32 - ;; - Linux:*|GNU:*|GNU/*:*) - f_platform=linux-g++ - ;; - NetBSD:*) - f_platform=netbsd-g++ - ;; - OpenBSD:*) - f_platform=openbsd-g++ - ;; - OSF1:*) - f_platform=osf1-g++ - ;; - QNX:*) - f_platform=qnx-g++ - ;; - *:3.2) - f_platform=sco-g++ - ;; - SunOS:4*) - f_platform=sunos-g++ - ;; - SunOS:5*) - f_platform=solaris-g++ - if test "$f_insttool" = NO; then - f_insttool=/usr/bin/install - fi - ;; - ULTRIX:*) - f_platform=ultrix-g++ - ;; - UNIX_SV:4.2*) - f_platform=unixware-g++ - ;; - Cygwin:*|CYGWIN*) - f_platform=win32-g++ - ;; - MINGW32_NT*) - f_platform=win32-mingw - ;; - *MiNT:*) - f_platform=m68k-atari-mint-g++ - ;; - *) - echo - echo "Your platform was not recognised by this configure script" - echo "Please use the -platform option to specify one of platforms" - echo "in this list:" - echo - for p in $f_platforms - do - echo " $0 $* -platform $p" - done - echo - exit 2 - esac - echo " Autodetected platform $f_platform... " - f_plf_auto=YES -fi - -if test -z "$f_docdir"; then - f_docdir='$(INSTALL)/share/doc/packages/doxygen' -fi - -if test "$f_plf_auto" = NO; then - printf " Checking for platform $f_platform... " - if test '!' -d tmake/lib/$f_platform; then - echo "not supported!" - echo - exit 2 - fi - echo "supported" -fi - -#- check for qt -------------------------------------------------------------- - -if test "$f_wizard" = YES; then - if test -z "$QTDIR"; then - echo " QTDIR environment variable not set!" - printf " Checking for Qt..." - for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do - for e in qmake qmake-qt4; do - if test -x "$d/bin/$e"; then - QTDIR=$d - QMAKEEXE=$e - break 2 - fi - done - done - else - for e in qmake qmake-qt4; do - if test -x "$QTDIR/bin/$e"; then - if test -e "$QTDIR/bin/$e"; then - printf " Detected Qt via the QTDIR environment variable..." - QMAKEEXE=$e - fi - fi - done - if test -z "$QMAKEEXE"; then - printf "ERROR Detected Qt via the QTDIR environment variable..." - echo ", but $QTDIR/bin/qmake or variant does not exist." - echo " Set the QTDIR environment variable such that \$QTDIR/bin/qmake or variant exists." - exit 2 - fi - fi - if test -z "$QTDIR"; then - echo "QTDIR not set and Qt not found at standard locations!" - echo - echo "Set the QTDIR environment variable such that \$QTDIR/bin/qmake exists." - echo "check the Qt installation instructions!" - exit 2 - fi - echo using $QTDIR -fi - -#- check for xapian ----------------------------------------------------------- - -if test "$f_search" = YES; then - if test -z "$XAPIAN"; then - printf " Checking for Xapian..." - for d in /usr /usr/local /opt/local; do - if test -e "$d/include/xapian.h"; then - XAPIAN=$d - break 2 - fi - done - else - if test -e "$XAPIAN/include/xapian.h"; then - printf " Detected Xapian via the XAPIAN environment variable..." - else - printf "ERROR Detected Xapian via the XAPIAN environment variable..." - echo ", but $XAPIAN/include/xapian.h does not exist." - echo " Set the XAPIAN environment variable such that \$XAPIAN/include/xapian.h exists." - exit 2 - fi - fi - if test -z "$XAPIAN"; then - echo "XAPIAN not set and xapian.h not found at standard locations!" - exit 2; - fi - echo using $XAPIAN -fi - -# - check for make ------------------------------------------------------------ - -printf " Checking for GNU make tool... " -if test "$f_make" = NO; then - make_names="gmake make" - make_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin" - make_prog=NO - for i in $make_names; do - for j in $make_dirs; do - if test -x "$j/$i"; then - if test -n "`$j/$i --version 2>/dev/null | grep GNU`"; then - make_prog="$j/$i" - break 2 - fi - fi - done - done - f_make="$make_prog" -fi - -if test "$f_make" = NO; then - echo "not found!"; - echo - exit 2 -fi -echo "using $f_make" - -# - check for install ------------------------------------------------------------ - -printf " Checking for GNU install tool... " -if test "$f_insttool" = NO; then - install_names="ginstall install" - install_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin /usr/ucb" - install_prog=NO - install_found=NO - for i in $install_names; do - for j in $install_dirs; do - if test -x "$j/$i"; then - if test -n "`$j/$i --version 2>/dev/null | grep utils`"; then - install_found=YES - install_prog="$j/$i" - break 2 - fi - fi - done - done - f_insttool="$install_prog" -fi - -if test "$f_insttool" = NO; then - if test "$install_found" = YES; then - echo; - else - echo "not found!"; - echo - fi - echo "GNU version of install is required: this is part of the fileutils/coreutils package: " - echo "see http://www.gnu.org/software/fileutils/fileutils.html" - echo - exit 2 -fi -echo "using $f_insttool"; - - -# - check for dot ------------------------------------------------------------ - -printf " Checking for dot (part of GraphViz)... " -if test "$f_dot" = NO; then - dot_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin" - dot_prog=NO - for j in $dot_dirs; do - if test -x "$j/dot"; then - dot_prog="$j/dot" - break 2 - fi - done - f_dot="$dot_prog" -fi - -if test "$f_dot" = NO; then - echo "not found!"; -else - echo "using $f_dot" -fi - -# - check for sqlite3 --------------------------------------------------------- - -if test "$f_sqlite3" = YES; then - printf " Checking for sqlite3 ... " - if test "$f_sqlite3_path" = NO; then - sqlite3_hdr_dir="/usr/include /usr/local/include /opt/local/include" - sqlite3_lib_dir="/usr/lib /usr/local/lib /opt/local/lib /usr/lib/x86_64-linux-gnu /usr/lib64" - else - sqlite3_hdr_dir="$f_sqlite3_path/include" - sqlite3_lib_dir="$f_sqlite3_path/lib" - fi - if test "$f_sqlite3static" = NO; then - sqlite3_lib_name="libsqlite3.so libsqlite3.dylib libsqlite3.a libsqlite3.dll.a" - else - sqlite3_lib_name="libsqlite3.a" - fi - sqlite3_hdr=NO - sqlite3_lib=NO - sqlite3_link= - for j in $sqlite3_hdr_dir; do - if test -f "$j/sqlite3.h"; then - sqlite3_hdr="$j/sqlite3.h" - break - fi - done - for i in $sqlite3_lib_dir; do - if test "$sqlite3_lib" = NO; then - for j in $sqlite3_lib_name; do - if test -e "$i/$j"; then - if test "$f_sqlite3static" = NO; then - sqlite3_lib="$i/$j" - sqlite3_link="-L$i -lsqlite3" - else - sqlite3_lib="$i/$j" - sqlite3_link="$i/$j -ldl" - fi - break - fi - done - fi - done - if test "$sqlite3_hdr" = NO -o "$sqlite3_lib" = NO; then - echo "not found!"; - exit 1 - else - echo "using header $sqlite3_hdr and library $sqlite3_lib..."; - fi -fi - -# - check for libclang --------------------------------------------------------- - -if test "$f_libclang" = YES; then - printf " Checking for libclang ... " - if llvm-config --version > /dev/null 2>&1; then - libclang_hdr_dir=`llvm-config --includedir` - libclang_lib_dir=`llvm-config --libdir` - else - libclang_hdr_dir="/usr/include /usr/local/include /opt/local/include" - libclang_lib_dir="/usr/lib /usr/local/lib /opt/local/lib /usr/lib64/llvm /usr/lib/llvm" - fi - if test "$f_libclangstatic" = NO; then - libclang_lib_name="libclang.so libclang.dylib libclang.a libclang.dll.a" - else - libclang_lib_name="libclang.a" - fi - libclang_hdr=NO - libclang_lib=NO - libclang_link= - for j in $libclang_hdr_dir; do - if test -f "$j/clang-c/Index.h"; then - libclang_hdr="$j/clang-c/Index.h" - break - fi - done - for i in $libclang_lib_dir; do - if test "$libclang_lib" = NO; then - for j in $libclang_lib_name; do - if test -f "$i/$j"; then - libclang_lib="$i/$j" - if test "$f_libclangstatic" = NO; then - libclang_link="-L $i -lclang" - else - libclang_link="$i/libclang.a $i/libclangFrontend.a $i/libclangSerialization.a $i/libclangParse.a $i/libclangSema.a $i/libclangAnalysis.a $i/libclangStaticAnalyzerCore.a $i/libclangAST.a $i/libclangBasic.a $i/libclangDriver.a $i/libclangEdit.a $i/libclangLex.a $i/libclangRewriteCore.a $i/libLLVMBitReader.a $i/libLLVMMC.a $i/libLLVMMCParser.a $i/libLLVMSupport.a -ldl -lpthread" - fi - break - fi - done - fi - done - if test "$libclang_hdr" = NO -o "$libclang_lib" = NO; then - echo "not found!"; - else - echo "using header $libclang_hdr and library $libclang_lib..."; - fi -fi - -# - check for python ---------------------------------------------------------- - -python_version=0 -printf " Checking for python... " -if test "$f_python" = NO; then - python_names="python3 python2 python" - python_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin" - python_prog=NO - python_found=NO - for i in $python_names; do - for j in $python_dirs; do - if test -x "$j/$i"; then - python_found=YES - if test `$j/$i -c "import sys; print(sys.version_info[0])"` = 3; then - python_prog="$j/$i"; - python_version=`$j/$i -c "import platform; print(platform.python_version())"`; - break 2 - elif test `$j/$i -c "import sys; print(sys.version_info[0])"` = 2; then - if test `$j/$i -c "import sys; print(sys.version_info[1])"` -ge 6; then - python_prog="$j/$i"; - python_version=`$j/$i -c "import platform; print(platform.python_version())"`; - break 2 - fi - fi - fi - done - done - f_python="$python_prog" -fi - -if test "$f_python" = NO; then - if test "$python_found" = YES; then - echo "version should be python 2.6 or higher." - else - echo "not found!"; - fi - echo - exit 2 -fi -echo "using $f_python (version $python_version)"; - -# - check for perl ------------------------------------------------------------ - -printf " Checking for perl... " -if test "$f_perl" = NO; then - perl_names="perl perl5" - perl_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin" - perl_prog=NO - perl_found=NO - for i in $perl_names; do - for j in $perl_dirs; do - if test -x "$j/$i"; then - perl_found=YES - if $j/$i -e 'require 5.000;' 2>/dev/null ; then - perl_prog="$j/$i" - break 2 - fi - fi - done - done - f_perl="$perl_prog" -fi - -if test "$f_perl" = NO; then - if test "$perl_found" = YES; then - echo "version is too old (5.000 or higher is required)." - else - echo "not found!"; - fi - echo - exit 2 -fi -echo "using $f_perl"; - -# - check for flex ------------------------------------------------------------ - -printf " Checking for flex... " -if test "$f_flex" = NO; then - flex_dirs="$bin_dirs /usr/bin /usr/local/bin /bin" - flex_prog=NO - flex_found=NO - for j in $flex_dirs; do - if test -x "$j/flex"; then - flex_found=YES - flex_prog="$j/flex" - break - fi - done - f_flex="$flex_prog" -fi - -if test "$f_flex" = NO; then - echo "not found!"; - exit 2 -else - echo "using $f_flex" -fi - -# - check for bison ------------------------------------------------------------ - -printf " Checking for bison... " -if test "$f_bison" = NO; then - bison_dirs="$bin_dirs /usr/bin /usr/local/bin /bin" - bison_prog=NO - bison_found=NO - for j in $bison_dirs; do - if test -x "$j/bison"; then - bison_found=YES - bison_prog="$j/bison" - break - fi - done - f_bison="$bison_prog" -fi - -if test "$f_bison" = NO; then - echo "not found!"; - exit 2 -else - echo "using $f_bison" -fi - -# ----------------------------------------------------------------------------- - -if test '!' -d "generated_src/doxygen"; then - mkdir -p generated_src/doxygen -fi -if test "$f_wizard" = YES; then - if test '!' -d "generated_src/doxywizard"; then - mkdir -p generated_src/doxywizard - fi -fi - -# -# Make VERSION file -# -test -f "VERSION" && chmod u+w VERSION -test -f "generated_src/doxygen/version.cpp" && chmod u+w generated_src/doxygen/version.cpp -echo " Generating generated_src/doxygen/version.cpp and VERSION..." -cd src -$f_python version.py ../generated_src/doxygen -cd .. -if test "$f_wizard" = YES; then - test -f "VERSION" && chmod u+w VERSION - test -f "generated_src/doxywizard/version.cpp" && chmod u+w generated_src/doxywizard/version.cpp - echo " Generating generated_src/doxywizard/version.cpp and VERSION..." - cd src - $f_python version.py ../generated_src/doxywizard - cd .. - -fi - -test -f .makeconfig && rm .makeconfig -test -f .tmakeconfig && rm .tmakeconfig - -configPWD=`pwd` - -cat > .makeconfig <<EOF -DOXYGEN = $configPWD -TMAKEPATH = $configPWD/tmake/lib/$f_platform -ENV = env TMAKEPATH="\$(TMAKEPATH)" -TMAKE = $configPWD/tmake/bin/tmake -MAKE = $f_make -PYTHON = $f_python -PERL = $f_perl -LEX = $f_flex -RM = rm -f -CP = cp -VERSION = `cat VERSION` -INSTALL = $f_prefix -INSTTOOL = $f_insttool -DOXYDOCS = .. -DOCDIR = $f_docdir -QTDIR = $QTDIR -QMAKEEXE = $QMAKEEXE -EOF - -if test "$f_dot" != NO; then - cat >> .makeconfig <<EOF -HAVE_DOT = $f_dot -EOF -fi - - -if test "$f_platform" = "m68k-atari-mint-g++"; then - cat >> .makeconfig <<EOF -TMAKE += -unix -EOF -fi - -if test "$f_platform" = "macosx-c++"; then - cat >> .makeconfig <<EOF -MKSPECS = -spec macx-g++ -EOF -fi -if test "$f_platform" = "macosx-uni-c++"; then - cat >> .makeconfig <<EOF -MKSPECS = -spec macx-g++ -EOF -fi - -# Make doxygen.spec... -# -echo " Created doxygen.spec file, for rpm generation." - -echo "%define version $doxygen_version_major.$doxygen_version_minor.$doxygen_version_revision" > spec.tmp -if test "$doxygen_version_mmn" = NO; then - echo "%define revision 1" >> spec.tmp - echo "%define mmn 1" >> spec.tmp -else - echo "%define revision $doxygen_version_mmn" >> spec.tmp - echo "%define mmn $doxygen_version_mmn" >> spec.tmp -fi - -mkdir -p packages -mkdir -p packages/rpm - -cat spec.tmp ./packages/rpm/doxygen.spec.in > ./packages/rpm/doxygen.spec - -rm -f spec.tmp - - -# make .tmakeconfig -# -touch .tmakeconfig -if test "$f_shared" = NO; then - if test "$f_platform" = "osf1-cxx" -o "$f_platform" = "irix-n32"; then - cat >> .tmakeconfig <<EOF - TMAKE_LFLAGS += -non_shared -EOF - elif test "$f_platform" = "solaris-cc"; then - cat >> .tmakeconfig <<EOF - TMAKE_LFLAGS += -Bstatic -EOF - elif test "$f_platform" = "hpux-cc"; then - cat >> .tmakeconfig <<EOF - TMAKE_LFLAGS += -noshared -EOF - else - cat >> .tmakeconfig <<EOF - TMAKE_LFLAGS += -static -EOF - fi -fi -if test "$f_platform" = "hpux-g++" -o "$f_platform" = "linux-g++"; then - cat >> .tmakeconfig <<EOF - TMAKE_CXXFLAGS += -D_LARGEFILE_SOURCE -EOF -fi -if test "$f_platform" = "macosx-uni-c++"; then - if test -n "`ls /Developer/SDKs/MacOSX10.*.sdk 2>/dev/null`"; then - mac_sdk=MacOSX10.4u.sdk - fi - if test -n "`ls /Developer/SDKs/MacOSX10.5*.sdk 2>/dev/null`"; then - mac_sdk=MacOSX10.5.sdk - fi - if test -n $mac_sdk; then - cat >> .tmakeconfig <<EOF - TMAKE_CFLAGS += -isysroot /Developer/SDKs/$mac_sdk - TMAKE_CXXFLAGS += -isysroot /Developer/SDKs/$mac_sdk - TMAKE_LFLAGS += -Wl,-syslibroot,/Developer/SDKs/$mac_sdk -EOF - fi -fi -if test "$f_wizard" = YES; then - cat >> .tmakeconfig <<EOF -TMAKE_MOC = $QTDIR/bin/moc -EOF -fi - -if test "$f_search" = YES; then - cat >> .tmakeconfig <<EOF -LIBS += -L$XAPIAN/lib -INCLUDEPATH += $XAPIAN/include -EOF -fi - -f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in addon/doxysearch/Makefile.in vhdlparser/Makefile.in" - -for i in $f_inmakefiles ; do - SRC=$i - DST=`echo $i|sed 's%\(.*\).in$%\1%'` - TIME=`date` - cat > $DST <<EOF -# -# This file was generated from `basename $i` on $TIME -# - -EOF - cat .makeconfig >> $DST - if test $i = Makefile.in; then - echo "" >> $DST - EXTRADEPS= - if test $f_wizard = YES; then - EXTRADEPS=doxywizard - fi -# if test $f_search = YES; then -# EXTRADEPS="$EXTRADEPS doxysearch" -# fi - echo "all: generated_src/doxygen/version.cpp $EXTRADEPS" >> $DST - echo " \$(MAKE) -C qtools" >> $DST - echo " \$(MAKE) -C libmd5" >> $DST - echo " \$(MAKE) -C vhdlparser" >> $DST - echo " \$(MAKE) -C src" >> $DST - - if test $f_wizard = YES; then - echo " \$(MAKE) MAN1DIR=\$(MAN1DIR) -C addon/doxywizard" >> $DST - fi - if test $f_search = YES; then - echo " \$(MAKE) -C addon/doxysearch" >> $DST - fi - if test $f_app = YES; then - echo " \$(MAKE) -C addon/doxyapp" >> $DST - fi - if test $f_doxmlparser = YES; then - echo " \$(MAKE) -C addon/doxmlparser/src" >> $DST - echo " \$(MAKE) -C addon/doxmlparser/test" >> $DST - echo " \$(MAKE) -C addon/doxmlparser/examples/metrics" >> $DST - fi - echo "" >> $DST - echo "doxywizard_install:" >> $DST - if test $f_wizard = YES; then - echo " \$(MAKE) INSTALL=\$(DESTDIR)\$(INSTALL) MAN1DIR=\$(MAN1DIR) -C addon/doxywizard install" >> $DST - fi - echo "doxysearch_install:" >> $DST - if test $f_search = YES; then - echo " \$(MAKE) INSTALL=\$(DESTDIR)\$(INSTALL) MAN1DIR=\$(MAN1DIR) -C addon/doxysearch install" >> $DST - fi - echo "" >> $DST - fi - if test $f_wizard = YES; then - sed -e "s/%%WITHDOXYWIZARD%% /--with doxywizard /g" $SRC >> $DST - else - sed -e "s/%%WITHDOXYWIZARD%% //g" $SRC >> $DST - fi - echo " Created $DST from $SRC..." -done - -cat src/libdoxycfg.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxycfg.t -cat src/libdoxygen.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxygen.t - -f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in vhdlparser/vhdlparser.pro.in" - -for i in $f_inprofiles ; do - SRC=$i - DST=`echo $i|sed 's%\(.*\).in$%\1%'` - TIME=`date` - cat > $DST <<EOF -# -# This file was generated from `basename $i` on $TIME -# - -EOF - if test "$f_debug" = NO; then - realopts="release" - else - realopts="debug" - fi - #if test "$f_thread" = YES; then - # realopts="$realopts thread" - #fi - cat $SRC .tmakeconfig | sed -e "s/\$extraopts/$realopts/g" -e "s;%%SQLITE3_INC%%;$sqlite3_hdr_dir;g" -e "s;%%SQLITE3_LIBS%%;$sqlite3_link;g" -e "s;%%LIBCLANG_INC%%;$libclang_hdr_dir;g" -e "s;%%LIBCLANG_LIBS%%;$libclang_link;g" >> $DST - echo " Created $DST from $SRC..." -done - -# - generating generated_src/doxygen/doxygen/lang_cfg.h -# use consistent method on Linux and Windows - -if test -f "generated_src/doxygen/lang_cfg.h"; then - chmod u+w generated_src/doxygen/lang_cfg.h # make sure file can be overwritten -fi -echo " Generating generated_src/doxygen/lang_cfg.h..." -if test "$f_english" = YES; then - $f_python src/lang_cfg.py ENONLY > generated_src/doxygen/lang_cfg.h -else - f_ulangs=`echo $f_langs | tr '[a-z]' '[A-Z]' | tr ',' ' '` - $f_python src/lang_cfg.py $f_ulangs > generated_src/doxygen/lang_cfg.h -fi - -if test -f "generated_src/doxygen/settings.h"; then - chmod u+w generated_src/doxygen/settings.h -fi -echo " Generating generated_src/doxygen/settings.h..." -$f_python src/settings.py $f_sqlite3 $f_libclang generated_src/doxygen - -if test "$f_wizard" = YES; then - if test -f "generated_src/doxywizard/settings.h"; then - chmod u+w generated_src/doxywizard/settings.h - fi - echo " Generating generated_src/doxywizard/settings.h..." - $f_python src/settings.py $f_sqlite3 $f_libclang generated_src/doxywizard -fi - -cd .. -echo " Finished" diff --git a/configure.bin b/configure.bin deleted file mode 100755 index dbc21c6..0000000 --- a/configure.bin +++ /dev/null @@ -1,118 +0,0 @@ -#! /bin/sh -# -# $Id: configure,v 1.1 1999/07/19 17:00:15 root Exp $ -# -# Copyright (C) 1997-2014 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. -# -# shell script to configure doxygen (use for binary releases) - -f_prefix=/usr/local -f_insttool=NO - -while test -n "$1"; do - case $1 in - --prefix) - shift; f_prefix=$1 - ;; - --install) - shift; f_insttool=$1 - ;; - -h | -help | --help) - f_help=y - ;; - *) - echo $1: unknown argument - f_help=y - f_error=y - ;; - esac - shift -done - -if test "$f_help" = y; then - cat <<EOF -Usage: $0 [--help] [--prefix dir] [--install name] - -Options: - - --help Print this help - - --prefix dir Installation prefix directory - [default: /usr/local] - - --install name Use \`name' as the name of the GNU install tool - [default: install] - -EOF - test "$f_error" = y && exit 1 - exit 0; -fi - -# - check for install ------------------------------------------------------------ - -echo -n " Checking for GNU install tool... " -if test "$f_insttool" = NO; then - install_names="ginstall install" - install_dirs="/usr/bin /usr/local/bin /bin /sbin $bin_dirs" - install_prog=NO - install_found=NO - for i in $install_names; do - for j in $install_dirs; do - if test -x "$j/$i"; then - if test -n "`$j/$i --version 2>/dev/null | grep utils`"; then - install_found=YES - install_prog="$j/$i" - break 2 - fi - fi - done - done - f_insttool="$install_prog" -fi - -if test "$f_insttool" = NO; then - if test "$install_found" = YES; then - echo "GNU version of install is required!" - else - echo "not found!"; - fi - echo - exit 2 -fi -echo "using $f_insttool"; - -# ---------------------------------------------------------- - - -cat > .makeconfig <<EOF -RM = rm -f -VERSION = `cat VERSION` -INSTALL = $f_prefix -INSTTOOL = $f_insttool -DOXYDOCS = .. - -export TMAKEPATH -EOF - -for i in Makefile.in ; do - SRC=$i - DST=`echo $i|sed 's%\(.*\).in$%\1%'` - TIME=`date` - cat > $DST <<EOF -# -# This file was generated from `basename $i` on $TIME -# - -EOF - cat .makeconfig $SRC >> $DST - echo " Created $DST from $SRC..." -done diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt new file mode 100644 index 0000000..1081fa4 --- /dev/null +++ b/doc/CMakeLists.txt @@ -0,0 +1,99 @@ +if (build_doc) + +find_program(EPSTOPDF NAMES epstopdf ) +find_program(SED NAMES sed ) +find_program(MAKE NAMES make gmake ) + +file(GLOB DOC_FILES "*") +file(GLOB LANG_FILES "${CMAKE_SOURCE_DIR}/src/translator_??.h") +file(COPY ${DOC_FILES} DESTINATION ${DOXYDOCS}) +file(COPY ${EXAMPLE_DIR} DESTINATION ${PROJECT_BINARY_DIR}) + +file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/man) +file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/src) +file(COPY ${CMAKE_SOURCE_DIR}/src/translator.h DESTINATION ${PROJECT_BINARY_DIR}/src) +file(COPY ${CMAKE_SOURCE_DIR}/src/translator_adapter.h DESTINATION ${PROJECT_BINARY_DIR}/src) +file(COPY ${LANG_FILES} DESTINATION ${PROJECT_BINARY_DIR}/src) +file(COPY ${CMAKE_SOURCE_DIR}/VERSION DESTINATION ${PROJECT_BINARY_DIR}) + +add_custom_target(docs + COMMENT "Generating documentation in ${DOXYDOCS}" + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen + COMMAND ${CMAKE_COMMAND} -E remove_directory ../latex/refman.tex + COMMAND ${CMAKE_COMMAND} -E copy doxygen_logo.gif ../html + COMMAND ${CMAKE_COMMAND} -E copy doxygen_logo_low.gif ../html + COMMAND ${CMAKE_COMMAND} -E copy Makefile.latex ../latex/Makefile + COMMAND ${SED} -e "s/\$VERSION/${VERSION}/g" doxygen_manual.tex > ../latex/doxygen_manual.tex + COMMAND ${SED} -e "s/\$VERSION/${VERSION}/g" doxygen.sty > ../latex/doxygen.sty + COMMAND ${EPSTOPDF} doxygen_logo.eps --outfile=../latex/doxygen_logo.pdf + COMMAND ${MAKE} -C ../latex > latex_out.txt + DEPENDS doxygen ${PROJECT_BINARY_DIR}/doc/language.doc config.doc + "${PROJECT_BINARY_DIR}/man/doxygen.1" + "${PROJECT_BINARY_DIR}/man/doxywizard.1" + "${PROJECT_BINARY_DIR}/man/doxysearch.1" + "${PROJECT_BINARY_DIR}/man/doxyindexer.1" + WORKING_DIRECTORY ${DOXYDOCS} + VERBATIM + ) + +# language.doc +add_custom_command( + COMMAND ${CMAKE_COMMAND} "-DSOURCE=${CMAKE_SOURCE_DIR}" -P ${CMAKE_SOURCE_DIR}/cmake/run_translator.cmake + DEPENDS ${DOXYDOCS}/translator.py + DEPENDS maintainers.txt language.tpl translator.py + OUTPUT ${PROJECT_BINARY_DIR}/doc/language.doc + WORKING_DIRECTORY ${DOXYDOCS} +) +set_source_files_properties(${DOXYDOCS}/language.doc PROPERTIES GENERATED 1) + +# config.doc +add_custom_command( + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -doc ${CMAKE_SOURCE_DIR}/src/config.xml > config.doc + DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py + OUTPUT config.doc + WORKING_DIRECTORY ${DOXYDOCS} +) +set_source_files_properties(${DOXYDOCS}/config.doc PROPERTIES GENERATED 1) + +string(TIMESTAMP TODAY "%d-%m-%Y") + +add_custom_command( + COMMAND ${SED} -e "s/DATE/${TODAY}/g" -e "s/VERSION/${VERSION}/g" doxygen.1 > "${PROJECT_BINARY_DIR}/man/doxygen.1" + OUTPUT "${PROJECT_BINARY_DIR}/man/doxygen.1" +) + +add_custom_command( + COMMAND ${SED} -e "s/DATE/${TODAY}/g" -e "s/VERSION/${VERSION}/g" doxywizard.1 > "${PROJECT_BINARY_DIR}/man/doxywizard.1" + OUTPUT "${PROJECT_BINARY_DIR}/man/doxywizard.1" +) + +add_custom_command( + COMMAND ${SED} -e "s/DATE/${TODAY}/g" -e "s/VERSION/${VERSION}/g" doxysearch.1 > "${PROJECT_BINARY_DIR}/man/doxysearch.1" + OUTPUT "${PROJECT_BINARY_DIR}/man/doxysearch.1" +) + +add_custom_command( + COMMAND ${SED} -e "s/DATE/${TODAY}/g" -e "s/VERSION/${VERSION}/g" doxyindexer.1 > "${PROJECT_BINARY_DIR}/man/doxyindexer.1" + OUTPUT "${PROJECT_BINARY_DIR}/man/doxyindexer.1" +) + +install(FILES + "${PROJECT_BINARY_DIR}/man/doxygen.1" + "${PROJECT_BINARY_DIR}/man/doxywizard.1" + "${PROJECT_BINARY_DIR}/man/doxysearch.1" + "${PROJECT_BINARY_DIR}/man/doxyindexer.1" + DESTINATION man/man1 +) + +install(FILES + "${PROJECT_BINARY_DIR}/latex/doxygen_manual.pdf" + DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}" +) + +install(DIRECTORY + "${PROJECT_BINARY_DIR}/examples" + "${PROJECT_BINARY_DIR}/html" + DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}" +) + +endif() diff --git a/doc/Doxyfile b/doc/Doxyfile index c57bbe9..ab97227 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -53,3 +53,4 @@ STRIP_CODE_COMMENTS = NO HTML_STYLESHEET = doxygen_manual.css ALIASES = LaTeX="\f$\mbox{\LaTeX}\f$" ALIASES += TeX="\f$\mbox{\TeX}\f$" +LATEX_BATCHMODE = YES diff --git a/doc/Makefile.in b/doc/Makefile.in deleted file mode 100644 index e3a833c..0000000 --- a/doc/Makefile.in +++ /dev/null @@ -1,39 +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. - -all: language config.doc FORCE - DOXYGEN_DOCDIR=$(DOXYDOCS); \ - export DOXYGEN_DOCDIR; \ - VERSION=$(VERSION) ; \ - export VERSION; \ - "$(DOXYGEN)/bin/doxygen" - @rm -f ../latex/refman.tex - @cp doxygen_logo*.gif ../html - @cp Makefile.latex ../latex/Makefile - @sed -e "s/\$$VERSION/$(VERSION)/g" doxygen_manual.tex >../latex/doxygen_manual.tex - @sed -e "s/\$$VERSION/$(VERSION)/g" doxygen.sty >../latex/doxygen.sty - @epstopdf doxygen_logo.eps --outfile=../latex/doxygen_logo.pdf - -clean: - rm -rf ../html ../latex *.bak - -language: language.doc - -language.doc: $(wildcard ../src/translator*.h) maintainers.txt language.tpl translator.py - $(PYTHON) translator.py - -config.doc: ../src/config.xml ../src/configgen.py - $(PYTHON) ../src/configgen.py -doc ../src/config.xml > config.doc - -FORCE: diff --git a/doc/Makefile.win_make.in b/doc/Makefile.win_make.in deleted file mode 100644 index a8fc5fb..0000000 --- a/doc/Makefile.win_make.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. - -all: language config.doc FORCE - @xcopy /s /q /i ..\examples ..\html\examples - set DOXYGEN_DOCDIR=. & \ - set VERSION=$(VERSION) & \ - $(DOXYGEN)\bin\doxygen - @del ..\latex\refman.tex - @copy doxygen_logo*.gif ..\html - @copy Makefile.latex ..\latex\Makefile - @sed -e "s/\$$VERSION/$(VERSION)/g" doxygen_manual.tex >..\latex\doxygen_manual.tex - @sed -e "s/\$$VERSION/$(VERSION)/g" doxygen.sty >..\latex\doxygen.sty - @epstopdf doxygen_logo.eps --outfile=..\latex\doxygen_logo.pdf - -clean: - del /s /q ..\html ..\latex - del translator_report.txt *.bak - -language: language.doc - -language.doc: maintainers.txt language.tpl translator.py - set DOXYGEN_DOCDIR=. & set VERSION=$(VERSION) & python translator.py - -config.doc: ..\src\config.xml ..\src\configgen.py - python ..\src\configgen.py -doc ..\src\config.xml > config.doc - - -FORCE: diff --git a/doc/Makefile.win_nmake.in b/doc/Makefile.win_nmake.in deleted file mode 100644 index af9c6d1..0000000 --- a/doc/Makefile.win_nmake.in +++ /dev/null @@ -1,41 +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. - -all: language config.doc FORCE - @xcopy /s /q /i ..\examples ..\html\examples - set DOXYGEN_DOCDIR=. - set VERSION=$(VERSION) - $(DOXYGEN)\bin\doxygen - @del ..\latex\refman.tex - @copy doxygen_logo*.gif ..\html - @copy Makefile.latex ..\latex\Makefile - @sed -e "s/\$$VERSION/$(VERSION)/g" doxygen_manual.tex >..\latex\doxygen_manual.tex - @sed -e "s/\$$VERSION/$(VERSION)/g" doxygen.sty >..\latex\doxygen.sty - @epstopdf doxygen_logo.eps --outfile=..\latex\doxygen_logo.pdf - -clean: - del /s /q ..\html ..\latex - del translator_report.txt *.bak - -language: language.doc - -language.doc: maintainers.txt language.tpl translator.py - set DOXYGEN_DOCDIR=. - set VERSION=$(VERSION) - python translator.py - -config.doc: ../src/config.xml ../src/configgen.py - python ../src/configgen.py -doc ../src/config.xml > config.doc - -FORCE: diff --git a/libmd5/CMakeLists.txt b/libmd5/CMakeLists.txt new file mode 100644 index 0000000..4d98d01 --- /dev/null +++ b/libmd5/CMakeLists.txt @@ -0,0 +1,3 @@ +add_library(md5 +md5.c +) diff --git a/qtools/CMakeLists.txt b/qtools/CMakeLists.txt new file mode 100644 index 0000000..96c0f27 --- /dev/null +++ b/qtools/CMakeLists.txt @@ -0,0 +1,57 @@ +include_directories(.) + +list(APPEND qtools_src +qbuffer.cpp +qcollection.cpp +qcstring.cpp +qdatastream.cpp +qdatetime.cpp +qdir.cpp +qfile.cpp +qfileinfo.cpp +qgarray.cpp +qgcache.cpp +qgdict.cpp +qglist.cpp +qglobal.cpp +qgstring.cpp +qgvector.cpp +qiodevice.cpp +qregexp.cpp +qstring.cpp +qtextstream.cpp +qtextcodec.cpp +qstringlist.cpp +qxml.cpp +qmap.cpp +qthread.cpp +qmutex.cpp +qutfcodec.cpp +) + +if (UNIX) +list(APPEND qtools_src +qfile_unix.cpp +qdir_unix.cpp +qfileinfo_unix.cpp +qthread_unix.cpp +qmutex_unix.cpp +qwaitcondition_unix.cpp +) +endif() + +if (WIN32) +list(APPEND qtools_src +qfile_win32.cpp +qdir_win32.cpp +qfileinfo_win32.cpp +qthread_win32.cpp +qmutex_win32.cpp +qwaitcondition_win32.cpp + +) +endif() + +add_library(qtools +${qtools_src} +) 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/config.xml b/src/config.xml index 9eb9feb..d7cd1f2 100644 --- a/src/config.xml +++ b/src/config.xml @@ -1243,7 +1243,9 @@ FILE_VERSION_INFO = "cleartool desc -fmt \%Vn" The \c INPUT tag is used to specify the files and/or directories that contain documented source files. You may enter file names like \c myfile.cpp or directories like \c /usr/src/myproject. - Separate the files or directories with spaces. + Separate the files or directories with spaces. See also + \ref cfg_file_patterns "FILE_PATTERNS" and + \ref cfg_extension_mapping "EXTENSION_MAPPING" \note If this tag is empty the current directory is searched. ]]> @@ -1267,7 +1269,11 @@ FILE_VERSION_INFO = "cleartool desc -fmt \%Vn" If the value of the \ref cfg_input "INPUT" tag contains directories, you can use the \c FILE_PATTERNS tag to specify one or more wildcard patterns (like `*.cpp` and `*.h`) to filter out the source-files - in the directories. If left blank the following patterns are tested: + in the directories.<br> + Note that for custom extensions or not directly supported extensions you also + need to set \ref cfg_extension_mapping "EXTENSION_MAPPING" for the extension + otherwise the files are not read by doxygen.<br> + If left blank the following patterns are tested: ]]> </docs> <value name='*.c'/> 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/docbookgen.cpp b/src/docbookgen.cpp index d7a4020..ac00e1f 100644 --- a/src/docbookgen.cpp +++ b/src/docbookgen.cpp @@ -483,13 +483,13 @@ static void generateDocbookForMember(MemberDef *md,FTextStream &t,Definition *de cnt++; } t << endl << "}"; - t << "</literallayout>" << endl; - if (md->briefDescription()) - { - t << "<para><emphasis>"; - writeDocbookString(t,md->briefDescription()); - t << "</emphasis></para>" << endl; - } + } + t << "</literallayout>" << endl; + if (md->briefDescription()) + { + t << "<para><emphasis>"; + writeDocbookString(t,md->briefDescription()); + t << "</emphasis></para>" << endl; } } else if (md->memberType()==MemberType_Define) 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 4ac666a..eb72a00 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/util.cpp b/src/util.cpp index 8a91fb0..3ee7ae5 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -5240,6 +5240,7 @@ QCString escapeCharsInString(const char *name,bool allowDots,bool allowUnderscor case '=': growBuf.addStr("_0A"); break; case '$': growBuf.addStr("_0B"); break; case '\\': growBuf.addStr("_0C"); break; + case '@': growBuf.addStr("_0D"); break; default: if (c<0) { 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() << "\""; diff --git a/testing/009/class_bug.xml b/testing/009/class_bug.xml index dc1ff06..5a770bb 100644 --- a/testing/009/class_bug.xml +++ b/testing/009/class_bug.xml @@ -32,7 +32,7 @@ </xrefsect> </para> </detaileddescription> - <location file="009_bug.cpp" bodystart="15" bodyend="26"/> + <location file="009_bug.cpp" line="16" column="1" bodyfile="009_bug.cpp" bodystart="15" bodyend="26"/> <listofallmembers> <member refid="class_bug_1a1f720954dd97cd1203e80501a6eae74c" prot="public" virt="non-virtual"> <scope>Bug</scope> diff --git a/testing/009/class_deprecated.xml b/testing/009/class_deprecated.xml index 53a6273..5d44aaf 100644 --- a/testing/009/class_deprecated.xml +++ b/testing/009/class_deprecated.xml @@ -30,7 +30,7 @@ </xrefsect> </para> </detaileddescription> - <location file="009_bug.cpp" bodystart="29" bodyend="36"/> + <location file="009_bug.cpp" line="30" column="1" bodyfile="009_bug.cpp" bodystart="29" bodyend="36"/> <listofallmembers> <member refid="class_deprecated_1a1d5f6803e72c625727e7083d1722dbf9" prot="public" virt="non-virtual"> <scope>Deprecated</scope> diff --git a/testing/009/class_reminder.xml b/testing/009/class_reminder.xml index c4f639e..379b3e7 100644 --- a/testing/009/class_reminder.xml +++ b/testing/009/class_reminder.xml @@ -37,7 +37,7 @@ </xrefsect> </para> </detaileddescription> - <location file="009_bug.cpp" bodystart="55" bodyend="60"/> + <location file="009_bug.cpp" line="56" column="1" bodyfile="009_bug.cpp" bodystart="55" bodyend="60"/> <listofallmembers> <member refid="class_reminder_1a173b5218bb11287b0e86a550d9f0728d" prot="public" virt="non-virtual"> <scope>Reminder</scope> diff --git a/testing/009/class_test.xml b/testing/009/class_test.xml index b9f7f9f..9f1b126 100644 --- a/testing/009/class_test.xml +++ b/testing/009/class_test.xml @@ -37,7 +37,7 @@ </xrefsect> </para> </detaileddescription> - <location file="009_bug.cpp" bodystart="47" bodyend="52"/> + <location file="009_bug.cpp" line="48" column="1" bodyfile="009_bug.cpp" bodystart="47" bodyend="52"/> <listofallmembers> <member refid="class_test_1a9fc54b716f326514a4c5f434137f4fc0" prot="public" virt="non-virtual"> <scope>Test</scope> diff --git a/testing/009/class_todo.xml b/testing/009/class_todo.xml index c98fdac..8657d60 100644 --- a/testing/009/class_todo.xml +++ b/testing/009/class_todo.xml @@ -37,7 +37,7 @@ </xrefsect> </para> </detaileddescription> - <location file="009_bug.cpp" bodystart="39" bodyend="44"/> + <location file="009_bug.cpp" line="40" column="1" bodyfile="009_bug.cpp" bodystart="39" bodyend="44"/> <listofallmembers> <member refid="class_todo_1a9e70ec9176ac4c1b20e011b4daddc9d8" prot="public" virt="non-virtual"> <scope>Todo</scope> diff --git a/testing/011/category_integer_07_arithmetic_08.xml b/testing/011/category_integer_07_arithmetic_08.xml index 12b6b6d..78a8c0e 100644 --- a/testing/011/category_integer_07_arithmetic_08.xml +++ b/testing/011/category_integer_07_arithmetic_08.xml @@ -45,7 +45,7 @@ <detaileddescription> <para>A category </para> </detaileddescription> - <location file="011_category.m" bodystart="17" bodyend="-1"/> + <location file="011_category.m" line="17" column="1" bodyfile="011_category.m" bodystart="17" bodyend="-1"/> <listofallmembers> <member refid="category_integer_07_arithmetic_08_1a12f411c5872ba3bafb8ea7dd1826cf2a" prot="public" virt="virtual"> <scope>Integer(Arithmetic)</scope> diff --git a/testing/011/interface_integer.xml b/testing/011/interface_integer.xml index e922dda..429c6a0 100644 --- a/testing/011/interface_integer.xml +++ b/testing/011/interface_integer.xml @@ -16,7 +16,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="011_category.m" bodystart="8" bodyend="-1"/> + <location file="011_category.m" line="8" column="1" bodyfile="011_category.m" bodystart="8" bodyend="-1"/> </memberdef> </sectiondef> <sectiondef kind="public-func"> @@ -80,7 +80,7 @@ </childnode> </node> </collaborationgraph> - <location file="011_category.m" bodystart="6" bodyend="-1"/> + <location file="011_category.m" line="6" column="1" bodyfile="011_category.m" bodystart="6" bodyend="-1"/> <listofallmembers> <member refid="interface_integer_1a35e89216966d8179a1b77f14b8211fda" prot="protected" virt="non-virtual"> <scope>Integer</scope> diff --git a/testing/012_cite.dox b/testing/012_cite.dox index 9bcb2c5..94be5e7 100644 --- a/testing/012_cite.dox +++ b/testing/012_cite.dox @@ -1,7 +1,7 @@ // objective: test the \cite command // check: indexpage.xml // check: citelist.xml -// config: CITE_BIB_FILES = sample.bib +// config: CITE_BIB_FILES = $INPUTDIR/sample.bib /** \mainpage * See \cite knuth79 for more info. */ diff --git a/testing/013/class_t1.xml b/testing/013/class_t1.xml index e0dc3a2..ba91621 100644 --- a/testing/013/class_t1.xml +++ b/testing/013/class_t1.xml @@ -8,7 +8,7 @@ <detaileddescription> <para>A class </para> </detaileddescription> - <location file="013_class.h" bodystart="10" bodyend="12"/> + <location file="013_class.h" line="11" column="1" bodyfile="013_class.h" bodystart="10" bodyend="12"/> <listofallmembers> </listofallmembers> </compounddef> diff --git a/testing/013/class_t2.xml b/testing/013/class_t2.xml index ca534e6..9df47e2 100644 --- a/testing/013/class_t2.xml +++ b/testing/013/class_t2.xml @@ -8,7 +8,7 @@ <detaileddescription> <para>class <ref refid="class_t2" kindref="compound">T2</ref> </para> </detaileddescription> - <location file="013_class.h" bodystart="14" bodyend="16"/> + <location file="013_class.h" line="15" column="1" bodyfile="013_class.h" bodystart="14" bodyend="16"/> <listofallmembers> </listofallmembers> </compounddef> diff --git a/testing/013/class_t3.xml b/testing/013/class_t3.xml index 2fba932..dc0cd3f 100644 --- a/testing/013/class_t3.xml +++ b/testing/013/class_t3.xml @@ -8,7 +8,7 @@ <detaileddescription> <para>class <ref refid="class_t3" kindref="compound">T3</ref> </para> </detaileddescription> - <location file="013_class.h" bodystart="18" bodyend="20"/> + <location file="013_class.h" line="19" column="1" bodyfile="013_class.h" bodystart="18" bodyend="20"/> <listofallmembers> </listofallmembers> </compounddef> diff --git a/testing/013/class_t4.xml b/testing/013/class_t4.xml index 907049f..52955d2 100644 --- a/testing/013/class_t4.xml +++ b/testing/013/class_t4.xml @@ -8,7 +8,7 @@ <detaileddescription> <para>class <ref refid="class_t4" kindref="compound">T4</ref> </para> </detaileddescription> - <location file="013_class.h" bodystart="22" bodyend="24"/> + <location file="013_class.h" line="23" column="1" bodyfile="013_class.h" bodystart="22" bodyend="24"/> <listofallmembers> </listofallmembers> </compounddef> diff --git a/testing/015/015__cond_8c.xml b/testing/015/015__cond_8c.xml index fb3a06c..43cf335 100644 --- a/testing/015/015__cond_8c.xml +++ b/testing/015/015__cond_8c.xml @@ -14,7 +14,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="015_cond.c" bodystart="20" bodyend="22"/> + <location file="015_cond.c" line="20" column="1" bodyfile="015_cond.c" bodystart="20" bodyend="22"/> </memberdef> </sectiondef> <briefdescription> diff --git a/testing/018/018__def_8c.xml b/testing/018/018__def_8c.xml index 0b30670..8518666 100644 --- a/testing/018/018__def_8c.xml +++ b/testing/018/018__def_8c.xml @@ -40,7 +40,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="018_def.c" bodystart="13" bodyend="13"/> + <location file="018_def.c" line="13" column="1" bodyfile="018_def.c" bodystart="13" bodyend="13"/> </memberdef> </sectiondef> <sectiondef kind="typedef"> @@ -56,7 +56,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="018_def.c" bodystart="12" bodyend="-1"/> + <location file="018_def.c" line="12" column="1" bodyfile="018_def.c" bodystart="12" bodyend="-1"/> </memberdef> </sectiondef> <sectiondef kind="var"> @@ -73,7 +73,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="018_def.c" bodystart="9" bodyend="-1"/> + <location file="018_def.c" line="9" column="1" bodyfile="018_def.c" bodystart="9" bodyend="-1"/> </memberdef> </sectiondef> <sectiondef kind="func"> @@ -92,7 +92,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="018_def.c" bodystart="10" bodyend="10"/> + <location file="018_def.c" line="10" column="1" bodyfile="018_def.c" bodystart="10" bodyend="10"/> </memberdef> <memberdef kind="function" id="018__def_8c_1a2652ccbfb85efa2df3c70ba6c4628f8d" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> <type>void</type> @@ -112,7 +112,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="018_def.c" bodystart="11" bodyend="11"/> + <location file="018_def.c" line="11" column="1" bodyfile="018_def.c" bodystart="11" bodyend="11"/> </memberdef> </sectiondef> <briefdescription> diff --git a/testing/021_dontinclude.cpp b/testing/021_dontinclude.cpp index 107991a..eeb95c5 100644 --- a/testing/021_dontinclude.cpp +++ b/testing/021_dontinclude.cpp @@ -1,6 +1,5 @@ // objective: test the \dontinclude, \skip, \until, \skipline, \line commands // check: indexpage.xml -// config: EXAMPLE_PATH = . /*! A test class. */ class Test diff --git a/testing/025/class_test.xml b/testing/025/class_test.xml index f0c7abd..c19341a 100644 --- a/testing/025/class_test.xml +++ b/testing/025/class_test.xml @@ -16,7 +16,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="025_example.cpp" bodystart="20" bodyend="20"/> + <location file="025_example.cpp" line="17" column="1" bodyfile="025_example.cpp" bodystart="20" bodyend="20"/> </memberdef> </sectiondef> <briefdescription> @@ -25,7 +25,7 @@ <detaileddescription> <para>More details about this class. </para> </detaileddescription> - <location file="025_example.cpp" bodystart="10" bodyend="18"/> + <location file="025_example.cpp" line="11" column="1" bodyfile="025_example.cpp" bodystart="10" bodyend="18"/> <listofallmembers> <member refid="class_test_1a47b775f65718978f1ffcd96376f8ecfa" prot="public" virt="non-virtual"> <scope>Test</scope> diff --git a/testing/025_example.cpp b/testing/025_example.cpp index 39736f8..817a47f 100644 --- a/testing/025_example.cpp +++ b/testing/025_example.cpp @@ -1,7 +1,7 @@ // objective: test the \example command // check: example_test_8cpp-example.xml // check: class_test.xml -// config: EXAMPLE_PATH = . + /** \brief A Test class. * diff --git a/testing/026/class_test.xml b/testing/026/class_test.xml index a332757..582d509 100644 --- a/testing/026/class_test.xml +++ b/testing/026/class_test.xml @@ -41,7 +41,7 @@ <para>A <ref refid="class_test" kindref="compound">Test</ref> class. More details about this class. <parameterlist kind="templateparam"><parameteritem><parameternamelist><parametername>T</parametername></parameternamelist><parameterdescription><para>A template parameter. </para></parameterdescription></parameteritem></parameterlist> </para> </detaileddescription> - <location file="026_exception.cpp" bodystart="8" bodyend="20"/> + <location file="026_exception.cpp" line="9" column="1" bodyfile="026_exception.cpp" bodystart="8" bodyend="20"/> <listofallmembers> <member refid="class_test_1abf9d5fbdaa4c23d0a513ee9746060779" prot="public" virt="non-virtual"> <scope>Test</scope> diff --git a/testing/027/struct_car.xml b/testing/027/struct_car.xml index c73ad34..9027597 100644 --- a/testing/027/struct_car.xml +++ b/testing/027/struct_car.xml @@ -18,7 +18,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="027_extends.c" bodystart="69" bodyend="-1"/> + <location file="027_extends.c" line="69" column="1" bodyfile="027_extends.c" bodystart="69" bodyend="-1"/> </memberdef> </sectiondef> <briefdescription> @@ -68,7 +68,7 @@ </childnode> </node> </collaborationgraph> - <location file="027_extends.c" bodystart="67" bodyend="70"/> + <location file="027_extends.c" line="68" column="1" bodyfile="027_extends.c" bodystart="67" bodyend="70"/> <listofallmembers> <member refid="struct_car_1ab8ff28306286da5a8b14fa9bdccaafaa" prot="protected" virt="non-virtual"> <scope>Car</scope> diff --git a/testing/027/struct_object.xml b/testing/027/struct_object.xml index 4047446..e14caa5 100644 --- a/testing/027/struct_object.xml +++ b/testing/027/struct_object.xml @@ -16,7 +16,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="027_extends.c" bodystart="21" bodyend="-1"/> + <location file="027_extends.c" line="21" column="1" bodyfile="027_extends.c" bodystart="21" bodyend="-1"/> </memberdef> </sectiondef> <sectiondef kind="public-func"> @@ -86,7 +86,7 @@ </childnode> </node> </inheritancegraph> - <location file="027_extends.c" bodystart="19" bodyend="22"/> + <location file="027_extends.c" line="20" column="1" bodyfile="027_extends.c" bodystart="19" bodyend="22"/> <listofallmembers> <member refid="struct_object_1a71225073d06a793b9a6ea9263ed37b12" prot="public" virt="non-virtual"> <scope>Object</scope> diff --git a/testing/027/struct_truck.xml b/testing/027/struct_truck.xml index 14ebde2..c5009d4 100644 --- a/testing/027/struct_truck.xml +++ b/testing/027/struct_truck.xml @@ -18,7 +18,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="027_extends.c" bodystart="79" bodyend="-1"/> + <location file="027_extends.c" line="79" column="1" bodyfile="027_extends.c" bodystart="79" bodyend="-1"/> </memberdef> </sectiondef> <briefdescription> @@ -68,7 +68,7 @@ <link refid="struct_object"/> </node> </collaborationgraph> - <location file="027_extends.c" bodystart="77" bodyend="80"/> + <location file="027_extends.c" line="78" column="1" bodyfile="027_extends.c" bodystart="77" bodyend="80"/> <listofallmembers> <member refid="struct_truck_1ad0ac321609dda1a6c552488b05ec7ac8" prot="protected" virt="non-virtual"> <scope>Truck</scope> diff --git a/testing/027/struct_vehicle.xml b/testing/027/struct_vehicle.xml index bf480e8..acf10a0 100644 --- a/testing/027/struct_vehicle.xml +++ b/testing/027/struct_vehicle.xml @@ -20,7 +20,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="027_extends.c" bodystart="45" bodyend="-1"/> + <location file="027_extends.c" line="45" column="1" bodyfile="027_extends.c" bodystart="45" bodyend="-1"/> </memberdef> </sectiondef> <sectiondef kind="public-func"> @@ -105,7 +105,7 @@ <link refid="struct_object"/> </node> </collaborationgraph> - <location file="027_extends.c" bodystart="43" bodyend="46"/> + <location file="027_extends.c" line="44" column="1" bodyfile="027_extends.c" bodystart="43" bodyend="46"/> <listofallmembers> <member refid="struct_vehicle_1ad7970f528d429f6fc1725173e93a77c2" prot="protected" virt="non-virtual"> <scope>Vehicle</scope> diff --git a/testing/029/029__hideinit_8c.xml b/testing/029/029__hideinit_8c.xml index f5db794..4caf092 100644 --- a/testing/029/029__hideinit_8c.xml +++ b/testing/029/029__hideinit_8c.xml @@ -16,7 +16,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="029_hideinit.c" bodystart="7" bodyend="-1"/> + <location file="029_hideinit.c" line="7" column="1" bodyfile="029_hideinit.c" bodystart="7" bodyend="-1"/> </memberdef> <memberdef kind="variable" id="029__hideinit_8c_1ac0da06d47d79ad4b9fb1c0eaf1118c3f" prot="public" static="no" mutable="no"> <type>int</type> @@ -30,7 +30,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="029_hideinit.c" bodystart="12" bodyend="-1"/> + <location file="029_hideinit.c" line="12" column="1" bodyfile="029_hideinit.c" bodystart="12" bodyend="-1"/> </memberdef> </sectiondef> <briefdescription> diff --git a/testing/030_htmlinclude.dox b/testing/030_htmlinclude.dox index a3716e6..a8e8af6 100644 --- a/testing/030_htmlinclude.dox +++ b/testing/030_htmlinclude.dox @@ -1,6 +1,5 @@ // objective: test the \htmlinclude command // check: indexpage.xml -// config: EXAMPLE_PATH = . /** \mainpage * Some text. * \htmlinclude sample.html diff --git a/testing/032_include.cpp b/testing/032_include.cpp index 8aae8e9..2eddc57 100644 --- a/testing/032_include.cpp +++ b/testing/032_include.cpp @@ -1,6 +1,5 @@ // objective: test the \include and \includelineno commands // check: indexpage.xml -// config: EXAMPLE_PATH = . /** \mainpage * Some text. diff --git a/testing/035/035__invariant_8c.xml b/testing/035/035__invariant_8c.xml index f1a924d..b3d74bc 100644 --- a/testing/035/035__invariant_8c.xml +++ b/testing/035/035__invariant_8c.xml @@ -33,7 +33,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="035_invariant.c" bodystart="10" bodyend="15"/> + <location file="035_invariant.c" line="10" column="1" bodyfile="035_invariant.c" bodystart="10" bodyend="15"/> </memberdef> </sectiondef> <briefdescription> diff --git a/testing/037/class_receiver.xml b/testing/037/class_receiver.xml index 5c4fde6..edb688a 100644 --- a/testing/037/class_receiver.xml +++ b/testing/037/class_receiver.xml @@ -32,7 +32,7 @@ </msc> </para> </detaileddescription> - <location file="037_msc.cpp" bodystart="28" bodyend="33"/> + <location file="037_msc.cpp" line="29" column="1" bodyfile="037_msc.cpp" bodystart="28" bodyend="33"/> <listofallmembers> <member refid="class_receiver_1a162099741e0324e6254c9bc570566e40" prot="public" virt="non-virtual"> <scope>Receiver</scope> diff --git a/testing/037/class_sender.xml b/testing/037/class_sender.xml index e58ab88..0f1996d 100644 --- a/testing/037/class_sender.xml +++ b/testing/037/class_sender.xml @@ -32,7 +32,7 @@ </msc> </para> </detaileddescription> - <location file="037_msc.cpp" bodystart="13" bodyend="18"/> + <location file="037_msc.cpp" line="14" column="1" bodyfile="037_msc.cpp" bodystart="13" bodyend="18"/> <listofallmembers> <member refid="class_sender_1a8ad2c6f9baa4e798868fe4a4d45f8fda" prot="public" virt="non-virtual"> <scope>Sender</scope> diff --git a/testing/039/class_test.xml b/testing/039/class_test.xml index 244e88d..2a4796a 100644 --- a/testing/039/class_test.xml +++ b/testing/039/class_test.xml @@ -55,7 +55,7 @@ <detaileddescription> <para>More details about this class. </para> </detaileddescription> - <location file="039_name.cpp" bodystart="8" bodyend="24"/> + <location file="039_name.cpp" line="9" column="1" bodyfile="039_name.cpp" bodystart="8" bodyend="24"/> <listofallmembers> <member refid="class_test_1a78e37a450a276b60a5a2fa4a46c86f2e" prot="public" virt="non-virtual"> <scope>Test</scope> diff --git a/testing/041/class_test.xml b/testing/041/class_test.xml index 7068026..57dbe37 100644 --- a/testing/041/class_test.xml +++ b/testing/041/class_test.xml @@ -31,7 +31,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="041_overload.cpp" bodystart="12" bodyend="12"/> + <location file="041_overload.cpp" line="7" column="1" bodyfile="041_overload.cpp" bodystart="12" bodyend="12"/> </memberdef> <memberdef kind="function" id="class_test_1ae87a6e26707e684c0d2d07bb3d4a9d7f" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> <type>void</type> @@ -49,7 +49,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="041_overload.cpp" bodystart="13" bodyend="13"/> + <location file="041_overload.cpp" line="8" column="1" bodyfile="041_overload.cpp" bodystart="13" bodyend="13"/> </memberdef> <memberdef kind="function" id="class_test_1a62a76eed05fa84633d1e460aeeaf875d" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> <type>void</type> @@ -72,7 +72,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="041_overload.cpp" bodystart="18" bodyend="18"/> + <location file="041_overload.cpp" line="9" column="1" bodyfile="041_overload.cpp" bodystart="18" bodyend="18"/> </memberdef> </sectiondef> <briefdescription> @@ -81,7 +81,7 @@ <detaileddescription> <para>More text. </para> </detaileddescription> - <location file="041_overload.cpp" bodystart="4" bodyend="10"/> + <location file="041_overload.cpp" line="5" column="1" bodyfile="041_overload.cpp" bodystart="4" bodyend="10"/> <listofallmembers> <member refid="class_test_1a8e7b46ceaf7bd2ab94114b390b3288ca" prot="public" virt="non-virtual"> <scope>Test</scope> diff --git a/testing/044/struct_s.xml b/testing/044/struct_s.xml index 2aa62c2..aefd50d 100644 --- a/testing/044/struct_s.xml +++ b/testing/044/struct_s.xml @@ -16,7 +16,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="044_section.h" bodystart="10" bodyend="-1"/> + <location file="044_section.h" line="10" column="1" bodyfile="044_section.h" bodystart="10" bodyend="-1"/> </memberdef> <memberdef kind="variable" id="struct_s_1a413054db7785010db38c16322c8583cc" prot="public" static="no" mutable="no"> <type>int</type> @@ -30,7 +30,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="044_section.h" bodystart="12" bodyend="-1"/> + <location file="044_section.h" line="12" column="1" bodyfile="044_section.h" bodystart="12" bodyend="-1"/> </memberdef> </sectiondef> <sectiondef kind="protected-attrib"> @@ -46,7 +46,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="044_section.h" bodystart="17" bodyend="-1"/> + <location file="044_section.h" line="17" column="1" bodyfile="044_section.h" bodystart="17" bodyend="-1"/> </memberdef> <memberdef kind="variable" id="struct_s_1a0c535a6122f4ae509a336e3a67f927a4" prot="protected" static="no" mutable="no"> <type>int</type> @@ -60,7 +60,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="044_section.h" bodystart="19" bodyend="-1"/> + <location file="044_section.h" line="19" column="1" bodyfile="044_section.h" bodystart="19" bodyend="-1"/> </memberdef> </sectiondef> <sectiondef kind="private-attrib"> @@ -76,7 +76,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="044_section.h" bodystart="24" bodyend="-1"/> + <location file="044_section.h" line="24" column="1" bodyfile="044_section.h" bodystart="24" bodyend="-1"/> </memberdef> <memberdef kind="variable" id="struct_s_1a4b26822a09bcd6b946702e99280826ff" prot="private" static="no" mutable="no"> <type>int</type> @@ -90,7 +90,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="044_section.h" bodystart="26" bodyend="-1"/> + <location file="044_section.h" line="26" column="1" bodyfile="044_section.h" bodystart="26" bodyend="-1"/> </memberdef> </sectiondef> <briefdescription> @@ -98,7 +98,7 @@ <detaileddescription> <para>A struct </para> </detaileddescription> - <location file="044_section.h" bodystart="5" bodyend="27"/> + <location file="044_section.h" line="6" column="1" bodyfile="044_section.h" bodystart="5" bodyend="27"/> <listofallmembers> <member refid="struct_s_1ab754fee7e3500035f644d0ac528cbfc3" prot="private" virt="non-virtual"> <scope>S</scope> diff --git a/testing/046/class_test.xml b/testing/046/class_test.xml index 62712d4..9a1bd9c 100644 --- a/testing/046/class_test.xml +++ b/testing/046/class_test.xml @@ -61,7 +61,7 @@ <para>A test class <simplesect kind="see"><para><ref refid="class_test_1a1683da699dc049d74101488d143c8e98" kindref="member">Test::method()</ref></para></simplesect> </para> </detaileddescription> - <location file="046_related.cpp" bodystart="10" bodyend="15"/> + <location file="046_related.cpp" line="11" column="1" bodyfile="046_related.cpp" bodystart="10" bodyend="15"/> <listofallmembers> <member refid="class_test_1a1283d836e0611ff772c1b06a31ecbbfe" prot="public" virt="non-virtual"> <scope>Test</scope> diff --git a/testing/048/048__showinit_8c.xml b/testing/048/048__showinit_8c.xml index 34b2c1c..4cc5717 100644 --- a/testing/048/048__showinit_8c.xml +++ b/testing/048/048__showinit_8c.xml @@ -15,7 +15,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="048_showinit.c" bodystart="8" bodyend="-1"/> + <location file="048_showinit.c" line="8" column="1" bodyfile="048_showinit.c" bodystart="8" bodyend="-1"/> </memberdef> <memberdef kind="variable" id="048__showinit_8c_1ac0da06d47d79ad4b9fb1c0eaf1118c3f" prot="public" static="no" mutable="no"> <type>int</type> @@ -30,7 +30,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="048_showinit.c" bodystart="13" bodyend="-1"/> + <location file="048_showinit.c" line="13" column="1" bodyfile="048_showinit.c" bodystart="13" bodyend="-1"/> </memberdef> </sectiondef> <briefdescription> diff --git a/testing/049_snippet.cpp b/testing/049_snippet.cpp index 614a43c..9c5f18b 100644 --- a/testing/049_snippet.cpp +++ b/testing/049_snippet.cpp @@ -1,6 +1,5 @@ // objective: test the \snippet command // check: indexpage.xml -// config: EXAMPLE_PATH = . /** \mainpage * A bubble sort algorithm diff --git a/testing/050_verbatim.dox b/testing/050_verbatim.dox index 0ff315f..40c75a5 100644 --- a/testing/050_verbatim.dox +++ b/testing/050_verbatim.dox @@ -1,6 +1,5 @@ // objective: test \verbatim and \verbinclude commands // check: indexpage.xml -// config: EXAMPLE_PATH = . /** \mainpage Some normal text. diff --git a/testing/056_latexinclude.dox b/testing/056_latexinclude.dox index 6a8052a..021b2f7 100644 --- a/testing/056_latexinclude.dox +++ b/testing/056_latexinclude.dox @@ -1,6 +1,5 @@ // objective: test the \latexinclude command // check: indexpage.xml -// config: EXAMPLE_PATH = . /** \mainpage * Some text. * \latexinclude sample.tex diff --git a/testing/057/057__caller__graphs_8tcl.xml b/testing/057/057__caller__graphs_8tcl.xml index c3dfb78..1046e30 100644 --- a/testing/057/057__caller__graphs_8tcl.xml +++ b/testing/057/057__caller__graphs_8tcl.xml @@ -24,7 +24,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="057_caller_graphs.tcl" bodystart="59" bodyend="61"/> + <location file="057_caller_graphs.tcl" line="59" column="1" bodyfile="057_caller_graphs.tcl" bodystart="59" bodyend="61"/> </memberdef> <memberdef kind="function" id="057__caller__graphs_8tcl_1ae4e1c2bb3adfdfbb71f52de84a8285b0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> <type/> @@ -37,7 +37,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="057_caller_graphs.tcl" bodystart="65" bodyend="67"/> + <location file="057_caller_graphs.tcl" line="65" column="1" bodyfile="057_caller_graphs.tcl" bodystart="65" bodyend="67"/> <referencedby refid="namespace1_1a9722420639306872cea2593b83028a45" compoundref="057__caller__graphs_8tcl" startline="85" endline="88">1::test3</referencedby> </memberdef> <memberdef kind="function" id="057__caller__graphs_8tcl_1a3f808a00e1b937978455d707851ab33a" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -51,7 +51,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="057_caller_graphs.tcl" bodystart="102" bodyend="105"/> + <location file="057_caller_graphs.tcl" line="102" column="1" bodyfile="057_caller_graphs.tcl" bodystart="102" bodyend="105"/> <references refid="namespace2_1a2839d9dea7f0d08f48958c3fc0cd00d3" compoundref="057__caller__graphs_8tcl" startline="106" endline="114">2::next</references> </memberdef> <memberdef kind="function" id="057__caller__graphs_8tcl_1a12acb916374f925e7b7ba302a1ca4efb" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -65,7 +65,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="057_caller_graphs.tcl" bodystart="136" bodyend="140"/> + <location file="057_caller_graphs.tcl" line="136" column="1" bodyfile="057_caller_graphs.tcl" bodystart="136" bodyend="140"/> <references refid="__057__caller__graphs_8tcl_1a7c3c8acee94bf61ba9e911dafe35adac" compoundref="__057__caller__graphs_8tcl" startline="1" endline="4">inFileB</references> </memberdef> <memberdef kind="function" id="057__caller__graphs_8tcl_1a7482c00c17357cf4846b0c1bd715979c" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -79,7 +79,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="057_caller_graphs.tcl" bodystart="141" bodyend="144"/> + <location file="057_caller_graphs.tcl" line="141" column="1" bodyfile="057_caller_graphs.tcl" bodystart="141" bodyend="144"/> <referencedby refid="__057__caller__graphs_8tcl_1a7c3c8acee94bf61ba9e911dafe35adac" compoundref="__057__caller__graphs_8tcl" startline="1" endline="4">inFileB</referencedby> </memberdef> </sectiondef> diff --git a/testing/057/__057__caller__graphs_8tcl.xml b/testing/057/__057__caller__graphs_8tcl.xml index 48ab815..a71e7b5 100644 --- a/testing/057/__057__caller__graphs_8tcl.xml +++ b/testing/057/__057__caller__graphs_8tcl.xml @@ -14,7 +14,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="_057_caller_graphs.tcl" bodystart="1" bodyend="4"/> + <location file="_057_caller_graphs.tcl" line="1" column="1" bodyfile="_057_caller_graphs.tcl" bodystart="1" bodyend="4"/> <references refid="057__caller__graphs_8tcl_1a7482c00c17357cf4846b0c1bd715979c" compoundref="057__caller__graphs_8tcl" startline="141" endline="144">inFileA</references> <referencedby refid="057__caller__graphs_8tcl_1a12acb916374f925e7b7ba302a1ca4efb" compoundref="057__caller__graphs_8tcl" startline="136" endline="140">master</referencedby> </memberdef> diff --git a/testing/057/namespace1.xml b/testing/057/namespace1.xml index 6a40cc4..33d073d 100644 --- a/testing/057/namespace1.xml +++ b/testing/057/namespace1.xml @@ -15,7 +15,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="057_caller_graphs.tcl" bodystart="62" bodyend="64"/> + <location file="057_caller_graphs.tcl" line="62" column="1" bodyfile="057_caller_graphs.tcl" bodystart="62" bodyend="64"/> <referencedby refid="namespace1_1a4a8285288ee1994ac886e2039777339e" compoundref="057__caller__graphs_8tcl" startline="77" endline="80">test1</referencedby> <referencedby refid="namespace1_1a11615154d3c207ed4106dd0bcb0639e8" compoundref="057__caller__graphs_8tcl" startline="93" endline="96">test5</referencedby> </memberdef> @@ -30,7 +30,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="057_caller_graphs.tcl" bodystart="68" bodyend="70"/> + <location file="057_caller_graphs.tcl" line="68" column="1" bodyfile="057_caller_graphs.tcl" bodystart="68" bodyend="70"/> <referencedby refid="namespace1_1ae1e88bb7ddd332348d7e29ac4a211b00" compoundref="057__caller__graphs_8tcl" startline="81" endline="84">test2</referencedby> </memberdef> <memberdef kind="function" id="namespace1_1a4a8285288ee1994ac886e2039777339e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -44,7 +44,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="057_caller_graphs.tcl" bodystart="77" bodyend="80"/> + <location file="057_caller_graphs.tcl" line="77" column="1" bodyfile="057_caller_graphs.tcl" bodystart="77" bodyend="80"/> <references refid="namespace1_1a5024a7bc323958c7230615f2fcaeaef8" compoundref="057__caller__graphs_8tcl" startline="62" endline="64">baz</references> </memberdef> <memberdef kind="function" id="namespace1_1ae1e88bb7ddd332348d7e29ac4a211b00" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -58,7 +58,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="057_caller_graphs.tcl" bodystart="81" bodyend="84"/> + <location file="057_caller_graphs.tcl" line="81" column="1" bodyfile="057_caller_graphs.tcl" bodystart="81" bodyend="84"/> <references refid="namespace1_1ad58c8f16ad5f12178c71ca988865bb58" compoundref="057__caller__graphs_8tcl" startline="68" endline="70">bar</references> </memberdef> <memberdef kind="function" id="namespace1_1a9722420639306872cea2593b83028a45" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -72,7 +72,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="057_caller_graphs.tcl" bodystart="85" bodyend="88"/> + <location file="057_caller_graphs.tcl" line="85" column="1" bodyfile="057_caller_graphs.tcl" bodystart="85" bodyend="88"/> <references refid="057__caller__graphs_8tcl_1ae4e1c2bb3adfdfbb71f52de84a8285b0" compoundref="057__caller__graphs_8tcl" startline="65" endline="67">bar</references> </memberdef> <memberdef kind="function" id="namespace1_1addc9b30656419de5e2651e27a013db29" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -86,7 +86,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="057_caller_graphs.tcl" bodystart="89" bodyend="92"/> + <location file="057_caller_graphs.tcl" line="89" column="1" bodyfile="057_caller_graphs.tcl" bodystart="89" bodyend="92"/> <references refid="namespace1_1_11_1acebecc4cb718010d00c3c150158b75ab" compoundref="057__caller__graphs_8tcl" startline="71" endline="73">1::1::bar</references> </memberdef> <memberdef kind="function" id="namespace1_1a11615154d3c207ed4106dd0bcb0639e8" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -100,7 +100,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="057_caller_graphs.tcl" bodystart="93" bodyend="96"/> + <location file="057_caller_graphs.tcl" line="93" column="1" bodyfile="057_caller_graphs.tcl" bodystart="93" bodyend="96"/> <references refid="namespace1_1a5024a7bc323958c7230615f2fcaeaef8" compoundref="057__caller__graphs_8tcl" startline="62" endline="64">baz</references> </memberdef> </sectiondef> diff --git a/testing/057/namespace1_1_11.xml b/testing/057/namespace1_1_11.xml index 8ff3ce9..e13e261 100644 --- a/testing/057/namespace1_1_11.xml +++ b/testing/057/namespace1_1_11.xml @@ -15,7 +15,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="057_caller_graphs.tcl" bodystart="71" bodyend="73"/> + <location file="057_caller_graphs.tcl" line="71" column="1" bodyfile="057_caller_graphs.tcl" bodystart="71" bodyend="73"/> <referencedby refid="namespace1_1addc9b30656419de5e2651e27a013db29" compoundref="057__caller__graphs_8tcl" startline="89" endline="92">1::test4</referencedby> </memberdef> </sectiondef> diff --git a/testing/057/namespace1_1_11_1_11.xml b/testing/057/namespace1_1_11_1_11.xml index f7f9716..55b7838 100644 --- a/testing/057/namespace1_1_11_1_11.xml +++ b/testing/057/namespace1_1_11_1_11.xml @@ -14,7 +14,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="057_caller_graphs.tcl" bodystart="74" bodyend="76"/> + <location file="057_caller_graphs.tcl" line="74" column="1" bodyfile="057_caller_graphs.tcl" bodystart="74" bodyend="76"/> </memberdef> </sectiondef> <briefdescription> diff --git a/testing/057/namespace2.xml b/testing/057/namespace2.xml index 0ce04a8..a8a9bc6 100644 --- a/testing/057/namespace2.xml +++ b/testing/057/namespace2.xml @@ -15,7 +15,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="057_caller_graphs.tcl" bodystart="106" bodyend="114"/> + <location file="057_caller_graphs.tcl" line="106" column="1" bodyfile="057_caller_graphs.tcl" bodystart="106" bodyend="114"/> <references refid="namespace2_1_12_1aceefa876cf364f44da1f523d3f7b0649" compoundref="057__caller__graphs_8tcl" startline="115" endline="118">2::2::next</references> <referencedby refid="057__caller__graphs_8tcl_1a3f808a00e1b937978455d707851ab33a" compoundref="057__caller__graphs_8tcl" startline="102" endline="105">next</referencedby> <referencedby refid="namespace2_1_12_1_12_1_12_1_12_1ac07f64c62783fd8b44317389b4a711f8" compoundref="057__caller__graphs_8tcl" startline="127" endline="130">2::2::2::2::2::next</referencedby> diff --git a/testing/057/namespace2_1_12.xml b/testing/057/namespace2_1_12.xml index af86ebe..a188f00 100644 --- a/testing/057/namespace2_1_12.xml +++ b/testing/057/namespace2_1_12.xml @@ -15,7 +15,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="057_caller_graphs.tcl" bodystart="115" bodyend="118"/> + <location file="057_caller_graphs.tcl" line="115" column="1" bodyfile="057_caller_graphs.tcl" bodystart="115" bodyend="118"/> <references refid="namespace2_1_12_1_12_1a85524e2015e377d433cd8384335c11d6" compoundref="057__caller__graphs_8tcl" startline="119" endline="122">2::2::2::next</references> <referencedby refid="namespace2_1a2839d9dea7f0d08f48958c3fc0cd00d3" compoundref="057__caller__graphs_8tcl" startline="106" endline="114">2::next</referencedby> </memberdef> diff --git a/testing/057/namespace2_1_12_1_12.xml b/testing/057/namespace2_1_12_1_12.xml index 0a6d7fa..e83b3fd 100644 --- a/testing/057/namespace2_1_12_1_12.xml +++ b/testing/057/namespace2_1_12_1_12.xml @@ -15,7 +15,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="057_caller_graphs.tcl" bodystart="119" bodyend="122"/> + <location file="057_caller_graphs.tcl" line="119" column="1" bodyfile="057_caller_graphs.tcl" bodystart="119" bodyend="122"/> <references refid="namespace2_1_12_1_12_1_12_1a3ea6e2ce66f4a9c30009852e4c7da2fe" compoundref="057__caller__graphs_8tcl" startline="123" endline="126">2::2::2::2::next</references> <referencedby refid="namespace2_1_12_1aceefa876cf364f44da1f523d3f7b0649" compoundref="057__caller__graphs_8tcl" startline="115" endline="118">2::2::next</referencedby> </memberdef> diff --git a/testing/057/namespace2_1_12_1_12_1_12.xml b/testing/057/namespace2_1_12_1_12_1_12.xml index 461d61e..83c2a73 100644 --- a/testing/057/namespace2_1_12_1_12_1_12.xml +++ b/testing/057/namespace2_1_12_1_12_1_12.xml @@ -15,7 +15,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="057_caller_graphs.tcl" bodystart="123" bodyend="126"/> + <location file="057_caller_graphs.tcl" line="123" column="1" bodyfile="057_caller_graphs.tcl" bodystart="123" bodyend="126"/> <references refid="namespace2_1_12_1_12_1_12_1_12_1ac07f64c62783fd8b44317389b4a711f8" compoundref="057__caller__graphs_8tcl" startline="127" endline="130">2::2::2::2::2::next</references> <referencedby refid="namespace2_1_12_1_12_1a85524e2015e377d433cd8384335c11d6" compoundref="057__caller__graphs_8tcl" startline="119" endline="122">2::2::2::next</referencedby> </memberdef> diff --git a/testing/057/namespace2_1_12_1_12_1_12_1_12.xml b/testing/057/namespace2_1_12_1_12_1_12_1_12.xml index 3981ff0..9222625 100644 --- a/testing/057/namespace2_1_12_1_12_1_12_1_12.xml +++ b/testing/057/namespace2_1_12_1_12_1_12_1_12.xml @@ -14,7 +14,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="057_caller_graphs.tcl" bodystart="127" bodyend="130"/> + <location file="057_caller_graphs.tcl" line="127" column="1" bodyfile="057_caller_graphs.tcl" bodystart="127" bodyend="130"/> <references refid="namespace2_1a2839d9dea7f0d08f48958c3fc0cd00d3" compoundref="057__caller__graphs_8tcl" startline="106" endline="114">2::next</references> <referencedby refid="namespace2_1_12_1_12_1_12_1a3ea6e2ce66f4a9c30009852e4c7da2fe" compoundref="057__caller__graphs_8tcl" startline="123" endline="126">2::2::2::2::next</referencedby> </memberdef> diff --git a/testing/057/namespacebar.xml b/testing/057/namespacebar.xml index 85cde41..e16966e 100644 --- a/testing/057/namespacebar.xml +++ b/testing/057/namespacebar.xml @@ -14,7 +14,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="057_caller_graphs.tcl" bodystart="29" bodyend="35"/> + <location file="057_caller_graphs.tcl" line="29" column="1" bodyfile="057_caller_graphs.tcl" bodystart="29" bodyend="35"/> <references refid="namespacebar_1a3426cd3a2eebcffa0dc333bcf5e2fe5e" compoundref="057__caller__graphs_8tcl" startline="36" endline="39">baz</references> <referencedby refid="namespacefoo_1a265acdcaea6da32c3bbd9afb5d0e32a4" compoundref="057__caller__graphs_8tcl" startline="44" endline="48">foo::master</referencedby> </memberdef> @@ -29,7 +29,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="057_caller_graphs.tcl" bodystart="36" bodyend="39"/> + <location file="057_caller_graphs.tcl" line="36" column="1" bodyfile="057_caller_graphs.tcl" bodystart="36" bodyend="39"/> <references refid="namespacebar_1a88879545dee287d377e638b87cdf6dd7" compoundref="057__caller__graphs_8tcl" startline="40" endline="42">bazbaz</references> <referencedby refid="namespacebar_1aa1678a9adb588c0b91b118de7cc38ddb" compoundref="057__caller__graphs_8tcl" startline="29" endline="35">slave</referencedby> </memberdef> @@ -44,7 +44,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="057_caller_graphs.tcl" bodystart="40" bodyend="42"/> + <location file="057_caller_graphs.tcl" line="40" column="1" bodyfile="057_caller_graphs.tcl" bodystart="40" bodyend="42"/> <referencedby refid="namespacebar_1a3426cd3a2eebcffa0dc333bcf5e2fe5e" compoundref="057__caller__graphs_8tcl" startline="36" endline="39">baz</referencedby> </memberdef> </sectiondef> diff --git a/testing/057/namespacefoo.xml b/testing/057/namespacefoo.xml index 0d81332..8d0ac75 100644 --- a/testing/057/namespacefoo.xml +++ b/testing/057/namespacefoo.xml @@ -14,7 +14,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="057_caller_graphs.tcl" bodystart="44" bodyend="48"/> + <location file="057_caller_graphs.tcl" line="44" column="1" bodyfile="057_caller_graphs.tcl" bodystart="44" bodyend="48"/> <references refid="namespacebar_1aa1678a9adb588c0b91b118de7cc38ddb" compoundref="057__caller__graphs_8tcl" startline="29" endline="35">bar::slave</references> </memberdef> </sectiondef> diff --git a/testing/057_caller_graphs.tcl b/testing/057_caller_graphs.tcl index f6e0e77..464d8aa 100644 --- a/testing/057_caller_graphs.tcl +++ b/testing/057_caller_graphs.tcl @@ -15,7 +15,7 @@ #// config: INLINE_SOURCES = no #// config: REFERENCED_BY_RELATION = yes #// config: REFERENCES_RELATION = yes -#// config: INPUT = 057_caller_graphs.tcl _057_caller_graphs.tcl +#// config: INPUT = $INPUTDIR/057_caller_graphs.tcl $INPUTDIR/_057_caller_graphs.tcl # config: HAVE_DOT = yes # config: CALLER_GRAPH = yes # config: CALL_GRAPH = yes diff --git a/testing/058/058__bracket__recursion_8tcl.xml b/testing/058/058__bracket__recursion_8tcl.xml index dcb60e4..0381b83 100644 --- a/testing/058/058__bracket__recursion_8tcl.xml +++ b/testing/058/058__bracket__recursion_8tcl.xml @@ -15,7 +15,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="10" bodyend="13"/> + <location file="058_bracket_recursion.tcl" line="10" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="10" bodyend="13"/> <referencedby refid="058__bracket__recursion_8tcl_1ab08ae027fc5777bc4f0629f1b60b35db" compoundref="058__bracket__recursion_8tcl" startline="22" endline="25">a</referencedby> <referencedby refid="058__bracket__recursion_8tcl_1a68bdb74c144118d936931c46f75d4b3e" compoundref="058__bracket__recursion_8tcl" startline="28" endline="32">b</referencedby> <referencedby refid="058__bracket__recursion_8tcl_1ab14f56bc3bd7680490ece4ad7815465f" compoundref="058__bracket__recursion_8tcl" startline="33" endline="37">c</referencedby> @@ -51,7 +51,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="16" bodyend="19"/> + <location file="058_bracket_recursion.tcl" line="16" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="16" bodyend="19"/> </memberdef> <memberdef kind="function" id="058__bracket__recursion_8tcl_1ab08ae027fc5777bc4f0629f1b60b35db" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> <type/> @@ -64,7 +64,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="22" bodyend="25"/> + <location file="058_bracket_recursion.tcl" line="22" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="22" bodyend="25"/> <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="058__bracket__recursion_8tcl_1a68bdb74c144118d936931c46f75d4b3e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -78,7 +78,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="28" bodyend="32"/> + <location file="058_bracket_recursion.tcl" line="28" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="28" bodyend="32"/> <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="058__bracket__recursion_8tcl_1ab14f56bc3bd7680490ece4ad7815465f" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -92,7 +92,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="33" bodyend="37"/> + <location file="058_bracket_recursion.tcl" line="33" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="33" bodyend="37"/> <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="058__bracket__recursion_8tcl_1af43f4b1f0064a33b2d662af9f06d3a00" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -106,7 +106,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="38" bodyend="42"/> + <location file="058_bracket_recursion.tcl" line="38" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="38" bodyend="42"/> <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="058__bracket__recursion_8tcl_1aff65a51a703804e0ad1adbcfd76c86f8" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -120,7 +120,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="43" bodyend="46"/> + <location file="058_bracket_recursion.tcl" line="43" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="43" bodyend="46"/> <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="058__bracket__recursion_8tcl_1af6830d2c644b45088ea8f1f74a46b778" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -134,7 +134,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="47" bodyend="50"/> + <location file="058_bracket_recursion.tcl" line="47" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="47" bodyend="50"/> <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="058__bracket__recursion_8tcl_1af08b4b5bfa9edf0b0a7dee1c2b2c29e0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -148,7 +148,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="51" bodyend="55"/> + <location file="058_bracket_recursion.tcl" line="51" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="51" bodyend="55"/> <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="058__bracket__recursion_8tcl_1af96fd0966e32a310a0778d2e5c357700" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -162,7 +162,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="56" bodyend="59"/> + <location file="058_bracket_recursion.tcl" line="56" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="56" bodyend="59"/> <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="058__bracket__recursion_8tcl_1a8c90afd4641b25be86bd09983c3cbee0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -176,7 +176,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="64" bodyend="68"/> + <location file="058_bracket_recursion.tcl" line="64" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="64" bodyend="68"/> <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="058__bracket__recursion_8tcl_1a2aaa92757686acea102cba3475f0c13b" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -190,7 +190,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="69" bodyend="73"/> + <location file="058_bracket_recursion.tcl" line="69" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="69" bodyend="73"/> <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="058__bracket__recursion_8tcl_1a20363f854eb4098a446733d63d34dbc1" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -204,7 +204,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="74" bodyend="77"/> + <location file="058_bracket_recursion.tcl" line="74" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="74" bodyend="77"/> <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="058__bracket__recursion_8tcl_1aff56f84b49947b84b2a304f51cf8e678" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -218,7 +218,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="78" bodyend="81"/> + <location file="058_bracket_recursion.tcl" line="78" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="78" bodyend="81"/> <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="058__bracket__recursion_8tcl_1a78d127e8bda64d4471ac811ad512fbd9" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -232,7 +232,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="82" bodyend="85"/> + <location file="058_bracket_recursion.tcl" line="82" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="82" bodyend="85"/> <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="058__bracket__recursion_8tcl_1acdde3cd86eb2421ce8dbb2e85227d368" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -246,7 +246,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="86" bodyend="89"/> + <location file="058_bracket_recursion.tcl" line="86" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="86" bodyend="89"/> <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="058__bracket__recursion_8tcl_1a495e7a4ede0831107e9d435080a7c268" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -260,7 +260,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="90" bodyend="94"/> + <location file="058_bracket_recursion.tcl" line="90" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="90" bodyend="94"/> <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="058__bracket__recursion_8tcl_1a8a57650834f5708d404e9c386b2edf87" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -274,7 +274,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="98" bodyend="101"/> + <location file="058_bracket_recursion.tcl" line="98" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="98" bodyend="101"/> </memberdef> <memberdef kind="function" id="058__bracket__recursion_8tcl_1a15229b450f26d8fa1c10bea4f3279f4d" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> <type/> @@ -287,7 +287,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="102" bodyend="107"/> + <location file="058_bracket_recursion.tcl" line="102" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="102" bodyend="107"/> <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="058__bracket__recursion_8tcl_1ab678a0a9a7e94bce5b17141f40220d88" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -301,7 +301,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="108" bodyend="114"/> + <location file="058_bracket_recursion.tcl" line="108" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="108" bodyend="114"/> <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="058__bracket__recursion_8tcl_1a0a0bd3dc69dd06934c4e6362155e0ace" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -315,7 +315,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="115" bodyend="120"/> + <location file="058_bracket_recursion.tcl" line="115" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="115" bodyend="120"/> <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="058__bracket__recursion_8tcl_1a011c73f2dbb87635a3b4206c72355f6e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -329,7 +329,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="121" bodyend="126"/> + <location file="058_bracket_recursion.tcl" line="121" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="121" bodyend="126"/> <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="058__bracket__recursion_8tcl_1a69e959f6901827e4d8271aeaa5fba0fc" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -343,7 +343,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="128" bodyend="131"/> + <location file="058_bracket_recursion.tcl" line="128" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="128" bodyend="131"/> <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="058__bracket__recursion_8tcl_1a2fb1c5cf58867b5bbc9a1b145a86f3a0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -357,7 +357,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="137" bodyend="142"/> + <location file="058_bracket_recursion.tcl" line="137" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="137" bodyend="142"/> <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="058__bracket__recursion_8tcl_1a25ed1bcb423b0b7200f485fc5ff71c8e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -371,7 +371,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="058_bracket_recursion.tcl" bodystart="143" bodyend="148"/> + <location file="058_bracket_recursion.tcl" line="143" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="143" bodyend="148"/> <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references> </memberdef> </sectiondef> diff --git a/testing/059/059__command__catch_8tcl.xml b/testing/059/059__command__catch_8tcl.xml index a12a366..b5e5c96 100644 --- a/testing/059/059__command__catch_8tcl.xml +++ b/testing/059/059__command__catch_8tcl.xml @@ -15,7 +15,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="059_command_catch.tcl" bodystart="10" bodyend="13"/> + <location file="059_command_catch.tcl" line="10" column="1" bodyfile="059_command_catch.tcl" bodystart="10" bodyend="13"/> <referencedby refid="059__command__catch_8tcl_1ab08ae027fc5777bc4f0629f1b60b35db" compoundref="059__command__catch_8tcl" startline="22" endline="25">a</referencedby> <referencedby refid="059__command__catch_8tcl_1a68bdb74c144118d936931c46f75d4b3e" compoundref="059__command__catch_8tcl" startline="29" endline="32">b</referencedby> <referencedby refid="059__command__catch_8tcl_1ab14f56bc3bd7680490ece4ad7815465f" compoundref="059__command__catch_8tcl" startline="33" endline="36">c</referencedby> @@ -39,7 +39,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="059_command_catch.tcl" bodystart="16" bodyend="19"/> + <location file="059_command_catch.tcl" line="16" column="1" bodyfile="059_command_catch.tcl" bodystart="16" bodyend="19"/> </memberdef> <memberdef kind="function" id="059__command__catch_8tcl_1ab08ae027fc5777bc4f0629f1b60b35db" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> <type/> @@ -52,7 +52,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="059_command_catch.tcl" bodystart="22" bodyend="25"/> + <location file="059_command_catch.tcl" line="22" column="1" bodyfile="059_command_catch.tcl" bodystart="22" bodyend="25"/> <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="059__command__catch_8tcl_1a68bdb74c144118d936931c46f75d4b3e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -66,7 +66,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="059_command_catch.tcl" bodystart="29" bodyend="32"/> + <location file="059_command_catch.tcl" line="29" column="1" bodyfile="059_command_catch.tcl" bodystart="29" bodyend="32"/> <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="059__command__catch_8tcl_1ab14f56bc3bd7680490ece4ad7815465f" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -80,7 +80,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="059_command_catch.tcl" bodystart="33" bodyend="36"/> + <location file="059_command_catch.tcl" line="33" column="1" bodyfile="059_command_catch.tcl" bodystart="33" bodyend="36"/> <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="059__command__catch_8tcl_1af43f4b1f0064a33b2d662af9f06d3a00" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -94,7 +94,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="059_command_catch.tcl" bodystart="37" bodyend="40"/> + <location file="059_command_catch.tcl" line="37" column="1" bodyfile="059_command_catch.tcl" bodystart="37" bodyend="40"/> <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="059__command__catch_8tcl_1aff65a51a703804e0ad1adbcfd76c86f8" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -108,7 +108,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="059_command_catch.tcl" bodystart="41" bodyend="44"/> + <location file="059_command_catch.tcl" line="41" column="1" bodyfile="059_command_catch.tcl" bodystart="41" bodyend="44"/> <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="059__command__catch_8tcl_1af6830d2c644b45088ea8f1f74a46b778" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -122,7 +122,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="059_command_catch.tcl" bodystart="45" bodyend="48"/> + <location file="059_command_catch.tcl" line="45" column="1" bodyfile="059_command_catch.tcl" bodystart="45" bodyend="48"/> <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="059__command__catch_8tcl_1af08b4b5bfa9edf0b0a7dee1c2b2c29e0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -136,7 +136,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="059_command_catch.tcl" bodystart="49" bodyend="54"/> + <location file="059_command_catch.tcl" line="49" column="1" bodyfile="059_command_catch.tcl" bodystart="49" bodyend="54"/> <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="059__command__catch_8tcl_1af96fd0966e32a310a0778d2e5c357700" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -150,7 +150,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="059_command_catch.tcl" bodystart="56" bodyend="59"/> + <location file="059_command_catch.tcl" line="56" column="1" bodyfile="059_command_catch.tcl" bodystart="56" bodyend="59"/> <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="059__command__catch_8tcl_1a8c90afd4641b25be86bd09983c3cbee0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -164,7 +164,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="059_command_catch.tcl" bodystart="60" bodyend="63"/> + <location file="059_command_catch.tcl" line="60" column="1" bodyfile="059_command_catch.tcl" bodystart="60" bodyend="63"/> <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="059__command__catch_8tcl_1a2aaa92757686acea102cba3475f0c13b" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -178,7 +178,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="059_command_catch.tcl" bodystart="75" bodyend="78"/> + <location file="059_command_catch.tcl" line="75" column="1" bodyfile="059_command_catch.tcl" bodystart="75" bodyend="78"/> <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> </sectiondef> diff --git a/testing/060/060__command__switch_8tcl.xml b/testing/060/060__command__switch_8tcl.xml index f1792f4..2def3fc 100644 --- a/testing/060/060__command__switch_8tcl.xml +++ b/testing/060/060__command__switch_8tcl.xml @@ -15,7 +15,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="060_command_switch.tcl" bodystart="10" bodyend="13"/> + <location file="060_command_switch.tcl" line="10" column="1" bodyfile="060_command_switch.tcl" bodystart="10" bodyend="13"/> <referencedby refid="060__command__switch_8tcl_1ab08ae027fc5777bc4f0629f1b60b35db" compoundref="060__command__switch_8tcl" startline="22" endline="25">a</referencedby> <referencedby refid="060__command__switch_8tcl_1a68bdb74c144118d936931c46f75d4b3e" compoundref="060__command__switch_8tcl" startline="29" endline="36">b</referencedby> <referencedby refid="060__command__switch_8tcl_1ab14f56bc3bd7680490ece4ad7815465f" compoundref="060__command__switch_8tcl" startline="37" endline="43">c</referencedby> @@ -48,7 +48,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="060_command_switch.tcl" bodystart="16" bodyend="19"/> + <location file="060_command_switch.tcl" line="16" column="1" bodyfile="060_command_switch.tcl" bodystart="16" bodyend="19"/> </memberdef> <memberdef kind="function" id="060__command__switch_8tcl_1ab08ae027fc5777bc4f0629f1b60b35db" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> <type/> @@ -61,7 +61,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="060_command_switch.tcl" bodystart="22" bodyend="25"/> + <location file="060_command_switch.tcl" line="22" column="1" bodyfile="060_command_switch.tcl" bodystart="22" bodyend="25"/> <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="060__command__switch_8tcl_1a68bdb74c144118d936931c46f75d4b3e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -75,7 +75,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="060_command_switch.tcl" bodystart="29" bodyend="36"/> + <location file="060_command_switch.tcl" line="29" column="1" bodyfile="060_command_switch.tcl" bodystart="29" bodyend="36"/> <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="060__command__switch_8tcl_1ab14f56bc3bd7680490ece4ad7815465f" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -89,7 +89,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="060_command_switch.tcl" bodystart="37" bodyend="43"/> + <location file="060_command_switch.tcl" line="37" column="1" bodyfile="060_command_switch.tcl" bodystart="37" bodyend="43"/> <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="060__command__switch_8tcl_1af43f4b1f0064a33b2d662af9f06d3a00" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -103,7 +103,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="060_command_switch.tcl" bodystart="44" bodyend="50"/> + <location file="060_command_switch.tcl" line="44" column="1" bodyfile="060_command_switch.tcl" bodystart="44" bodyend="50"/> <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="060__command__switch_8tcl_1aff65a51a703804e0ad1adbcfd76c86f8" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -117,7 +117,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="060_command_switch.tcl" bodystart="51" bodyend="57"/> + <location file="060_command_switch.tcl" line="51" column="1" bodyfile="060_command_switch.tcl" bodystart="51" bodyend="57"/> <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="060__command__switch_8tcl_1af6830d2c644b45088ea8f1f74a46b778" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -131,7 +131,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="060_command_switch.tcl" bodystart="58" bodyend="65"/> + <location file="060_command_switch.tcl" line="58" column="1" bodyfile="060_command_switch.tcl" bodystart="58" bodyend="65"/> <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="060__command__switch_8tcl_1af08b4b5bfa9edf0b0a7dee1c2b2c29e0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -145,7 +145,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="060_command_switch.tcl" bodystart="66" bodyend="73"/> + <location file="060_command_switch.tcl" line="66" column="1" bodyfile="060_command_switch.tcl" bodystart="66" bodyend="73"/> <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="060__command__switch_8tcl_1af96fd0966e32a310a0778d2e5c357700" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -159,7 +159,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="060_command_switch.tcl" bodystart="74" bodyend="81"/> + <location file="060_command_switch.tcl" line="74" column="1" bodyfile="060_command_switch.tcl" bodystart="74" bodyend="81"/> <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="060__command__switch_8tcl_1a8c90afd4641b25be86bd09983c3cbee0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -173,7 +173,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="060_command_switch.tcl" bodystart="83" bodyend="94"/> + <location file="060_command_switch.tcl" line="83" column="1" bodyfile="060_command_switch.tcl" bodystart="83" bodyend="94"/> <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="060__command__switch_8tcl_1a2aaa92757686acea102cba3475f0c13b" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -187,7 +187,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="060_command_switch.tcl" bodystart="95" bodyend="106"/> + <location file="060_command_switch.tcl" line="95" column="1" bodyfile="060_command_switch.tcl" bodystart="95" bodyend="106"/> <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="060__command__switch_8tcl_1a20363f854eb4098a446733d63d34dbc1" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -201,7 +201,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="060_command_switch.tcl" bodystart="107" bodyend="118"/> + <location file="060_command_switch.tcl" line="107" column="1" bodyfile="060_command_switch.tcl" bodystart="107" bodyend="118"/> <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="060__command__switch_8tcl_1aff56f84b49947b84b2a304f51cf8e678" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -215,7 +215,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="060_command_switch.tcl" bodystart="119" bodyend="129"/> + <location file="060_command_switch.tcl" line="119" column="1" bodyfile="060_command_switch.tcl" bodystart="119" bodyend="129"/> <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="060__command__switch_8tcl_1a78d127e8bda64d4471ac811ad512fbd9" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -229,7 +229,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="060_command_switch.tcl" bodystart="130" bodyend="141"/> + <location file="060_command_switch.tcl" line="130" column="1" bodyfile="060_command_switch.tcl" bodystart="130" bodyend="141"/> <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="060__command__switch_8tcl_1acdde3cd86eb2421ce8dbb2e85227d368" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -243,7 +243,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="060_command_switch.tcl" bodystart="142" bodyend="153"/> + <location file="060_command_switch.tcl" line="142" column="1" bodyfile="060_command_switch.tcl" bodystart="142" bodyend="153"/> <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="060__command__switch_8tcl_1a495e7a4ede0831107e9d435080a7c268" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -257,7 +257,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="060_command_switch.tcl" bodystart="154" bodyend="165"/> + <location file="060_command_switch.tcl" line="154" column="1" bodyfile="060_command_switch.tcl" bodystart="154" bodyend="165"/> <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="060__command__switch_8tcl_1a15229b450f26d8fa1c10bea4f3279f4d" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -271,7 +271,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="060_command_switch.tcl" bodystart="166" bodyend="175"/> + <location file="060_command_switch.tcl" line="166" column="1" bodyfile="060_command_switch.tcl" bodystart="166" bodyend="175"/> <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="060__command__switch_8tcl_1ab678a0a9a7e94bce5b17141f40220d88" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -285,7 +285,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="060_command_switch.tcl" bodystart="176" bodyend="185"/> + <location file="060_command_switch.tcl" line="176" column="1" bodyfile="060_command_switch.tcl" bodystart="176" bodyend="185"/> <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="060__command__switch_8tcl_1a0a0bd3dc69dd06934c4e6362155e0ace" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -299,7 +299,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="060_command_switch.tcl" bodystart="186" bodyend="195"/> + <location file="060_command_switch.tcl" line="186" column="1" bodyfile="060_command_switch.tcl" bodystart="186" bodyend="195"/> <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> <memberdef kind="function" id="060__command__switch_8tcl_1a011c73f2dbb87635a3b4206c72355f6e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -313,7 +313,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="060_command_switch.tcl" bodystart="196" bodyend="205"/> + <location file="060_command_switch.tcl" line="196" column="1" bodyfile="060_command_switch.tcl" bodystart="196" bodyend="205"/> <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references> </memberdef> </sectiondef> diff --git a/testing/061/class_test.xml b/testing/061/class_test.xml index b233e9c..47e70ac 100644 --- a/testing/061/class_test.xml +++ b/testing/061/class_test.xml @@ -15,7 +15,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="061_bug_705503.tcl" bodystart="12" bodyend="12"/> + <location file="061_bug_705503.tcl" line="12" column="1" bodyfile="061_bug_705503.tcl" bodystart="12" bodyend="12"/> </memberdef> <memberdef kind="function" id="class_test_1ac7148d2852b30d157e078fe0fe58a350" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> <type/> @@ -29,7 +29,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="061_bug_705503.tcl" bodystart="16" bodyend="16"/> + <location file="061_bug_705503.tcl" line="16" column="1" bodyfile="061_bug_705503.tcl" bodystart="16" bodyend="16"/> </memberdef> <memberdef kind="function" id="class_test_1abdf3375950ec49e29f4bae947b7e3f26" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> <type/> @@ -43,7 +43,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="061_bug_705503.tcl" bodystart="19" bodyend="19"/> + <location file="061_bug_705503.tcl" line="19" column="1" bodyfile="061_bug_705503.tcl" bodystart="19" bodyend="19"/> </memberdef> </sectiondef> <briefdescription> @@ -51,7 +51,7 @@ </briefdescription> <detaileddescription> </detaileddescription> - <location file="061_bug_705503.tcl" bodystart="10" bodyend="13"/> + <location file="061_bug_705503.tcl" line="10" column="1" bodyfile="061_bug_705503.tcl" bodystart="10" bodyend="13"/> <listofallmembers> <member refid="class_test_1ac7148d2852b30d157e078fe0fe58a350" prot="public" virt="non-virtual"> <scope>Test</scope> diff --git a/testing/062/namespacen1.xml b/testing/062/namespacen1.xml index a31fc29..408ef87 100644 --- a/testing/062/namespacen1.xml +++ b/testing/062/namespacen1.xml @@ -15,7 +15,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="062_namespace_resolution.tcl" bodystart="12" bodyend="16"/> + <location file="062_namespace_resolution.tcl" line="12" column="1" bodyfile="062_namespace_resolution.tcl" bodystart="12" bodyend="16"/> <references refid="namespacen1_1a0bff29f718fa43e49b7ca79985afb5fa" compoundref="062__namespace__resolution_8tcl" startline="17" endline="20">p2</references> </memberdef> <memberdef kind="function" id="namespacen1_1a0bff29f718fa43e49b7ca79985afb5fa" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -29,7 +29,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="062_namespace_resolution.tcl" bodystart="17" bodyend="20"/> + <location file="062_namespace_resolution.tcl" line="17" column="1" bodyfile="062_namespace_resolution.tcl" bodystart="17" bodyend="20"/> <referencedby refid="namespacen1_1a9f23d7a7f141915457e8e26023d70cb4" compoundref="062__namespace__resolution_8tcl" startline="12" endline="16">p1</referencedby> </memberdef> </sectiondef> diff --git a/testing/062/namespacen2.xml b/testing/062/namespacen2.xml index 29c4d80..f545576 100644 --- a/testing/062/namespacen2.xml +++ b/testing/062/namespacen2.xml @@ -15,7 +15,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="062_namespace_resolution.tcl" bodystart="31" bodyend="35"/> + <location file="062_namespace_resolution.tcl" line="31" column="1" bodyfile="062_namespace_resolution.tcl" bodystart="31" bodyend="35"/> <references refid="namespacen2_1a49fadfbefa795204a3c566ec76ff632f" compoundref="062__namespace__resolution_8tcl" startline="36" endline="39">p2</references> </memberdef> <memberdef kind="function" id="namespacen2_1a49fadfbefa795204a3c566ec76ff632f" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -29,7 +29,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="062_namespace_resolution.tcl" bodystart="36" bodyend="39"/> + <location file="062_namespace_resolution.tcl" line="36" column="1" bodyfile="062_namespace_resolution.tcl" bodystart="36" bodyend="39"/> <referencedby refid="namespacen2_1a74950c0185232e374220a0707b4903c6" compoundref="062__namespace__resolution_8tcl" startline="31" endline="35">p1</referencedby> </memberdef> </sectiondef> diff --git a/testing/062/namespacen3.xml b/testing/062/namespacen3.xml index bfc1364..f8c2fb5 100644 --- a/testing/062/namespacen3.xml +++ b/testing/062/namespacen3.xml @@ -15,7 +15,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="062_namespace_resolution.tcl" bodystart="47" bodyend="51"/> + <location file="062_namespace_resolution.tcl" line="47" column="1" bodyfile="062_namespace_resolution.tcl" bodystart="47" bodyend="51"/> <references refid="namespacen3_1a14e9fe1b27a6d36db9ace2eef4509979" compoundref="062__namespace__resolution_8tcl" startline="52" endline="55">p2</references> </memberdef> <memberdef kind="function" id="namespacen3_1a14e9fe1b27a6d36db9ace2eef4509979" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> @@ -29,7 +29,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="062_namespace_resolution.tcl" bodystart="52" bodyend="55"/> + <location file="062_namespace_resolution.tcl" line="52" column="1" bodyfile="062_namespace_resolution.tcl" bodystart="52" bodyend="55"/> <referencedby refid="namespacen3_1ae7e87e49507bd56dad087cffecd35b29" compoundref="062__namespace__resolution_8tcl" startline="47" endline="51">p1</referencedby> </memberdef> </sectiondef> diff --git a/testing/063/namespaceoo_1_1_helpers.xml b/testing/063/namespaceoo_1_1_helpers.xml index 40b4830..e9083dc 100644 --- a/testing/063/namespaceoo_1_1_helpers.xml +++ b/testing/063/namespaceoo_1_1_helpers.xml @@ -15,7 +15,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="063_bug_729092.tcl" bodystart="34" bodyend="43"/> + <location file="063_bug_729092.tcl" line="34" column="1" bodyfile="063_bug_729092.tcl" bodystart="34" bodyend="43"/> </memberdef> </sectiondef> <briefdescription> diff --git a/testing/063/namespaceoo_1_1define.xml b/testing/063/namespaceoo_1_1define.xml index 214b705..69c05d0 100644 --- a/testing/063/namespaceoo_1_1define.xml +++ b/testing/063/namespaceoo_1_1define.xml @@ -15,7 +15,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="063_bug_729092.tcl" bodystart="18" bodyend="27"/> + <location file="063_bug_729092.tcl" line="18" column="1" bodyfile="063_bug_729092.tcl" bodystart="18" bodyend="27"/> </memberdef> </sectiondef> <briefdescription> diff --git a/testing/064/struct_foo.xml b/testing/064/struct_foo.xml index 3765625..d2bed81 100644 --- a/testing/064/struct_foo.xml +++ b/testing/064/struct_foo.xml @@ -97,7 +97,7 @@ </itemizedlist> </para> </detaileddescription> - <location file="064_castoperator.cpp" bodystart="20" bodyend="25"/> + <location file="064_castoperator.cpp" line="20" column="1" bodyfile="064_castoperator.cpp" bodystart="20" bodyend="25"/> <listofallmembers> <member refid="struct_foo_1aab9774d892b6cd4a0fbebd034b4c1fad" prot="public" virt="non-virtual"> <scope>Foo</scope> diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt new file mode 100644 index 0000000..21df5ab --- /dev/null +++ b/testing/CMakeLists.txt @@ -0,0 +1,9 @@ +find_program(XMLLINT NAMES xmllint) +find_program(DIFF NAMES diff) + +add_custom_target(tests + COMMENT "Running doxygen tests..." + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --all --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing + DEPENDS doxygen +) + diff --git a/testing/Makefile b/testing/Makefile deleted file mode 100644 index f40107f..0000000 --- a/testing/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -tests: - @perl runtests.pl --doxygen ../bin/doxygen - diff --git a/testing/README b/testing/README.txt index 993ff48..ee3de59 100644 --- a/testing/README +++ b/testing/README.txt @@ -1,18 +1,18 @@ Doxygen regession test suite ============================ -This directory contains a set of regression tests. Each test consists of a -file starting with a 3 digit number and a corresponding directory whose name -has the same 3 digit number. The directory contains one or more reference -files that are compared against the XML output produced by doxygen. If the -result is the same, there is no regression and the test passes. If there is a +This directory contains a set of regression tests. Each test consists of a +file starting with a 3 digit number and a corresponding directory whose name +has the same 3 digit number. The directory contains one or more reference +files that are compared against the XML output produced by doxygen. If the +result is the same, there is no regression and the test passes. If there is a difference the test fails and the difference (in diff -u format) will be shown. -The runtest.pl script responsible for running the tests takes a number of +The runtest.py script responsible for running the tests takes a number of optional parameters: --id n: run test with number n only (the option may be specified +-id n: run test with number n only (the option may be specified multiple times) default is to run all tests. --updateref: update the reference files. Should be used in combination +-updateref: update the reference files. Should be used in combination with -id to update the reference file(s) for the given test. -all: can be used in combination with -updateref to update the reference files for all tests. @@ -20,29 +20,29 @@ optional parameters: -xmllint exe: run the specified xmllint executable. The runtest.pl has the following dependenies on 3rd party tools: -- perl to run the script +- python to run the script - xmllint to normalize the XML output - diff to show the differences in case a test fails - + Each test file can have a number of special comment lines that are extracted by the runtest.pl script and take the form: -// <identifier>: 'argument' +// <identifier>: 'argument' Where <identifier> can be one of: - objective: 'argument' provides the objective for the test (i.e. its purpose) -- check: 'argument' names a file that is generated by doxygen, which should +- check: 'argument' names a file that is generated by doxygen, which should be compared against the reference. - config: 'argument' is a line that is added to the default Doxyfile used to run doxygen on the test file. Example to run all tests: - perl runtest.pl + python runtest.py Example to run a test - perl runtest.pl -id 10 + python runtest.py -id 10 Example to update the reference files for a test - perl runtest.pl -updateref -id 10 + python runtest.py -updateref -id 10 -There is also a Makefile, which can be used to run all tests by simply -invoking make. +There is also a CMakeLists.txt, which can be used from the build directory +to run all tests by simply invoking 'make tests'. diff --git a/testing/runtests.pl b/testing/runtests.pl deleted file mode 100755 index 0e1938d..0000000 --- a/testing/runtests.pl +++ /dev/null @@ -1,252 +0,0 @@ -#!/usr/bin/perl - -# perl script to execute doxygen's regression test suite. -# -# Copyright (C) 1997-2014 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. - -use strict; -use warnings; - -use Getopt::Long; -use Test::More; -use File::Path qw(make_path remove_tree); -use File::Copy qw(copy); - -my $Test = Test::Builder->new; -my $opt_doxygen_exe = 'doxygen'; -my $opt_xmllint_exe = 'xmllint'; -my $opt_updateref = ''; -my @opt_test_ids; -my $opt_all = ''; - -GetOptions( 'updateref' => \$opt_updateref, - 'doxygen=s' => \$opt_doxygen_exe, - 'xmllint=s' => \$opt_xmllint_exe, - 'id=i' => \@opt_test_ids, - 'all' => \$opt_all - ); - -sub read_two_files { - my $first = shift; - my $second = shift; - my $filter = shift; - my $success = 1; - my @errors; - - unless (open FIRST, "$first") { - $success = 0; - push @errors, "$first absent"; - } - unless (open SECOND, "$second") { - $success = 0; - push @errors, "$second absent"; - } - return ($success, @errors) unless $success; - - my $first_lines = join "",<FIRST>; - my $second_lines = join "",<SECOND>; - - close FIRST; - close SECOND; - - return ($success, $first_lines, $second_lines); -} - -sub compare_ok { - my $got_file = shift; - my $expected_file = shift; - my $name = shift; - my @read_result = read_two_files($got_file, $expected_file); - my $files_exist = shift @read_result; - - if ($files_exist) { - my ($got, $expected) = @read_result; - my $diff = `diff -u $got_file $expected_file`; - my $failed = length $diff; - return ($failed,"Difference between generated output and reference:\n$diff"); - } - else { - return (1,join "\n", @read_result); - } -} - -sub chop_volatile { - my $line = shift; - $line =~ s/version="\d\.\d+\.\d+(\.\d+)?(\-\d+)?"/version=""/g; # strip version - $line =~ s/file=".*\/(.*)"/file="$1"/g; # strip location - return $line; -} - -sub get_config { - my $file = shift; - my %config; - open F,"<$file"; - while (<F>) { - if (/\/\/\s*(\S+):\s*(.*)$/) { - my $key = $1; - my $val = $2; - chomp $val; - $config{$key} = [] unless defined $config{$key}; - push @{$config{$key}},$val; - } - } - return %config; -} - -sub perform_test { - my $test_file = shift; - my %config = get_config($test_file); - my $test_name = "[$test_file]: $config{'objective'}[0]"; - my $test_id = $test_file; - $test_id =~ s/^(\d+).*$/$1/; - my $test_out = "test_output_${test_id}"; - - if (scalar($config{'check'})==0) { - $Test->ok(0, $test_name); - $Test->diag("Test doesn't specify any files to check"); - return; - } - - # prepare test environment - remove_tree("$test_out"); - make_path("$test_out"); - copy("Doxyfile","$test_out"); - open(F,">>$test_out/Doxyfile"); - print F "INPUT = $test_file\n"; - print F "XML_OUTPUT = $test_out/out\n"; - foreach my $cfg (@{$config{'config'}}) { - print F "$cfg\n"; - } - close(F); - - # run doxygen - if (system("$opt_doxygen_exe $test_out/Doxyfile")!=0) { - $Test->ok(0, $test_name); - $Test->diag("Failed to run doxygen"); - return; - } - - # look for files to check against the reference - foreach my $fn (@{$config{'check'}}) { - if (!-f "$test_out/out/$fn") { - $Test->ok(0, $test_name); - $Test->diag("Non-existing file $test_out/out/$fn after 'check:' statement"); - return; - } - # run xmllint on the output file - my @lines = `$opt_xmllint_exe --format --noblanks --nowarning $test_out/out/$fn`; - if (scalar(@lines)>0 && open(F,">$test_out/$fn")) { - foreach my $line (@lines) { - print F chop_volatile($line); - } - close(F); - } else { - $Test->ok(0, $test_name); - $Test->diag("Failed to run xmllint on the doxygen output file $test_out/out/$fn"); - } - my ($failed,$msg) = compare_ok("$test_out/$fn","$test_id/$fn",$test_name); - if ($failed) { - $Test->ok(0, $test_name); - $Test->diag($msg); - return; - } - } - - # test passed - remove_tree("$test_out"); - $Test->ok(1, $test_name); -} - -sub update_test { - my $test_file = shift; - my %config = get_config($test_file); - my $test_name = "[$test_file]: $config{'objective'}[0]"; - my $test_id = $test_file; - $test_id =~ s/^(\d+).*$/$1/; - my $test_out = $test_id; - - # prepare reference environment - remove_tree("$test_out"); - make_path("$test_out"); - copy("Doxyfile","$test_out"); - open(F,">>$test_out/Doxyfile"); - print F "INPUT = $test_file\n"; - print F "XML_OUTPUT = $test_out/out\n"; - foreach my $cfg (@{$config{'config'}}) { - print F "$cfg\n"; - } - close(F); - - print "Updating reference for $test_name\n"; - - # run doxygen - if (system("$opt_doxygen_exe $test_out/Doxyfile")!=0) { - print("Error: failed to run doxygen"); - return; - } - my $err=0; - - # look for files to prepare as reference - foreach my $fn (@{$config{'check'}}) { - if (!-f "$test_out/out/$fn") { - printf("Error: Non-existing file $test_out/out/$fn after 'check:' statement\n"); - $err=1; - } - # run xmllint on the output file - if (!$err) { - my @lines = `$opt_xmllint_exe --format --noblanks --nowarning $test_out/out/$fn`; - if (scalar(@lines)>0 && open(F,">$test_out/$fn")) { - foreach my $line (@lines) { - print F chop_volatile($line); - } - close(F); - } else { - printf("Error: Failed to run xmllint on the doxygen output file $test_out/out/$fn\n"); - $err=1; - } - } - } - - if (!$err) { - # clean-up - remove_tree("$test_out/out"); - unlink("$test_out/Doxyfile"); - } -} - -# get the tests -my @tests; -if (scalar(@opt_test_ids)==0 && $opt_updateref && !$opt_all) { - printf("Error: updateref option requires -id to update a test or -all to update all\n"); - exit(1); -} -if (scalar(@opt_test_ids)>0) { - foreach my $t (@opt_test_ids) { - push @tests, glob("${t}_* 0${t}_* 00${t}_*"); - } -} else { - @tests = glob('[0-9][0-9][0-9]_*'); -} - -if ($opt_updateref) { - # update reference - foreach my $test (@tests) { - update_test($test); - } -} else { - # run tests - plan tests => scalar(@tests); - foreach my $test (@tests) { - perform_test($test); - } -} - diff --git a/testing/runtests.py b/testing/runtests.py new file mode 100644 index 0000000..a5e82bf --- /dev/null +++ b/testing/runtests.py @@ -0,0 +1,201 @@ +#!/usr/bin/python + +from __future__ import print_function +import argparse, glob, itertools, re, shutil, os, sys + +config_reg = re.compile('.*\/\/\s*(?P<name>\S+):\s*(?P<value>.*)$') + +class Tester: + def __init__(self,args,test): + self.args = args + self.test = test + self.update = args.updateref + self.config = self.get_config() + self.test_name = '[%s]: %s' % (self.test,self.config['objective'][0]) + self.test_id = self.test.split('_')[0] + if self.update: + self.test_out = self.args.inputdir+'/'+self.test_id + else: + self.test_out = self.args.outputdir+'/test_output_'+self.test_id + self.prepare_test() + + def compare_ok(self,got_file,expected_file,name): + if not os.path.isfile(got_file): + return (True,'%s absent' % got_file) + elif not os.path.isfile(expected_file): + return (True,'%s absent' % expected_file) + else: + diff = os.popen('diff -u %s %s' % (got_file,expected_file)).read() + if diff and not diff.startswith("No differences"): + return (True,'Difference between generated output and reference:\n%s' % diff) + return (False,'') + + def get_config(self): + config = {} + with open(self.args.inputdir+'/'+self.test,'r') as f: + for line in f.readlines(): + m = config_reg.match(line) + if m: + key = m.group('name') + value = m.group('value') + if (key=='config'): + value = value.replace('$INPUTDIR',self.args.inputdir) + #print('key=%s value=%s' % (key,value)) + if key in config: + config[key].append(value) + else: + config[key] = [value] + return config + + def prepare_test(self): + # prepare test environment + shutil.rmtree(self.test_out,ignore_errors=True) + os.mkdir(self.test_out) + shutil.copy(self.args.inputdir+'/Doxyfile',self.test_out) + with open(self.test_out+'/Doxyfile','a') as f: + print('INPUT=%s/%s' % (self.args.inputdir,self.test), file=f) + print('STRIP_FROM_PATH=%s' % self.args.inputdir, file=f) + print('XML_OUTPUT=%s/out' % self.test_out, file=f) + print('EXAMPLE_PATH=%s' % self.args.inputdir, file=f) + if 'config' in self.config: + for option in self.config['config']: + print(option, file=f) + + if 'check' not in self.config or not self.config['check']: + print('Test doesn\'t specify any files to check') + sys.exit(1) + + # run doxygen + if os.system('%s %s/Doxyfile 2>/dev/null' % (self.args.doxygen,self.test_out))!=0: + print('Error: failed to run %s on %s/Doxyfile' % (self.args.doxygen,self.test_out)); + sys.exit(1) + + # update the reference data for this test + def update_test(self,testmgr): + print('Updating reference for %s' % self.test_name) + + if 'check' in self.config: + for check in self.config['check']: + check_file='%s/out/%s' % (self.test_out,check) + # check if the file we need to check is actually generated + if not os.path.isfile(check_file): + print('Non-existing file %s after \'check:\' statement' % check_file) + return + # convert output to canonical form + data = os.popen('%s --format --noblanks --nowarning %s' % (self.args.xmllint,check_file)).read() + if data: + # strip version + data = re.sub(r'xsd" version="[0-9.-]+"','xsd" version=""',data).rstrip('\n') + else: + print('Failed to run %s on the doxygen output file %s' % (self.args.xmllint,self.test_out)) + return + out_file='%s/%s' % (self.test_out,check) + with open(out_file,'w') as f: + print(data,file=f) + shutil.rmtree(self.test_out+'/out',ignore_errors=True) + os.remove(self.test_out+'/Doxyfile') + + # check the relevant files of a doxygen run with the reference material + def perform_test(self,testmgr): + # look for files to check against the reference + if 'check' in self.config: + for check in self.config['check']: + check_file='%s/out/%s' % (self.test_out,check) + # check if the file we need to check is actually generated + if not os.path.isfile(check_file): + testmgr.ok(False,self.test_name,msg='Non-existing file %s after \'check:\' statement' % check_file) + return + # convert output to canonical form + data = os.popen('%s --format --noblanks --nowarning %s' % (self.args.xmllint,check_file)).read() + if data: + # strip version + data = re.sub(r'xsd" version="[0-9.-]+"','xsd" version=""',data).rstrip('\n') + else: + testmgr.ok(False,self.test_name,msg='Failed to run %s on the doxygen output file %s' % (self.args.xmllint,self.test_out)) + return + out_file='%s/%s' % (self.test_out,check) + with open(out_file,'w') as f: + print(data,file=f) + ref_file='%s/%s/%s' % (self.args.inputdir,self.test_id,check) + (failed,msg) = self.compare_ok(out_file,ref_file,self.test_name) + if failed: + testmgr.ok(False,self.test_name,msg) + return + shutil.rmtree(self.test_out,ignore_errors=True) + testmgr.ok(True,self.test_name) + + def run(self,testmgr): + if self.update: + self.update_test(testmgr) + else: + self.perform_test(testmgr) + +class TestManager: + def __init__(self,args,tests): + self.args = args + self.tests = tests + self.num_tests = len(tests) + self.count=1 + self.passed=0 + print('1..%d' % self.num_tests) + + def ok(self,result,test_name,msg='Ok'): + if result: + print('ok %s - %s' % (self.count,test_name)) + self.passed = self.passed + 1 + else: + print('not ok %s - %s' % (self.count,test_name)) + print('-------------------------------------') + print(msg) + print('-------------------------------------') + self.count = self.count + 1 + + def result(self): + if self.passed==self.num_tests: + print('All tests passed!') + else: + print('%d out of %s tests failed' % (self.num_tests-self.passed,self.num_tests)) + return 0 if self.passed==self.num_tests else 1 + + def perform_tests(self): + for test in self.tests: + tester = Tester(self.args,test) + tester.run(self) + return 0 if self.args.updateref else self.result() + +def main(): + # argument handling + parser = argparse.ArgumentParser(description='run doxygen tests') + parser.add_argument('--updateref',help='update the reference data for a test',action="store_true") + parser.add_argument('--doxygen',nargs='?',default='doxygen',help='path/name of the doxygen executable') + parser.add_argument('--xmllint',nargs='?',default='xmllint',help='path/name of the xmllint executable') + parser.add_argument('--id',nargs='+',dest='ids',action='append',type=int,help='id of the test to perform') + parser.add_argument('--all',help='perform all tests',action="store_true") + parser.add_argument('--inputdir',nargs='?',default='.',help='input directory containing the tests') + parser.add_argument('--outputdir',nargs='?',default='.',help='output directory to write the doxygen output to') + args = parser.parse_args() + + # sanity check + if (not args.updateref is None) and (args.ids is None) and (args.all is None): + parser.error('--updateref requires either --id or --all') + + starting_directory = os.getcwd() + os.chdir(args.inputdir) + # find the tests to run + if args.ids: # test ids are given by user + tests = [] + for id in list(itertools.chain.from_iterable(args.ids)): + tests.append(glob.glob('%s_*'%id)) + tests.append(glob.glob('0%s_*'%id)) + tests.append(glob.glob('00%s_*'%id)) + tests = list(itertools.chain.from_iterable(tests)) + else: # find all tests + tests = glob.glob('[0-9][0-9][0-9]_*') + os.chdir(starting_directory) + + # create test manager to run the tests + testManager = TestManager(args,tests) + sys.exit(testManager.perform_tests()) + +if __name__ == '__main__': + main() diff --git a/tmake/CHANGES b/tmake/CHANGES deleted file mode 100644 index ce686e9..0000000 --- a/tmake/CHANGES +++ /dev/null @@ -1,49 +0,0 @@ - Changes from version 1.2 to 1.3 - -* Improved Qt 2.0 support. - -* INCLUDEPATH can have directories containing whitespace (use semicolon) - as separator. - -* Many, many code fixes and doc improvements. - - - Changes from version 1.1 to 1.2 - -* tmake is no longer restricted to C++ only. You can now use both C++ - and C files in your project. Thanks to Ulrich Ring for valuable feed- - back and comments. - -* Added support for building DLL libraries under Windows. - NOTE: Qt 1.42 and later now uses qtmain.lib in addition to qt.lib - when your application uses the Qt DLL. Add "DEFINES = QT_DLL" to - your project file to use the Qt DLL. - -* New dist target added in the app and lib templates. - Run "make dist" to pack all files in your project using tar/gzip or zip. - Thanks to Kalle Dalheimer for this patch. - -* Fixed bad command line interpretation bug in tmake.exe and progen.exe. - -* Added support for Borland C++ builder 3. - -* Initial support for QNX/g++ and the IBM Visual Age compiler on Win32. - Thanks to Igor Kovalenko and Joost Kraaijeveld. - -* Many fixes in tmake.conf for several Unix configurations. - - - Changes from version 1.0 to 1.1 - -* Provides tmake.exe and progen.exe for Windows users without perl. - -* Added many new Unix templates. - -* Added subdirs.t templates. - -* Added system-dependent project settings - (e.g. solaris-cc:TMAKE_CFLAGS = -pts) - -* Many bug fixes and improvements for existing templates. - -* Improved documentation. diff --git a/tmake/LICENSE b/tmake/LICENSE deleted file mode 100644 index 7262d5a..0000000 --- a/tmake/LICENSE +++ /dev/null @@ -1,9 +0,0 @@ - License Statement for tmake - -Copyright (C) 1996-1999 by Troll Tech AS. All rights reserved. - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, provided -that the this copyright notice appears in all copies. -No representations are made about the suitability of this software for any -purpose. It is provided "as is" without express or implied warranty. diff --git a/tmake/README b/tmake/README deleted file mode 100644 index b049d32..0000000 --- a/tmake/README +++ /dev/null @@ -1,10 +0,0 @@ - tmake version 1.3 - -tmake is an easy-to-use tool for creating and maintaining makefiles across -many platforms and compilers. For information about installing and using -tmake, see: - - doc/tmake.html -- User's Guide - doc/tmake_ref.html -- Reference Manual - -Download the latest version from: <ftp://ftp.troll.no/freebies/tmake> diff --git a/tmake/bin/progen b/tmake/bin/progen deleted file mode 100755 index 5be6411..0000000 --- a/tmake/bin/progen +++ /dev/null @@ -1,249 +0,0 @@ -#!/usr/bin/perl -############################################################################ -# -# -# Generates a tmake project file. -# -# Copyright (C) 1996-1998 by Troll Tech AS. All rights reserved. -# -# Permission to use, copy, modify, and distribute this software and its -# documentation for any purpose and without fee is hereby granted, provided -# that this copyright notice appears in all copies. -# No representations are made about the suitability of this software for any -# purpose. It is provided "as is" without express or implied warranty. -# -############################################################################ - -# Default project settings -$project{"TEMPLATE"} = "app"; -$project{"CONFIG"} = "qt warn_on release"; - -@project_extra = (); - -while ( @ARGV ) { # parse command line args - $_ = shift @ARGV; - if ( s/^-// ) { - if ( /^o(.*)/ ) { - $outfile = ($1 eq "") ? shift @ARGV : $1; - ($outfile eq "-") && ($outfile = ""); - } elsif ( /^n(.*)/ ) { - $project{"TARGET"} = ($1 eq "") ? shift @ARGV : $1; - } elsif ( /^t(.*)/ ) { - $project{"TEMPLATE"} = ($1 eq "") ? shift @ARGV : $1; - $project{"TEMPLATE"} =~ s/\.t$//i; - } elsif ( /lower/ ) { - $tolower = 1; - } else { - &progen_usage; - } - } elsif ( /^\s*(?:[\w\-]+:)?\w+\s*[\+\-\*\/]?=/ ) { # project override - push( @project_extra, $_ ); - } else { - push (@files, $_ ); - } -} - -$outfile eq "" || open(STDOUT,">" . $outfile) || - &progen_error("Can't create \"$outfile\""); - -if ( ! @files ) { - @files = &find_files(".",".*",1); -} - -if ( $tolower ) { - foreach $f ( @files ) { - $f =~ tr/A-Z/a-z/; - } -} - -@hdr = sort grep(/\.(h|hh|hpp|hxx)$/i,@files); -@src = sort grep(/\.(c|cpp|cc|cxx)$/i && ! /moc_/i,@files); - -# Remove source files that are included by other source files -foreach $f ( @src ) { - $srcdict{$f} = 1; -} -foreach $f ( @src ) { - if ( open(F,"< $f") ) { - while ( <F> ) { - if ( /^\s*#\s*include\s+\"([^\"]*)\"/ ) { - $srcdict{$1} = 0; - } - } - } -} -foreach $f( @src ) { - $srcdict{$f} && (push(@src2,$f)); -} -@src = @src2; - -$project{"HEADERS"} = join(" ",sort @hdr); -$project{"SOURCES"} = join(" ",sort @src); - -foreach $p ( @project_extra ) { - if ( $p =~ /^\s*((?:[\w\-]+:)?\w+)\s*([\+\-\*\/])?=\s*(.*)/ ) { - if ( $project{$1} ne "" ) { - Project($p); - } - } -} - -$project{"HEADERS"} =~ s/\s+/ \\\n\t\t /g; -$project{"SOURCES"} =~ s/\s+/ \\\n\t\t /g; - -print "TEMPLATE\t= " . $project{"TEMPLATE"} . "\n"; -print "CONFIG\t\t= " . $project{"CONFIG"} . "\n"; -print "HEADERS\t\t= " . $project{"HEADERS"} . "\n"; -print "SOURCES\t\t= " . $project{"SOURCES"} . "\n"; -if ( $project{"TARGET"} ne "" ) { - print "TARGET\t\t= " . $project{"TARGET"} . "\n"; -} - -foreach ( @project_extra ) { - if ( /^\s*((?:[\w\-]+:)?\w+)\s*([\+\-\*\/])?=\s*(.*)/ ) { - if ( $project{$1} eq "" ) { - $t = $1; - if ( length($t) < 8 ) { - $t .= "\t\t"; - } elsif ( length($t) < 16 ) { - $t .= "\t"; - } else { - $t .= " "; - } - print "$t$2= $3\n"; - } - } -} - -exit 0; - - -# -# progen_usage() -# -# Prints a message about program usage and exits -# - -sub progen_usage { - print STDERR "Usage:\n progen [options] [files]\n"; - print STDERR "Options:\n"; - print STDERR " -lower Lower-case letters filenames (useful for non-Unix)\n"; - print STDERR " -n name Specify a project name (= TARGET)\n"; - print STDERR " -o file Write output to \"file\"\n"; - print STDERR " -t file Specify a template file other than qtapp\n"; - exit 1; -} - - -# -# progen_error(msg) -# -# Prints the message and exits -# - -sub progen_error { - my($msg) = @_; - print STDERR "progen error: " . $msg . "\n"; - exit 1; -} - - -# -# Finds files. -# -# Examples: -# find_files("/usr","\.cpp$",1) - finds .cpp files in /usr and below -# find_files("/tmp","^#",0) - finds #* files in /tmp -# - -sub find_files { - my($dir,$match,$descend) = @_; - my($file,$p,@files); - local(*D); - $dir =~ s=\\=/=g; - ($dir eq "") && ($dir = "."); - if ( opendir(D,$dir) ) { - if ( $dir eq "." ) { - $dir = ""; - } else { - ($dir =~ /\/$/) || ($dir .= "/"); - } - foreach $file ( readdir(D) ) { - next if ( $file =~ /^\.\.?$/ ); - $p = $dir . $file; - ($file =~ /$match/i) && (push @files, $p); - if ( $descend && -d $p && ! -l $p ) { - push @files, &find_files($p,$match,$descend); - } - } - closedir(D); - } - return @files; -} - - -# -# strip_project_val(tag) -# -# Strips white space from project value strings. -# - -sub strip_project_val { - my($v) = @_; - $v =~ s/^\s+//; # trim white space - $v =~ s/\s+$//; - return $v; -} - - -# -# Project(strings) -# -# This is a powerful function for setting or reading project variables. -# Returns the resulting project variables (joined with space between). -# -# This is a slightly modified version of the Project function in tmake. - -sub Project { - my @settings = @_; - my($r,$t,$s,$v,$p,$c); - $r = ""; - foreach ( @settings ) { - $v = $_; - if ( $v =~ s/^\s*((?:[\w\-]+:)?\w+)\s*(\+=|\*=|\-=|\/=|=)\s*// ) { - $t = $1; - $s = $2; - $v = strip_project_val($v); - $p = $project{$t}; - if ( $s eq "=" ) { # set variable - $p = $v; - } elsif ( $s eq "+=" ) { # append - if ( $p eq "" ) { - $p = $v; - } else { - $p .= " " . $v; - } - } elsif ( $s eq "*=" ) { # append if not contained - if ( !($p =~ /(?:^|\s)\Q$v\E(?:\s|$)/) ) { - if ( $p eq "" ) { - $p = $v; - } else { - $p .= " " . $v; - } - } - } elsif ( $s eq "-=" ) { # subtract - $p =~ s/$v//g; - } elsif ( $s eq "/=" ) { # sed - $cmd = '$p =~ ' . $v; - eval $cmd; - } - $project{$t} = strip_project_val($p); - } else { - $p = strip_project_val($project{$v}); - } - if ( $p ne "" ) { - $r = ($r eq "") ? $p : ($r . " " . $p); - } - } - return $r; -} diff --git a/tmake/bin/tmake b/tmake/bin/tmake deleted file mode 100755 index 9158d7a..0000000 --- a/tmake/bin/tmake +++ /dev/null @@ -1,1262 +0,0 @@ -#!/usr/bin/perl -############################################################################ -# -# -# Creates a Makefile from a template and a project file. -# -# Copyright (C) 1996-1998 by Troll Tech AS. All rights reserved. -# -# Permission to use, copy, modify, and distribute this software and its -# documentation for any purpose and without fee is hereby granted, provided -# that this copyright notice appears in all copies. -# No representations are made about the suitability of this software for any -# purpose. It is provided "as is" without express or implied warranty. -# -# -# Some important, global variables in tmake: -# cpp_ext C++ extension added to moc output (.cpp) -# obj_ext Object file extension (.o on Unix, .obj otherwise) -# moc_aware Will scan for files containing Qt signals/slots -# moc_pre Moc prefix for generated moc file: x.h -> moc_x.cpp -# moc_ext Moc extension for generated moc file: x.cpp -> x.moc -# moc_cmd The moc command in your makefile, $(MOC) -# linebreak Line break character (\) -# dir_sep Directory separator (/ on Unix, \ on Windows) -# is_unix Autodetected. If not Unix, assume Windows (Win32). -# -# If you need to customize any of these settings, do it before -# calling StdInit() in the template file. -# -############################################################################ - -$TMAKE_VERSION = "1.3"; - -if ($] < 5.0) { - &tmake_error("This program requires perl version 5 or newer"); -} - -$cpp_ext = "cpp"; -$moc_aware = 0; -$moc_pre = "moc_"; -$moc_ext = "moc"; -$moc_cmd = '$(MOC)'; -$linebreak = "\\"; -$really_unix = &check_unix(); -$is_unix = $really_unix; -$dir_sep = $is_unix ? "/" : "\\"; -$obj_ext = $is_unix ? "o" : "obj"; -$depend_path = ""; -$nodepend = 0; -$output_count = 0; -$notrim_whitespace = 0; -$read_tmakeconf = 0; - -$template_name = ""; -$project_name = ""; -$outfile = ""; -%project = (); -$eval_quit = 0; - -$project{"TMAKEPATH"} = $ENV{"TMAKEPATH"} . ";" . $ENV{"HOME"} . "/.tmake/"; - -while ( @ARGV ) { # parse command line args - $_ = shift @ARGV; - if ( s/^-// ) { - if ( /^e(.*)/ ) { - if ( ! $read_tmakeconf ) { - $read_tmakeconf = 1; - &ScanProject( &find_template("tmake.conf") ); - } - $text = ""; - eval( ($1 eq "") ? shift @ARGV : $1 ); - die $@ if $@; - print $text . "\n" if ($text ne ""); - $eval_quit = 1; - } elsif ( /^t(.*)/ ) { - $template_name = ($1 eq "") ? shift @ARGV : $1; - } elsif ( /^o(.*)/ ) { - $outfile = ($1 eq "") ? shift @ARGV : $1; - ($outfile eq "-") && ($outfile = ""); - if ( $outfile ne "" ) { - open(STDOUT,">" . fix_path($outfile)) || - &tmake_error("Can't create \"$outfile\""); - } - } elsif ( /^p(.*)/ ) { - # - # The -p option is obsolete and will be removed in the next - # tmake release. - # - &tmake_warning( "-p option obsolete, instead use \"tmake file1.pro file2.pro ...\""); - my($pf) = ($1 eq "") ? shift @ARGV : $1; - if ( ! $read_tmakeconf ) { - $read_tmakeconf = 1; - &ScanProject( &find_template("tmake.conf") ); - } - if ( ! ($pf =~ /\.pro$/i) && -f fix_path($pf . ".pro") ) { - $pf .= ".pro"; - } - if ( $project_name eq "" ) { - $project_name = $pf; - $project{"PROJECT"} = $project_name; - $project{"PROJECT"} =~ s/\.pro$//i; - $project{"TARGET"} = $project{"PROJECT"}; - } - if ( !&ScanProject($pf) ) { - &tmake_error("Can't open project file \"$pf\""); - } - } elsif ( /^unix$/ ) { - $is_unix = 1; - $dir_sep = "/"; - $obj_ext = "o"; - } elsif ( /^win32$/ ) { - $is_unix = 0; - $dir_sep = "\\"; - $obj_ext = "obj"; - } elsif ( /^nodepend$/ ) { - $nodepend = 1; # don't generate dependencies - } elsif ( /^v$/ ) { - $verbose = 1; - } else { - &tmake_usage(); - } - } elsif ( /^\s*((?:[^:\s]*?:)?)(\w+)\s*(\+=|\*=|\-=|\/=|=)/ ) { - if ( ! $read_tmakeconf && ! (/^\s*TMAKEPATH/) ) { - $read_tmakeconf = 1; - &ScanProject( &find_template("tmake.conf") ); - } - Project( $_ ); # manual project setting - } else { - my($pf) = $_; - if ( ! $read_tmakeconf ) { - $read_tmakeconf = 1; - &ScanProject( &find_template("tmake.conf") ); - } - if ( ! ($pf =~ /\.pro$/i) && -f fix_path($pf . ".pro") ) { - $pf .= ".pro"; - } - if ( $project_name eq "" ) { - $project_name = $pf; - $project{"PROJECT"} = $project_name; - $project{"PROJECT"} =~ s/\.pro$//i; - $project{"TARGET"} = $project{"PROJECT"}; - } - if ( !&ScanProject($pf) ) { - &tmake_error("Can't open project file \"$pf\""); - } - } -} - -&tmake_verb("Version $TMAKE_VERSION (runtime environment: " . - ($really_unix ? "Unix" : "Win32") . ")\n" ); - -if ( $eval_quit ) { - &tmake_verb("Done!"); - exit 0; -} -($project_name eq "") && &tmake_usage(); - -if ( $template_name eq "" ) { - $template_name = $project{"TEMPLATE"} ? - $project{"TEMPLATE"} : "default.t"; -} -$template_name = &find_template($template_name); -&IncludeTemplate($template_name); -&tmake_verb("Done!"); -exit 0; # finished! - - - -############################################################################## -# Subroutines from here -############################################################################## - -# -# tmake_usage() -# -# Prints a message about program usage and exits -# - -sub tmake_usage { - print STDERR "Usage:\n tmake [options] project-files\n"; - print STDERR "Options:\n"; - print STDERR " -e expr Evaluate expression, ignore template file\n"; - print STDERR " -nodepend Don't generate dependency information\n"; - print STDERR " -o file Write output to file\n"; - print STDERR " -t file Specify a template file\n"; - print STDERR " -unix Create output for Unix (auto detects)\n"; - print STDERR " -v Verbose/debug mode\n"; - print STDERR " -win32 Create output for Win32 (auto detects)\n"; - exit 1; -} - - -# -# tmake_error(msg) -# -# Prints the message and exits -# - -sub tmake_error { - my($msg) = @_; - print STDERR "tmake error: " . $msg . "\n"; - exit 1; -} - - -# -# tmake_warning(msg) -# -# Prints the warning message -# - -sub tmake_warning { - my($msg) = @_; - print STDERR "tmake warning: " . $msg . "\n"; -} - - -# -# tmake_verb() -# -# Prints a verbose message -# - -sub tmake_verb { - my($msg) = @_; - $verbose && print STDERR "tmake: " . $msg . "\n"; -} - - -# -# check_unix() -# -# Returns 1 if this is a Unix, 0 otherwise. -# - -sub check_unix { - my($r); - $r = 0; - if ( -f "/bin/uname" ) { - $r = 1; - (-f "\\bin\\uname") && ($r = 0); - } - if ( -f "/usr/bin/uname" ) { - $r = 1; - (-f "\\usr\\bin\\uname") && ($r = 0); - } - return $r; -} - - -# -# find_template(filename) -# -# Looks for the template file. -# 1. search the current directory -# 2. search the directories in TMAKEPATH -# 3. search in $HOME/.tmake -# - -sub find_template { - my($filename) = @_; - my($tb,$d,$p,@dirs); - if ( !defined($template_base) || ($template_base eq "") ) { - $tb = ""; - } else { - $tb = $template_base . ";"; - } - $d = $tb . $project{"TMAKEPATH"}; - @dirs = (""); - push @dirs, &split_path( $d ); - $filename .= ".t" unless ($filename =~ /\.\w+$/); - for $d ( @dirs ) { - $p = $d . $filename; - if ( -f fix_path($p) ) { - if ( $filename eq "tmake.conf" ) { - $tmake_platform = $d; - $tmake_platform =~ s-.*[/\\]([^/\\]*)[/\\]-$1-; - &tmake_verb("Detected platform $tmake_platform"); - } - return $p; - } - return ($d . $filename) if ( -f fix_path($d . $filename) ); - } - &tmake_error("Template file " . $filename . " not found"); -} - - -############################################################################## -# User functions -############################################################################## - -# -# StdInit() -# -# Standard initialization -# - -sub StdInit { - my($p); - return if $stdinit_done; - $stdinit_done = 1; - if ( defined($project{"OBJECTS_DIR"}) ) { - $project{"OBJECTS_DIR"} = FixPath($project{"OBJECTS_DIR"}); - &mkdirp($project{"OBJECTS_DIR"},0777); - } - if ( defined($project{"MOC_DIR"}) ) { - $project{"MOC_DIR"} = FixPath($project{"MOC_DIR"}); - &mkdirp($project{"MOC_DIR"},0777); - } - if ( defined($project{"DESTDIR"}) ) { - $project{"DESTDIR"} = FixPath($project{"DESTDIR"}); - &mkdirp($project{"DESTDIR"},0777); - } - $project{"OBJECTS"} = &Objects($project{"SOURCES"}); - if ( $moc_aware ) { - $project{"_HDRMOC"} = &list_moc($project{"HEADERS"},$moc_pre,$cpp_ext); - $project{"_SRCMOC"} = &list_moc($project{"SOURCES"},"",$moc_ext); - $project{"OBJMOC"} = &Objects($project{"_HDRMOC"}); - $p = $project{"_HDRMOC"} . " " . $project{"_SRCMOC"}; - $p =~ s/(^\s+|\s+$)//g; - $project{"SRCMOC"} = $p; - } - &AddIncludePath(""); -} - - -sub FixPath { - my($p) = @_; - if ( !defined($p) || ($p eq "") || ($p eq ".") ) { - $p = ""; - } else { - $p .= $dir_sep; - $p =~ s-[\\/]+-${dir_sep}-g; - } - return $p; -} - - -# -# Config(name) -# -# Returns true if the project variable CONFIG contains the -# configuration name. -# - -sub Config { - my($name) = @_; - return $project{"CONFIG"} =~ /\b\Q$name\E\b/; -} - - -# -# DisableOutput() -# -# Disables tmake output. Must be restored by calling a corresponding -# EnableOutput(). -# - -sub DisableOutput { - $output_count++; -} - - -# -# EnableOutput() -# -# Enables tmake output again after DisableOutput() has been called. -# - -sub EnableOutput { - $output_count--; -} - - -# -# Now() - sets $text -# -# Sets $text to the current date and time. -# - -sub Now { - my($sec,$min,$hour,$mday,$mon,$year); - ($sec,$min,$hour,$mday,$mon,$year) = localtime(time()); - $text = sprintf("%02d:%02d, %4d/%02d/%02d", - $hour, $min, 1900+$year, 1+$mon, $mday); -} - - -# -# expand_project_var(var) -# -# Internal function for Project(). -# Expands a project value string. -# - -sub expand_project_var { - my($v) = @_; - my($c); - return "" if !defined($v); - $c = 0; - while ( $c < 100 ) { # expand $$ - if ( $v =~ s/(\$\$\w+)/\035/ ) { - $_ = $1; - s/\$\$//g; - if ( !defined($project{$_}) ) { - $v =~ s/\035//g; - } else { - $v =~ s/\035/$project{$_}/g; - } - $c++; - } else { - $c = 100; - } - } - return $v; -} - - -# -# Project(strings) -# -# This is a powerful function for setting or reading project variables. -# Returns the resulting project variables (joined with space between). -# -# Get a project variable: -# $s = Project("TEMPLATE"); -> $s = "TEMPLATE" -# -# Set a project variable: -# Project("TEMPLATE = lib"); -> TEMPLATE = lib -# Project("CONFIG =";) -> CONFIG empty -# -# Append to a project variable: -# Project("CONFIG = qt"); -> CONFIG = qt -# Project("CONFIG += debug"); -> CONFIG = qt debug -# -# Append to a project variable if it does not contain the value already: -# Project("CONFIG = qt release"); -> CONFIG = qt release -# Project("CONFIG *= qt"); -> CONFIG = qt release -# Project("CONFIG *= opengl"); -> CONFIG = qt release opengl -# -# Subtract from a project variable: -# Project("THINGS = abc xyz"); -> THINGS = abc xyz -# Project("THINGS -= abc"); -> THINGS = xyz -# -# Search/replace on a project variable: -# Project("CONFIG = tq opengl"); -> CONFIG = tq opengl -# Project("CONFIG /= s/tq/qt/"); -> CONFIG = qt opengl -# -# The operations can be performed on several project variables at a time. -# -# Project("TEMPLATE = app", "CONFIG *= opengl", "THINGS += klm"); -# - -sub Project { - my @settings = @_; - my($r,$if_var,$t,$s,$v,$p,$c); - $r = ""; - foreach ( @settings ) { - $v = $_; - if ( $v =~ s/^\s*([^:\r\n]+:)?(\w+)\s*(\+=|\*=|\-=|\/=|=)// ) { - $if_var = $1; - if ( $if_var ne "" ) { - chop $if_var; - if ( $if_var eq "unix" ) { - return "" if !$is_unix; - } elsif ( $if_var eq "win32" ) { - return "" if $is_unix; - } elsif ( ($if_var ne $tmake_platform) && !Config($if_var) ) { - return ""; - } - } - $t = $2; - $s = $3; - if ( ! $notrim_whitespace ) { - $v =~ s/^\s+//; # trim white space - $v =~ s/\s+$//; - } - $v = expand_project_var($v); - $p = $project{$t}; - if ( $s ne "=" && $v eq "" ) { - # nothing to append, subtract or sed - } elsif ( $s eq "=" ) { # set variable - $p = $v; - } elsif ( $s eq "+=" ) { # append - if ( $p eq "" ) { - $p = $v; - } else { - $p .= " " . $v; - } - } elsif ( $s eq "*=" ) { # append if not contained - if ( !($p =~ /(?:^|\s)\Q$v\E(?:\s|$)/) ) { - if ( $p eq "" ) { - $p = $v; - } else { - $p .= " " . $v; - } - } - } elsif ( $s eq "-=" ) { # subtract - $p =~ s/$v//g; - } elsif ( $s eq "/=" ) { # sed - $cmd = '$p =~ ' . $v; - eval $cmd; - } - $project{$t} = expand_project_var($p); - } else { - $p = expand_project_var($project{$v}); - } - if ( $p ne "" ) { - $r = ($r eq "") ? $p : ($r . " " . $p); - } - } - return $r; -} - - -# -# Substitute(string) -# -# This function substitutes project variables in a text. -# -# Example: -# Substitute('The project name is "$$PROJECT"') -# - -sub Substitute { - my($subst) = @_; - $text = expand_project_var($subst); - return $text; -} - - -# -# ScanProject(file) -# -# Scans a project file. Inserts project variables into the global -# associative project array. -# - -sub ScanProject { - my($file) = @_; - my($var,$val,@v,$more,$line,$endmark); - - $var = ""; - $line = 0; - open(TMP,fix_path($file)) || return 0; - - &tmake_verb("Reading the project file $file"); - while ( <TMP> ) { - $line++; - s/\#.*//; # strip comment - s/^\s+//; # strip white space - s/\s+$//; - if ( /^(([^:\r\n]+:)?\w+\s*(\+|\-|\*|\/)?=)/ ) { - $var = $1; # var also contains the ".=" - s/^.*?=\s*//; - if ( /^\<\<(.*)$/ ) { - $endmark = $1; - $val = ""; - while ( <TMP> ) { - $line++; - if ( /^\Q$endmark\E$/ ) { - $endmark = ""; - last; - } - $val .= $_; - } - if ( $endmark ne "" ) { - tmake_error("$file:$line: End marker $endmark not found"); - } - chop $val if ( $val ne "" ); - $notrim_whitespace++; - Project( $var . $val ); - $notrim_whitespace--; - $var = ""; - $_ = ""; - } - } - if ( $var ne "" ) { - $more = ( $_ =~ s/\s*\\\s*$// ); # more if \ at end of line - push( @v, split( /\s+/, $_ ) ); - if ( ! $more ) { - $val = join(" ",@v); - Project( $var . $val ); - $var = ""; - @v = (); - } - } elsif ( $_ ne "" ) { - tmake_error("$file:$line: Syntax error"); - } - } - close(TMP); - &tmake_verb("Done reading the project file $file"); - return 1; -} - - -# -# IncludeTemplate(template_name) -# -# Includes and processes a template file. -# -# Below, we read the template file and executes any perl code found. -# Perl code comes after "#$". The variable $text contains the text -# to replace the perl code that was executed. -# Template comments begin with "#!". -# - -sub IncludeTemplate { - my($t_name) = @_; - my($cmd,$cmd_block,$cmd_end,$is_cmd_block,$saveline,$spaceonly); - local($text); - local(*T); - - $t_name = &find_template($t_name); - if ( $tmake_template_dict{$t_name} ) { - &tmake_error("Cyclic template inclusion for $t_name"); - } else { - $tmake_template_dict{$t_name} = 1; - } - $template_base = $t_name; - $template_base =~ s-(.*[/\\]).*-$1-; - &tmake_verb("Reading the template $t_name"); - open(T,fix_path($t_name)) || - &tmake_error("Can't open template file \"$t_name\""); - - while ( <T> ) { - if ( /\#\!/ ) { # tmake comment - s/\s*\#\!.*//; - next if /^$/; - } - if ( /\#\$(\{)?\s*(.*)\n/ ) { # code - $cmd = $2; - $is_cmd_block = defined($1) && ($1 eq "{"); - s/\#\$.*\n//; - if ( $is_cmd_block ) { # code block #${ ... - $saveline = $_; - $cmd_block = $cmd; - $cmd_end = 0; - while ( <T> ) { - $cmd = $_; - $cmd =~ s/\s*\#\!.*//; # tmake comment - if ( $cmd =~ /^\s*\#\$\}/ ) { - $_ = ""; - $cmd_end = 1; - last; - } - $cmd =~ s/^\s*\#(\$)?\s*//; - $cmd_block .= $cmd; - } - $cmd_end || &tmake_error('#$} expected but not found'); - $cmd = $cmd_block; - $_ = $saveline; - } - $spaceonly = /^\s*$/; - $saveline = $_; - &tmake_verb("Evaluate: $cmd"); - $text = ""; - eval $cmd; - die $@ if $@; - next if $spaceonly && ($text =~ /^\s*$/); - print $saveline . $text . "\n" if $output_count <= 0; - } else { # something else - print if $output_count <= 0; - } - } - close( T ); -} - - -# -# Expand(var) - appends to $text -# -# Expands a list of $project{} variables with a space character between them. -# - -sub Expand { - my @vars = @_; - my($t); - $t = Project(@vars); - if ( $text eq "" ) { - $text = $t; - } elsif ( $t ne "" ) { - $text .= " " . $t; - } - return $text; -} - - -# -# ExpandGlue(var,prepend,glue,append) - appends to $text -# -# Expands a $project{} variable, splits on whitespace -# and joins with $glue. $prepend is put at the start -# of the string and $append is put at the end of the -# string. The resulting string becomes "" if the project -# var is empty or not defined. -# -# Example: -# -# The project file defines: -# SOURCES = a b c -# -# ExpandGlue("SOURCES","<","-",">") -# -# The result: -# $text = "<a-b-c>" -# - -sub ExpandGlue { - my($var,$prepend,$glue,$append) = @_; - my($t,$v); - $v = Project($var); - if ( $v eq "" ) { - $t = ""; - } else { - $t = $prepend . join($glue,split(/\s+/,$v)) . $append; - } - if ( $text eq "" ) { - $text = $t; - } elsif ( $t ne "" ) { - $text .= " " . $t; - } - return $text; -} - - -# -# ExpandList(var) - sets $text. -# -# Suitable for expanding HEADERS = ... etc. in a Makefile -# - -sub ExpandList { - my($var) = @_; - return ExpandGlue($var,""," ${linebreak}\n\t\t",""); -} - - -# -# ExpandPath(var,prepend,glue,append) - appends to $text -# -# Expands a $project{} variable, splits on either ';' or -# whitespace and joins with $glue. $prepend is put at the -# start of the string and $append is put at the end of the -# string. The resulting string becomes "" if the project -# variable is empty or not defined. -# -# If the variable contains at least one semicolon or tmake -# is running on Windows, the resulting items are put in -# double-quotes. -# -# Example: -# -# The project file defines: -# INCLUDEPATH = "C:\qt\include;c:\program files\msdev\include -# -# ExpandGlue("INCLUDEPATH","-I","-I","") -# -# The result: -# $text = -I"c:\qt\include" -I"c:\program files\msdev\include" -# - -sub ExpandPath { - my($var,$prepend,$glue,$append) = @_; - my($t,$v); - my($s); - $v = Project($var); - if ( $v eq "" ) { - $t = ""; - } else { - if ( $v =~ /;/ || !$is_unix ) { - $prepend .= '"'; - $glue = '"' . $glue . '"'; - $append = '"' . $append; - } - - if ( $v =~ /;/ ) { - $t = $prepend . join($glue,split(/;+/,$v)) . $append; - } else { - $t = $prepend . join($glue,split(/\s+/,$v)) . $append; - } - } - if ( $text eq "" ) { - $text = $t; - } elsif ( $t ne "" ) { - $text .= " " . $t; - } - return $text; -} - - -# -# TmakeSelf() -# -# Generates makefile rule to regenerate the makefile using tmake. -# - -sub TmakeSelf { - my $a = "tmake $project_name"; - if ( $nodepend ) { - $a .= " -nodepend"; - } - if ( $outfile ) { - $text = "tmake: $outfile\n\n$outfile: $project_name\n\t"; - $a .= " -o $outfile"; - } else { - $text = "tmake:\n\t"; - } - $text .= $a -} - - -# -# Objects(files) -# -# Replaces any extension with .o ($obj_ext). -# - -sub Objects { - local($_) = @_; - my(@a); - @a = split(/\s+/,$_); - foreach ( @a ) { - s-\.\w+$-.${obj_ext}-; - if ( defined($project{"OBJECTS_DIR"}) ) { - s-^.*[\\/]--; - $_ = $project{"OBJECTS_DIR"} . $_; - } - } - return join(" ",@a); -} - - -# -# list_moc(files,prefix,extension) -# -# Scans all files and selects all files that contain Q_OBJECT. -# Insert a prefix before the filename and replaces the filename extention. -# - -sub list_moc { - my($files,$pre,$ext) = @_; - my(@v,@m,@lines,$contents,$n,$f,$t); - @v = split(/\s+/,$files); - undef $/; - foreach $f ( @v ) { - if ( open(TMP,fix_path($f)) ) { - $contents = <TMP>; - close(TMP); - $n = 0; - @lines = split(/\n/,$contents); - grep( /tmake\s+ignore\s+Q_OBJECT/ && $n--, @lines ); - $contents =~ s-/\*.*?\*/--gs; # strip C/C++ comments - $contents =~ s-//.*\n--g; - @lines = split(/\n/,$contents); - grep( /(^|\W)Q_OBJECT(\W|$)/ && $n++, @lines ); - if ( $n > 0 ) { - $t = $f; - $t =~ s-^(.*[/\\])?([^/\\]*?)\.(\w+)$-$1${pre}$2.${ext}-; - if ( defined($project{"MOC_DIR"}) ) { - $t =~ s-^.*[\\/]--; - $t = $project{"MOC_DIR"} . $t; - } - $moc_output{$f} = $t; - $moc_input{$t} = $f; - push(@m,$t); - } - $contents = ""; - } - } - $/ = "\n"; - return join(" ",@m); -} - - -# -# BuildObj(objects,sources) -# -# Builds the object files. -# - -sub BuildObj { - my($obj,$src) = @_; - my(@objv,$srcv,$i,$s,$o,$d,$c,$comp,$cimp); - @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; - if ( defined($moc_output{$s}) && ($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 ""; - if ( ($s =~ /\.c$/) ) { - $comp = "TMAKE_RUN_CC"; - $cimp = "TMAKE_RUN_CC_IMP"; - } else { - $comp = "TMAKE_RUN_CXX"; - $cimp = "TMAKE_RUN_CXX_IMP"; - } - if ( defined($project{"OBJECTS_DIR"}) || - !defined($project{$cimp}) ) { - $c = $project{$comp}; - $c =~ s/\$src/$s/; - $c =~ s/\$obj/$o/; - $text .= "\n\t$c"; - } - $text .= "\n\n"; - } - chop $text; -} - - -# -# BuildMocObj(objects,sources) -# -# Builds the moc object files. -# - -sub BuildMocObj { - my($obj,$src) = @_; - my(@objv,$srcv,$i,$s,$o,$hdr,$d); - @objv = split(/\s+/,$obj); - @srcv = split(/\s+/,$src); - for $i ( 0..$#objv ) { - $s = $srcv[$i]; - $o = $objv[$i]; - $hdr = $moc_input{$srcv[$i]}; - $text .= $o . ": " . $s . " ${linebreak}\n\t\t" . $hdr; - $d = &make_depend($hdr); - $text .= " ${linebreak}\n\t\t" . $d if $d ne ""; - if ( defined($project{"OBJECTS_DIR"}) || defined($project{"MOC_DIR"})|| - !defined($project{"TMAKE_RUN_CXX_IMP"}) ) { - $c = $project{"TMAKE_RUN_CXX"}; - $c =~ s/\$src/$s/; - $c =~ s/\$obj/$o/; - $text .= "\n\t$c"; - } - $text .= "\n\n"; - } - chop $text; -} - - -# -# BuildMocSrc(files) -# -# Builds the moc source files from headers and sources. -# - -sub BuildMocSrc { - my($f) = @_; - my(@v,$m,$o); - @v = split(/\s+/,$f); - foreach $m ( @v ) { - $o = $moc_output{$m}; - if ( defined($o) && ($o ne "") ) { - $text .= "$o: $m\n\t$moc_cmd $m -o $o\n\n"; - } - } - chop $text; -} - - -# -# AddIncludePath(path) -# -# Adds path to the current include path, $project{"INCLUDEPATH"}. -# - -sub AddIncludePath { - my($path) = @_; - my($p); - if ( $project{"INCPATH"} && - ($project{"INCPATH"} =~ /(?:^|\s)\Q$path\E(?:\s|$)/) ) { - return; - } - $project{"INCLUDEPATH"} = "" if !defined($project{"INCLUDEPATH"}); - if ( !defined($project{"INCPATH_SEP"}) ) { - if ( $project{"INCLUDEPATH"} =~ /;/ ) { - $project{"INCPATH_SEP"} = ";"; - } else { - $project{"INCPATH_SEP"} = " "; - } - } - $p = $project{"INCLUDEPATH"}; - $p = ($p && $path) ? ($p . ";" . $path) : ($p . $path); - $project{"INCLUDEPATH"} = $p; - $p = join($project{"INCPATH_SEP"},&split_path($p)); - $p =~ s=[\\/]($project{"INCPATH_SEP"}|$)=$project{"INCPATH_SEP"}=g; - $project{"INCPATH"} = $p; -} - - -# -# FindHighestLibVersion(dir,name) -# -# Returns the newest library version. Scans all the files in the specifies -# directory and returns the highest version number. -# -# Used on Windows only. -# -# Example: -# FindHighestLibVersion("c:\qt\lib","qt") returns "200" if -# the c:\qt\lib directory contains qt141.lib and qt200.lib. -# - -sub FindHighestLibVersion { - my($dir,$name) = @_; - my(@files,$f,$v,$highest); - $highest = ""; - @files = find_files($dir,"${name}.*\.lib"); - for $f ( @files ) { - if ( $f =~ /(\d+)\.lib/i ) { - $v = $1; - if ( $highest eq "" || $v > $highest ) { - $highest = $v; - } - } - } - return $highest; -} - - -# -# Finds files. -# -# Examples: -# find_files("/usr","\.cpp$",1) - finds .cpp files in /usr and below -# find_files("/tmp","^#",0) - finds #* files in /tmp -# - -sub find_files { - my($dir,$match,$descend) = @_; - my($file,$p,@files); - local(*D); - $dir =~ s=\\=/=g; - ($dir eq "") && ($dir = "."); - if ( opendir(D,fix_path($dir)) ) { - if ( $dir eq "." ) { - $dir = ""; - } else { - ($dir =~ /\/$/) || ($dir .= "/"); - } - foreach $file ( readdir(D) ) { - next if ( $file =~ /^\.\.?$/ ); - $p = $dir . $file; - if ( $is_unix ) { - ($file =~ /$match/) && (push @files, $p); - } else { - ($file =~ /$match/i) && (push @files, $p); - } - if ( $descend && -d $p && ! -l $p ) { - push @files, &find_files($p,$match,$descend); - } - } - closedir(D); - } - return @files; -} - - -# -# make_depend(file) -# -# Returns a list of included files. -# Uses the global $depend_path variable. -# - -sub make_depend { - my($file) = @_; - my($i,$count); - if ( $nodepend ) { - return ""; - } - if ( ! $depend_path_fixed ) { - $depend_path_fixed = 1; - if ( defined($project{"DEPENDPATH"}) ) { - $depend_path = $project{"DEPENDPATH"}; - } else { - $depend_path = ""; - } - $count = 0; - while ( $count < 100 ) { - if ( $depend_path =~ s/(\$[\{\(]?\w+[\}\)]?)/035/ ) { - $_ = $1; - s/[\$\{\}\(\)]//g; - $depend_path =~ s/035/$ENV{$_}/g; - } else { - $count = 100; - } - } - @dep_path = &split_path($depend_path); - } - @cur_dep_path = @dep_path; - if ( $file =~ /(.*[\/\\])/ ) { - $dep_curdir = $1; - push @cur_dep_path, $dep_curdir; - } else { - $dep_curdir = ""; - } - $dep_file = $file; - &canonical_dep($file); - %dep_dict = (); - $i = &build_dep($file); - chop $i; - $i =~ s=/=$dir_sep=g unless $is_unix; - $i =~ s=([a-zA-Z]):/=//$1/=g if (defined($gnuwin32) && $gnuwin32); - return join(" ${linebreak}\n\t\t",split(/ /,$i) ); -} - -# -# build_dep() - Internal for make_depend() -# - -sub build_dep { - my($file) = @_; - my(@i,$a,$n); - $a = ""; - return $a if !(defined $depend_dict{$file}); - @i = split(/ /,$depend_dict{$file}); - for $n ( @i ) { - if ( !defined($dep_dict{$n}) && defined($full_path{$n}) ) { - $dep_dict{$n} = 1; - $a .= $full_path{$n} . " " . &build_dep($n); - } - } - return $a; -} - -# -# canonical_dep(file) - Internal for make_depend() -# -# Reads the file and all included files recursively. -# %depend_dict associates a file name to a list of included files. -# - -sub canonical_dep { - my($file) = @_; - my(@inc,$i); - @inc = &scan_dep($file); - if ( @inc ) { - $depend_dict{$file} = join(" ",@inc); - for $i ( @inc ) { - &canonical_dep($i) if !defined($depend_dict{$i}); - } - } -} - -# -# scan_dep(file) - Internal for make_depend() -# -# Returns an array of included files. -# - -sub scan_dep { - my($file) = @_; - my($dir,$path,$found,@allincs,@includes,%incs); - $path = $file; - @includes = (); - return @includes if $file =~ /\.$moc_ext$/; # avoid .moc files - if ( ! (-f fix_path($path)) ) { - $found = 0; - for $dir ( @cur_dep_path ) { - $path = $dir . $file; - last if ( $found = (-f fix_path($path)) ); - } - return @includes if ! $found; - } - undef $/; - if ( open(TMP,fix_path($path)) ) { - $full_path{$file} = $path; - $_ = <TMP>; - s-/\*.*?\*/--gs; # strip C/C++ comments - s-//.*\n-\n-g; - @allincs = split(/\n/,$_); - @allincs = grep(/^\s*#\s*include/,@allincs); - foreach ( @allincs ) { # all #include lines - next if !(/^\s*#\s*include\s+[<"]([^>"]*)[>"]/) || defined($incs{$1}); - push(@includes,$1); - $incs{$1} = "1"; - } - close(TMP); - } - $/ = "\n"; - return @includes; -} - - -# -# split_path(path) -# -# Splits a path containing : (Unix) or ; (MSDOS, NT etc.) separators. -# Returns an array. -# - -sub split_path { - my($p) = @_; - my($s,@d); - @d = (); - return @d if !defined($p) || $p eq ""; - $p =~ s=:=;=g if $is_unix; - $p =~ s=[/\\]+=/=g; - if ( !($p =~ /;/) ) { - $p =~ s/\s+/;/g; - } - $p =~ s/\s*;\s*/;/g; - while( $p =~ /(?:(?:[^\"\;][^\;]*;*)|(?:\"[^\"]*\";*))/g ) { - $s = $&; - $s =~ s=\"==g; - $s =~ s=[\s\;]+$==g; - $s =~ s=([^/:])$=$1/=g; - $s =~ s=/=$dir_sep=g unless $is_unix; - push @d, $s; - } - return @d; -} - - -# -# fix_path(path) -# -# Converts all '\' to '/' if this really seems to be a Unix box. -# - -sub fix_path { - my($p) = @_; - if ( $really_unix ) { - $p =~ s-\\-/-g; - } else { - $p =~ s-/-\\-g; - } - return $p; -} - - -# -# mkdirp(filename,mode) - Internal for StdInit() -# -# Creates the directory specified by $filename, with permissions -# specified by mode (as modified by umask). Recursively calls -# mkdir, similar to 'mkdir -p'. -# - -sub mkdirp { - my($filename,$mode) = @_; - if ( $filename =~ /\$\(\w+\)/ ) { # ignore "$(something)" - return 0; - } - $filename =~ s-[\\:/]+-/-g; - if ( -d $filename ) { - return 1; - } - $filename =~ m-^((.*)/)?(.*)-; - if ( defined($2) && ! mkdirp($2,$mode) ) { - return 0; - } - return mkdir($filename,$mode); -} diff --git a/tmake/doc/m-linux-gcc.html b/tmake/doc/m-linux-gcc.html deleted file mode 100644 index 300ef35..0000000 --- a/tmake/doc/m-linux-gcc.html +++ /dev/null @@ -1,85 +0,0 @@ -<!doctype HTML public "-//W3C//DTD HTML 3.2//EN"> -<html><head><title> -Generated Makefile for Linux / GNU g++ -</title></head><body bgcolor="#ffffff"> -<h2 align=center>Generated Makefile for Linux / GNU gcc</h2> - -<pre> -############################################################################# -# Makefile for building hello -# Generated by tmake at 10:11, 1998/07/07 -# Project: hello -# Template: app -############################################################################# - -####### Compiler, tools and options - -CC = g++ -CFLAGS = -Wall -W -O2 -fno-strength-reduce -INCPATH = -I$(QTDIR)/include -LINK = g++ -LFLAGS = -LIBS = -L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -lX11 -MOC = moc - -####### Files - -HEADERS = hello.h -SOURCES = hello.cpp \ - main.cpp -OBJECTS = hello.o \ - main.o -SRCMOC = moc_hello.cpp -OBJMOC = moc_hello.o -TARGET = hello - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .C .c - -.cpp.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< - -.cxx.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< - -.cc.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< - -.C.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< - -.c.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< - -####### Build rules - -all: $(TARGET) - -$(TARGET): $(OBJECTS) $(OBJMOC) - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) - -moc: $(SRCMOC) - -tmake: - tmake hello.pro - -clean: - -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(TARGET) - -rm -f *~ core - -####### Compile - -hello.o: hello.cpp \ - hello.h - -main.o: main.cpp \ - hello.h - -moc_hello.o: moc_hello.cpp \ - hello.h - -moc_hello.cpp: hello.h - $(MOC) hello.h -o moc_hello.cpp -</pre> -</body></html> diff --git a/tmake/doc/m-win32-msvc.html b/tmake/doc/m-win32-msvc.html deleted file mode 100644 index 24097cc..0000000 --- a/tmake/doc/m-win32-msvc.html +++ /dev/null @@ -1,89 +0,0 @@ -<!doctype HTML public "-//W3C//DTD HTML 3.2//EN"> -<html><head><title> -Generated Makefile for Win32 / Microsoft Visual C++ -</title></head><body bgcolor="#ffffff"> -<h2 align=center>Generated Makefile for Win32 / Microsoft Visual C++</h2> - -<pre> -############################################################################# -# Makefile for building hello -# Generated by tmake at 20:40, 1998/02/27 -# Project: hello -# Template: app -############################################################################# - -####### Compiler, tools and options - -CC = cl -CFLAGS = -nologo -W3 -O2 -INCPATH = -I"$(QTDIR)\include" -LINK = link -LFLAGS = /NOLOGO /SUBSYSTEM:windows -LIBS = $(QTDIR)\lib\qt.lib user32.lib gdi32.lib comdlg32.lib wsock32.lib -MOC = moc - -####### Files - -HEADERS = hello.h -SOURCES = hello.cpp \ - main.cpp -OBJECTS = hello.obj \ - main.obj -SRCMOC = moc_hello.cpp -OBJMOC = moc_hello.obj -TARGET = hello.exe - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.obj: - $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< - -.cxx.obj: - $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< - -.cc.obj: - $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< - -.c.obj: - $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< - -####### Build rules - -all: $(TARGET) - -$(TARGET): $(OBJECTS) $(OBJMOC) - $(LINK) $(LFLAGS) /OUT:$(TARGET) @<< - $(OBJECTS) $(OBJMOC) $(LIBS) -<< - -moc: $(SRCMOC) - -tmake: Makefile - -Makefile: hello.pro - tmake hello.pro -o Makefile - -clean: - -del hello.obj - -del main.obj - -del moc_hello.cpp - -del moc_hello.obj - -del $(TARGET) - -####### Compile - -hello.obj: hello.cpp \ - hello.h - -main.obj: main.cpp \ - hello.h - -moc_hello.obj: moc_hello.cpp \ - hello.h - -moc_hello.cpp: hello.h - $(MOC) hello.h -o moc_hello.cpp -</pre> -</body></html> diff --git a/tmake/doc/tmake.html b/tmake/doc/tmake.html deleted file mode 100644 index 1b14809..0000000 --- a/tmake/doc/tmake.html +++ /dev/null @@ -1,727 +0,0 @@ -<!doctype HTML public "-//W3C//DTD HTML 3.2//EN"> -<html><head><title> -User's Guide - tmake -</title></head><body bgcolor="#ffffff"> -<p><h1 align=center>User's Guide - tmake</h1> - - -<hr> -<h2>Introduction</h2> - -tmake is an easy-to-use tool from Troll Tech to create and maintain -makefiles for software projects. It can be a painful task to manage -makefiles manually, especially if you develop for more than one platform -or use more than one compiler. tmake automates and streamlines this -process and lets you spend your valuable time on writing code, not -makefiles. - -<p> -Our main motivation for developing tmake was that we spent far too much -time maintaining makefiles for <a href="http://www.troll.no/qt">Qt</a>, -our cross-platform GUI toolkit. Qt supports around 15 flavors of Unix, -Microsoft Windows, and around 15 different C++ compilers. We looked at -GNU autoconf, but it was Unix-specific and not flexible enough in our -opinion. Our makefile system also had to deal with Qt <a -href="http://www.troll.no/qt/metaobjects.html">meta object compiler</a> -(moc) issues. The moc program extracts meta information from C++ files and -generates a C++ file with data tables etc. It takes extra work to add -makefile rules for the moc and wanted to automate this task. - -<p> -tmake is written in Perl and requires that you have installed perl version -5 or newer. Basic use of tmake requires no perl knowledge, but if you know -perl you can extend tmake and write your own makefile templates. - -<p> -<b>Windows users:</b> The tmake distribution for Win32 includes tmake.exe -(built by the perl2exe utility) and you do not need to download and -install perl unless you want to modify the tmake source code or run other -perl scripts. You can download perl for Win32 (Windows NT and 95) from <a -href="http://www.activestate.com">www.activestate.com</a> - -<p> -tmake is free software and you may use, copy, modify and distribute tmake -and its documentation for any purpose and without any fee. See the -LICENSE file for details. - -<p> -Feedback is highly appreciated. Contact the author, Haavard Nord <a -href="mailto:hanord@troll.no">(hanord@troll.no)</a>, if you have ideas, -patches etc. for tmake. - -<hr> -<h2>Installation</h2> - -<ol> -<li>Make sure you have perl version 5 or later installed (optional -for Windows users). -<li>Unpack the tmake tar.gz archive for Unix or the tmake .zip file for Windows. -<li>Set the TMAKEPATH environment variable to the directories -containing the template files (see below). -<li>Add the tmake/bin directory to your PATH. -</ol> - -Here are some examples:<p> -<strong>Unix Bourne shell:</strong><pre> - TMAKEPATH=/local/tmake/lib/linux-g++ - PATH=$PATH:/local/tmake/bin - export TMAKEPATH PATH -</pre> - -<strong>Unix C shell:</strong><pre> - setenv TMAKEPATH /local/tmake/lib/linux-g++ - setenv PATH $PATH:/local/tmake/bin -</pre> - -<strong>Microsoft Windows:</strong><pre> - set TMAKEPATH=c:\tmake\lib\win32-msvc - set PATH=%PATH%;c:\tmake\bin -</pre> - -<p> -The template directory name has the form <em>platform</em>-<em>compiler</em> -and contains a platform configuration file (tmake.conf) and tmake template -files. - -<p> -Supported platforms: AIX, Data General, FreeBSD, HPUX, SGI Irix, Linux, -NetBSD, OpenBSD, OSF1/DEC, SCO, Solaris, SunOS, Ultrix, Unixware and -Win32. - -<p> -You can find your platform-compiler combination in the <tt>tmake/lib</tt>. - -<p> -<b>Unix users:</b> tmake requires that perl is in /usr/bin. If your -version of perl is elsewehere, either change the first line of tmake or -make a small shell script which invokes tmake with the correct perl. - - -<hr> -<h2>Getting Started</h2> - -Let's assume you have a small Qt application consisting of one C++ header -file and two source files. - -First you need to create a tmake project file, e.g. hello.pro:<pre> - HEADERS = hello.h - SOURCES = hello.cpp main.cpp - TARGET = hello -</pre> - -Then run tmake to create a Makefile:<pre> - tmake hello.pro -o Makefile -</pre> -And finally:<pre> - make -</pre> -This builds the hello program. Remember to set the <code>TMAKEPATH</code> -environment variable before you run tmake. -<p> -See <a href="m-linux-gcc.html">Makefile for Linux/g++</a>.<br> -See <a href="m-win32-msvc.html">Makefile for Win32/msvc</a> -(Microsoft Visual C++).<br> - - -<hr> -<h2>Makefile Templates</h2> - -The tmake distribution includes three makefile templates and one -configuration file for each platform/compiler combination. The -<code>TMAKEPATH</code> environment variable tells tmake where to find -these files: -<p> -<table border="0"> - <tr> - <td> </td> - <td>app.t</td> - <td> </td> - <td>Creates a makefile for building applications.</td> - </tr> - <tr> - <td> </td> - <td>lib.t</td> - <td> </td> - <td>Creates a makefile for building libraries.</td> - </tr> - <tr> - <td> </td> - <td>subdirs.t</td> - <td> </td> - <td>Creates a makefile for building targets in subdirectories.</td> - </tr> - <tr> - <td> </td> - <td>tmake.conf</td> - <td> </td> - <td>This configuration file contains compiler options and lists - tools and libraries. - </tr> -</table> - - -<p> -The hello.pro project file above does not have a <code>TEMPLATE</code> or -a <code>CONFIG</code> variable. The default template is <tt>app</tt> (the .t -extension is optional) and the default configuration is <tt>qt warn_on -release</tt>. - -This project file produces exactly the same result as the hello.pro -above:<pre> - TEMPLATE = app - CONFIG = qt warn_on release - HEADERS = hello.h - SOURCES = hello.cpp main.cpp - TARGET = hello -</pre> - - - -<h4>Makefile Configuration</h4> - -<p> -The <code>CONFIG</code> variable is recognized by both the app.t and lib.t -templates and specifies what compiler options to use and which extra -libraries to link in. - -These options control the compilation flags: -<p> -<table border="0"> - <tr> - <td> </td> - <td>release</td> - <td> </td> - <td>Compile with optimization enabled, ignored if - "debug" is specified.</td> - </tr> - <tr> - <td> </td> - <td>debug</td> - <td> </td> - <td>Compile with debug options enabled.</td> - </tr> - <tr> - <td> </td> - <td>warn_on</td> - <td> </td> - <td>The compiler should emit more warnings than normally, ignored if - "warn_off" is specified.</td> - </tr> - <tr> - <td> </td> - <td>warn_off</td> - <td> </td> - <td>The compiler should emit no warnings or as few as possible.</td> - </tr> -</table> - -<p> -These options defines the application/library type: -<p> -<table border="0"> - <tr> - <td> </td> - <td>qt</td> - <td> </td> - <td>The target is a Qt application/library and requires Qt header - files/library.</td> - </tr> - <tr> - <td> </td> - <td>opengl</td> - <td> </td> - <td>The target requires the OpenGL (or Mesa) headers/libraries.</td> - </tr> - <tr> - <td> </td> - <td>x11</td> - <td> </td> - <td>The target is a X11 application or library.</td> - </tr> - <tr> - <td> </td> - <td>windows</td> - <td> </td> - <td>The target is a Win32 window application (app.t only).</td> - </tr> - <tr> - <td> </td> - <td>console</td> - <td> </td> - <td>The target is a Win32 console application (app.t only).</td> - </tr> - <tr> - <td> </td> - <td>dll</td> - <td> </td> - <td>The target is a shared object/DLL.</td> - </tr> - <tr> - <td> </td> - <td>staticlib</td> - <td> </td> - <td>The target is a static library (lib.t only).</td> - </tr> -</table> - -<p> -As an example, if the hello application uses both Qt and OpenGL and you -want to compile it for debugging, your <code>CONFIG</code> line should -read:<pre> - CONFIG = qt opengl debug -</pre> - -<p> -The most common tmake options and project variables are described here. -See the tmake <a href="tmake_ref.html">reference manual</a> for -details.<p> - - - -<h4>The Application Template</h4> - -The application template, app.t, lets you compile and link executable -programs or shared objects (DLLs). - -This template recognizes several variabless. -<p> -<table border="0"> - <tr> - <td> </td> - <td>HEADERS</td> - <td> </td> - <td>Header files.</td> - </tr> - <tr> - <td> </td> - <td>SOURCES</td> - <td> </td> - <td>Source files.</td> - </tr> - <tr> - <td> </td> - <td>TARGET</td> - <td> </td> - <td>Name of executable (adds .exe if on Windows).</td> - </tr> - <tr> - <td> </td> - <td>DESTDIR</td> - <td> </td> - <td>Where to put the target.</td> - </tr> - <tr> - <td> </td> - <td>DEFINES</td> - <td> </td> - <td>Tell compiler to define C preprocessor macros (-D option).</td> - </tr> - <tr> - <td> </td> - <td>INCLUDEPATH</td> - <td> </td> - <td>Sets the include file search path for the compiler (-I - option). - </td> - </tr> - <tr> - <td> </td> - <td>DEPENDPATH</td> - <td> </td> - <td>Sets the dependency search path for tmake.</td> - </tr> - <tr> - <td> </td> - <td>DEF_FILE</td> - <td> </td> - <td>Win32 only: Link with a .def file.</td> - </tr> - <tr> - <td> </td> - <td>RC_FILE</td> - <td> </td> - <td>Win32 only: Use a .rc file (compile to temporary .res). - </td> - </tr> - <tr> - <td> </td> - <td>RES_FILE</td> - <td> </td> - <td>Win32 only: Link with a .res file. - </td> - </tr> -</table> - -<p> - - -<h4>The Library Template</h4> - -The library template, lib.t, lets you compile and create static or shared -libraries. - -<p> -The lib.t template supports the same project variables as app.t, but also -<code>VERSION</code>. <code>VERSION</code> is the version number of the -target library, e.g. 1.40. The version is important for shared libraries. - - - -<h4>The Subdirs Template</h4> - -The subdirs template, subdirs.t, lets you invoke make in subdirectories. - -<p>The <code>SUBDIRS</code> variable contains the name of all subdirectories to -be processed. - - -<h4>Special Templates for Microsoft Visual C++</h4> - -If you have Microsoft Visual C++ 5.0, you can use two special templates to -generate a MSVC++ IDE project (.dsp file). After you have generated -e.g. hello.dsp, choose "File"->"Open Workspace" and select the hello.dsp -file. Visual C++ will then create a workspace (.dsw file) for you.<p> -<table border="0"> - <tr> - <td> </td> - <td>vcapp.t</td> - <td> </td> - <td>Creates an application project file (Microsoft Visual C++ 5.0 - only).</td> - </tr> - <tr> - <td> </td> - <td>vclib.t</td> - <td> </td> - <td>Creates a library project file (Microsoft Visual C++ 5.0 - only).</td> - </tr> -</table> - -<p> -Run tmake to create a hello.dsp file (use -t to override the default -template):<pre> - tmake -t vcapp -o hello.dsp hello.pro -</pre> - - -<hr> -<h2>Project File Syntax</h2> - -The tmake project file has a very simple syntax. You may set -project variables, append to project variables, remove from -project variable and substitute project variables. - -To set a project variable:<pre> - HEADERS = gui.h xml.h url.h -</pre> - -If you cannot fit everything on one line, use '\' to split it up:<pre> - HEADERS = gui.h \ - xml.h \ - url.h -</pre> - -<p> -Project variables contains lists of items (such as header files, -compiler options etc.) and use whitespace to separate the items. -This means that tmake cannot deal with items containing whitespace. -The INCLUDEPATH variable is an exception. If INCLUDEPATH contains -one or more semicolons (;), tmake uses the semicolon to separate -the include directories, hence you can have include directories -containing whitespace (this is quite common on Windows). - -<p> -Here is an example:<pre> - INCLUDEPATH = C:\Program Files\DBLib\Include;C:\qt\include -</pre> - -<p> -tmake supports <em>project variable expension</em>. Use $$ to expand -any project variable:<pre> - ALLFILES = $$HEADERS $$SOURCES -</pre> - -<p> -Most often you assign some value to a project variable, but you can -also add to, remove from or replace parts of a project variable.<pre> - A = abc - X = xyz - A += def # A = abc def - X *= xyz # X = xyz - B = $$A # B = abc def - B -= abc # B = def - X /= s/y/Y/ # X = xYz -</pre> -The *= operation adds the value if the variable does not already contain it. -The /= operation performs regular expression substitution. - -<p> -You can also set variables from the command line when running the tmake -program. For instance, if you want to generate a makefile with debug -information:<pre> - tmake "CONFIG+=debug" hello.pro -</pre> - -<p> -Use the <tt>unix:</tt> or <tt>win32:</tt> (conditional) qualifier if you want a -platform-specific variable:<pre> - SOURCES = common.cpp # common for all platforms - unix:SOURCES += unix.cpp # additional sources for Unix - win32:SOURCES += win32.cpp # additional sources for Windows - unix:LIBS += -lm # on Unix we need the math lib -</pre> -If none of the platforms match, tmake looks for the variable in CONFIG -variable:<pre> - debug:SOURCES += dbgstuff.cpp # additional source for debugging -</pre> - -Finally, you can set platform and compiler-dependent variables:<pre> - linux-g++:TMAKE_CFLAGS = -fno-rtti -</pre> - -<p> -You may define your own project variables to be used by custom templates. A -project variable is stored in <code>%project</code>, which is an associative -Perl array. Access it like this: <code>$project{"var"}</code> or via the -function <code>Project("var")</code>. For example, after reading -"hello.pro", <code>$project{"SOURCES"}</code> contains "hello.cpp -main.cpp".<p> - - -<hr> -<h2><a name="usage"></a>Running tmake</h2> - -Usage:<pre> - tmake [options] <em>project files or project settings</em> -</pre> -Options:<pre> - -e expr Evaluate the Perl expression. Ignores the template file. - -nodepend Don't generate dependency information. - -o <em>file</em> Write output to <em>file</em> instead of stdout. - -t <em>file</em> Specify a template <em>file</em>. - -unix Force tmake into Unix mode. - -v Verbose/debugging on. - -win32 Force tmake into Win32 mode. -</pre> - -The -t option overrides any <code>TEMPLATE</code> variable in the project file. -<p> -The default project file extension is ".pro". The default template file -extension is ".t". If you do not specify these extension tmake will -automatically add them for you. - -<p> -Example of basic use:<pre> - tmake hello -o Makefile -</pre> - -<p> -Example of how to create a makefile with debugging information:<pre> - tmake "CONFIG+=debug" hello -o Makefile -</pre> - -<p> -Exmaple of how to specify a TMAKEPATH:<pre> - tmake "TMAKEPATH=/local/tmake/lib/hpux-g++" hello.pro -o Makefile -</pre> - -Example of how to evaluate a perl expression (print names of headers -and source files):<pre> - tmake hello -e 'Expand("HEADERS","SOURCES")' -</pre> - -<hr> -<h2><a name="progen"></a>The progen Utility</h2> - -The progen utility creates project files for you. It can be used like -this:<pre> - progen -n hello -o hello.pro -</pre> -If no .cpp or .h files are specified on the command line, progen -searches for .cpp and .h (except moc_*.cpp) in the current directory -and below. -<p> -Usage:<pre> - progen [options] [<em>C/C++ header files and source files</em>] -</pre> -Options:<pre> - -lower Lower-case letters in filenames (useful on Windows). - -n <em>name</em> Specify a project name (<code>TARGET</code>). - -o <em>file</em> Write output to <em>file</em> instead of stdout. - -t <em>file</em> Specify a template <em>file</em>. -</pre> - - -<hr> -<h2>Advanced Topics</h2> - -In most cases you will be happy with using tmake as described above, but -sometimes you need to add special compiler options or even add new -makefile rules. This chapter describes how to customize your makefiles. - -<h4>Conditional Project Settings</h4> - -If you need a special compiler option etc., you can add platform-dependent -settings in your project file:<pre> - solaris-cc:TMAKE_CC = /opt/bin/CC_5.0 - solaris-cc:TMAKE_CFLAGS = -pts - unix:TMAKE_LIBS = -lXext - win32:INCLUDEPATH = c:\myinclude - win32-borland:DEFINES = NO_BOOL -</pre> - -You can prefix a project variable with unix: or win32: to make it specific for -either Unix or Windows. You can also prefix a variable with -<em>platform-compiler</em> - -<h4>Your Own Templates</h4> - -If you know Perl programming, there is virtually no limitation to what you -can do with tmake. First you need to know how tmake works. - -<h4>Template Processing</h4> - -When you run tmake, it first reads the <tt>tmake.conf</tt> file. -This configuration file has the same syntax as the project file. - -tmake then reads the project file and sets the project variables it -finds, e.g. <code>HEADERS</code>, <code>SOURCES</code> etc. - -All variables and values are stored in a global associative Perl hash -array called <code>project</code>. For example, -<code>$project{"SOURCES"}</code> contains "hello.cpp main.cpp" -after processing hello.pro. - -When both the <tt>tmake.conf</tt> and the project files have been -read, tmake starts reading the template file line by line and -executes any Perl code it finds in the template. - -<ul> -<li>Anything after <code>#$</code> until newline is - evaluated as perl code. The perl code is substituted - with the contents of the <code>$text</code> - variable. -<li>Block of perl code: <code>#${</code> until - <code>#$}</code>. -<li>Comments; <code>#!</code> until newline is stripped. -<li>Anything else is copied directly from the template to - the output. -</ul> - -<p> -Example:<pre> - #! This is a comment which will be removed. - This text will appear in the output. - #$ $text = "The header file(s) are: " . $project{"HEADERS"}; - # This text also appears in the output. - #${ - $a = 12; - $b = 13; - $text = $a * $b; - #$} - That's all. -</pre> -Output:<pre> - This text will appear in the output. - The header file(s) are: hello.h - # This text also appears in the output. - 156 - That's all. -</pre> - - -<h3>Using tmake With Lex and Yacc</h3> - -The standard tmake templates knows how to process C and C++ files, but -sometimes you need to process additional files and link them into your -project. A typical example is to process lex and yacc files when you're -building a parser. - -<p> -Parser template:<pre> - #! - #! parser.t: This is a custom template for building a parser - #! - #$ IncludeTemplate("app.t"); - - ####### Lex/yacc programs and options - - LEX = flex - YACC = #$ $text = ($is_unix ? "yacc -d" : "byacc -d"); - - ####### Lex/yacc files - - LEXIN = #$ Expand("LEXINPUT"); - LEXOUT = lex.yy.c - YACCIN = #$ Expand("YACCINPUT"); - YACCOUT = y.tab.c - YACCHDR = y.tab.h - PARSER = #$ Expand("PARSER"); - - ####### Process lex/yacc files - - $(LEXOUT): $(LEXIN) - $(LEX) $(LEXIN) - - $(PARSER): $(YACCIN) $(LEXOUT) - $(YACC) $(YACCIN) - #$ $text = ($is_unix ? "-rm -f " : "-del ") . '$(PARSER)'; - #$ $text = ($is_unix ? "-mv " : "-ren ") . '$(YACCOUT) $(PARSER)'; -</pre> - -The parser template adds some extra rules to the application template -in order to build the lex and yacc portions of the project. This -template is portable across Unix and Windows since it generates different -commands depending on the <code>$is_unix</code> variable. - -<p> -To learn more about the Expand() function and other Perl functions which -tmake provides, consult the <a href="tmake_ref.html">reference manual</a>. - -<p> -Example project file:<pre> - TEMPLATE = parser.t - CONFIG = console release - LEXINPUT = lexer.l - YACCINPUT = grammar.y - PARSER = parser.cpp - SOURCES = $$PARSER \ - node.cpp \ - asmgen.cpp - TARGET = parser -</pre> - -Here we use macro expansion <code>$$PARSER</code> to avoid writing parser.cpp -two places. - - -<h3>Counting the Number of Code Lines</h3> - -tmake is generic since it is based on Perl. You can create your own -templates for other purposes than producing makefiles. Here is an example -template that counts the number of code lines in our project. - -<p> -Template wc.t:<pre> - #! Template that count number of C++ lines. - The number of C++ code lines for #$ $text=$project_name; - #${ - $files = $project{"HEADERS"} . " " . $project{"SOURCES"}; - $text = `wc -l $files`; - #$} -</pre> -Run it:<pre> - tmake -t wc hello -</pre> -Output:<pre> - The number of C++ code lines for hello.pro - 25 hello.h - 98 hello.cpp - 38 main.cpp - 161 total -</pre> -This will only work if the wc program is installed on your system. - - -</body></html> diff --git a/tmake/doc/tmake_ref.html b/tmake/doc/tmake_ref.html deleted file mode 100644 index c9124c4..0000000 --- a/tmake/doc/tmake_ref.html +++ /dev/null @@ -1,463 +0,0 @@ -<!doctype HTML public "-//W3C//DTD HTML 3.2//EN"> -<html><head><title> -Reference Manual - tmake -</title></head><body bgcolor="#ffffff"> -<p><h1 align=center>Reference Manual - tmake</h1> - -<hr> -<h2>Project Variable Reference</h2> - -<h4><a name="ALL_DEPS"></a>ALL_DEPS</h4> -Specifies additional dependencies for the makefile target "all:".<p> - - -<h4><a name="CLEAN_FILES"></a>CLEAN_FILES</h4> -Specifies additional files to be removed for "make clean".<p> -Example:<pre> - CLEAN_FILES = core *~ -</pre> - - -<h4><a name="CONFIG"></a>CONFIG</h4> -Sets the make configuration. It tells the tmake templates what compiler -options to use and which extra libraries to link in.<p> -These options control the compilation flags: -<p> -<table border="0"> - <tr> - <td> </td> - <td>release</td> - <td> </td> - <td>Compile with optimization enabled, ignored if - "debug" is specified.</td> - </tr> - <tr> - <td> </td> - <td>debug</td> - <td> </td> - <td>Compile with debug options enabled.</td> - </tr> - <tr> - <td> </td> - <td>warn_on</td> - <td> </td> - <td>The compiler should emit more warnings than normally, ignored if - "warn_off" is specified.</td> - </tr> - <tr> - <td> </td> - <td>warn_off</td> - <td> </td> - <td>The compiler should emit no warnings or as few as possible.</td> - </tr> -</table> - -<p> -These options defines the application/library type: -<p> -<table border="0"> - <tr> - <td> </td> - <td>qt</td> - <td> </td> - <td>The target is a Qt application/library and requires Qt header - files/library.</td> - </tr> - <tr> - <td> </td> - <td>opengl</td> - <td> </td> - <td>The target requires the OpenGL (or Mesa) headers/libraries.</td> - </tr> - <tr> - <td> </td> - <td>x11</td> - <td> </td> - <td>The target is a X11 application (app.t only).</td> - </tr> - <tr> - <td> </td> - <td>windows</td> - <td> </td> - <td>The target is a Win32 window application (app.t only).</td> - </tr> - <tr> - <td> </td> - <td>console</td> - <td> </td> - <td>The target is a Win32 console application (app.t only).</td> - </tr> - <tr> - <td> </td> - <td>dll</td> - <td> </td> - <td>The target is a shared object/DLL (app.t only).</td> - </tr> - <tr> - <td> </td> - <td>staticlib</td> - <td> </td> - <td>The target is a static library (lib.t only).</td> - </tr> -</table> - - -<h4><a name="DEFINES"></a>DEFINES</h4> -Specifies C/C++ macros (-D compiler option). On Windows you need -to let DEFINES contain "QT_DLL" if you are building a Qt program -which should link with the Qt DLL. - - -<h4><a name="DEF_FILE"></a>DEF_FILE</h4> -Win32/app.t only: Specifies a .def file. - - -<h4><a name="DESTDIR"></a>DESTDIR</h4> -Specifies where to put the target file. -Example:<pre> - DESTDIR = ../../lib -</pre> -You must create this directory before running make. - - -<h4><a name="HEADERS"></a>HEADERS</h4> -Defines the header files of the project. - - -<h4><a name="INCPATH"></a>INCPATH</h4> -This variable is generated from <code>INCLUDEPATH</code>. The ';' or ':' -separators have been replaced by ' ' (single space). This makes it -easier to split. qtapp.t and other templates expand -<code>INCPATH</code> to set -I options for the C++ compiler. - - -<h4><a name="INCLUDEPATH"></a>INCLUDEPATH</h4> -This variable specifies the #include directories. It can be set in the -project file, or by the <a href="#AddIncludePath">AddIncludePath()</a> -function.<p> -Example:<pre> - INCLUDEPATH = c:\msdev\include d:\stl\include -</pre> -Use ';' or space as the directory separator. - - -<h4><a name="LIBS"></a>LIBS</h4> -Defines additional libraries to be linked in when creating an application -or a shared library. You probably want to use a platform qualifier since -libraries are specified differently on Unix and Win32.<p> -Example:<pre> - unix:LIBS = -lXext -lm - win32:LIBS = ole32.lib -</pre> - - -<h4><a name="MOC_DIR"></a>MOC_DIR</h4> -Specifies where to put the temporary moc output files. By default they -are stored in the directory where the moc input files are. -<p> -Example:<pre> - MOC_DIR = tmp -</pre> -You must create this directory before running make. -<p> -See also: <a href="#OBJECTS_DIR">OBJECTS_DIR</a>. - - -<h4><a name="OBJECTS"></a>OBJECTS</h4> -This varialble is generated from <code>SOURCES</code> by the StdInit() function. -The extension of each source file has been replaced by .o (Unix) or .obj -(Win32).<p> -Example:<pre> - SOURCES = a.x b.y -</pre> -Then <code>OBJECTS</code> become "a.o b.o" on Unix and "a.obj b.obj" on -Win32. - - -<h4><a name="OBJECTS_DIR"></a>OBJECTS_DIR</h4> -Specifies where to put object files. By default they are stored in -the directory where the source files are.<p> -Example:<pre> - OBJECTS_DIR = tmp -</pre> -You must create this directory before running make. -<p> -See also: <a href="#MOC_DIR">MOC_DIR</a>. - - -<h4><a name="OBJMOC"></a>OBJMOC</h4> -This variable is generated by the <a href="#StdInit">StdInit()</a> function if -<code>$moc_aware</code> is true. <code>OBJMOC</code> contains the name of -all intermediate moc object files.<p> -Example:<pre> - HEADERS = demo.h - SOURCES = demo.cpp main.cpp -</pre> -If <tt>demo.h</tt> and <tt>main.cpp</tt> define classes that use signals -and slots (i.e. the <code>Q_OBJECT</code> "keyword" is found in these two -files), <code>OBJMOC</code> becomes:<pre> - OBJMOC = moc_demo.obj -</pre> -See also: <a href="#SRCMOC">SRCMOC</a>. - - -<h4><a name="PROJECT"></a>PROJECT</h4> -This is the name of the project. It defaults to the name of the project -file, excluding the .pro extension. - - -<h4><a name="RC_FILE"></a>RC_FILE</h4> -Win32/app.t only: Specifies a .rc file. Cannot be used with the RES_FILE -variable. - - -<h4><a name="RES_FILE"></a>RES_FILE</h4> -Win32/app.t only: Specifies a .res file. You can either specify a -.rc file or one or more .res files. - - -<h4><a name="SOURCES"></a>SOURCES</h4> -Defines the source files of the project. - - -<h4><a name="SRCMOC"></a>SRCMOC</h4> -This variable is generated by the <a href="#StdInit">StdInit()</a> function if -<code>CONFIG</code> contains "qt". <code>SRCMOC</code> contains the name of -all intermediate moc files.<p> -Example:<pre> - HEADERS = demo.h - SOURCES = demo.cpp main.cpp -</pre> -If <tt>demo.h</tt> and <tt>main.cpp</tt> define classes that use signals -and slots (i.e. the <code>Q_OBJECT</code> "keyword" is found in these two -files), <code>SRCMOC</code> becomes:<pre> - SRCMOC = moc_demo.cpp main.moc -</pre> -See also: <a href="#OBJMOC">OBJMOC</a>. - - -<h4><a name="TARGET"></a>TARGET</h4> -Sets the makefile target, i.e. what program to build. - - -<h4><a name="TEMPLATE"></a>TEMPLATE</h4> -Sets the default template. This can be overridden by the tmake -t -<a href="tmake.html#usage">option</a>. - - -<h4><a name="TMAKE_CC"></a>TMAKE_CC</h4> -Contains the name of the compiler. - - -<h4><a name="TMAKE_CFLAGS"></a>TMAKE_CFLAGS</h4> -Contains the default compiler flags. - - -<h4><a name="TMAKE_FILEVARS"></a>TMAKE_FILEVARS</h4> -Tells tmake which variables contain file names. This is because tmake -on Windows replace the directory separator / with \. - - -<hr> -<h2>Function Reference</h2> -This section contains a brief description of some important -tmake functions used by the templates. - - -<h3><a name="AddIncludePath"></a>AddIncludePath(path)</h3> -Adds <em>path</em> to the include path variable, -<a href="#INCLUDEPATH">INCLUDEPATH</a>. The include path is used -for two purposes:<ol> -<li>Searching files when generating include dependencies. -<li>Setting -I options for the C/C++ compiler. -</ol> -<p> -Example:<pre> - #$ AddIncludePath('$QTDIR/include;/local/include'); -</pre> - - -<h3>BuildMocObj(objects,sources)</h3> -Creates build rules for moc source files. Generates -include dependencies.<p> -Example:<pre> - #$ BuildMocObj($project{"OBJMOC"},$project{"SRCMOC"}); -</pre>Output:<pre> - moc_hello.o: moc_hello.cpp \ - hello.h \ - ... -</pre> - -<h3>BuildMocSrc(files)</h3> -Creates moc source files from C++ files containing classes that -define signals and slots. For a header file <tt>x.h</tt>, the -generated moc file is called <tt>moc_x.h</tt>. For a source file -<tt>y.cpp</tt>, the generates moc file is called <tt>y.moc</tt> and -should be #include'd by <tt>y.cpp</tt>.<p> -Example:<pre> - #$ BuildMocSrc($project{"HEADERS"}); - #$ BuildMocSrc($project{"SOURCES"}); -</pre>Output:<pre> - moc_hello.cpp: hello.h - $(MOC) hello.h -o moc_hello.cpp -</pre> - - -<h3>BuildObj(objects,sources)</h3> -Creates build rules for source files. Generates -include dependencies.<p> -Example:<pre> - #$ BuildObj($project{"OBJECTS"},$project{"SOURCES"}); -</pre>Output:<pre> - hello.o: hello.cpp \ - hello.h \ - ... - - main.o: main.cpp \ - hello.h \ - ... -</pre> - - -<h3>Config(string)</h3> -Returns true if the <code>CONFIG</code> variable contains the given string. -<p>Example:<pre> - #$ if ( Config("release") { } -</pre> - - -<h3>DisableOutput()</h3> -Call this function to force tmake to generate no output until -EnableOutput() is called. -<p>Example:<pre> - #$ Config("debug") && DisableOutput(); - Anything here is skipped if CONFIG contains "debug". - #$ Config("debug") && EnableOutput(); -</pre> - - -<h3>EnableOutput()</h3> -Enables tmake output after DisableOutput() was called. - - -<h3>Expand(var)</h3> -Expands a project variable. Equivalent to <code>$text = $project{$var}</code>. -<p>Example:<pre> - VERSION = #$ Expand("VERSION"); -</pre>Output:<pre> - VERSION = 1.1 -</pre> - -<h3>ExpandGlue(var,prepend,glue,append)</h3> -Expands a $project{} variable, splits on whitespace -and joins with $glue. $prepend is put at the start -of the string and $append is put at the end of the -string. The resulting string ($text) becomes "" if -the project variable is empty or not defined.<p> -Example:<pre> - clear: - #$ ExpandGlue("OBJECTS","-del","\n\t-del ",""); -</pre>Output (Windows NT):<pre> - clear: - -del hello.obj - -del main.obj -</pre> - - -<h3>ExpandList(var)</h3> -This function is suitable for expanding lists of files. -Equivalent with <code>ExpandGlue($var,""," \\\n\t\t","")</code>.<p> -Example:<pre> - OBJECTS = #$ ExpandList("OBJECTS"); -</pre>Output:<pre> - OBJECTS = hello.o \ - main.o -</pre> - - -<h3>ExpandPath(var,prepend,glue,append)</h3> -Similar to ExpandGlue, except that it splits the items on a semicolon -instead of space (if the variable contains at least one semicolon). - - -<h3>IncludeTemplate(file)</h3> -Includes a template file. The ".t" extension is optional.<p> -Example:<pre> - #$ IncludeTemplate("mytemplate"); -</pre> - - -<h3>Now()</h3> -Sets $text to the current date and time.<p> -Example:<pre> - # Generated at #$ Now() -</pre>Output:<pre> - # Generated at 12:58, 1996/11/19 -</pre> - - -<h3>Project(strings)</h3> -This is a powerful function for setting and reading project -variables. Returns the resulting project variables (joined with space -between). -<p>Examples:<pre> -# Get a project variable: - $s = Project("TEMPLATE"); -> $s = "TEMPLATE" - -# Set a project variable: - Project("TEMPLATE = lib"); -> TEMPLATE = lib - Project("CONFIG =";) -> CONFIG empty - -# Append to a project variable: - Project("CONFIG = qt"); -> CONFIG = qt - Project("CONFIG += debug"); -> CONFIG = qt debug - -# Append to a project variable if it does not contain the value already: - Project("CONFIG = qt release"); -> CONFIG = qt release - Project("CONFIG *= qt"); -> CONFIG = qt release - Project("CONFIG *= opengl"); -> CONFIG = qt release opengl - -# Subtract from a project variable: - Project("THINGS = abc xyz"); -> THINGS = abc xyz - Project("THINGS -= abc"); -> THINGS = xyz - -# Search/replace on a project variable: - Project("CONFIG = tq opengl"); -> CONFIG = tq opengl - Project("CONFIG /= s/tq/qt/"); -> CONFIG = qt opengl - -# The operations can be performed on several project variables at a time. - - Project("TEMPLATE = app", "CONFIG *= opengl", "THINGS += klm"); -</pre> - - -<h3><a name="ScanProject"></a>ScanProject(file)</h3> -Scans a project file and stores the project variables and values in the -global associative <code>%project</code> array. - - -<h3><a name="StdInit"></a>StdInit()</h3> -Standard initialization of tmake. StdInit() should be -called from one of the first lines in the template.<p> - -This function creates some new project variables:<ul> -<li><code><a href="#OBJECTS">OBJECTS</a></code> - - Object files corresponding to - <code><a href="#SOURCES">SOURCES</a></code>. -<li><code><a href="#SRCMOC">SRCMOC</a></code> - moc source files. -<li><code><a href="#OBJMOC">OBJMOC</a></code> - moc object files. -</ul> - -The moc-related variables are created only if <code>CONFIG</code> contains "qt" - - -<h3>Substitute(string)</h3> -This function takes a string and substitutes any occurrence of $$var -with the actual content of the variable. Returns the substituted string. -Also sets $text. -<p> -Important: Use single quotes around the string, otherwise perl will expand -any $vars it finds. -<p>Example:<pre> - Substitute('Project name: $$PROJECT, uses template $$TEMPLATE'); -</pre> diff --git a/tmake/example/hello.cpp b/tmake/example/hello.cpp deleted file mode 100644 index 4868c4d..0000000 --- a/tmake/example/hello.cpp +++ /dev/null @@ -1,102 +0,0 @@ -/**************************************************************************** -** -** -** Copyright (C) 1992-1998 Troll Tech AS. All rights reserved. -** -** This file is part of an example program for Qt. This example -** program may be used, distributed and modified without limitation. -** -*****************************************************************************/ - -#include "hello.h" -#include <qpushbutton.h> -#include <qtimer.h> -#include <qpainter.h> -#include <qpixmap.h> - - -/* - Constructs a Hello widget. Starts a 40 ms animation timer. -*/ - -Hello::Hello( const char *text, QWidget *parent, const char *name ) - : QWidget(parent,name), t(text), b(0) -{ - QTimer *timer = new QTimer(this); - connect( timer, SIGNAL(timeout()), SLOT(animate()) ); - timer->start( 40 ); - - resize( 200, 100 ); -} - - -/* - This private slot is called each time the timer fires. -*/ - -void Hello::animate() -{ - b = (b + 1) & 15; - repaint( FALSE ); -} - - -/* - Handles mouse button release events for the Hello widget. - - We emit the clicked() signal when the mouse is released inside - the widget. -*/ - -void Hello::mouseReleaseEvent( QMouseEvent *e ) -{ - if ( rect().contains( e->pos() ) ) - emit clicked(); -} - - -/* - Handles paint events for the Hello widget. - - Flicker-free update. The text is first drawn in the pixmap and the - pixmap is then blt'ed to the screen. -*/ - -void Hello::paintEvent( QPaintEvent * ) -{ - static int sin_tbl[16] = { - 0, 38, 71, 92, 100, 92, 71, 38, 0, -38, -71, -92, -100, -92, -71, -38}; - - if ( t.isEmpty() ) - return; - - // 1: Compute some sizes, positions etc. - QFontMetrics fm = fontMetrics(); - int w = fm.width(t) + 20; - int h = fm.height() * 2; - int pmx = width()/2 - w/2; - int pmy = height()/2 - h/2; - - // 2: Create the pixmap and fill it with the widget's background - QPixmap pm( w, h ); - pm.fill( this, pmx, pmy ); - - // 3: Paint the pixmap. Cool wave effect - QPainter p; - int x = 10; - int y = h/2 + fm.descent(); - int i = 0; - p.begin( &pm ); - p.setFont( font() ); - while ( t[i] ) { - int i16 = (b+i) & 15; - p.setPen( QColor((15-i16)*16,255,255,QColor::Hsv) ); - p.drawText( x, y-sin_tbl[i16]*h/800, &t[i], 1 ); - x += fm.width( t[i] ); - i++; - } - p.end(); - - // 4: Copy the pixmap to the Hello widget - bitBlt( this, pmx, pmy, &pm ); -} diff --git a/tmake/example/hello.h b/tmake/example/hello.h deleted file mode 100644 index 07fb8c5..0000000 --- a/tmake/example/hello.h +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** -** Copyright (C) 1992-1998 Troll Tech AS. All rights reserved. -** -** This file is part of an example program for Qt. This example -** program may be used, distributed and modified without limitation. -** -*****************************************************************************/ - -#ifndef HELLO_H -#define HELLO_H - -#include <qwidget.h> - - -class Hello : public QWidget -{ - Q_OBJECT -public: - Hello( const char *text, QWidget *parent=0, const char *name=0 ); -signals: - void clicked(); -protected: - void mouseReleaseEvent( QMouseEvent * ); - void paintEvent( QPaintEvent * ); -private slots: - void animate(); -private: - QString t; - int b; -}; - -#endif diff --git a/tmake/example/hello.pro b/tmake/example/hello.pro deleted file mode 100644 index a299923..0000000 --- a/tmake/example/hello.pro +++ /dev/null @@ -1,3 +0,0 @@ -HEADERS = hello.h -SOURCES = hello.cpp main.cpp -TARGET = hello diff --git a/tmake/example/main.cpp b/tmake/example/main.cpp deleted file mode 100644 index 4b55a58..0000000 --- a/tmake/example/main.cpp +++ /dev/null @@ -1,38 +0,0 @@ -// -// File: main.cpp -// -// A small Qt example application written by Troll Tech. -// -// It displays a text in a window and quits when you click -// the mouse in the window. -// - -#include "hello.h" -#include <qapp.h> - - -/* - The program starts here. It parses the command line and build a message - string to be displayed by the Hello widget. -*/ - -int main( int argc, char **argv ) -{ - QApplication a(argc,argv); - QString s; - for ( int i=1; i<argc; i++ ) { - s += argv[i]; - if ( i<argc-1 ) - s += " "; - } - if ( s.isEmpty() ) - s = "Hello, World"; - Hello h( s ); - h.setCaption( "Qt says hello" ); - QObject::connect( &h, SIGNAL(clicked()), &a, SLOT(quit()) ); - h.setFont( QFont("times",32,QFont::Bold) ); // default font - h.setBackgroundColor( white ); // default bg color - a.setMainWidget( &h ); - h.show(); - return a.exec(); -} diff --git a/tmake/example/wc.t b/tmake/example/wc.t deleted file mode 100644 index dc041b5..0000000 --- a/tmake/example/wc.t +++ /dev/null @@ -1,6 +0,0 @@ -#! Template that count number of C++ lines -The number of C++ code lines for #$ $text=$project_name; -#${ - $files = $project{"HEADERS"} . " " . $project{"SOURCES"}; - $text = `wc -l $files`; -#$} diff --git a/tmake/lib/aix-g++/app.t b/tmake/lib/aix-g++/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/aix-g++/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/aix-g++/lib.t b/tmake/lib/aix-g++/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/aix-g++/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/aix-g++/subdirs.t b/tmake/lib/aix-g++/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/aix-g++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/aix-g++/tmake.conf b/tmake/lib/aix-g++/tmake.conf deleted file mode 100644 index 897d509..0000000 --- a/tmake/lib/aix-g++/tmake.conf +++ /dev/null @@ -1,58 +0,0 @@ -# -# -# -# tmake configuration for aix-g++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -TMAKE_CFLAGS_WARN_ON = -Wall -W -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = g++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = /usr/X11R6/include -TMAKE_LIBDIR_X11 = /usr/X11R6/lib -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = /usr/X11R6/include -TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib - -TMAKE_LINK = g++ -TMAKE_LINK_SHLIB = -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -TMAKE_LFLAGS_SONAME = - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cqs -TMAKE_RANLIB = - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/aix-xlc/app.t b/tmake/lib/aix-xlc/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/aix-xlc/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/aix-xlc/lib.t b/tmake/lib/aix-xlc/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/aix-xlc/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/aix-xlc/subdirs.t b/tmake/lib/aix-xlc/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/aix-xlc/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/aix-xlc/tmake.conf b/tmake/lib/aix-xlc/tmake.conf deleted file mode 100644 index 4013923..0000000 --- a/tmake/lib/aix-xlc/tmake.conf +++ /dev/null @@ -1,64 +0,0 @@ -# -# -# -# tmake configuration for aix-xlc -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = xlc -TMAKE_CFLAGS = -qstrict -TMAKE_CFLAGS_WARN_ON = -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -TMAKE_CFLAGS_YACC = - -TMAKE_CXX = xlC -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = -TMAKE_LIBDIR_X11 = -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = -TMAKE_LIBDIR_OPENGL = - -TMAKE_LINK = xlC -TMAKE_LINK_SHLIB = ld -TMAKE_LINK_SHLIB_CMD = /usr/lpp/xlC/bin/makeC++SharedLib -p 0 \ - -o lib$(TARGET).so.$(VER_MAJ).$(VER_MIN) \ - -lXext -lX11 $(OBJECTS) $(OBJMOC); \ - ar q lib$(TARGET).a lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ - ranlib lib$(TARGET).a; \ - mv lib$(TARGET).a $(DESTDIR) -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -TMAKE_LFLAGS_SONAME = - -TMAKE_LIBS = -liconv -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cq -TMAKE_RANLIB = ranlib - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/beos-g++/app.t b/tmake/lib/beos-g++/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/beos-g++/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/beos-g++/lib.t b/tmake/lib/beos-g++/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/beos-g++/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/beos-g++/subdirs.t b/tmake/lib/beos-g++/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/beos-g++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/beos-g++/tmake.conf b/tmake/lib/beos-g++/tmake.conf deleted file mode 100644 index b6649c9..0000000 --- a/tmake/lib/beos-g++/tmake.conf +++ /dev/null @@ -1,51 +0,0 @@ -# -# -# -# tmake configuration for linux-g++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -TMAKE_CFLAGS_WARN_ON = -Wall -W -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -fPIC -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = g++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib - -TMAKE_LINK = g++ -TMAKE_LINK_SHLIB = g++ -TMAKE_LFLAGS = -Wl,-rpath=/lib:$(QTDIR)/lib -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -shared -TMAKE_LFLAGS_SONAME = -Wl,-soname, - -TMAKE_LIBS = -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt - -TMAKE_MOC = moc - -TMAKE_AR = ar cqs -TMAKE_RANLIB = - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/bsdi-g++/app.t b/tmake/lib/bsdi-g++/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/bsdi-g++/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/bsdi-g++/lib.t b/tmake/lib/bsdi-g++/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/bsdi-g++/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/bsdi-g++/subdirs.t b/tmake/lib/bsdi-g++/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/bsdi-g++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/bsdi-g++/tmake.conf b/tmake/lib/bsdi-g++/tmake.conf deleted file mode 100644 index 65f7316..0000000 --- a/tmake/lib/bsdi-g++/tmake.conf +++ /dev/null @@ -1,61 +0,0 @@ -# -# -# -# tmake configuration for bsdi-shlicc++, bsdi 4.0 -# -# shlicc/++ is a BSDI wrapper around cc/g++ that enables shared libs -# (info/7367) -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -TMAKE_CFLAGS_WARN_ON = -Wall -W -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -fPIC -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = shlicc++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = /usr/X11R6/include -TMAKE_LIBDIR_X11 = /usr/X11R6/lib -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = /usr/X11R6/include -TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib - -TMAKE_LINK = shlicc++ -TMAKE_LINK_SHLIB = shlicc++ -TMAKE_LFLAGS = -Wl,-rpath=/lib:/usr/X11R6/lib:$(QTDIR)/lib -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -shared -TMAKE_LFLAGS_SONAME = -Wl,-soname, - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cqs -TMAKE_RANLIB = - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/dgux-g++/app.t b/tmake/lib/dgux-g++/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/dgux-g++/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/dgux-g++/lib.t b/tmake/lib/dgux-g++/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/dgux-g++/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/dgux-g++/subdirs.t b/tmake/lib/dgux-g++/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/dgux-g++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/dgux-g++/tmake.conf b/tmake/lib/dgux-g++/tmake.conf deleted file mode 100644 index f4132d1..0000000 --- a/tmake/lib/dgux-g++/tmake.conf +++ /dev/null @@ -1,59 +0,0 @@ -# -# -# -# tmake configuration for linux-g++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -TMAKE_CFLAGS_WARN_ON = -Wall -W -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -fPIC -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = g++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = /usr/X11R6/include -TMAKE_LIBDIR_X11 = /usr/X11R6/lib -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = /usr/X11R6/include -TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib - -TMAKE_LINK = g++ -TMAKE_LINK_SHLIB = g++ -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -shared -# "Frithjof.Brestrich" <brest@infp.fzk.de> suggests -h not -soname -TMAKE_LFLAGS_SONAME = -Wl,-h, - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cq -TMAKE_RANLIB = - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/freebsd-g++/app.t b/tmake/lib/freebsd-g++/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/freebsd-g++/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/freebsd-g++/lib.t b/tmake/lib/freebsd-g++/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/freebsd-g++/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/freebsd-g++/subdirs.t b/tmake/lib/freebsd-g++/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/freebsd-g++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/freebsd-g++/tmake.conf b/tmake/lib/freebsd-g++/tmake.conf deleted file mode 100644 index 0b3c497..0000000 --- a/tmake/lib/freebsd-g++/tmake.conf +++ /dev/null @@ -1,60 +0,0 @@ -# -# -# -# tmake configuration for freebsd-g++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -pipe -TMAKE_CFLAGS_WARN_ON = -Wall -W -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -fPIC -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = g++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = /usr/X11R6/include -TMAKE_LIBDIR_X11 = /usr/X11R6/lib -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = /usr/X11R6/include -TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib - -TMAKE_LINK = g++ -TMAKE_LINK_SHLIB = g++ -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -shared - -# soname does not work on fbsd 2.x -#TMAKE_LFLAGS_SONAME = -Wl,-soname - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cqs -TMAKE_RANLIB = - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/gnu-g++/app.t b/tmake/lib/gnu-g++/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/gnu-g++/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/gnu-g++/lib.t b/tmake/lib/gnu-g++/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/gnu-g++/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/gnu-g++/subdirs.t b/tmake/lib/gnu-g++/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/gnu-g++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/gnu-g++/tmake.conf b/tmake/lib/gnu-g++/tmake.conf deleted file mode 100644 index 635bc5c..0000000 --- a/tmake/lib/gnu-g++/tmake.conf +++ /dev/null @@ -1,58 +0,0 @@ -# -# -# -# tmake configuration for linux-g++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -TMAKE_CFLAGS_WARN_ON = -Wall -W -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -fPIC -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = g++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = /usr/X11R6/include -TMAKE_LIBDIR_X11 = /usr/X11R6/lib -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = /usr/X11R6/include -TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib - -TMAKE_LINK = g++ -TMAKE_LINK_SHLIB = g++ -TMAKE_LFLAGS = -Wl,-rpath=/lib:/usr/X11R6/lib:$(QTDIR)/lib -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -shared -TMAKE_LFLAGS_SONAME = -Wl,-soname, - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cqs -TMAKE_RANLIB = - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/hpux-acc/app.t b/tmake/lib/hpux-acc/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/hpux-acc/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/hpux-acc/lib.t b/tmake/lib/hpux-acc/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/hpux-acc/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/hpux-acc/subdirs.t b/tmake/lib/hpux-acc/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/hpux-acc/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/hpux-acc/tmake.conf b/tmake/lib/hpux-acc/tmake.conf deleted file mode 100644 index dbd0c8e..0000000 --- a/tmake/lib/hpux-acc/tmake.conf +++ /dev/null @@ -1,60 +0,0 @@ -# -# -# -# tmake configuration for hpux-acc -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = aCC -TMAKE_CFLAGS = -w -D__STRICT_ANSI__ -DPNG_USE_LOCAL_ARRAYS -TMAKE_CFLAGS_WARN_ON = -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = +Z -TMAKE_CFLAGS_YACC = - -TMAKE_CXX = aCC -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = /usr/include/X11R6 -TMAKE_LIBDIR_X11 = /usr/lib/X11R6 -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = -TMAKE_LIBDIR_OPENGL = /opt/graphics/OpenGL/lib - -TMAKE_LINK = aCC -TMAKE_LINK_SHLIB = aCC -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -b -TMAKE_LFLAGS_SONAME = -TMAKE_HPUX_SHLIB = 1 - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -lICE -lSM -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -lGL -TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu -TMAKE_LIBS_YACC = -ly - -TMAKE_MOC = moc - -TMAKE_AR = ar cq -TMAKE_RANLIB = - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/hpux-cc/app.t b/tmake/lib/hpux-cc/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/hpux-cc/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/hpux-cc/lib.t b/tmake/lib/hpux-cc/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/hpux-cc/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/hpux-cc/subdirs.t b/tmake/lib/hpux-cc/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/hpux-cc/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/hpux-cc/tmake.conf b/tmake/lib/hpux-cc/tmake.conf deleted file mode 100644 index b5881ec..0000000 --- a/tmake/lib/hpux-cc/tmake.conf +++ /dev/null @@ -1,59 +0,0 @@ -# -# -# -# tmake configuration for hpux-cc -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = cc -TMAKE_CFLAGS = -w +a1 -DAportable -TMAKE_CFLAGS_WARN_ON = -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = +Z -TMAKE_CFLAGS_YACC = - -TMAKE_CXX = CC -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = /usr/include/X11R6 -TMAKE_LIBDIR_X11 = /usr/lib/X11R6 -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = -TMAKE_LIBDIR_OPENGL = - -TMAKE_LINK = CC -TMAKE_LINK_SHLIB = CC -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -b -TMAKE_LFLAGS_SONAME = -TMAKE_HPUX_SHLIB = 1 - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cq -TMAKE_RANLIB = - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/hpux-g++/app.t b/tmake/lib/hpux-g++/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/hpux-g++/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/hpux-g++/lib.t b/tmake/lib/hpux-g++/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/hpux-g++/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/hpux-g++/subdirs.t b/tmake/lib/hpux-g++/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/hpux-g++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/hpux-g++/tmake.conf b/tmake/lib/hpux-g++/tmake.conf deleted file mode 100644 index fb39414..0000000 --- a/tmake/lib/hpux-g++/tmake.conf +++ /dev/null @@ -1,60 +0,0 @@ -# -# -# -# tmake configuration for hpux-g++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -TMAKE_CFLAGS_WARN_ON = -Wall -W -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O0 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -fPIC -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = g++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = /usr/include/X11R6 -TMAKE_LIBDIR_X11 = /usr/lib/X11R6 -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = -TMAKE_LIBDIR_OPENGL = - -TMAKE_LINK = g++ -TMAKE_LINK_SHLIB = g++ -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -fPIC -shared -TMAKE_LFLAGS_SONAME = -TMAKE_HPUX_SHLIB = 1 - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cq -TMAKE_RANLIB = - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/irix-64/app.t b/tmake/lib/irix-64/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/irix-64/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/irix-64/lib.t b/tmake/lib/irix-64/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/irix-64/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/irix-64/subdirs.t b/tmake/lib/irix-64/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/irix-64/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/irix-64/tmake.conf b/tmake/lib/irix-64/tmake.conf deleted file mode 100644 index ac0e2fa..0000000 --- a/tmake/lib/irix-64/tmake.conf +++ /dev/null @@ -1,60 +0,0 @@ -# -# -# -# tmake configuration for irix-64 -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = cc -TMAKE_CFLAGS = -64 LANG:bool=ON -woff 1209,1233,1314,1355,1375,1506 -TMAKE_CFLAGS_WARN_ON = -fullwarn -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -OPT:Olimit=3000 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -TMAKE_CFLAGS_YACC = -woff 1110,1174,3262 - -TMAKE_CXX = CC -TMAKE_CXXFLAGS = -64 LANG:bool=ON -woff 1209,1233,1314,1355,1375,1506 -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = -TMAKE_LIBDIR_X11 = -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = -TMAKE_LIBDIR_OPENGL = - -TMAKE_LINK = CC -TMAKE_LINK_SHLIB = CC -TMAKE_LFLAGS = -64 -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -shared -TMAKE_LFLAGS_SONAME = -Wl,-soname, - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cq -TMAKE_RANLIB = - -TMAKE_CLEAN = -r so_locations ii_files - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/irix-dcc/app.t b/tmake/lib/irix-dcc/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/irix-dcc/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/irix-dcc/lib.t b/tmake/lib/irix-dcc/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/irix-dcc/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/irix-dcc/subdirs.t b/tmake/lib/irix-dcc/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/irix-dcc/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/irix-dcc/tmake.conf b/tmake/lib/irix-dcc/tmake.conf deleted file mode 100644 index 0fcbaa8..0000000 --- a/tmake/lib/irix-dcc/tmake.conf +++ /dev/null @@ -1,60 +0,0 @@ -# -# -# -# tmake configuration for irix-dcc -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = DCC -TMAKE_CFLAGS = -TMAKE_CFLAGS_WARN_ON = -fullwarn -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -TMAKE_CFLAGS_YACC = - -TMAKE_CXX = DCC -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = -TMAKE_LIBDIR_X11 = -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = -TMAKE_LIBDIR_OPENGL = - -TMAKE_LINK = DCC -TMAKE_LINK_SHLIB = DCC -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -shared -TMAKE_LFLAGS_SONAME = -Wl,-soname, - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cq -TMAKE_RANLIB = - -TMAKE_CLEAN = so_locations - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/irix-g++/app.t b/tmake/lib/irix-g++/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/irix-g++/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/irix-g++/lib.t b/tmake/lib/irix-g++/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/irix-g++/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/irix-g++/subdirs.t b/tmake/lib/irix-g++/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/irix-g++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/irix-g++/tmake.conf b/tmake/lib/irix-g++/tmake.conf deleted file mode 100644 index 2192c71..0000000 --- a/tmake/lib/irix-g++/tmake.conf +++ /dev/null @@ -1,60 +0,0 @@ -# -# -# -# tmake configuration for irix-g++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -TMAKE_CFLAGS_WARN_ON = -Wall -W -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O0 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -fPIC -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = g++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = -TMAKE_LIBDIR_X11 = -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = -TMAKE_LIBDIR_OPENGL = - -TMAKE_LINK = g++ -TMAKE_LINK_SHLIB = g++ -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -shared -TMAKE_LFLAGS_SONAME = -Wl,-soname, - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cq -TMAKE_RANLIB = ranlib - -TMAKE_CLEAN = so_locations - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/irix-n32/app.t b/tmake/lib/irix-n32/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/irix-n32/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/irix-n32/lib.t b/tmake/lib/irix-n32/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/irix-n32/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/irix-n32/subdirs.t b/tmake/lib/irix-n32/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/irix-n32/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/irix-n32/tmake.conf b/tmake/lib/irix-n32/tmake.conf deleted file mode 100644 index 9d8bcb4..0000000 --- a/tmake/lib/irix-n32/tmake.conf +++ /dev/null @@ -1,60 +0,0 @@ -# -# -# -# tmake configuration for irix-n32 -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = cc -TMAKE_CFLAGS = -n32 -mips3 LANG:bool=ON -woff 1209,1233,1314,1355,1375,1506 -TMAKE_CFLAGS_WARN_ON = -fullwarn -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -TMAKE_CFLAGS_YACC = -woff 1110,1174,3262 - -TMAKE_CXX = CC -TMAKE_CXXFLAGS = -n32 -mips3 LANG:bool=ON -woff 1209,1233,1314,1355,1375,1506 -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = -TMAKE_LIBDIR_X11 = -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = -TMAKE_LIBDIR_OPENGL = - -TMAKE_LINK = CC -TMAKE_LINK_SHLIB = CC -TMAKE_LFLAGS = -n32 -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -shared -TMAKE_LFLAGS_SONAME = -Wl,-soname, - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -lGL -TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cq -TMAKE_RANLIB = - -TMAKE_CLEAN = -r so_locations ii_files - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/irix-o32/app.t b/tmake/lib/irix-o32/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/irix-o32/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/irix-o32/lib.t b/tmake/lib/irix-o32/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/irix-o32/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/irix-o32/subdirs.t b/tmake/lib/irix-o32/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/irix-o32/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/irix-o32/tmake.conf b/tmake/lib/irix-o32/tmake.conf deleted file mode 100644 index 89b8728..0000000 --- a/tmake/lib/irix-o32/tmake.conf +++ /dev/null @@ -1,60 +0,0 @@ -# -# -# -# tmake configuration for irix-o32 -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = cc -TMAKE_CFLAGS = -32 LANG:bool=ON -woff 1209,1233,1314,1355,1375,1506 -TMAKE_CFLAGS_WARN_ON = -fullwarn -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -OPT:Olimit=3000 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -TMAKE_CFLAGS_YACC = -woff 1110,1174,3262 - -TMAKE_CXX = CC -TMAKE_CXXFLAGS = -32 LANG:bool=ON -woff 1209,1233,1314,1355,1375,1506 -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = -TMAKE_LIBDIR_X11 = -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = -TMAKE_LIBDIR_OPENGL = - -TMAKE_LINK = CC -TMAKE_LINK_SHLIB = CC -TMAKE_LFLAGS = -32 -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -shared -TMAKE_LFLAGS_SONAME = -Wl,-soname, - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cq -TMAKE_RANLIB = - -TMAKE_CLEAN = -r so_locations ii_files - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/linux-64/app.t b/tmake/lib/linux-64/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/linux-64/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/linux-64/lib.t b/tmake/lib/linux-64/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/linux-64/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/linux-64/subdirs.t b/tmake/lib/linux-64/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/linux-64/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/linux-64/tmake.conf b/tmake/lib/linux-64/tmake.conf deleted file mode 100644 index 334cb0f..0000000 --- a/tmake/lib/linux-64/tmake.conf +++ /dev/null @@ -1,59 +0,0 @@ -# -# -# -# tmake configuration for linux-g++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -pipe -TMAKE_CFLAGS_WARN_ON = -Wall -W -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -fPIC -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = g++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = /usr/X11R6/include -TMAKE_LIBDIR_X11 = /usr/X11R6/lib64 -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib64 -TMAKE_INCDIR_OPENGL = /usr/X11R6/include -TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64 - -TMAKE_LINK = g++ -TMAKE_LINK_SHLIB = g++ -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -g -TMAKE_LFLAGS_SHLIB = -shared -TMAKE_LFLAGS_SONAME = -Wl,-soname, - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_X11SM = -lICE -lSM -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cqs -TMAKE_RANLIB = - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/linux-g++/app.t b/tmake/lib/linux-g++/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/linux-g++/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/linux-g++/lib.t b/tmake/lib/linux-g++/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/linux-g++/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/linux-g++/subdirs.t b/tmake/lib/linux-g++/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/linux-g++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/linux-g++/tmake.conf b/tmake/lib/linux-g++/tmake.conf deleted file mode 100644 index e100bce..0000000 --- a/tmake/lib/linux-g++/tmake.conf +++ /dev/null @@ -1,59 +0,0 @@ -# -# -# -# tmake configuration for linux-g++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -pipe -fsigned-char -TMAKE_CFLAGS_WARN_ON = -Wall -W -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O3 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -fPIC -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = g++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = /usr/X11R6/include -TMAKE_LIBDIR_X11 = /usr/X11R6/lib -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = /usr/X11R6/include -TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib - -TMAKE_LINK = g++ -TMAKE_LINK_SHLIB = g++ -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -g -TMAKE_LFLAGS_SHLIB = -shared -TMAKE_LFLAGS_SONAME = -Wl,-soname, - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_X11SM = -lICE -lSM -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cqs -TMAKE_RANLIB = - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/m68k-atari-mint-g++/app.t b/tmake/lib/m68k-atari-mint-g++/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/m68k-atari-mint-g++/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/m68k-atari-mint-g++/lib.t b/tmake/lib/m68k-atari-mint-g++/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/m68k-atari-mint-g++/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/m68k-atari-mint-g++/subdirs.t b/tmake/lib/m68k-atari-mint-g++/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/m68k-atari-mint-g++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/m68k-atari-mint-g++/tmake.conf b/tmake/lib/m68k-atari-mint-g++/tmake.conf deleted file mode 100644 index 9e1b373..0000000 --- a/tmake/lib/m68k-atari-mint-g++/tmake.conf +++ /dev/null @@ -1,59 +0,0 @@ -# -# -# -# tmake configuration for linux-g++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -TMAKE_CFLAGS_WARN_ON = -Wall -W -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O0 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -fPIC -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = g++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = /usr/X11R6/include -TMAKE_LIBDIR_X11 = /usr/X11R6/lib -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = /usr/X11R6/include -TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib - -TMAKE_LINK = g++ -TMAKE_LINK_SHLIB = g++ -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -g -TMAKE_LFLAGS_SHLIB = -shared -TMAKE_LFLAGS_SONAME = -Wl,-soname, - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_X11SM = -lICE -lSM -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cqs -TMAKE_RANLIB = - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/macosx-c++/app.t b/tmake/lib/macosx-c++/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/macosx-c++/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/macosx-c++/lib.t b/tmake/lib/macosx-c++/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/macosx-c++/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/macosx-c++/subdirs.t b/tmake/lib/macosx-c++/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/macosx-c++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/macosx-c++/tmake.conf b/tmake/lib/macosx-c++/tmake.conf deleted file mode 100644 index 377b06f..0000000 --- a/tmake/lib/macosx-c++/tmake.conf +++ /dev/null @@ -1,59 +0,0 @@ -# -# -# -# tmake configuration for macosx-c++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = cc -TMAKE_CFLAGS = -pipe -TMAKE_CFLAGS_WARN_ON = -Wall -W -Wno-deprecated-declarations -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O3 -TMAKE_CFLAGS_DEBUG = -g -fstack-protector -TMAKE_CFLAGS_SHLIB = -fPIC -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = c++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -mmacosx-version-min=10.5 -DYY_TYPEDEF_YY_SIZE_T -Dyy_size_t=int -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = -TMAKE_LIBDIR_X11 = -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = /usr/X11R6/include -TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib - -TMAKE_LINK = c++ -TMAKE_LINK_SHLIB = c++ -TMAKE_LFLAGS = -Wl,-search_paths_first -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -shared - -TMAKE_LFLAGS_SONAME = -dynamiclib -install_name - -TMAKE_LIBS = -liconv -framework CoreServices -TMAKE_LIBS_X11 = -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cq -TMAKE_RANLIB = ranlib - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/macosx-intel-c++/app.t b/tmake/lib/macosx-intel-c++/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/macosx-intel-c++/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/macosx-intel-c++/lib.t b/tmake/lib/macosx-intel-c++/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/macosx-intel-c++/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/macosx-intel-c++/subdirs.t b/tmake/lib/macosx-intel-c++/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/macosx-intel-c++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/macosx-intel-c++/tmake.conf b/tmake/lib/macosx-intel-c++/tmake.conf deleted file mode 100644 index 33af519..0000000 --- a/tmake/lib/macosx-intel-c++/tmake.conf +++ /dev/null @@ -1,59 +0,0 @@ -# -# -# -# tmake configuration for macosx-c++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = cc -TMAKE_CFLAGS = -pipe -arch i386 -arch x86_64 -TMAKE_CFLAGS_WARN_ON = -Wall -W -Wno-deprecated-declarations -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -fPIC -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = c++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -mmacosx-version-min=10.5 -DYY_TYPEDEF_YY_SIZE_T -Dyy_size_t=int -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = -TMAKE_LIBDIR_X11 = -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = /usr/X11R6/include -TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib - -TMAKE_LINK = c++ -TMAKE_LINK_SHLIB = c++ -TMAKE_LFLAGS = -Wl,-search_paths_first -arch i386 -arch x86_64 -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -shared - -TMAKE_LFLAGS_SONAME = -dynamiclib -install_name - -TMAKE_LIBS = -liconv -framework CoreServices -mmacosx-version-min=10.5 -TMAKE_LIBS_X11 = -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cq -TMAKE_RANLIB = ranlib - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/macosx-uni-c++/app.t b/tmake/lib/macosx-uni-c++/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/macosx-uni-c++/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/macosx-uni-c++/lib.t b/tmake/lib/macosx-uni-c++/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/macosx-uni-c++/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/macosx-uni-c++/subdirs.t b/tmake/lib/macosx-uni-c++/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/macosx-uni-c++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/macosx-uni-c++/tmake.conf b/tmake/lib/macosx-uni-c++/tmake.conf deleted file mode 100644 index 9d7a4a8..0000000 --- a/tmake/lib/macosx-uni-c++/tmake.conf +++ /dev/null @@ -1,59 +0,0 @@ -# -# -# -# tmake configuration for macosx-c++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = cc -TMAKE_CFLAGS = -pipe -arch i386 -arch ppc -TMAKE_CFLAGS_WARN_ON = -Wall -W -Wno-deprecated-declarations -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -fPIC -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = c++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -mmacosx-version-min=10.5 -DYY_TYPEDEF_YY_SIZE_T -Dyy_size_t=int -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = -TMAKE_LIBDIR_X11 = -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = /usr/X11R6/include -TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib - -TMAKE_LINK = c++ -TMAKE_LINK_SHLIB = c++ -TMAKE_LFLAGS = -Wl,-search_paths_first -arch i386 -arch ppc -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -shared - -TMAKE_LFLAGS_SONAME = -dynamiclib -install_name - -TMAKE_LIBS = -liconv -framework CoreServices -mmacosx-version-min=10.5 -TMAKE_LIBS_X11 = -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cq -TMAKE_RANLIB = ranlib - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/netbsd-g++/app.t b/tmake/lib/netbsd-g++/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/netbsd-g++/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/netbsd-g++/lib.t b/tmake/lib/netbsd-g++/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/netbsd-g++/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/netbsd-g++/subdirs.t b/tmake/lib/netbsd-g++/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/netbsd-g++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/netbsd-g++/tmake.conf b/tmake/lib/netbsd-g++/tmake.conf deleted file mode 100644 index cad7876..0000000 --- a/tmake/lib/netbsd-g++/tmake.conf +++ /dev/null @@ -1,61 +0,0 @@ -# -# -# -# tmake configuration for netbsd-g++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -TMAKE_CFLAGS_WARN_ON = -Wall -W -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -fPIC -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = g++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = /usr/X11R6/include -TMAKE_LIBDIR_X11 = /usr/X11R6/lib -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = /usr/X11R6/include -TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib - -TMAKE_LINK = g++ -TMAKE_LINK_SHLIB = ld -TMAKE_LINK_SHLIB_CMD = $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) \ - `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | \ - tsort` $(LIBS) -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -Bshareable -TMAKE_LFLAGS_SONAME = - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cqs -TMAKE_RANLIB = - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/openbsd-g++/app.t b/tmake/lib/openbsd-g++/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/openbsd-g++/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/openbsd-g++/lib.t b/tmake/lib/openbsd-g++/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/openbsd-g++/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/openbsd-g++/subdirs.t b/tmake/lib/openbsd-g++/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/openbsd-g++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/openbsd-g++/tmake.conf b/tmake/lib/openbsd-g++/tmake.conf deleted file mode 100644 index 89cdc9b..0000000 --- a/tmake/lib/openbsd-g++/tmake.conf +++ /dev/null @@ -1,61 +0,0 @@ -# -# -# -# tmake configuration for netbsd-g++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -TMAKE_CFLAGS_WARN_ON = -Wall -W -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -fPIC -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = g++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = /usr/X11R6/include -TMAKE_LIBDIR_X11 = /usr/X11R6/lib -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = /usr/X11R6/include -TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib - -TMAKE_LINK = g++ -TMAKE_LINK_SHLIB = ld -TMAKE_LINK_SHLIB_CMD = $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) \ - `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | \ - tsort` $(LIBS) -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -Bshareable -TMAKE_LFLAGS_SONAME = - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar q -TMAKE_RANLIB = ranlib - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/osf1-cxx/app.t b/tmake/lib/osf1-cxx/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/osf1-cxx/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/osf1-cxx/lib.t b/tmake/lib/osf1-cxx/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/osf1-cxx/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/osf1-cxx/subdirs.t b/tmake/lib/osf1-cxx/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/osf1-cxx/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/osf1-cxx/tmake.conf b/tmake/lib/osf1-cxx/tmake.conf deleted file mode 100644 index b3f9a5d..0000000 --- a/tmake/lib/osf1-cxx/tmake.conf +++ /dev/null @@ -1,60 +0,0 @@ -# -# -# -# tmake configuration for osf1-cxx (a.k.a. DEC Unix) -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = cxx -TMAKE_CFLAGS = -x cc -w -D_POSIX_SOURCE -D_OSF_SOURCE -D_AES_SOURCE -TMAKE_CFLAGS_WARN_ON = -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -TMAKE_CFLAGS_YACC = -Olimit 1000 - -TMAKE_CXX = cxx -TMAKE_CXXFLAGS = -x cxx -w -D_POSIX_SOURCE -D_OSF_SOURCE -D_AES_SOURCE -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = /usr/X11R6/include -TMAKE_LIBDIR_X11 = /usr/X11R6/lib -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = /usr/X11R6/include -TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib - -TMAKE_LINK = cxx -TMAKE_LINK_SHLIB = cxx -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -shared -TMAKE_LFLAGS_SONAME = <<END --soname -END - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cqs -TMAKE_RANLIB = - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/osf1-g++/app.t b/tmake/lib/osf1-g++/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/osf1-g++/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/osf1-g++/lib.t b/tmake/lib/osf1-g++/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/osf1-g++/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/osf1-g++/subdirs.t b/tmake/lib/osf1-g++/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/osf1-g++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/osf1-g++/tmake.conf b/tmake/lib/osf1-g++/tmake.conf deleted file mode 100644 index e23713e..0000000 --- a/tmake/lib/osf1-g++/tmake.conf +++ /dev/null @@ -1,58 +0,0 @@ -# -# -# -# tmake configuration for osf1-g++ (a.k.a. DEC Unix) -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -D_POSIX_SOURCE -D_OSF_SOURCE -D_AES_SOURCE -TMAKE_CFLAGS_WARN_ON = -Wall -W -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -fPIC -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = g++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = /usr/X11R6/include -TMAKE_LIBDIR_X11 = /usr/X11R6/lib -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = /usr/X11R6/include -TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib - -TMAKE_LINK = g++ -TMAKE_LINK_SHLIB = g++ -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -shared -TMAKE_LFLAGS_SONAME = -Wl,-soname, - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cqs -TMAKE_RANLIB = - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/qnx-g++/app.t b/tmake/lib/qnx-g++/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/qnx-g++/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/qnx-g++/lib.t b/tmake/lib/qnx-g++/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/qnx-g++/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/qnx-g++/subdirs.t b/tmake/lib/qnx-g++/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/qnx-g++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/qnx-g++/tmake.conf b/tmake/lib/qnx-g++/tmake.conf deleted file mode 100644 index 4846d68..0000000 --- a/tmake/lib/qnx-g++/tmake.conf +++ /dev/null @@ -1,58 +0,0 @@ -# -# -# -# tmake configuration for qnx-g++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -pipe -TMAKE_CFLAGS_WARN_ON = -Wall -W -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O -fno-inline -fno-pack-struct -TMAKE_CFLAGS_DEBUG = -g -fno-inline -fno-pack-struct -TMAKE_CFLAGS_SHLIB = -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses -fno-inline -fno-pack-struct - -TMAKE_CXX = g++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = /usr/X11R6/include -TMAKE_LIBDIR_X11 = /usr/X11R6/lib -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = /usr/X11R6/include -TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib - -TMAKE_LINK = g++ -TMAKE_LINK_SHLIB = g++ -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -TMAKE_LFLAGS_SONAME = - -TMAKE_LIBS = -lunix -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cqs -TMAKE_RANLIB = - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/sco-g++/app.t b/tmake/lib/sco-g++/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/sco-g++/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/sco-g++/lib.t b/tmake/lib/sco-g++/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/sco-g++/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/sco-g++/subdirs.t b/tmake/lib/sco-g++/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/sco-g++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/sco-g++/tmake.conf b/tmake/lib/sco-g++/tmake.conf deleted file mode 100644 index c571f98..0000000 --- a/tmake/lib/sco-g++/tmake.conf +++ /dev/null @@ -1,58 +0,0 @@ -# -# -# -# tmake configuration for sco-g++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -TMAKE_CFLAGS_WARN_ON = -Wall -W -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -fPIC -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = g++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = -TMAKE_LIBDIR_X11 = -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = -TMAKE_LIBDIR_OPENGL = - -TMAKE_LINK = g++ -TMAKE_LINK_SHLIB = g++ -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -shared -TMAKE_LFLAGS_SONAME = - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lsocket -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cq -TMAKE_RANLIB = ranlib - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/solaris-cc-64/app.t b/tmake/lib/solaris-cc-64/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/solaris-cc-64/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/solaris-cc-64/lib.t b/tmake/lib/solaris-cc-64/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/solaris-cc-64/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/solaris-cc-64/subdirs.t b/tmake/lib/solaris-cc-64/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/solaris-cc-64/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/solaris-cc-64/tmake.conf b/tmake/lib/solaris-cc-64/tmake.conf deleted file mode 100644 index 889fde7..0000000 --- a/tmake/lib/solaris-cc-64/tmake.conf +++ /dev/null @@ -1,61 +0,0 @@ -# -# -# -# tmake configuration for solaris-cc -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = cc -TMAKE_CFLAGS = -xtarget=generic64 -TMAKE_CFLAGS_WARN_ON = -TMAKE_CFLAGS_WARN_OFF = -w -TMAKE_CFLAGS_RELEASE = -O -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -KPIC -TMAKE_CFLAGS_YACC = - -TMAKE_CXX = CC -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = -xO2 -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = -PIC -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = /usr/openwin/include -TMAKE_LIBDIR_X11 = /usr/openwin/lib -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = -TMAKE_LIBDIR_OPENGL = - -TMAKE_LINK = CC -# Jan Wortelboer <janw@wins.uva.nl> suggests avoiding $LD_LIBRARY_PATH: -TMAKE_LINK_SHLIB = CC -R$(QTDIR)/lib:/usr/openwin/lib -TMAKE_LFLAGS = -64 -xtarget=generic64 -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -G -h $(TARGET1) -TMAKE_LFLAGS_SONAME = - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -lICE -lSM -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -lGL -TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = CC -xar -o -TMAKE_RANLIB = - -TMAKE_CLEAN = -r Templates.DB - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/solaris-cc-gcc/app.t b/tmake/lib/solaris-cc-gcc/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/solaris-cc-gcc/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/solaris-cc-gcc/lib.t b/tmake/lib/solaris-cc-gcc/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/solaris-cc-gcc/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/solaris-cc-gcc/subdirs.t b/tmake/lib/solaris-cc-gcc/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/solaris-cc-gcc/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/solaris-cc-gcc/tmake.conf b/tmake/lib/solaris-cc-gcc/tmake.conf deleted file mode 100644 index de013a0..0000000 --- a/tmake/lib/solaris-cc-gcc/tmake.conf +++ /dev/null @@ -1,62 +0,0 @@ -# -# -# -# tmake configuration for solaris-cc-gcc -# (Using SunPro CC for C++ code and gcc for C code.) -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -TMAKE_CFLAGS_WARN_ON = -Wall -W -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -fPIC -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = CC -TMAKE_CXXFLAGS = -TMAKE_CXXFLAGS_WARN_ON = -TMAKE_CXXFLAGS_WARN_OFF = -w -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = -PIC -TMAKE_CXXFLAGS_YACC = - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = /usr/openwin/include -TMAKE_LIBDIR_X11 = /usr/openwin/lib -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = -TMAKE_LIBDIR_OPENGL = - -TMAKE_LINK = CC -# Jan Wortelboer <janw@wins.uva.nl> suggests avoiding $LD_LIBRARY_PATH: -TMAKE_LINK_SHLIB = CC -R$(QTDIR)/lib:/usr/openwin/lib -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -G -h $(TARGET1) -TMAKE_LFLAGS_SONAME = - -TMAKE_LIBS = -lC -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = CC -xar -o -TMAKE_RANLIB = - -TMAKE_CLEAN = -r Templates.DB - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/solaris-cc/app.t b/tmake/lib/solaris-cc/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/solaris-cc/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/solaris-cc/lib.t b/tmake/lib/solaris-cc/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/solaris-cc/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/solaris-cc/subdirs.t b/tmake/lib/solaris-cc/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/solaris-cc/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/solaris-cc/tmake.conf b/tmake/lib/solaris-cc/tmake.conf deleted file mode 100644 index 3dbe810..0000000 --- a/tmake/lib/solaris-cc/tmake.conf +++ /dev/null @@ -1,61 +0,0 @@ -# -# -# -# tmake configuration for solaris-cc -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = cc -TMAKE_CFLAGS = -TMAKE_CFLAGS_WARN_ON = -TMAKE_CFLAGS_WARN_OFF = -w -TMAKE_CFLAGS_RELEASE = -O -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -KPIC -TMAKE_CFLAGS_YACC = - -TMAKE_CXX = CC -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = -O2 -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = -PIC -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = /usr/openwin/include -TMAKE_LIBDIR_X11 = /usr/openwin/lib -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = -TMAKE_LIBDIR_OPENGL = - -TMAKE_LINK = CC -# Jan Wortelboer <janw@wins.uva.nl> suggests avoiding $LD_LIBRARY_PATH: -TMAKE_LINK_SHLIB = CC -R$(QTDIR)/lib:/usr/openwin/lib -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -G -h $(TARGET1) -TMAKE_LFLAGS_SONAME = - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -lICE -lSM -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -lGL -TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = CC -xar -o -TMAKE_RANLIB = - -TMAKE_CLEAN = -r Templates.DB - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/solaris-g++/app.t b/tmake/lib/solaris-g++/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/solaris-g++/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/solaris-g++/lib.t b/tmake/lib/solaris-g++/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/solaris-g++/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/solaris-g++/subdirs.t b/tmake/lib/solaris-g++/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/solaris-g++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/solaris-g++/tmake.conf b/tmake/lib/solaris-g++/tmake.conf deleted file mode 100644 index a6817bf..0000000 --- a/tmake/lib/solaris-g++/tmake.conf +++ /dev/null @@ -1,59 +0,0 @@ -# -# -# -# tmake configuration for solaris-g++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -TMAKE_CFLAGS_WARN_ON = -Wall -W -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -fPIC -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = g++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = /usr/openwin/include -TMAKE_LIBDIR_X11 = /usr/openwin/lib -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = -TMAKE_LIBDIR_OPENGL = - -TMAKE_LINK = g++ -TMAKE_LINK_SHLIB = g++ -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHAPP = -shared -TMAKE_LFLAGS_SHLIB = -shared -h $(TARGET1) -TMAKE_LFLAGS_SONAME = - -TMAKE_LIBS = -liconv -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cq -TMAKE_RANLIB = - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/sunos-g++/app.t b/tmake/lib/sunos-g++/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/sunos-g++/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/sunos-g++/lib.t b/tmake/lib/sunos-g++/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/sunos-g++/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/sunos-g++/subdirs.t b/tmake/lib/sunos-g++/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/sunos-g++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/sunos-g++/tmake.conf b/tmake/lib/sunos-g++/tmake.conf deleted file mode 100644 index 52f9e2d..0000000 --- a/tmake/lib/sunos-g++/tmake.conf +++ /dev/null @@ -1,58 +0,0 @@ -# -# -# -# tmake configuration for sunos-g++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -TMAKE_CFLAGS_WARN_ON = -Wall -W -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -fPIC -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = g++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = /usr/openwin/include -TMAKE_LIBDIR_X11 = /usr/openwin/lib -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = -TMAKE_LIBDIR_OPENGL = - -TMAKE_LINK = g++ -TMAKE_LINK_SHLIB = g++ -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -fPIC -shared -TMAKE_LFLAGS_SONAME = - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cq -TMAKE_RANLIB = ranlib - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/ultrix-g++/app.t b/tmake/lib/ultrix-g++/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/ultrix-g++/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/ultrix-g++/lib.t b/tmake/lib/ultrix-g++/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/ultrix-g++/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/ultrix-g++/subdirs.t b/tmake/lib/ultrix-g++/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/ultrix-g++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/ultrix-g++/tmake.conf b/tmake/lib/ultrix-g++/tmake.conf deleted file mode 100644 index 59813eb..0000000 --- a/tmake/lib/ultrix-g++/tmake.conf +++ /dev/null @@ -1,58 +0,0 @@ -# -# -# -# tmake configuration for ultrix-g++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -TMAKE_CFLAGS_WARN_ON = -Wall -W -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = g++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = /usr/X11R6/include -TMAKE_LIBDIR_X11 = /usr/X11R6/lib -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = /usr/X11R6/include -TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib - -TMAKE_LINK = g++ -#TMAKE_LINK_SHLIB = g++ -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -#TMAKE_LFLAGS_SHLIB = -shared -#TMAKE_LFLAGS_SONAME = -Wl,-soname, - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu - -TMAKE_MOC = moc - -TMAKE_AR = ar cqs -TMAKE_RANLIB = - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/unix/app.t b/tmake/lib/unix/app.t deleted file mode 100644 index f59c9f9..0000000 --- a/tmake/lib/unix/app.t +++ /dev/null @@ -1,6 +0,0 @@ -############################################################################# -#! -#! This is a tmake template for building Unix applications. -#! -#$ Project('TMAKE_APP_FLAG = 1'); -#$ IncludeTemplate("generic.t"); diff --git a/tmake/lib/unix/generic.t b/tmake/lib/unix/generic.t deleted file mode 100644 index 2852b36..0000000 --- a/tmake/lib/unix/generic.t +++ /dev/null @@ -1,283 +0,0 @@ -#! -#! This is a tmake template for building UNIX applications or libraries. -#! -#${ - if ( Project("TMAKE_LIB_FLAG") && !Config("staticlib") ) { - Project('CONFIG *= dll'); - } elsif ( Project("TMAKE_APP_FLAG") || Config("dll") ) { - Project('CONFIG -= staticlib'); - } - if ( Config("warn_off") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_OFF'); - Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_WARN_OFF'); - } elsif ( Config("warn_on") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_ON'); - Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_WARN_ON'); - } - if ( Config("debug") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_DEBUG'); - Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_DEBUG'); - Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_DEBUG'); - } elsif ( Config("release") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_RELEASE'); - Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_RELEASE'); - Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_RELEASE'); - } - if ( Config("qt") || Config("opengl") ) { - Project('CONFIG *= x11lib'); - if ( Config("opengl") ) { - Project('CONFIG *= x11inc'); - } - } - if ( Config("x11") ) { - Project('CONFIG *= x11lib'); - Project('CONFIG *= x11inc'); - } - if ( Config("qt") ) { - Project('CONFIG *= moc'); - AddIncludePath(Project("TMAKE_INCDIR_QT")); - if ( Config("release") ) { - Project('DEFINES += NO_DEBUG'); - } - if ( Config("opengl") ) { - Project("TMAKE_LIBDIR_QT") && - Project('TMAKE_LIBS *= -L$$TMAKE_LIBDIR_QT'); - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_OPENGL'); - } - if ( !((Project("TARGET") eq "qt") && Project("TMAKE_LIB_FLAG")) ) { - Project("TMAKE_LIBDIR_QT") && - Project('TMAKE_LIBS *= -L$$TMAKE_LIBDIR_QT'); - if ( Config("thread") ) { - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_MT'); - } else { - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT'); - } - } - } - if ( Config("opengl") ) { - AddIncludePath(Project("TMAKE_INCDIR_OPENGL")); - Project("TMAKE_LIBDIR_OPENGL") && - Project('TMAKE_LIBS *= -L$$TMAKE_LIBDIR_OPENGL'); - Project('TMAKE_LIBS *= $$TMAKE_LIBS_OPENGL'); - } - if ( Config("x11inc") ) { - AddIncludePath(Project("TMAKE_INCDIR_X11")); - } - if ( Config("x11lib") ) { - Project("TMAKE_LIBDIR_X11") && - Project('TMAKE_LIBS *= -L$$TMAKE_LIBDIR_X11'); - Project('TMAKE_LIBS *= $$TMAKE_LIBS_X11'); - } - if ( Config("moc") ) { - $moc_aware = 1; - } - Project('TMAKE_LIBS = $$LIBS $$TMAKE_LIBS'); - if ( !Project("TMAKE_RUN_CC") ) { - Project('TMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src'); - } - if ( !Project("TMAKE_RUN_CC_IMP") ) { - Project('TMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<'); - } - if ( !Project("TMAKE_RUN_CXX") ) { - Project('TMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src'); - } - if ( !Project("TMAKE_RUN_CXX_IMP") ) { - Project('TMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<'); - } - Project('TMAKE_FILETAGS = HEADERS SOURCES TARGET DESTDIR $$FILETAGS'); - StdInit(); - $project{"VERSION"} || ($project{"VERSION"} = "1.0"); - $project{"VER_MAJ"} = $project{"VERSION"}; - $project{"VER_MAJ"} =~ s/\.\d+$//; - $project{"VER_MIN"} = $project{"VERSION"}; - $project{"VER_MIN"} =~ s/^\d+\.//; - Project('DESTDIR_TARGET = $(TARGET)'); - if ( Project("TMAKE_APP_FLAG") ) { - if ( Config("dll") ) { - Project('TARGET = $$TARGET.so'); - Project("TMAKE_LFLAGS_SHAPP") || - ($project{"TMAKE_LFLAGS_SHAPP"} = $project{"TMAKE_LFLAGS_SHLIB"}); - Project("TMAKE_LFLAGS_SONAME") && - ($project{"TMAKE_LFLAGS_SONAME"} .= $project{"TARGET"}); - } - $project{"TARGET"} = $project{"DESTDIR"} . $project{"TARGET"}; - } elsif ( Config("staticlib") ) { - $project{"TARGET"} = $project{"DESTDIR"} . "lib" . - $project{"TARGET"} . ".a"; - Project("TMAKE_AR_CMD") || - Project('TMAKE_AR_CMD = $(AR) $(TARGET) $(OBJECTS) $(OBJMOC)'); - } else { - $project{"TARGETA"} = $project{"DESTDIR"} . "lib" . - $project{"TARGET"} . ".a"; - if ( Project("TMAKE_AR_CMD") ) { - $project{"TMAKE_AR_CMD"} =~ s/\(TARGET\)/\(TARGETA\)/g; - } else { - Project('TMAKE_AR_CMD = $(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)'); - } - if ( $project{"TMAKE_HPUX_SHLIB"} ) { - $project{"TARGET_x.y"} = "lib" . $project{"TARGET"} . ".sl"; - } else { - $project{"TARGET_"} = "lib" . $project{"TARGET"} . ".so"; - $project{"TARGET_x"} = $project{"TARGET_"} . "." . - $project{"VER_MAJ"}; - $project{"TARGET_x.y"} = $project{"TARGET_"} . "." . - $project{"VERSION"}; - $project{"TMAKE_LN_SHLIB"} = "-ln -s"; - } - $project{"TARGET"} = $project{"TARGET_x.y"}; - if ( $project{"DESTDIR"} ) { - $project{"DESTDIR_TARGET"} = $project{"DESTDIR"} . - $project{"TARGET"}; - } - Project("TMAKE_LFLAGS_SONAME") && - ($project{"TMAKE_LFLAGS_SONAME"} .= $project{"TARGET_x"}); - $project{"TMAKE_LINK_SHLIB_CMD"} || - ($project{"TMAKE_LINK_SHLIB_CMD"} = - '$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)'); - } - if ( Config("dll") ) { - Project('TMAKE_CFLAGS *= $$TMAKE_CFLAGS_SHLIB' ); - Project('TMAKE_CXXFLAGS *= $$TMAKE_CXXFLAGS_SHLIB' ); - if ( Project("TMAKE_APP_FLAG") ) { - Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_SHAPP'); - } else { - Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_SHLIB $$TMAKE_LFLAGS_SONAME'); - } - } -#$} -#! -# Makefile for building #$ Expand("TARGET") -# Generated by tmake at #$ Now(); -# Project: #$ Expand("PROJECT"); -# Template: #$ Expand("TEMPLATE"); -############################################################################# - -####### Compiler, tools and options - -CC = #$ Expand("TMAKE_CC"); -CXX = #$ Expand("TMAKE_CXX"); -CFLAGS = #$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); -CXXFLAGS= #$ Expand("TMAKE_CXXFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); -INCPATH = #$ ExpandPath("INCPATH","-I"," -I",""); -#$ Config("staticlib") && DisableOutput(); -LINK = #$ Expand("TMAKE_LINK"); -LFLAGS = #$ Expand("TMAKE_LFLAGS"); -LIBS = #$ Expand("TMAKE_LIBS"); -#$ Config("staticlib") && EnableOutput(); -#$ Project("TMAKE_LIB_FLAG") || DisableOutput(); -AR = #$ Expand("TMAKE_AR"); -RANLIB = #$ Expand("TMAKE_RANLIB"); -#$ Project("TMAKE_LIB_FLAG") || EnableOutput(); -MOC = #$ Expand("TMAKE_MOC"); - -TAR = #$ Expand("TMAKE_TAR"); -GZIP = #$ Expand("TMAKE_GZIP"); - -####### Files - -HEADERS = #$ ExpandList("HEADERS"); -SOURCES = #$ ExpandList("SOURCES"); -OBJECTS = #$ ExpandList("OBJECTS"); -SRCMOC = #$ ExpandList("SRCMOC"); -OBJMOC = #$ ExpandList("OBJMOC"); -DIST = #$ ExpandList("DISTFILES"); -TARGET = #$ Expand("TARGET"); -#$ (Project("TMAKE_APP_FLAG") || Config("staticlib")) && DisableOutput(); -TARGETA = #$ Expand("TARGETA"); -TARGETD = #$ Expand("TARGET_x.y"); -TARGET0 = #$ Expand("TARGET_"); -TARGET1 = #$ Expand("TARGET_x"); -#$ (Project("TMAKE_APP_FLAG") || Config("staticlib")) && EnableOutput(); - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .C .c - -.cpp.o: - #$ Expand("TMAKE_RUN_CXX_IMP"); - -.cxx.o: - #$ Expand("TMAKE_RUN_CXX_IMP"); - -.cc.o: - #$ Expand("TMAKE_RUN_CXX_IMP"); - -.C.o: - #$ Expand("TMAKE_RUN_CXX_IMP"); - -.c.o: - #$ Expand("TMAKE_RUN_CC_IMP"); - -####### Build rules - -#$ Project("TMAKE_APP_FLAG") || DisableOutput(); -all: #$ ExpandGlue("ALL_DEPS",""," "," "); $text .= '$(TARGET)'; - -$(TARGET): $(HEADERS) $(OBJECTS) $(OBJMOC) #$ Expand("TARGETDEPS"); - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) -#$ Project("TMAKE_APP_FLAG") || EnableOutput(); -#$ (Config("staticlib") || Project("TMAKE_APP_FLAG")) && DisableOutput(); -all: #$ ExpandGlue("ALL_DEPS",""," ",""); Expand("DESTDIR_TARGET"); - -#$ Substitute('$$DESTDIR_TARGET: $(OBJECTS) $(OBJMOC) $$TARGETDEPS'); - -rm -f $(TARGET) $(TARGET0) $(TARGET1) - #$ Expand("TMAKE_LINK_SHLIB_CMD"); - #$ ExpandGlue("TMAKE_LN_SHLIB",""," "," \$(TARGET) \$(TARGET0)"); - #$ ExpandGlue("TMAKE_LN_SHLIB",""," "," \$(TARGET) \$(TARGET1)"); - #${ - $d = Project("DESTDIR"); - if ( $d ) { - $d =~ s-([^/])$-$1/-; - if ( Project("TMAKE_HPUX_SHLIB") ) { - $text = "-rm -f $d\$(TARGET)\n\t" . - "-mv \$(TARGET) $d"; - } else { - $text = "-rm -f $d\$(TARGET)\n\t" . - "-rm -f $d\$(TARGET0)\n\t" . - "-rm -f $d\$(TARGET1)\n\t" . - "-mv \$(TARGET) \$(TARGET0) \$(TARGET1) $d"; - } - } - #$} - -staticlib: $(TARGETA) - -$(TARGETA): $(OBJECTS) $(OBJMOC) #$ Expand("TARGETDEPS"); - -rm -f $(TARGETA) - #$ Expand("TMAKE_AR_CMD"); - #$ ExpandGlue("TMAKE_RANLIB","",""," \$(TARGETA)"); -#$ (Config("staticlib") || Project("TMAKE_APP_FLAG")) && EnableOutput(); -#$ Config("staticlib") || DisableOutput(); -all: #$ ExpandGlue("ALL_DEPS",""," "," "); $text .= '$(TARGET)'; - -staticlib: $(TARGET) - -$(TARGET): $(OBJECTS) $(OBJMOC) #$ Expand("TARGETDEPS"); - -rm -f $(TARGET) - #$ Expand("TMAKE_AR_CMD"); - #$ ExpandGlue("TMAKE_RANLIB","",""," \$(TARGET)"); -#$ Config("staticlib") || EnableOutput(); - -moc: $(SRCMOC) - -#$ TmakeSelf(); - -dist: - #$ Substitute('$(TAR) $$PROJECT.tar $$PROJECT.pro $(SOURCES) $(HEADERS) $(DIST)'); - #$ Substitute('$(GZIP) $$PROJECT.tar'); - -clean: - -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(TARGET) -#$ (Config("staticlib") || Project("TMAKE_APP_FLAG")) && DisableOutput(); - -rm -f $(TARGET0) $(TARGET1) $(TARGETA) -#$ (Config("staticlib") || Project("TMAKE_APP_FLAG")) && EnableOutput(); - #$ ExpandGlue("TMAKE_CLEAN","-rm -f "," ",""); - -rm -f *~ core - #$ ExpandGlue("CLEAN_FILES","-rm -f "," ",""); - -####### Compile - -#$ BuildObj(Project("OBJECTS"),Project("SOURCES")); -#$ BuildMocObj(Project("OBJMOC"),Project("SRCMOC")); -#$ BuildMocSrc(Project("HEADERS")); -#$ BuildMocSrc(Project("SOURCES")); diff --git a/tmake/lib/unix/lib.t b/tmake/lib/unix/lib.t deleted file mode 100644 index dd24c63..0000000 --- a/tmake/lib/unix/lib.t +++ /dev/null @@ -1,6 +0,0 @@ -############################################################################# -#! -#! This is a tmake template for building Unix libraries. -#! -#$ Project('TMAKE_LIB_FLAG = 1'); -#$ IncludeTemplate("generic.t"); diff --git a/tmake/lib/unix/subdirs.t b/tmake/lib/unix/subdirs.t deleted file mode 100644 index e2b58a7..0000000 --- a/tmake/lib/unix/subdirs.t +++ /dev/null @@ -1,38 +0,0 @@ -############################################################################# -#! -#! This is a tmake template for creating a makefile that invokes make in -#! sub directories - for Unix. -#! -#${ - StdInit(); - Project('MAKEFILE') || Project('MAKEFILE = Makefile'); - Project('TMAKE') || Project('TMAKE = tmake'); -#$} -#! -# Makefile for building targets in sub directories. -# Generated by tmake at #$ Now(); -# Project: #$ Expand("PROJECT"); -# Template: #$ Expand("TEMPLATE"); -############################################################################# - -MAKEFILE= #$ Expand("MAKEFILE"); -TMAKE = #$ Expand("TMAKE"); - -SUBDIRS = #$ ExpandList("SUBDIRS"); - -all: $(SUBDIRS) - -$(SUBDIRS): FORCE - cd $@; $(MAKE) - -#$ TmakeSelf(); - -tmake_all: -#${ - $text = "\t" . 'for i in $(SUBDIRS); do ( cd $$i ; $(TMAKE) $$i.pro -o $(MAKEFILE); grep "TEMPLATE.*subdirs" $$i.pro 2>/dev/null >/dev/null && $(MAKE) -f $(MAKEFILE) tmake ) ; done'; -#$} - -clean: - for i in $(SUBDIRS); do ( cd $$i ; $(MAKE) clean ) ; done - -FORCE: diff --git a/tmake/lib/unixware-g++/app.t b/tmake/lib/unixware-g++/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/unixware-g++/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/unixware-g++/lib.t b/tmake/lib/unixware-g++/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/unixware-g++/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/unixware-g++/subdirs.t b/tmake/lib/unixware-g++/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/unixware-g++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/unixware-g++/tmake.conf b/tmake/lib/unixware-g++/tmake.conf deleted file mode 100644 index d4e063f..0000000 --- a/tmake/lib/unixware-g++/tmake.conf +++ /dev/null @@ -1,60 +0,0 @@ -# -# -# -# tmake configuration for sco-g++ -# -# incl. UnixWare 7 -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -D_UNIXWARE -TMAKE_CFLAGS_WARN_ON = -Wall -W -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -fPIC -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = g++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = -TMAKE_LIBDIR_X11 = /usr/X/lib -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = -TMAKE_LIBDIR_OPENGL = - -TMAKE_LINK = g++ -TMAKE_LINK_SHLIB = g++ -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -shared -TMAKE_LFLAGS_SONAME = - -TMAKE_LIBS = -lc -TMAKE_LIBS_X11 = -lXext -lX11 -lsocket -lnsl -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu -lXt - -TMAKE_MOC = moc - -TMAKE_AR = ar cq -TMAKE_RANLIB = - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/unixware7-cc/app.t b/tmake/lib/unixware7-cc/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/unixware7-cc/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/unixware7-cc/lib.t b/tmake/lib/unixware7-cc/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/unixware7-cc/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/unixware7-cc/subdirs.t b/tmake/lib/unixware7-cc/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/unixware7-cc/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/unixware7-cc/tmake.conf b/tmake/lib/unixware7-cc/tmake.conf deleted file mode 100644 index 6e239dc..0000000 --- a/tmake/lib/unixware7-cc/tmake.conf +++ /dev/null @@ -1,60 +0,0 @@ -# -# -# -# tmake configuration for sco-g++ -# -# (UnixWare file, with different -D) -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = cc -TMAKE_CFLAGS = -TMAKE_CFLAGS_WARN_ON = -Wall -W -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O -T used -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -K PIC -TMAKE_CFLAGS_YACC = - -TMAKE_CXX = CC -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = -TMAKE_LIBDIR_X11 = /usr/X/lib -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = -TMAKE_LIBDIR_OPENGL = - -TMAKE_LINK = CC -TMAKE_LINK_SHLIB = CC -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -G -TMAKE_LFLAGS_SONAME = - -TMAKE_LIBS = -TMAKE_LIBS_X11 = -lXext -lX11 -lsocket -lnsl -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu -lXt - -TMAKE_MOC = moc - -TMAKE_AR = ar cq -TMAKE_RANLIB = - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/unixware7-g++/app.t b/tmake/lib/unixware7-g++/app.t deleted file mode 100644 index 867725e..0000000 --- a/tmake/lib/unixware7-g++/app.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/app.t"); diff --git a/tmake/lib/unixware7-g++/lib.t b/tmake/lib/unixware7-g++/lib.t deleted file mode 100644 index 2523b2f..0000000 --- a/tmake/lib/unixware7-g++/lib.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/lib.t"); diff --git a/tmake/lib/unixware7-g++/subdirs.t b/tmake/lib/unixware7-g++/subdirs.t deleted file mode 100644 index 5e888af..0000000 --- a/tmake/lib/unixware7-g++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Unix template -#$ IncludeTemplate("../unix/subdirs.t"); diff --git a/tmake/lib/unixware7-g++/tmake.conf b/tmake/lib/unixware7-g++/tmake.conf deleted file mode 100644 index 44f30a5..0000000 --- a/tmake/lib/unixware7-g++/tmake.conf +++ /dev/null @@ -1,60 +0,0 @@ -# -# -# -# tmake configuration for sco-g++ -# -# (UnixWare file, with different -D) -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -D_UNIXWARE7 -TMAKE_CFLAGS_WARN_ON = -Wall -W -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_SHLIB = -fPIC -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = g++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_LIBDIR = -TMAKE_INCDIR_X11 = -TMAKE_LIBDIR_X11 = /usr/X/lib -TMAKE_INCDIR_QT = $(QTDIR)/include -TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = -TMAKE_LIBDIR_OPENGL = - -TMAKE_LINK = g++ -TMAKE_LINK_SHLIB = g++ -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_SHLIB = -shared -TMAKE_LFLAGS_SONAME = - -TMAKE_LIBS = -lc -TMAKE_LIBS_X11 = -lXext -lX11 -lsocket -lnsl -lm -TMAKE_LIBS_QT = -lqt -TMAKE_LIBS_QT_MT = -lqt-mt -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu -lXt - -TMAKE_MOC = moc - -TMAKE_AR = ar cq -TMAKE_RANLIB = - -TMAKE_TAR = tar -cf -TMAKE_GZIP = gzip -9f diff --git a/tmake/lib/win32-borland/app.t b/tmake/lib/win32-borland/app.t deleted file mode 100644 index fc4dc2c..0000000 --- a/tmake/lib/win32-borland/app.t +++ /dev/null @@ -1,6 +0,0 @@ -############################################################################# -#! -#! This is a tmake template for building Win32 applications. -#! -#$ Project('TMAKE_APP_FLAG = 1'); -#$ IncludeTemplate("generic.t"); diff --git a/tmake/lib/win32-borland/generic.t b/tmake/lib/win32-borland/generic.t deleted file mode 100644 index aa7f53b..0000000 --- a/tmake/lib/win32-borland/generic.t +++ /dev/null @@ -1,237 +0,0 @@ -#! -#! This is a tmake template for building Win32 applications or libraries. -#! -#${ - if ( Config("qt") ) { - if ( !(Project("DEFINES") =~ /QT_NODLL/) && - ((Project("DEFINES") =~ /QT_(?:MAKE)?DLL/) || - ($ENV{"QT_DLL"} && !$ENV{"QT_NODLL"})) ) { - Project('TMAKE_QT_DLL = 1'); - if ( (Project("TARGET") eq "qt") && Project("TMAKE_LIB_FLAG") ) { - Project('CONFIG += dll'); - } - } - } - if ( Config("dll") || Project("TMAKE_APP_FLAG") ) { - Project('CONFIG -= staticlib'); - Project('TMAKE_APP_OR_DLL = 1'); - } else { - Project('CONFIG += staticlib'); - } - if ( Config("warn_off") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_OFF'); - Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_WARN_OFF'); - } elsif ( Config("warn_on") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_ON'); - Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_WARN_ON'); - } - if ( Config("debug") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_DEBUG'); - Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_DEBUG'); - Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_DEBUG'); - } elsif ( Config("release") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_RELEASE'); - Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_RELEASE'); - Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_RELEASE'); - } - if ( Config("qt") || Config("opengl") ) { - Project('CONFIG += windows' ); - } - if ( Config("qt") ) { - Project('CONFIG *= moc'); - AddIncludePath(Project("TMAKE_INCDIR_QT")); - if ( Config("release") ) { - Project('DEFINES += NO_DEBUG'); - } - if ( Config("opengl") ) { - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_OPENGL'); - } - if ( (Project("TARGET") eq "qt") && Project("TMAKE_LIB_FLAG") ) { - if ( Project("TMAKE_QT_DLL") ) { - Project('DEFINES -= QT_DLL'); - Project('DEFINES *= QT_MAKEDLL'); - Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_QT_DLL'); - } - } else { - if ( Project("TMAKE_QT_DLL") ) { - Project('DEFINES *= QT_DLL'); - } - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT'); - if ( Project("TMAKE_QT_DLL") ) { - my $qtver =FindHighestLibVersion($ENV{"QTDIR"} . "/lib", "qt"); - Project("TMAKE_LIBS /= s/qt.lib/qt${qtver}.lib/"); - if ( !Config("dll") ) { - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_DLL'); - } - } - } - } - if ( Config("opengl") ) { - Project('TMAKE_LIBS *= $$TMAKE_LIBS_OPENGL'); - } - if ( Config("dll") ) { - Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE_DLL'); - Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS_DLL'); - if ( Project("TMAKE_LIB_FLAG") ) { - my $ver = Project("VERSION"); - $ver =~ s/\.//g; - $project{"TARGET_EXT"} = "${ver}.dll"; - } else { - $project{"TARGET_EXT"} = ".dll"; - } - } else { - Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE'); - Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS'); - if ( Project("TMAKE_APP_FLAG") ) { - $project{"TARGET_EXT"} = ".exe"; - } else { - $project{"TARGET_EXT"} = ".lib"; - } - } - if ( Config("windows") ) { - if ( Config("console") ) { - Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY'); - Project('TMAKE_LIBS *= $$TMAKE_LIBS_CONSOLE'); - } else { - Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_WINDOWS_ANY'); - } - Project('TMAKE_LIBS *= $$TMAKE_LIBS_WINDOWS'); - } else { - Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY'); - Project('TMAKE_LIBS *= $$TMAKE_LIBS_CONSOLE'); - } - if ( Config("moc") ) { - $moc_aware = 1; - } - Project('TMAKE_LIBS += $$LIBS'); - Project('TMAKE_FILETAGS = HEADERS SOURCES DEF_FILE RC_FILE TARGET TMAKE_LIBS DESTDIR DLLDESTDIR $$FILETAGS'); - foreach ( split(/\s/,Project("TMAKE_FILETAGS")) ) { - $project{$_} =~ s-[/\\]+-\\-g; - } - if ( Project("DEF_FILE") ) { - Project('TMAKE_LFLAGS *= /DEF:$$DEF_FILE'); - } - if ( Project("RC_FILE") ) { - if ( Project("RES_FILE") ) { - tmake_error("Both .rc and .res file specified.\n" . - "Please specify one of them, not both."); - } - $project{"RES_FILE"} = $project{"RC_FILE"}; - $project{"RES_FILE"} =~ s/\.rc$/.res/i; - Project('TARGETDEPS += $$RES_FILE'); - } - if ( Project("RES_FILE") ) { - Project('TMAKE_LIBS *= $$RES_FILE'); - } - StdInit(); - if ( Project("VERSION") ) { - $project{"VER_MAJ"} = $project{"VERSION"}; - $project{"VER_MAJ"} =~ s/\.\d+$//; - $project{"VER_MIN"} = $project{"VERSION"}; - $project{"VER_MIN"} =~ s/^\d+\.//; - } - Project('TMAKE_CLEAN += $$TARGET.tds'); -#$} -#! -# Makefile for building #$ Expand("TARGET") -# Generated by tmake at #$ Now(); -# Project: #$ Expand("PROJECT"); -# Template: #$ Expand("TEMPLATE"); -############################################################################# - -!if !$d(BCB) -BCB = $(MAKEDIR)\.. -!endif - -####### Compiler, tools and options - -CC = #$ Expand("TMAKE_CC"); -CXX = #$ Expand("TMAKE_CXX"); -CFLAGS = #$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); -CXXFLAGS= #$ Expand("TMAKE_CXXFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); -INCPATH = #$ ExpandPath("INCPATH",'-I',' -I',''); -#$ !Project("TMAKE_APP_OR_DLL") && DisableOutput(); -LINK = #$ Expand("TMAKE_LINK"); -LFLAGS = #$ Expand("TMAKE_LFLAGS"); -LIBS = #$ Expand("TMAKE_LIBS"); -#$ !Project("TMAKE_APP_OR_DLL") && EnableOutput(); -#$ Project("TMAKE_APP_OR_DLL") && DisableOutput(); -LIB = #$ Expand("TMAKE_LIB"); -#$ Project("TMAKE_APP_OR_DLL") && EnableOutput(); -MOC = #$ Expand("TMAKE_MOC"); - -ZIP = #$ Expand("TMAKE_ZIP"); - -####### Files - -HEADERS = #$ ExpandList("HEADERS"); -SOURCES = #$ ExpandList("SOURCES"); -OBJECTS = #$ ExpandList("OBJECTS"); -SRCMOC = #$ ExpandList("SRCMOC"); -OBJMOC = #$ ExpandList("OBJMOC"); -DIST = #$ ExpandList("DISTFILES"); -TARGET = #$ ExpandGlue("TARGET",$project{"DESTDIR"},"",$project{"TARGET_EXT"}); - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.obj: - #$ Expand("TMAKE_RUN_CXX_IMP"); - -.cxx.obj: - #$ Expand("TMAKE_RUN_CXX_IMP"); - -.cc.obj: - #$ Expand("TMAKE_RUN_CXX_IMP"); - -.c.obj: - #$ Expand("TMAKE_RUN_CC_IMP"); - -####### Build rules - -all: #$ ExpandGlue("ALL_DEPS",""," "," "); $text .= '$(TARGET)'; - -$(TARGET): $(HEADERS) $(OBJECTS) $(OBJMOC) #$ Expand("TARGETDEPS"); -#$ Project("TMAKE_APP_OR_DLL") || DisableOutput(); - $(LINK) @&&| - $(LFLAGS) $(OBJECTS) $(OBJMOC), $(TARGET),,$(LIBS) -#$ Project("TMAKE_APP_OR_DLL") || EnableOutput(); -#$ Project("TMAKE_APP_OR_DLL") && DisableOutput(); - -del $(TARGET) - $(LIB) $(TARGET) @&&| -#${ -# $text = "+" . join(" \\\n+",split(/\s+/,$project{"OBJECTS"})) . " \\\n+" -# . join(" \\\n+",split(/\s+/,$project{"OBJMOC"})); -#$} -#$ Project("TMAKE_APP_OR_DLL") && EnableOutput(); -| -#$ (Config("dll") && Project("DLLDESTDIR")) || DisableOutput(); - -copy $(TARGET) #$ Expand("DLLDESTDIR"); -#$ (Config("dll") && Project("DLLDESTDIR")) || EnableOutput(); -#$ Project("RC_FILE") || DisableOutput(); - -#$ Substitute("\$\$RES_FILE: \$\$RC_FILE\n\t\$\$TMAKE_RC \$\$RC_FILE"); -#$ Project("RC_FILE") || EnableOutput(); - -moc: $(SRCMOC) - -#$ TmakeSelf(); - -dist: - #$ Substitute('$(ZIP) $$PROJECT.zip $$PROJECT.pro $(SOURCES) $(HEADERS) $(DIST)'); - -clean: - #$ ExpandGlue("OBJECTS","-del ","\n\t-del ",""); - #$ ExpandGlue("SRCMOC" ,"-del ","\n\t-del ",""); - #$ ExpandGlue("OBJMOC" ,"-del ","\n\t-del ",""); - -del $(TARGET) - #$ ExpandGlue("TMAKE_CLEAN","-del ","\n\t-del ",""); - #$ ExpandGlue("CLEAN_FILES","-del ","\n\t-del ",""); - -####### Compile - -#$ BuildObj(Project("OBJECTS"),Project("SOURCES")); -#$ BuildMocObj(Project("OBJMOC"),Project("SRCMOC")); -#$ BuildMocSrc(Project("HEADERS")); -#$ BuildMocSrc(Project("SOURCES")); diff --git a/tmake/lib/win32-borland/lib.t b/tmake/lib/win32-borland/lib.t deleted file mode 100644 index d8ac6c7..0000000 --- a/tmake/lib/win32-borland/lib.t +++ /dev/null @@ -1,6 +0,0 @@ -############################################################################# -#! -#! This is a tmake template for building Win32 libraries. -#! -#$ Project('TMAKE_LIB_FLAG = 1'); -#$ IncludeTemplate("generic.t"); diff --git a/tmake/lib/win32-borland/subdirs.t b/tmake/lib/win32-borland/subdirs.t deleted file mode 100644 index f08e41f..0000000 --- a/tmake/lib/win32-borland/subdirs.t +++ /dev/null @@ -1,3 +0,0 @@ -#! Use the common Win32 template -#$ Project("TMAKE_NOFORCE = 1"); -#$ IncludeTemplate("../win32/subdirs.t"); diff --git a/tmake/lib/win32-borland/tmake.conf b/tmake/lib/win32-borland/tmake.conf deleted file mode 100644 index bce6f1a..0000000 --- a/tmake/lib/win32-borland/tmake.conf +++ /dev/null @@ -1,56 +0,0 @@ -# -# -# -# tmake configuration for Win32/Borland C++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = bcc32 -TMAKE_CFLAGS = -TMAKE_CFLAGS_WARN_ON = -w -TMAKE_CFLAGS_WARN_OFF = -w- -TMAKE_CFLAGS_RELEASE = -O2 -TMAKE_CFLAGS_DEBUG = -v -TMAKE_CFLAGS_YACC = - -TMAKE_CXX = $$TMAKE_CC -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_INCDIR_QT = $(QTDIR)\include - -TMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o$obj $src -TMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o$@ $< -TMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$obj $src -TMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$@ $< - -TMAKE_LINK = ilink32 -TMAKE_LFLAGS = -L$(BCB)\lib -c -x -Gn -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -v -TMAKE_LFLAGS_CONSOLE = -ap -Tpe c0x32.obj -TMAKE_LFLAGS_WINDOWS = -aa -Tpe c0w32.obj -TMAKE_LFLAGS_CONSOLE_DLL= -Gi -ap -Tpd c0d32.obj -TMAKE_LFLAGS_WINDOWS_DLL= -Gi -aa -Tpd c0d32.obj - -TMAKE_LIBS = import32.lib cw32.lib -TMAKE_LIBS_CONSOLE = -TMAKE_LIBS_WINDOWS = -TMAKE_LIBS_QT = $(QTDIR)\lib\qt.lib -TMAKE_LIBS_QT_DLL = $(QTDIR)\lib\qtmain.lib -TMAKE_LIBS_QT_OPENGL = $(QTDIR)\lib\qgl.lib -TMAKE_LIBS_OPENGL = - -TMAKE_MOC = moc - -TMAKE_LIB = tlib /C /P256 -TMAKE_RC = brc32 - -TMAKE_ZIP = zip -r -9 diff --git a/tmake/lib/win32-g++/app.t b/tmake/lib/win32-g++/app.t deleted file mode 100644 index fc4dc2c..0000000 --- a/tmake/lib/win32-g++/app.t +++ /dev/null @@ -1,6 +0,0 @@ -############################################################################# -#! -#! This is a tmake template for building Win32 applications. -#! -#$ Project('TMAKE_APP_FLAG = 1'); -#$ IncludeTemplate("generic.t"); diff --git a/tmake/lib/win32-g++/generic.t b/tmake/lib/win32-g++/generic.t deleted file mode 100644 index 33494a2..0000000 --- a/tmake/lib/win32-g++/generic.t +++ /dev/null @@ -1,243 +0,0 @@ -#! -#! This is a tmake template for building Win32 applications or libraries. -#! -#${ - if ( Config("qt") ) { - if ( !(Project("DEFINES") =~ /QT_NODLL/) && - ((Project("DEFINES") =~ /QT_(?:MAKE)?DLL/) || - ($ENV{"QT_DLL"} && !$ENV{"QT_NODLL"})) ) { - Project('TMAKE_QT_DLL = 1'); - if ( (Project("TARGET") eq "qt") && Project("TMAKE_LIB_FLAG") ) { - Project('CONFIG += dll'); - } - } - } - if ( Config("dll") || Project("TMAKE_APP_FLAG") ) { - Project('CONFIG -= staticlib'); - Project('TMAKE_APP_OR_DLL = 1'); - } else { - Project('CONFIG += staticlib'); - } - if ( Config("warn_off") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_OFF'); - Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_WARN_OFF'); - } elsif ( Config("warn_on") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_ON'); - Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_WARN_ON'); - } - if ( Config("debug") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_DEBUG'); - Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_DEBUG'); - Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_DEBUG'); - } elsif ( Config("release") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_RELEASE'); - Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_RELEASE'); - Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_RELEASE'); - } - if ( Config("qt") || Config("opengl") ) { - Project('CONFIG += windows' ); - } - if ( Config("qt") ) { - Project('CONFIG *= moc'); - AddIncludePath(Project("TMAKE_INCDIR_QT")); - if ( Config("release") ) { - Project('DEFINES += NO_DEBUG'); - } - if ( Config("opengl") ) { - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_OPENGL'); - } - if ( (Project("TARGET") eq "qt") && Project("TMAKE_LIB_FLAG") ) { - if ( Project("TMAKE_QT_DLL") ) { - Project('DEFINES -= QT_DLL'); - Project('DEFINES *= QT_MAKEDLL'); - Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_QT_DLL'); - } - } else { - if ( Project("TMAKE_QT_DLL") ) { - Project('DEFINES *= QT_DLL'); - } - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT'); - if ( Project("TMAKE_QT_DLL") ) { - my $qtver =FindHighestLibVersion($ENV{"QTDIR"} . "/lib", "qt"); - Project("TMAKE_LIBS /= s/qt.lib/qt${qtver}.lib/"); - if ( !Config("dll") ) { - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_DLL'); - } - } - } - } - if ( Config("opengl") ) { - Project('TMAKE_LIBS *= $$TMAKE_LIBS_OPENGL'); - } - if ( Config("dll") ) { - Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE_DLL'); - Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS_DLL'); - if ( Project("TMAKE_LIB_FLAG") ) { - my $ver = Project("VERSION"); - $ver =~ s/\.//g; - $project{"TARGET_EXT"} = "${ver}.dll"; - } else { - $project{"TARGET_EXT"} = ".dll"; - } - } else { - if ( Config("cgi") ) { - Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE'); - Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS'); - $project{"TARGET_EXT"} = ""; - } else { - if ( Project("TMAKE_APP_FLAG") ) { - $project{"TARGET_EXT"} = ".exe"; - } else { - $project{"TARGET_EXT"} = ".a"; - } - } - } - if ( Config("windows") ) { - if ( Config("console") ) { - Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY'); - Project('TMAKE_LIBS *= $$TMAKE_LIBS_CONSOLE'); - } else { - Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_WINDOWS_ANY'); - } - Project('TMAKE_LIBS *= $$TMAKE_LIBS_WINDOWS'); - } else { - Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY'); - Project('TMAKE_LIBS *= $$TMAKE_LIBS_CONSOLE'); - } - if ( Config("moc") ) { - $moc_aware = 1; - } - Project('TMAKE_LIBS += $$LIBS'); - Project('TMAKE_FILETAGS = HEADERS SOURCES DEF_FILE RC_FILE TARGET TMAKE_LIBS DESTDIR DLLDESTDIR $$FILETAGS'); - foreach ( split(/\s/,Project("TMAKE_FILETAGS")) ) { - $project{$_} =~ s-[/\\]+-/-g; - } - if ( Project("DEF_FILE") ) { - Project('TMAKE_LFLAGS *= $$DEF_FILE'); - } - if ( Project("RC_FILE") ) { - if ( Project("RES_FILE") ) { - tmake_error("Both .rc and .res file specified.\n" . - "Please specify one of them, not both."); - } - $project{"RES_FILE"} = $project{"RC_FILE"}; - $project{"RES_FILE"} =~ s/\.rc$/.res/i; - Project('TARGETDEPS += $$RES_FILE'); - } - if ( Project("RES_FILE") ) { - Project('TMAKE_LIBS *= $$RES_FILE'); - } - $obj_ext = "o"; - $dir_sep = "/"; - $gnuwin32 = 1; - if ( Config("qt") ) { - $qtdir = $ENV{"QTDIR"}; - $project{"INCPATH"} =~ s/\$\(QTDIR\)/$qtdir/; - $project{"INCPATH"} =~ s/\\/\//g; - $project{"TMAKE_LIBS"} =~ s/\$\(QTDIR\)/$qtdir/; - $project{"TMAKE_LIBS"} =~ s/\\/\//g; - } - StdInit(); - if ( Project("VERSION") ) { - $project{"VER_MAJ"} = $project{"VERSION"}; - $project{"VER_MAJ"} =~ s/\.\d+$//; - $project{"VER_MIN"} = $project{"VERSION"}; - $project{"VER_MIN"} =~ s/^\d+\.//; - } - if ( Config("staticlib") ) { - $project{"TARGET"} = "lib" . $project{"TARGET"} - } -#$} -#! -# Makefile for building #$ Expand("TARGET") -# Generated by tmake at #$ Now(); -# Project: #$ Expand("PROJECT"); -# Template: #$ Expand("TEMPLATE"); -############################################################################# - -####### Compiler, tools and options - -CC = #$ Expand("TMAKE_CC"); -CXX = #$ Expand("TMAKE_CXX"); -CFLAGS = #$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); -CXXFLAGS= #$ Expand("TMAKE_CXXFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); -INCPATH = #$ ExpandPath("INCPATH",'-I',' -I',''); -#$ !Project("TMAKE_APP_OR_DLL") && DisableOutput(); -LINK = #$ Expand("TMAKE_LINK"); -LFLAGS = #$ Expand("TMAKE_LFLAGS"); -LIBS = #$ Expand("TMAKE_LIBS"); -#$ !Project("TMAKE_APP_OR_DLL") && EnableOutput(); -#$ Project("TMAKE_APP_OR_DLL") && DisableOutput(); -AR = #$ Expand("TMAKE_AR"); -RANLIB = #$ Expand("TMAKE_RANLIB"); -#$ Project("TMAKE_APP_OR_DLL") && EnableOutput(); -MOC = #$ Expand("TMAKE_MOC"); - -ZIP = #$ Expand("TMAKE_ZIP"); - -####### Files - -HEADERS = #$ ExpandList("HEADERS"); -SOURCES = #$ ExpandList("SOURCES"); -OBJECTS = #$ ExpandList("OBJECTS"); -SRCMOC = #$ ExpandList("SRCMOC"); -OBJMOC = #$ ExpandList("OBJMOC"); -DIST = #$ ExpandList("DISTFILES"); -TARGET = #$ ExpandGlue("TARGET",$project{"DESTDIR"},"",$project{"TARGET_EXT"}); - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.o: - #$ Expand("TMAKE_RUN_CXX_IMP"); - -.cxx.o: - #$ Expand("TMAKE_RUN_CXX_IMP"); - -.cc.o: - #$ Expand("TMAKE_RUN_CXX_IMP"); - -.c.o: - #$ Expand("TMAKE_RUN_CC_IMP"); - -####### Build rules - -all: #$ ExpandGlue("ALL_DEPS",""," "," "); $text .= '$(TARGET)'; - -$(TARGET): $(HEADERS) $(OBJECTS) $(OBJMOC) #$ Expand("TARGETDEPS"); -#$ Project("TMAKE_APP_OR_DLL") || DisableOutput(); - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) -#$ Project("TMAKE_APP_OR_DLL") || EnableOutput(); -#$ Project("TMAKE_APP_OR_DLL") && DisableOutput(); - -rm -f $(TARGET) - $(AR) $(TARGET) $(OBJECTS) $(OBJMOC) - #$ ExpandGlue("TMAKE_RANLIB","",""," \$(TARGET)"); -#$ Project("TMAKE_APP_OR_DLL") && EnableOutput(); -#$ (Config("dll") && Project("DLLDESTDIR")) || DisableOutput(); - -cp $(TARGET) #$ Expand("DLLDESTDIR"); -#$ (Config("dll") && Project("DLLDESTDIR")) || EnableOutput(); -#$ Project('RC_FILE') || DisableOutput(); - -#$ Substitute("\$\$RES_FILE: \$\$RC_FILE\n\t\$\$TMAKE_RC \$\$RC_FILE"); -#$ Project('RC_FILE') || EnableOutput(); - -moc: $(SRCMOC) - -#$ TmakeSelf(); - -dist: - #$ Substitute('$(ZIP) $$PROJECT.zip $$PROJECT.pro $(SOURCES) $(HEADERS) $(DIST)'); - -clean: - -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(TARGET) - #$ ExpandGlue("TMAKE_CLEAN","-rm -f "," ",""); - -rm -f *~ core - #$ ExpandGlue("CLEAN_FILES","-rm -f "," ",""); - -####### Compile - -#$ BuildObj(Project("OBJECTS"),Project("SOURCES")); -#$ BuildMocObj(Project("OBJMOC"),Project("SRCMOC")); -#$ BuildMocSrc(Project("HEADERS")); -#$ BuildMocSrc(Project("SOURCES")); diff --git a/tmake/lib/win32-g++/lib.t b/tmake/lib/win32-g++/lib.t deleted file mode 100644 index d8ac6c7..0000000 --- a/tmake/lib/win32-g++/lib.t +++ /dev/null @@ -1,6 +0,0 @@ -############################################################################# -#! -#! This is a tmake template for building Win32 libraries. -#! -#$ Project('TMAKE_LIB_FLAG = 1'); -#$ IncludeTemplate("generic.t"); diff --git a/tmake/lib/win32-g++/subdirs.t b/tmake/lib/win32-g++/subdirs.t deleted file mode 100644 index 8b881ab..0000000 --- a/tmake/lib/win32-g++/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Win32 template -#$ IncludeTemplate("../win32/subdirs.t"); diff --git a/tmake/lib/win32-g++/tmake.conf b/tmake/lib/win32-g++/tmake.conf deleted file mode 100644 index d313a44..0000000 --- a/tmake/lib/win32-g++/tmake.conf +++ /dev/null @@ -1,56 +0,0 @@ -# -# -# -# tmake configuration for Win32/g++ (Cygnus gnu-win32) -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -TMAKE_CFLAGS_WARN_ON = -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = g++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_INCDIR_QT = $(QTDIR)/include - -TMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src -TMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< -TMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src -TMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -TMAKE_LINK = g++ -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console -TMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows -TMAKE_LFLAGS_CONSOLE_DLL= -Wl,-subsystem,console -TMAKE_LFLAGS_WINDOWS_DLL= -Wl,-subsystem,windows - -TMAKE_LIBS = -TMAKE_LIBS_CONSOLE = -TMAKE_LIBS_WINDOWS = -luser32 -lgdi32 -lcomdlg32 -limm32 -lole32 -luuid -lwsock32 -TMAKE_LIBS_QT = -L$(QTDIR)/lib -lqt -TMAKE_LIBS_QT_DLL = -lqtmain -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lopengl32 - -TMAKE_MOC = moc - -TMAKE_AR = ar cqs -TMAKE_RANLIB = - -TMAKE_ZIP = zip -r -9 diff --git a/tmake/lib/win32-mingw/app.t b/tmake/lib/win32-mingw/app.t deleted file mode 100644 index fc4dc2c..0000000 --- a/tmake/lib/win32-mingw/app.t +++ /dev/null @@ -1,6 +0,0 @@ -############################################################################# -#! -#! This is a tmake template for building Win32 applications. -#! -#$ Project('TMAKE_APP_FLAG = 1'); -#$ IncludeTemplate("generic.t"); diff --git a/tmake/lib/win32-mingw/generic.t b/tmake/lib/win32-mingw/generic.t deleted file mode 100644 index 4988d59..0000000 --- a/tmake/lib/win32-mingw/generic.t +++ /dev/null @@ -1,239 +0,0 @@ -#! -#! This is a tmake template for building Win32 applications or libraries. -#! -#${ - if ( Config("qt") ) { - if ( !(Project("DEFINES") =~ /QT_NODLL/) && - ((Project("DEFINES") =~ /QT_(?:MAKE)?DLL/) || - ($ENV{"QT_DLL"} && !$ENV{"QT_NODLL"})) ) { - Project('TMAKE_QT_DLL = 1'); - if ( (Project("TARGET") eq "qt") && Project("TMAKE_LIB_FLAG") ) { - Project('CONFIG += dll'); - } - } - } - if ( Config("dll") || Project("TMAKE_APP_FLAG") ) { - Project('CONFIG -= staticlib'); - Project('TMAKE_APP_OR_DLL = 1'); - } else { - Project('CONFIG += staticlib'); - } - if ( Config("warn_off") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_OFF'); - Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_WARN_OFF'); - } elsif ( Config("warn_on") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_ON'); - Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_WARN_ON'); - } - if ( Config("debug") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_DEBUG'); - Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_DEBUG'); - Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_DEBUG'); - } elsif ( Config("release") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_RELEASE'); - Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_RELEASE'); - Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_RELEASE'); - } - if ( Config("qt") || Config("opengl") ) { - Project('CONFIG += windows' ); - } - if ( Config("qt") ) { - Project('CONFIG *= moc'); - AddIncludePath(Project("TMAKE_INCDIR_QT")); - if ( Config("release") ) { - Project('DEFINES += NO_DEBUG'); - } - if ( Config("opengl") ) { - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_OPENGL'); - } - if ( (Project("TARGET") eq "qt") && Project("TMAKE_LIB_FLAG") ) { - if ( Project("TMAKE_QT_DLL") ) { - Project('DEFINES -= QT_DLL'); - Project('DEFINES *= QT_MAKEDLL'); - Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_QT_DLL'); - } - } else { - if ( Project("TMAKE_QT_DLL") ) { - Project('DEFINES *= QT_DLL'); - } - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT'); - if ( Project("TMAKE_QT_DLL") ) { - my $qtver =FindHighestLibVersion($ENV{"QTDIR"} . "/lib", "qt"); - Project("TMAKE_LIBS /= s/qt.lib/qt${qtver}.lib/"); - if ( !Config("dll") ) { - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_DLL'); - } - } - } - } - if ( Config("opengl") ) { - Project('TMAKE_LIBS *= $$TMAKE_LIBS_OPENGL'); - } - if ( Config("dll") ) { - Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE_DLL'); - Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS_DLL'); - if ( Project("TMAKE_LIB_FLAG") ) { - my $ver = Project("VERSION"); - $ver =~ s/\.//g; - $project{"TARGET_EXT"} = "${ver}.dll"; - } else { - $project{"TARGET_EXT"} = ".dll"; - } - } else { - Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE'); - Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS'); - if ( Project("TMAKE_APP_FLAG") ) { - $project{"TARGET_EXT"} = ".exe"; - } else { - $project{"TARGET_EXT"} = ".a"; - } - } - if ( Config("windows") ) { - if ( Config("console") ) { - Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY'); - Project('TMAKE_LIBS *= $$TMAKE_LIBS_CONSOLE'); - } else { - Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_WINDOWS_ANY'); - } - Project('TMAKE_LIBS *= $$TMAKE_LIBS_WINDOWS'); - } else { - Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY'); - Project('TMAKE_LIBS *= $$TMAKE_LIBS_CONSOLE'); - } - if ( Config("moc") ) { - $moc_aware = 1; - } - Project('TMAKE_LIBS += $$LIBS'); - Project('TMAKE_FILETAGS = HEADERS SOURCES DEF_FILE RC_FILE TARGET TMAKE_LIBS DESTDIR DLLDESTDIR $$FILETAGS'); - foreach ( split(/\s/,Project("TMAKE_FILETAGS")) ) { - $project{$_} =~ s-[/\\]+-/-g; - } - if ( Project("DEF_FILE") ) { - Project('TMAKE_LFLAGS *= $$DEF_FILE'); - } - if ( Project("RC_FILE") ) { - if ( Project("RES_FILE") ) { - tmake_error("Both .rc and .res file specified.\n" . - "Please specify one of them, not both."); - } - $project{"RES_FILE"} = $project{"RC_FILE"}; - $project{"RES_FILE"} =~ s/\.rc$/.res/i; - Project('TARGETDEPS += $$RES_FILE'); - } - if ( Project("RES_FILE") ) { - Project('TMAKE_LIBS *= $$RES_FILE'); - } - $obj_ext = "o"; - $dir_sep = "/"; - $gnuwin32 = 1; - if ( Config("qt") ) { - $qtdir = $ENV{"QTDIR"}; - $project{"INCPATH"} =~ s/\$\(QTDIR\)/$qtdir/; - $project{"INCPATH"} =~ s/\\/\//g; - $project{"TMAKE_LIBS"} =~ s/\$\(QTDIR\)/$qtdir/; - $project{"TMAKE_LIBS"} =~ s/\\/\//g; - } - StdInit(); - if ( Project("VERSION") ) { - $project{"VER_MAJ"} = $project{"VERSION"}; - $project{"VER_MAJ"} =~ s/\.\d+$//; - $project{"VER_MIN"} = $project{"VERSION"}; - $project{"VER_MIN"} =~ s/^\d+\.//; - } - if ( Config("staticlib") ) { - $project{"TARGET"} = "lib" . $project{"TARGET"}; - } -#$} -#! -# Makefile for building #$ Expand("TARGET") -# Generated by tmake at #$ Now(); -# Project: #$ Expand("PROJECT"); -# Template: #$ Expand("TEMPLATE"); -############################################################################# - -####### Compiler, tools and options - -CC = #$ Expand("TMAKE_CC"); -CXX = #$ Expand("TMAKE_CXX"); -CFLAGS = #$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); -CXXFLAGS= #$ Expand("TMAKE_CXXFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); -INCPATH = #$ ExpandPath("INCPATH",'-I',' -I',''); -#$ !Project("TMAKE_APP_OR_DLL") && DisableOutput(); -LINK = #$ Expand("TMAKE_LINK"); -LFLAGS = #$ Expand("TMAKE_LFLAGS"); -LIBS = #$ Expand("TMAKE_LIBS"); -#$ !Project("TMAKE_APP_OR_DLL") && EnableOutput(); -#$ Project("TMAKE_APP_OR_DLL") && DisableOutput(); -AR = #$ Expand("TMAKE_AR"); -RANLIB = #$ Expand("TMAKE_RANLIB"); -#$ Project("TMAKE_APP_OR_DLL") && EnableOutput(); -MOC = #$ Expand("TMAKE_MOC"); - -ZIP = #$ Expand("TMAKE_ZIP"); - -####### Files - -HEADERS = #$ ExpandList("HEADERS"); -SOURCES = #$ ExpandList("SOURCES"); -OBJECTS = #$ ExpandList("OBJECTS"); -SRCMOC = #$ ExpandList("SRCMOC"); -OBJMOC = #$ ExpandList("OBJMOC"); -DIST = #$ ExpandList("DISTFILES"); -TARGET = #$ ExpandGlue("TARGET",$project{"DESTDIR"},"",$project{"TARGET_EXT"}); - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.o: - #$ Expand("TMAKE_RUN_CXX_IMP"); - -.cxx.o: - #$ Expand("TMAKE_RUN_CXX_IMP"); - -.cc.o: - #$ Expand("TMAKE_RUN_CXX_IMP"); - -.c.o: - #$ Expand("TMAKE_RUN_CC_IMP"); - -####### Build rules - -all: #$ ExpandGlue("ALL_DEPS",""," "," "); $text .= '$(TARGET)'; - -$(TARGET): $(HEADERS) $(OBJECTS) $(OBJMOC) #$ Expand("TARGETDEPS"); -#$ Project("TMAKE_APP_OR_DLL") || DisableOutput(); - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) -#$ Project("TMAKE_APP_OR_DLL") || EnableOutput(); -#$ Project("TMAKE_APP_OR_DLL") && DisableOutput(); - -rm -f $(TARGET) - $(AR) $(TARGET) $(OBJECTS) $(OBJMOC) - #$ ExpandGlue("TMAKE_RANLIB","",""," \$(TARGET)"); -#$ Project("TMAKE_APP_OR_DLL") && EnableOutput(); -#$ (Config("dll") && Project("DLLDESTDIR")) || DisableOutput(); - -cp $(TARGET) #$ Expand("DLLDESTDIR"); -#$ (Config("dll") && Project("DLLDESTDIR")) || EnableOutput(); -#$ Project('RC_FILE') || DisableOutput(); - -#$ Substitute("\$\$RES_FILE: \$\$RC_FILE\n\t\$\$TMAKE_RC \$\$RC_FILE"); -#$ Project('RC_FILE') || EnableOutput(); - -moc: $(SRCMOC) - -#$ TmakeSelf(); - -dist: - #$ Substitute('$(ZIP) $$PROJECT.zip $$PROJECT.pro $(SOURCES) $(HEADERS) $(DIST)'); - -clean: - -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(TARGET) - #$ ExpandGlue("TMAKE_CLEAN","-rm -f "," ",""); - -rm -f *~ core - #$ ExpandGlue("CLEAN_FILES","-rm -f "," ",""); - -####### Compile - -#$ BuildObj(Project("OBJECTS"),Project("SOURCES")); -#$ BuildMocObj(Project("OBJMOC"),Project("SRCMOC")); -#$ BuildMocSrc(Project("HEADERS")); -#$ BuildMocSrc(Project("SOURCES")); diff --git a/tmake/lib/win32-mingw/lib.t b/tmake/lib/win32-mingw/lib.t deleted file mode 100644 index d8ac6c7..0000000 --- a/tmake/lib/win32-mingw/lib.t +++ /dev/null @@ -1,6 +0,0 @@ -############################################################################# -#! -#! This is a tmake template for building Win32 libraries. -#! -#$ Project('TMAKE_LIB_FLAG = 1'); -#$ IncludeTemplate("generic.t"); diff --git a/tmake/lib/win32-mingw/subdirs.t b/tmake/lib/win32-mingw/subdirs.t deleted file mode 100644 index 8b881ab..0000000 --- a/tmake/lib/win32-mingw/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Win32 template -#$ IncludeTemplate("../win32/subdirs.t"); diff --git a/tmake/lib/win32-mingw/tmake.conf b/tmake/lib/win32-mingw/tmake.conf deleted file mode 100644 index c6d1918..0000000 --- a/tmake/lib/win32-mingw/tmake.conf +++ /dev/null @@ -1,56 +0,0 @@ -# -# -# -# tmake configuration for Win32/mingw (MINGW gnu-win32) -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = gcc -TMAKE_CFLAGS = -TMAKE_CFLAGS_WARN_ON = -TMAKE_CFLAGS_WARN_OFF = -TMAKE_CFLAGS_RELEASE = -O2 -s -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -TMAKE_CXX = g++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_INCDIR_QT = $(QTDIR)/include - -TMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src -TMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< -TMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src -TMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -TMAKE_LINK = g++ -TMAKE_LFLAGS = -TMAKE_LFLAGS_RELEASE = -s -TMAKE_LFLAGS_DEBUG = -TMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console -TMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows -TMAKE_LFLAGS_CONSOLE_DLL= -Wl,-subsystem,console -TMAKE_LFLAGS_WINDOWS_DLL= -Wl,-subsystem,windows - -TMAKE_LIBS = -TMAKE_LIBS_CONSOLE = -TMAKE_LIBS_WINDOWS = -luser32 -lgdi32 -lcomdlg32 -limm32 -lole32 -luuid -lwsock32 -TMAKE_LIBS_QT = -L$(QTDIR)/lib -lqt -TMAKE_LIBS_QT_DLL = -lqtmain -TMAKE_LIBS_QT_OPENGL = -lqgl -TMAKE_LIBS_OPENGL = -lopengl32 - -TMAKE_MOC = moc - -TMAKE_AR = ar cqs -TMAKE_RANLIB = - -TMAKE_ZIP = zip -r -9 diff --git a/tmake/lib/win32-msvc/app.t b/tmake/lib/win32-msvc/app.t deleted file mode 100644 index fc4dc2c..0000000 --- a/tmake/lib/win32-msvc/app.t +++ /dev/null @@ -1,6 +0,0 @@ -############################################################################# -#! -#! This is a tmake template for building Win32 applications. -#! -#$ Project('TMAKE_APP_FLAG = 1'); -#$ IncludeTemplate("generic.t"); diff --git a/tmake/lib/win32-msvc/generic.t b/tmake/lib/win32-msvc/generic.t deleted file mode 100644 index 3344236..0000000 --- a/tmake/lib/win32-msvc/generic.t +++ /dev/null @@ -1,229 +0,0 @@ -#! -#! This is a tmake template for building Win32 applications or libraries. -#! -#${ - if ( Config("qt") ) { - if ( !(Project("DEFINES") =~ /QT_NODLL/) && - ((Project("DEFINES") =~ /QT_(?:MAKE)?DLL/) || - ($ENV{"QT_DLL"} && !$ENV{"QT_NODLL"})) ) { - Project('TMAKE_QT_DLL = 1'); - if ( (Project("TARGET") eq "qt") && Project("TMAKE_LIB_FLAG") ) { - Project('CONFIG += dll'); - } - } - } - if ( Config("dll") || Project("TMAKE_APP_FLAG") ) { - Project('CONFIG -= staticlib'); - Project('TMAKE_APP_OR_DLL = 1'); - } else { - Project('CONFIG += staticlib'); - } - if ( Config("warn_off") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_OFF'); - Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_WARN_OFF'); - } elsif ( Config("warn_on") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_ON'); - Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_WARN_ON'); - } - if ( Config("debug") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_DEBUG'); - Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_DEBUG'); - Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_DEBUG'); - } elsif ( Config("release") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_RELEASE'); - Project('TMAKE_CXXFLAGS += $$TMAKE_CXXFLAGS_RELEASE'); - Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_RELEASE'); - } - if ( Config("qt") || Config("opengl") ) { - Project('CONFIG += windows' ); - } - if ( Config("qt") ) { - Project('CONFIG *= moc'); - AddIncludePath(Project("TMAKE_INCDIR_QT")); - if ( Config("release") ) { - Project('DEFINES += NO_DEBUG'); - } - if ( Config("opengl") ) { - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_OPENGL'); - } - if ( (Project("TARGET") eq "qt") && Project("TMAKE_LIB_FLAG") ) { - if ( Project("TMAKE_QT_DLL") ) { - Project('DEFINES -= QT_DLL'); - Project('DEFINES *= QT_MAKEDLL'); - Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_QT_DLL'); - } - } else { - if ( Project("TMAKE_QT_DLL") ) { - Project('DEFINES *= QT_DLL'); - } - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT'); - if ( Project("TMAKE_QT_DLL") ) { - my $qtver =FindHighestLibVersion($ENV{"QTDIR"} . "/lib", "qt"); - Project("TMAKE_LIBS /= s/qt.lib/qt${qtver}.lib/"); - if ( !Config("dll") ) { - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_DLL'); - } - } - } - } - if ( Config("opengl") ) { - Project('TMAKE_LIBS *= $$TMAKE_LIBS_OPENGL'); - } - if ( Config("dll") ) { - Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE_DLL'); - Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS_DLL'); - if ( Project("TMAKE_LIB_FLAG") ) { - my $ver = Project("VERSION"); - $ver =~ s/\.//g; - $project{"TARGET_EXT"} = "${ver}.dll"; - } else { - $project{"TARGET_EXT"} = ".dll"; - } - } else { - Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE'); - Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS'); - if ( Project("TMAKE_APP_FLAG") ) { - $project{"TARGET_EXT"} = ".exe"; - } else { - $project{"TARGET_EXT"} = ".lib"; - } - } - if ( Config("windows") ) { - if ( Config("console") ) { - Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY'); - Project('TMAKE_LIBS *= $$TMAKE_LIBS_CONSOLE'); - } else { - Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_WINDOWS_ANY'); - } - Project('TMAKE_LIBS *= $$TMAKE_LIBS_WINDOWS'); - } else { - Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY'); - Project('TMAKE_LIBS *= $$TMAKE_LIBS_CONSOLE'); - } - if ( Config("moc") ) { - $moc_aware = 1; - } - Project('TMAKE_LIBS += $$LIBS'); - Project('TMAKE_FILETAGS = HEADERS SOURCES DEF_FILE RC_FILE TARGET TMAKE_LIBS DESTDIR DLLDESTDIR $$FILETAGS'); - foreach ( split(/\s/,Project("TMAKE_FILETAGS")) ) { - $project{$_} =~ s-[/\\]+-\\-g; - } - if ( Project("DEF_FILE") ) { - Project('TMAKE_LFLAGS *= /DEF:$$DEF_FILE'); - } - if ( Project("RC_FILE") ) { - if ( Project("RES_FILE") ) { - tmake_error("Both .rc and .res file specified.\n" . - "Please specify one of them, not both."); - } - $project{"RES_FILE"} = $project{"RC_FILE"}; - $project{"RES_FILE"} =~ s/\.rc$/.res/i; - Project('TARGETDEPS += $$RES_FILE'); - } - if ( Project("RES_FILE") ) { - Project('TMAKE_LIBS *= $$RES_FILE'); - } - StdInit(); - if ( Project("VERSION") ) { - $project{"VER_MAJ"} = $project{"VERSION"}; - $project{"VER_MAJ"} =~ s/\.\d+$//; - $project{"VER_MIN"} = $project{"VERSION"}; - $project{"VER_MIN"} =~ s/^\d+\.//; - } - Project('debug:TMAKE_CLEAN += $$TARGET.pdb vc*.pdb $$TARGET.ilk'); -#$} -#! -# Makefile for building #$ Expand("TARGET") -# Generated by tmake at #$ Now(); -# Project: #$ Expand("PROJECT"); -# Template: #$ Expand("TEMPLATE"); -############################################################################# - -####### Compiler, tools and options - -CC = #$ Expand("TMAKE_CC"); -CXX = #$ Expand("TMAKE_CXX"); -CFLAGS = #$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); -CXXFLAGS= #$ Expand("TMAKE_CXXFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); -INCPATH = #$ ExpandPath("INCPATH",'-I',' -I',''); -#$ !Project("TMAKE_APP_OR_DLL") && DisableOutput(); -LINK = #$ Expand("TMAKE_LINK"); -LFLAGS = #$ Expand("TMAKE_LFLAGS"); -LIBS = #$ Expand("TMAKE_LIBS"); -#$ !Project("TMAKE_APP_OR_DLL") && EnableOutput(); -#$ Project("TMAKE_APP_OR_DLL") && DisableOutput(); -LIB = #$ Expand("TMAKE_LIB"); -#$ Project("TMAKE_APP_OR_DLL") && EnableOutput(); -MOC = #$ Expand("TMAKE_MOC"); - -ZIP = #$ Expand("TMAKE_ZIP"); - -####### Files - -HEADERS = #$ ExpandList("HEADERS"); -SOURCES = #$ ExpandList("SOURCES"); -OBJECTS = #$ ExpandList("OBJECTS"); -SRCMOC = #$ ExpandList("SRCMOC"); -OBJMOC = #$ ExpandList("OBJMOC"); -DIST = #$ ExpandList("DISTFILES"); -TARGET = #$ ExpandGlue("TARGET",$project{"DESTDIR"},"",$project{"TARGET_EXT"}); - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.obj: - #$ Expand("TMAKE_RUN_CXX_IMP"); - -.cxx.obj: - #$ Expand("TMAKE_RUN_CXX_IMP"); - -.cc.obj: - #$ Expand("TMAKE_RUN_CXX_IMP"); - -.c.obj: - #$ Expand("TMAKE_RUN_CC_IMP"); - -####### Build rules - -all: #$ ExpandGlue("ALL_DEPS",""," "," "); $text .= '$(TARGET)'; - -$(TARGET): $(HEADERS) $(OBJECTS) $(OBJMOC) #$ Expand("TARGETDEPS"); -#$ Project("TMAKE_APP_OR_DLL") || DisableOutput(); - $(LINK) $(LFLAGS) /OUT:$(TARGET) @<< - $(OBJECTS) $(OBJMOC) $(LIBS) -#$ Project("TMAKE_APP_OR_DLL") || EnableOutput(); -#$ Project("TMAKE_APP_OR_DLL") && DisableOutput(); - $(LIB) /OUT:$(TARGET) @<< - $(OBJECTS) $(OBJMOC) -#$ Project("TMAKE_APP_OR_DLL") && EnableOutput(); -<< -#$ (Config("dll") && Project("DLLDESTDIR")) || DisableOutput(); - -copy $(TARGET) #$ Expand("DLLDESTDIR"); -#$ (Config("dll") && Project("DLLDESTDIR")) || EnableOutput(); -#$ Project("RC_FILE") || DisableOutput(); - -#$ Substitute("\$\$RES_FILE: \$\$RC_FILE\n\t\$\$TMAKE_RC \$\$RC_FILE"); -#$ Project("RC_FILE") || EnableOutput(); - -moc: $(SRCMOC) - -#$ TmakeSelf(); - -dist: - #$ Substitute('$(ZIP) $$PROJECT.zip $$PROJECT.pro $(SOURCES) $(HEADERS) $(DIST)'); - -clean: - #$ ExpandGlue("OBJECTS","-del ","\n\t-del ",""); - #$ ExpandGlue("SRCMOC" ,"-del ","\n\t-del ",""); - #$ ExpandGlue("OBJMOC" ,"-del ","\n\t-del ",""); - -del $(TARGET) - #$ ExpandGlue("TMAKE_CLEAN","-del ","\n\t-del ",""); - #$ ExpandGlue("CLEAN_FILES","-del ","\n\t-del ",""); - -####### Compile - -#$ BuildObj(Project("OBJECTS"),Project("SOURCES")); -#$ BuildMocObj(Project("OBJMOC"),Project("SRCMOC")); -#$ BuildMocSrc(Project("HEADERS")); -#$ BuildMocSrc(Project("SOURCES")); diff --git a/tmake/lib/win32-msvc/lib.t b/tmake/lib/win32-msvc/lib.t deleted file mode 100644 index d8ac6c7..0000000 --- a/tmake/lib/win32-msvc/lib.t +++ /dev/null @@ -1,6 +0,0 @@ -############################################################################# -#! -#! This is a tmake template for building Win32 libraries. -#! -#$ Project('TMAKE_LIB_FLAG = 1'); -#$ IncludeTemplate("generic.t"); diff --git a/tmake/lib/win32-msvc/subdirs.t b/tmake/lib/win32-msvc/subdirs.t deleted file mode 100644 index 8b881ab..0000000 --- a/tmake/lib/win32-msvc/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Win32 template -#$ IncludeTemplate("../win32/subdirs.t"); diff --git a/tmake/lib/win32-msvc/tmake.conf b/tmake/lib/win32-msvc/tmake.conf deleted file mode 100644 index e3191a3..0000000 --- a/tmake/lib/win32-msvc/tmake.conf +++ /dev/null @@ -1,65 +0,0 @@ -# -# -# -# tmake configuration for Win32/Microsoft C++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = cl -TMAKE_CFLAGS = -nologo -TMAKE_CFLAGS_WARN_ON = -W3 -TMAKE_CFLAGS_WARN_OFF = -W0 -TMAKE_CFLAGS_RELEASE = -O2 -TMAKE_CFLAGS_DEBUG = -Zi -TMAKE_CFLAGS_MT = -MT -TMAKE_CFLAGS_MT_DBG = -MTd -TMAKE_CFLAGS_MT_DLL = -MD -TMAKE_CFLAGS_MT_DLLDBG = -MDd -TMAKE_CFLAGS_YACC = - -TMAKE_CXX = $$TMAKE_CC -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_MT = $$TMAKE_CFLAGS_MT -TMAKE_CXXFLAGS_MT_DBG = $$TMAKE_CFLAGS_MT_DBG -TMAKE_CXXFLAGS_MT_DLL = $$TMAKE_CFLAGS_MT_DLL -TMAKE_CXXFLAGS_MT_DLLDBG= $$TMAKE_CFLAGS_MT_DLLDBG -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_INCDIR_QT = $(QTDIR)\include - -TMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src -TMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< -TMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src -TMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< - -TMAKE_LINK = link -TMAKE_LFLAGS = /NOLOGO -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = /DEBUG -TMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:console -TMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:windows -TMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL -TMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL -TMAKE_LFLAGS_QT_DLL = /BASE:0x39D00000 - -TMAKE_LIBS = -TMAKE_LIBS_CONSOLE = -TMAKE_LIBS_WINDOWS = user32.lib gdi32.lib comdlg32.lib imm32.lib ole32.lib uuid.lib wsock32.lib -TMAKE_LIBS_QT = $(QTDIR)\lib\qt.lib -TMAKE_LIBS_QT_DLL = $(QTDIR)\lib\qtmain.lib -TMAKE_LIBS_QT_OPENGL = $(QTDIR)\lib\qgl.lib -TMAKE_LIBS_OPENGL = opengl32.lib glu32.lib - -TMAKE_MOC = moc - -TMAKE_LIB = lib /NOLOGO -TMAKE_RC = rc - -TMAKE_ZIP = zip -r -9 diff --git a/tmake/lib/win32-msvc/vcapp.t b/tmake/lib/win32-msvc/vcapp.t deleted file mode 100644 index ac7ae23..0000000 --- a/tmake/lib/win32-msvc/vcapp.t +++ /dev/null @@ -1,244 +0,0 @@ -#! -#! This TMAKE template - Microsoft Visual C++ 5.0 applications -#! -#${ - if ( Config("qt") ) { - if ( !(Project("DEFINES") =~ /QT_NODLL/) && - ((Project("DEFINES") =~ /QT_(?:MAKE)?DLL/) || - ($ENV{"QT_DLL"} && !$ENV{"QT_NODLL"})) ) { - Project('TMAKE_QT_DLL = 1'); - if ( (Project("TARGET") eq "qt") && Project("TMAKE_LIB_FLAG") ) { - Project('CONFIG += dll'); - } - } - } - if ( Config("qt") || Config("opengl") ) { - Project('CONFIG += windows'); - } - if ( Config("qt") ) { - $moc_aware = 1; - AddIncludePath(Project('TMAKE_INCDIR_QT')); - if ( Config("opengl") ) { - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_OPENGL'); - } - if ( Project("TMAKE_QT_DLL") ) { - Project('DEFINES *= QT_DLL'); - } - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT'); - if ( Project("TMAKE_QT_DLL") ) { - my $qtver =FindHighestLibVersion($ENV{"QTDIR"} . "/lib", "qt"); - Project("TMAKE_LIBS /= s/qt.lib/qt${qtver}.lib/"); - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_DLL'); - } - } - if ( Config("opengl") ) { - Project('TMAKE_LIBS *= $$TMAKE_LIBS_OPENGL'); - } - Project('TMAKE_LIBS += $$LIBS'); - - if ( Config("console") ) { - $project{"VC_PROJ_TYPE"} = 'Win32 (x86) Console Application'; - $project{"VC_PROJ_CODE"} = '0x0103'; - $vc_base_libs = 'kernel32.lib user32.lib gdi32.lib winspool.lib ' . - 'comdlg32.lib advapi32.lib shell32.lib ole32.lib ' . - 'oleaut32.lib uuid.lib odbc32.lib odbccp32.lib '; - $vc_libs = $vc_base_libs; - $vc_link_release = '/nologo /subsystem:console /machine:I386'; - $vc_link_debug = '/nologo /subsystem:console /debug /machine:I386 /pdbtype:sept'; - $vc_cpp_def_release = '/D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" '; - $vc_cpp_def_debug = '/D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" '; - } else { - $project{"VC_PROJ_TYPE"} = 'Win32 (x86) Application'; - $project{"VC_PROJ_CODE"} = '0x0101'; - $vc_base_libs = 'kernel32.lib user32.lib gdi32.lib winspool.lib ' . - 'comdlg32.lib advapi32.lib shell32.lib ole32.lib ' . - 'oleaut32.lib uuid.lib odbc32.lib odbccp32.lib '; - $vc_libs = $vc_base_libs . 'wsock32.lib '; - $vc_link_release = '/nologo /subsystem:windows /machine:I386'; - $vc_link_debug = '/nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept'; - $vc_cpp_def_release = '/D "NDEBUG" /D "WIN32" /D "_WINDOWS" '; - $vc_cpp_def_debug = '/D "_DEBUG" /D "WIN32" /D "_WINDOWS" '; - } - $project{"VC_BASE_LINK_RELEASE"} = $vc_base_libs . $vc_link_release; - $project{"VC_BASE_LINK_DEBUG"} = $vc_base_libs . $vc_link_debug; - $tmake_libs = Project('TMAKE_LIBS') ? (Project('TMAKE_LIBS') . " ") : ""; - $project{"VC_LINK_RELEASE"} = $vc_libs . $tmake_libs . $vc_link_release; - $project{"VC_LINK_DEBUG"} = $vc_libs . $tmake_libs . $vc_link_debug; - - $vc_cpp_opt_release = '/nologo /W3 /GX /O2 '; - $vc_cpp_opt_debug = '/nologo /W3 /Gm /GX /Zi /Od '; - $vc_cpp_opt_common = '/YX /FD /c'; - $project{"VC_BASE_CPP_RELEASE"} = $vc_cpp_opt_release . $vc_cpp_def_release . $vc_cpp_opt_common; - $project{"VC_BASE_CPP_DEBUG"} = $vc_cpp_opt_debug . $vc_cpp_def_debug . $vc_cpp_opt_common; - ExpandPath("INCPATH",'/I ',' /I ',''); - if ( $text ne "" ) { $vc_inc = $text . " "; $text = ""; } else { $vc_inc = ""; } - ExpandGlue("DEFINES",'/D "','" /D "','"'); - if ( $text ne "" ) { $vc_def = $text . " "; $text = ""; } else { $vc_def = ""; } - $project{"VC_CPP_RELEASE"} = $vc_cpp_opt_release . $vc_inc . $vc_cpp_def_release . $vc_def . $vc_cpp_opt_common; - $project{"VC_CPP_DEBUG"} = $vc_cpp_opt_debug . $vc_inc . $vc_cpp_def_debug . $vc_def . $vc_cpp_opt_common; - - $project{"MAKEFILE"} = $project{"PROJECT"} . ".mak"; - $project{"TARGETAPP"} = $project{"TARGET"} . ".exe"; - Project('TMAKE_FILETAGS = HEADERS SOURCES TARGET DESTDIR $$FILETAGS'); - foreach ( split(/\s/,Project('TMAKE_FILETAGS')) ) { - $project{$_} =~ s-/-\\-g; - } - StdInit(); - if ( defined($project{"DESTDIR"}) ) { - $project{"TARGETAPP"} = $project{"DESTDIR"} . "\\" . $project{"TARGETAPP"}; - $project{"TARGETAPP"} =~ s/\\+/\\/g; - } - %all_files = (); - @files = split(/\s+/,$project{"HEADERS"}); - foreach ( @files ) { $all_files{$_} = "h" }; - @files = split(/\s+/,$project{"SOURCES"}); - foreach ( @files ) { $all_files{$_} = "s" }; - if ( $moc_aware ) { - @files = split(/\s+/,$project{"_HDRMOC"}); - foreach ( @files ) { $all_files{$_} = "m"; } - @files = split(/\s+/,$project{"_SRCMOC"}); - foreach ( @files ) { $all_files{$_} = "i"; } - } - %file_names = (); - foreach $f ( %all_files ) { - $n = $f; - $n =~ s/^.*\\//; - $file_names{$n} = $f; - $file_path{$n} = ".\\" . $f; - $file_path2{$n} = (($f =~ /^\./) ? "" : ".\\") . $f; - } -#$} -# Microsoft Developer Studio Project File - #$ Substitute('Name="$$TARGET" - Package Owner=<4>'); -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE #$ Substitute('"$$VC_PROJ_TYPE" $$VC_PROJ_CODE'); - -CFG=#$ Substitute('$$TARGET - Win32 Debug'); -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "#$ ExpandGlue('MAKEFILE','','','".'); -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f #$ Substitute('"$$MAKEFILE" CFG="$$TARGET - Win32 Debug"'); -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE #$ Substitute('"$$TARGET - Win32 Release" (based on "$$VC_PROJ_TYPE")'); -!MESSAGE #$ Substitute('"$$TARGET - Win32 Debug" (based on "$$VC_PROJ_TYPE")'); -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -#$ Config("windows") && ($text='MTL=midl.exe'); -RSC=rc.exe - -!IF "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Release"'); - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0'); -# PROP Target_Dir "" -# ADD BASE CPP #$ Expand("VC_BASE_CPP_RELEASE"); -# ADD CPP #$ Expand("VC_CPP_RELEASE"); -#$ Config("windows") || DisableOutput(); -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -#$ Config("windows") || EnableOutput(); -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 #$ Expand("VC_BASE_LINK_RELEASE"); -# ADD LINK32 #$ Expand("VC_LINK_RELEASE"); - -!ELSEIF "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Debug"'); - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0'); -# PROP Target_Dir "" -# ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG"); -# ADD CPP #$ Expand("VC_CPP_DEBUG"); -#$ Config("windows") || DisableOutput(); -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -#$ Config("windows") || EnableOutput(); -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 #$ Expand("VC_BASE_LINK_DEBUG"); -# ADD LINK32 #$ Expand("VC_LINK_DEBUG"); - -!ENDIF - -# Begin Target - -# Name #$Substitute('"$$TARGET - Win32 Release"'); -# Name #$Substitute('"$$TARGET - Win32 Debug"'); -#${ - foreach $n ( sort keys %file_names ) { - $f = $file_names{$n}; - $p = $file_path{$n}; - $p2 = $file_path2{$n}; - $t = $all_files{$f}; - if ( ($t eq "h") && $moc_output{$f} ) { - my($build); - $build = "\n\n# Begin Custom Build - Running moc...\nInputPath=" . $p2 . "\n\n" - . '"' . $moc_output{$f} . '" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"' - . "\n\tmoc $p2 -o " . $moc_output{$f} . "\n\n" - . "# End Custom Build\n\n"; - $text .= ("# Begin Source File\n\nSOURCE=$p\n\n" - . '!IF "$(CFG)" == "' . $project{"TARGET"} . ' - Win32 Release"' - . $build); - $text .= ('!ELSEIF "$(CFG)" == "' . $project{"TARGET"} . ' - Win32 Debug"' - . $build - . "!ENDIF \n\n# End Source File\n"); - } elsif ( $t eq "i" ) { - my($build,$dn); - $build = "\n\n# Begin Custom Build - Running moc...\nInputPath=" . $p2 . "\n\n" - . '"' . $f . '" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"' - . "\n\tmoc ". $moc_input{$f} . " -o $f\n\n" - . "# End Custom Build\n\n"; - $dn = $n; - $dn =~ s/\..*//; - $dn =~ tr/a-z/A-Z/; - $text .= ("# Begin Source File\n\nSOURCE=$p\n" - . "USERDEP__$dn=" . '"' . $moc_input{$f} . '"' . "\n\n" - . '!IF "$(CFG)" == "' . $project{"TARGET"} . ' - Win32 Release"' - . $build); - $text .= ('!ELSEIF "$(CFG)" == "' . $project{"TARGET"} . ' - Win32 Debug"' - . $build - . "!ENDIF \n\n# End Source File\n"); - } elsif ( $t eq "s" || $t eq "m" || $t eq "h" ) { - $text .= "# Begin Source File\n\nSOURCE=$p\n# End Source File\n"; - } - } - chop $text; -#$} -# End Target -# End Project diff --git a/tmake/lib/win32-msvc/vclib.t b/tmake/lib/win32-msvc/vclib.t deleted file mode 100644 index 11cd1d7..0000000 --- a/tmake/lib/win32-msvc/vclib.t +++ /dev/null @@ -1,178 +0,0 @@ -#! -#! This TMAKE template - Microsoft Visual C++ 5.0 libraries -#! -#${ - if ( Config("qt") || Config("opengl") ) { - Project('CONFIG += windows'); - } - if ( Config("qt") ) { - $moc_aware = 1; - AddIncludePath(Project('TMAKE_INCDIR_QT')); - } - - $project{"VC_PROJ_TYPE"} = 'Win32 (x86) Static Library'; - $project{"VC_PROJ_CODE"} = '0x0104'; - - $vc_cpp_def_release = '/D "NDEBUG" /D "WIN32" /D "_WINDOWS" '; - $vc_cpp_def_debug = '/D "_DEBUG" /D "WIN32" /D "_WINDOWS" '; - $vc_cpp_opt_release = '/nologo /W3 /GX /O2 '; - $vc_cpp_opt_debug = '/nologo /W3 /Gm /GX /Zi /Od '; - $vc_cpp_opt_common = '/YX /FD /c'; - $project{"VC_BASE_CPP_RELEASE"} = $vc_cpp_opt_release . $vc_cpp_def_release . $vc_cpp_opt_common; - $project{"VC_BASE_CPP_DEBUG"} = $vc_cpp_opt_debug . $vc_cpp_def_debug . $vc_cpp_opt_common; - ExpandPath("INCPATH",'/I ',' /I ',''); - if ( $text ne "" ) { $vc_inc = $text . " "; $text = ""; } else { $vc_inc = ""; } - ExpandGlue("DEFINES",'/D "','" /D "','"'); - if ( $text ne "" ) { $vc_def = $text . " "; $text = ""; } else { $vc_def = ""; } - $project{"VC_CPP_RELEASE"} = $vc_cpp_opt_release . $vc_inc . $vc_cpp_def_release . $vc_def . $vc_cpp_opt_common; - $project{"VC_CPP_DEBUG"} = $vc_cpp_opt_debug . $vc_inc . $vc_cpp_def_debug . $vc_def . $vc_cpp_opt_common; - - $project{"MAKEFILE"} = $project{"PROJECT"} . ".mak"; - $project{"TARGETLIB"} = $project{"TARGET"} . ".lib"; - Project('TMAKE_FILETAGS = HEADERS SOURCES TARGET DESTDIR $$FILETAGS'); - foreach ( split(/\s/,Project('TMAKE_FILETAGS')) ) { - $project{$_} =~ s-/-\\-g; - } - StdInit(); - if ( defined($project{"DESTDIR"}) ) { - $project{"TARGETLIB"} = $project{"DESTDIR"} . "\\" . $project{"TARGETLIB"}; - $project{"TARGETLIB"} =~ s/\\+/\\/g; - } - %all_files = (); - @files = split(/\s+/,$project{"HEADERS"}); - foreach ( @files ) { $all_files{$_} = "h" }; - @files = split(/\s+/,$project{"SOURCES"}); - foreach ( @files ) { $all_files{$_} = "s" }; - if ( $moc_aware ) { - @files = split(/\s+/,$project{"_HDRMOC"}); - foreach ( @files ) { $all_files{$_} = "m"; } - @files = split(/\s+/,$project{"_SRCMOC"}); - foreach ( @files ) { $all_files{$_} = "i"; } - } - %file_names = (); - foreach $f ( %all_files ) { - $n = $f; - $n =~ s/^.*\\//; - $file_names{$n} = $f; - $file_path{$n} = ".\\" . $f; - $file_path2{$n} = (($f =~ /^\./) ? "" : ".\\") . $f; - } -#$} -# Microsoft Developer Studio Project File - #$ Substitute('Name="$$TARGET" - Package Owner=<4>'); -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE #$ Substitute('"$$VC_PROJ_TYPE" $$VC_PROJ_CODE'); - -CFG=#$ Substitute('$$TARGET - Win32 Debug'); -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "#$ ExpandGlue('MAKEFILE','','','".'); -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f #$ Substitute('"$$MAKEFILE" CFG="$$TARGET - Win32 Debug"'); -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE #$ Substitute('"$$TARGET - Win32 Release" (based on "$$VC_PROJ_TYPE")'); -!MESSAGE #$ Substitute('"$$TARGET - Win32 Debug" (based on "$$VC_PROJ_TYPE")'); -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe - -!IF "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Release"'); - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP #$ Expand("VC_BASE_CPP_RELEASE"); -# ADD CPP #$ Expand("VC_CPP_RELEASE"); -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo #$ Project("TARGETLIB") && Substitute('/out:"$$TARGETLIB"'); - -!ELSEIF "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Debug"'); - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG"); -# ADD CPP #$ Expand("VC_CPP_DEBUG"); -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo #$ Project("TARGETLIB") && Substitute('/out:"$$TARGETLIB"'); - -!ENDIF - -# Begin Target - -# Name #$Substitute('"$$TARGET - Win32 Release"'); -# Name #$Substitute('"$$TARGET - Win32 Debug"'); -#${ - foreach $n ( sort keys %file_names ) { - $f = $file_names{$n}; - $p = $file_path{$n}; - $p2 = $file_path2{$n}; - $t = $all_files{$f}; - if ( ($t eq "h") && $moc_output{$f} ) { - my($build); - $build = "\n\n# Begin Custom Build - Running moc...\nInputPath=" . $p2 . "\n\n" - . '"' . $moc_output{$f} . '" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"' - . "\n\tmoc $p2 -o " . $moc_output{$f} . "\n\n" - . "# End Custom Build\n\n"; - $text .= ("# Begin Source File\n\nSOURCE=$p\n\n" - . '!IF "$(CFG)" == "' . $project{"TARGET"} . ' - Win32 Release"' - . $build); - $text .= ('!ELSEIF "$(CFG)" == "' . $project{"TARGET"} . ' - Win32 Debug"' - . $build - . "!ENDIF \n\n# End Source File\n"); - } elsif ( $t eq "i" ) { - my($build,$dn); - $build = "\n\n# Begin Custom Build - Running moc...\nInputPath=" . $p2 . "\n\n" - . '"' . $f . '" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"' - . "\n\tmoc ". $moc_input{$f} . " -o $f\n\n" - . "# End Custom Build\n\n"; - $dn = $n; - $dn =~ s/\..*//; - $dn =~ tr/a-z/A-Z/; - $text .= ("# Begin Source File\n\nSOURCE=$p\n" - . "USERDEP__$dn=" . '"' . $moc_input{$f} . '"' . "\n\n" - . '!IF "$(CFG)" == "' . $project{"TARGET"} . ' - Win32 Release"' - . $build); - $text .= ('!ELSEIF "$(CFG)" == "' . $project{"TARGET"} . ' - Win32 Debug"' - . $build - . "!ENDIF \n\n# End Source File\n"); - } elsif ( $t eq "s" || $t eq "m" || $t eq "h" ) { - $text .= "# Begin Source File\n\nSOURCE=$p\n# End Source File\n"; - } - } - chop $text; -#$} -# End Target -# End Project diff --git a/tmake/lib/win32-symantec/app.t b/tmake/lib/win32-symantec/app.t deleted file mode 100644 index fc4dc2c..0000000 --- a/tmake/lib/win32-symantec/app.t +++ /dev/null @@ -1,6 +0,0 @@ -############################################################################# -#! -#! This is a tmake template for building Win32 applications. -#! -#$ Project('TMAKE_APP_FLAG = 1'); -#$ IncludeTemplate("generic.t"); diff --git a/tmake/lib/win32-symantec/generic.t b/tmake/lib/win32-symantec/generic.t deleted file mode 100644 index ab39654..0000000 --- a/tmake/lib/win32-symantec/generic.t +++ /dev/null @@ -1,211 +0,0 @@ -#! -#! This is a tmake template for building Win32 applications or libraries. -#! -#${ - if ( Config("qt") ) { - if ( $ENV{"QT_DLL"} && !$ENV{"QT_NODLL"} ) { - Project('TMAKE_QT_DLL = 1'); - if ( Project("TARGET") eq "qt" ) { - Project('CONFIG += dll'); - } - } - } - if ( Config("dll") || Project("TMAKE_APP_FLAG") ) { - Project('CONFIG -= staticlib'); - Project('TMAKE_APP_OR_DLL = 1'); - } else { - Project('CONFIG += staticlib'); - } - if ( Config("warn_off") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_OFF'); - } elsif ( Config("warn_on") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_ON'); - } - if ( Config("debug") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_DEBUG'); - Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_DEBUG'); - } elsif ( Config("release") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_RELEASE'); - Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_RELEASE'); - } - if ( Config("qt") || Config("opengl") ) { - Project('CONFIG += windows' ); - } - if ( Config("qt") ) { - $moc_aware = 1; - AddIncludePath(Project('TMAKE_INCDIR_QT')); - if ( Config("opengl") ) { - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_OPENGL'); - } - if ( Project("TARGET") eq "qt" ) { - if ( Project("TMAKE_QT_DLL") && !(Project("DEFINES") =~ /QT_NODLL/) ) { - Project('DEFINES *= QT_MAKEDLL'); - } - } else { - if ( Project("TMAKE_QT_DLL") && !(Project("DEFINES") =~ /QT_NODLL/) ) { - Project('DEFINES *= QT_DLL'); - } - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT'); - if ( (Project("DEFINES") =~ /QT_DLL/) ) { - my $qtver =FindHighestLibVersion($ENV{"QTDIR"} . "/lib", "qt"); - Project("TMAKE_LIBS /= s/qt.lib/qt${qtver}.lib/"); - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_DLL'); - } - } - } - if ( Config("opengl") ) { - Project('TMAKE_LIBS *= $$TMAKE_LIBS_OPENGL'); - } - if ( Config("dll") ) { - Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE_DLL'); - Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS_DLL'); - if ( Project("TMAKE_LIB_FLAG") ) { - my $ver = Project("VERSION"); - $ver =~ s/\.//g; - $project{"TARGET_EXT"} = "${ver}.dll"; - } else { - $project{"TARGET_EXT"} = ".dll"; - } - } else { - Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE'); - Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS'); - if ( Project('TMAKE_APP_FLAG') ) { - $project{"TARGET_EXT"} = ".exe"; - } else { - $project{"TARGET_EXT"} = ".lib"; - } - } - if ( Config("windows") ) { - if ( Config("console") ) { - Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY'); - Project('TMAKE_LIBS *= $$TMAKE_LIBS_CONSOLE'); - } else { - Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_WINDOWS_ANY'); - } - Project('TMAKE_LIBS *= $$TMAKE_LIBS_WINDOWS'); - } else { - Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY'); - Project('TMAKE_LIBS *= $$TMAKE_LIBS_CONSOLE'); - } - Project('TMAKE_LIBS += $$LIBS'); - Project('TMAKE_FILETAGS = HEADERS SOURCES DEF_FILE RC_FILE TARGET TMAKE_LIBS DESTDIR DLLDESTDIR $$FILETAGS'); - foreach ( split(/\s/,Project('TMAKE_FILETAGS')) ) { - $project{$_} =~ s-[/\\]+-\\-g; - } - if ( Project('DEF_FILE') ) { - Project('TMAKE_LFLAGS *= /DEF:$$DEF_FILE'); - } - if ( Project('RC_FILE') ) { - if ( Project('RES_FILE') ) { - tmake_error("Both .rc and .res file specified.\n" . - "Please specify one of them, not both."); - } - $project{"RES_FILE"} = $project{"RC_FILE"}; - $project{"RES_FILE"} =~ s/\.rc$/.res/i; - Project('TARGETDEPS += $$RES_FILE'); - } - if ( Project('RES_FILE') ) { - Project('TMAKE_LIBS *= $$RES_FILE'); - } - StdInit(); - if ( Project("VERSION") ) { - $project{"VER_MAJ"} = $project{"VERSION"}; - $project{"VER_MAJ"} =~ s/\.\d+$//; - $project{"VER_MIN"} = $project{"VERSION"}; - $project{"VER_MIN"} =~ s/^\d+\.//; - } -#$} -#! -# Makefile for building #$ Expand("TARGET") -# Generated by tmake at #$ Now(); -# Project: #$ Expand("PROJECT"); -# Template: #$ Expand("TEMPLATE"); -############################################################################# - -####### Compiler, tools and options - -CC = #$ Expand("TMAKE_CC"); -CFLAGS = #$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); -INCPATH = #$ ExpandPath("INCPATH",'-I',' -I',''); -#$ !Project("TMAKE_APP_OR_DLL") && DisableOutput(); -LINK = #$ Expand("TMAKE_LINK"); -LFLAGS = #$ Expand("TMAKE_LFLAGS"); -LIBS = #$ Expand("TMAKE_LIBS"); -#$ !Project("TMAKE_APP_OR_DLL") && EnableOutput(); -#$ Project("TMAKE_APP_OR_DLL") && DisableOutput(); -LIB = #$ Expand("TMAKE_LIB"); -#$ Project("TMAKE_APP_OR_DLL") && EnableOutput(); -MOC = #$ Expand("TMAKE_MOC"); - -ZIP = #$ Expand("TMAKE_ZIP"); - -####### Files - -HEADERS = #$ ExpandList("HEADERS"); -SOURCES = #$ ExpandList("SOURCES"); -OBJECTS = #$ ExpandList("OBJECTS"); -SRCMOC = #$ ExpandList("SRCMOC"); -OBJMOC = #$ ExpandList("OBJMOC"); -DIST = #$ ExpandList("DISTFILES"); -TARGET = #$ ExpandGlue("TARGET",$project{"DESTDIR"},"",$project{"TARGET_EXT"}); - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.obj: - #$ Expand("TMAKE_COMPILE_IMP"); - -.cxx.obj: - #$ Expand("TMAKE_COMPILE_IMP"); - -.cc.obj: - #$ Expand("TMAKE_COMPILE_IMP"); - -.c.obj: - #$ Expand("TMAKE_COMPILE_IMP"); - -####### Build rules - -all: #$ ExpandGlue("ALL_DEPS",""," "," "); $text .= '$(TARGET)'; - -$(TARGET): $(HEADERS) $(OBJECTS) $(OBJMOC) #$ Expand("TARGETDEPS"); -#$ Project("TMAKE_APP_OR_DLL") || DisableOutput(); - $(LINK) $(LFLAGS) $(OBJECTS) $(OBJMOC), $(TARGET),, $(LIBS) -#$ Project("TMAKE_APP_OR_DLL") || EnableOutput(); -#$ Project("TMAKE_APP_OR_DLL") && DisableOutput(); - -del $(TARGET) -#${ -# $text = "\t\$(LIB) \$(TARGET) " -# . join(" \\\n+",split(/\s+/,$project{"OBJECTS"})) . " \\\n+" -# . join(" \\\n+",split(/\s+/,$project{"OBJMOC"})) . ",;"; -#$} -#$ Project("TMAKE_APP_OR_DLL") && EnableOutput(); -#$ (Config("dll") && Project("DLLDESTDIR")) || DisableOutput(); - -copy $(TARGET) #$ Expand("DLLDESTDIR"); -#$ (Config("dll") && Project("DLLDESTDIR")) || EnableOutput(); -#$ Project('RC_FILE') || DisableOutput(); - -#$ Substitute("\$\$RES_FILE: \$\$RC_FILE\n\t\$\$TMAKE_RC \$\$RC_FILE"); -#$ Project('RC_FILE') || EnableOutput(); - -moc: $(SRCMOC) - -#$ TmakeSelf(); - -dist: - #$ Substitute('$(ZIP) $$PROJECT.zip $$PROJECT.pro $(SOURCES) $(HEADERS) $(DIST)'); - -clean: - #$ ExpandGlue("OBJECTS","-del ","\n\t-del ",""); - #$ ExpandGlue("SRCMOC" ,"-del ","\n\t-del ",""); - #$ ExpandGlue("OBJMOC" ,"-del ","\n\t-del ",""); - -del $(TARGET) - #$ ExpandGlue("CLEAN_FILES","-del ","\n\t-del ",""); - -####### Compile - -#$ BuildObj(Project("OBJECTS"),Project("SOURCES")); -#$ BuildMocObj(Project("OBJMOC"),Project("SRCMOC")); -#$ BuildMocSrc(Project("HEADERS")); -#$ BuildMocSrc(Project("SOURCES")); diff --git a/tmake/lib/win32-symantec/lib.t b/tmake/lib/win32-symantec/lib.t deleted file mode 100644 index d8ac6c7..0000000 --- a/tmake/lib/win32-symantec/lib.t +++ /dev/null @@ -1,6 +0,0 @@ -############################################################################# -#! -#! This is a tmake template for building Win32 libraries. -#! -#$ Project('TMAKE_LIB_FLAG = 1'); -#$ IncludeTemplate("generic.t"); diff --git a/tmake/lib/win32-symantec/subdirs.t b/tmake/lib/win32-symantec/subdirs.t deleted file mode 100644 index 8b881ab..0000000 --- a/tmake/lib/win32-symantec/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Win32 template -#$ IncludeTemplate("../win32/subdirs.t"); diff --git a/tmake/lib/win32-symantec/tmake.conf b/tmake/lib/win32-symantec/tmake.conf deleted file mode 100644 index 81f88c2..0000000 --- a/tmake/lib/win32-symantec/tmake.conf +++ /dev/null @@ -1,56 +0,0 @@ -# -# -# -# tmake configuration for Win32/Symantec C++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = sc -TMAKE_CFLAGS = -mn -w2 -TMAKE_CFLAGS_WARN_ON = -TMAKE_CFLAGS_WARN_OFF = -w -TMAKE_CFLAGS_RELEASE = -o -TMAKE_CFLAGS_DEBUG = -g -TMAKE_CFLAGS_YACC = - -TMAKE_CXX = $$TMAKE_CC -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_INCDIR_QT = $(QTDIR)\include - -TMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o$obj $src -TMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o$@ $< -TMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$obj $src -TMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$@ $< - -TMAKE_LINK = link -TMAKE_LFLAGS = /NOLOGO /NOI -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = /DEBUG -TMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:console -TMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:windows -TMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL -TMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL - -TMAKE_LIBS = -TMAKE_LIBS_CONSOLE = -TMAKE_LIBS_WINDOWS = user32.lib gdi32.lib comdlg32.lib imm32.lib ole32.lib uuid.lib wsock32.lib -TMAKE_LIBS_QT = $(QTDIR)\lib\qt.lib -TMAKE_LIBS_QT_DLL = $(QTDIR)\lib\qtmain.lib -TMAKE_LIBS_QT_OPENGL = $(QTDIR)\lib\qgl.lib -TMAKE_LIBS_OPENGL = opengl32.lib - -TMAKE_MOC = moc - -TMAKE_LIB = lib /C /N /NOI /P:32 -TMAKE_RC = rc - -TMAKE_ZIP = zip -r -9 diff --git a/tmake/lib/win32-visage/app.t b/tmake/lib/win32-visage/app.t deleted file mode 100644 index fc4dc2c..0000000 --- a/tmake/lib/win32-visage/app.t +++ /dev/null @@ -1,6 +0,0 @@ -############################################################################# -#! -#! This is a tmake template for building Win32 applications. -#! -#$ Project('TMAKE_APP_FLAG = 1'); -#$ IncludeTemplate("generic.t"); diff --git a/tmake/lib/win32-visage/generic.t b/tmake/lib/win32-visage/generic.t deleted file mode 100644 index b5b1fb6..0000000 --- a/tmake/lib/win32-visage/generic.t +++ /dev/null @@ -1,207 +0,0 @@ -#! -#! This is a tmake template for building Win32 applications or libraries. -#! -#${ - if ( Config("qt") ) { - if ( $ENV{"QT_DLL"} && !$ENV{"QT_NODLL"} ) { - Project('TMAKE_QT_DLL = 1'); - if ( Project("TARGET") eq "qt" ) { - Project('CONFIG += dll'); - } - } - } - if ( Config("dll") || Project("TMAKE_APP_FLAG") ) { - Project('CONFIG -= staticlib'); - Project('TMAKE_APP_OR_DLL = 1'); - } else { - Project('CONFIG += staticlib'); - } - if ( Config("warn_off") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_OFF'); - } elsif ( Config("warn_on") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_ON'); - } - if ( Config("debug") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_DEBUG'); - Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_DEBUG'); - } elsif ( Config("release") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_RELEASE'); - Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_RELEASE'); - } - if ( Config("qt") || Config("opengl") ) { - Project('CONFIG += windows' ); - } - if ( Config("qt") ) { - $moc_aware = 1; - AddIncludePath(Project('TMAKE_INCDIR_QT')); - if ( Config("opengl") ) { - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_OPENGL'); - } - if ( Project("TARGET") eq "qt" ) { - if ( Project("TMAKE_QT_DLL") && !(Project("DEFINES") =~ /QT_NODLL/) ) { - Project('DEFINES *= QT_MAKEDLL'); - } - } else { - if ( Project("TMAKE_QT_DLL") && !(Project("DEFINES") =~ /QT_NODLL/) ) { - Project('DEFINES *= QT_DLL'); - } - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT'); - if ( (Project("DEFINES") =~ /QT_DLL/) ) { - my $qtver =FindHighestLibVersion($ENV{"QTDIR"} . "/lib", "qt"); - Project("TMAKE_LIBS /= s/qt.lib/qt${qtver}.lib/"); - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_DLL'); - } - } - } - if ( Config("opengl") ) { - Project('TMAKE_LIBS *= $$TMAKE_LIBS_OPENGL'); - } - if ( Config("dll") ) { - Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE_DLL'); - Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS_DLL'); - if ( Project("TMAKE_LIB_FLAG") ) { - my $ver = Project("VERSION"); - $ver =~ s/\.//g; - $project{"TARGET_EXT"} = "${ver}.dll"; - } else { - $project{"TARGET_EXT"} = ".dll"; - } - } else { - Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE'); - Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS'); - if ( Project('TMAKE_APP_FLAG') ) { - $project{"TARGET_EXT"} = ".exe"; - } else { - $project{"TARGET_EXT"} = ".lib"; - } - } - if ( Config("windows") ) { - if ( Config("console") ) { - Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY'); - Project('TMAKE_LIBS *= $$TMAKE_LIBS_CONSOLE'); - } else { - Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_WINDOWS_ANY'); - } - Project('TMAKE_LIBS *= $$TMAKE_LIBS_WINDOWS'); - } else { - Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY'); - Project('TMAKE_LIBS *= $$TMAKE_LIBS_CONSOLE'); - } - Project('TMAKE_LIBS += $$LIBS'); - Project('TMAKE_FILETAGS = HEADERS SOURCES DEF_FILE RC_FILE TARGET TMAKE_LIBS DESTDIR DLLDESTDIR $$FILETAGS'); - foreach ( split(/\s/,Project('TMAKE_FILETAGS')) ) { - $project{$_} =~ s-[/\\]+-\\-g; - } - if ( Project('DEF_FILE') ) { - Project('TMAKE_LFLAGS *= /DEF:$$DEF_FILE'); - } - if ( Project('RC_FILE') ) { - if ( Project('RES_FILE') ) { - tmake_error("Both .rc and .res file specified.\n" . - "Please specify one of them, not both."); - } - $project{"RES_FILE"} = $project{"RC_FILE"}; - $project{"RES_FILE"} =~ s/\.rc$/.res/i; - Project('TARGETDEPS += $$RES_FILE'); - } - if ( Project('RES_FILE') ) { - Project('TMAKE_LIBS *= $$RES_FILE'); - } - StdInit(); - if ( Project("VERSION") ) { - $project{"VER_MAJ"} = $project{"VERSION"}; - $project{"VER_MAJ"} =~ s/\.\d+$//; - $project{"VER_MIN"} = $project{"VERSION"}; - $project{"VER_MIN"} =~ s/^\d+\.//; - } -#$} -#! -# Makefile for building #$ Expand("TARGET") -# Generated by tmake at #$ Now(); -# Project: #$ Expand("PROJECT"); -# Template: #$ Expand("TEMPLATE"); -############################################################################# - -####### Compiler, tools and options - -CC = #$ Expand("TMAKE_CC"); -CFLAGS = #$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); -INCPATH = #$ ExpandGlue("INCPATH",'-I',' -I',''); -#$ !Project("TMAKE_APP_OR_DLL") && DisableOutput(); -LINK = #$ Expand("TMAKE_LINK"); -LFLAGS = #$ Expand("TMAKE_LFLAGS"); -LIBS = #$ Expand("TMAKE_LIBS"); -#$ !Project("TMAKE_APP_OR_DLL") && EnableOutput(); -#$ Project("TMAKE_APP_OR_DLL") && DisableOutput(); -LIB = #$ Expand("TMAKE_LIB"); -#$ Project("TMAKE_APP_OR_DLL") && EnableOutput(); -MOC = #$ Expand("TMAKE_MOC"); - -ZIP = #$ Expand("TMAKE_ZIP"); - -####### Files - -HEADERS = #$ ExpandList("HEADERS"); -SOURCES = #$ ExpandList("SOURCES"); -OBJECTS = #$ ExpandList("OBJECTS"); -SRCMOC = #$ ExpandList("SRCMOC"); -OBJMOC = #$ ExpandList("OBJMOC"); -DIST = #$ ExpandList("DISTFILES"); -TARGET = #$ ExpandGlue("TARGET",$project{"DESTDIR"},"",$project{"TARGET_EXT"}); - -####### Implicit rules - -.SUFFIXES: .cpp .cxx .cc .c - -.cpp.obj: - #$ Expand("TMAKE_COMPILE_IMP"); - -.cxx.obj: - #$ Expand("TMAKE_COMPILE_IMP"); - -.cc.obj: - #$ Expand("TMAKE_COMPILE_IMP"); - -.c.obj: - #$ Expand("TMAKE_COMPILE_IMP"); - -####### Build rules - -all: #$ ExpandGlue("ALL_DEPS",""," "," "); $text .= '$(TARGET)'; - -$(TARGET): $(HEADERS) $(OBJECTS) $(OBJMOC) #$ Expand("TARGETDEPS"); -#$ Project("TMAKE_APP_OR_DLL") || DisableOutput(); -$(TARGET): $(OBJECTS) $(LIBS) #$ Expand("TARGETDEPS"); - $(LINK) -B"$(LFLAGS)" $(OBJECTS) $(LIBS) -Fe$(TARGET) -#$ Project("TMAKE_APP_OR_DLL") || EnableOutput(); -#$ Project("TMAKE_APP_OR_DLL") && DisableOutput(); - $(LIB) /OUT:$(TARGET) $(OBJECTS) $(OBJMOC) -#$ Project("TMAKE_APP_OR_DLL") && EnableOutput(); -#$ (Config("dll") && Project("DLLDESTDIR")) || DisableOutput(); - -copy $(TARGET) #$ Expand("DLLDESTDIR"); -#$ (Config("dll") && Project("DLLDESTDIR")) || EnableOutput(); -#$ Project('RC_FILE') || DisableOutput(); - -#$ Substitute("\$\$RES_FILE: \$\$RC_FILE\n\t\$\$TMAKE_RC \$\$RC_FILE"); -#$ Project('RC_FILE') || EnableOutput(); - -moc: $(SRCMOC) - -#$ TmakeSelf(); - -dist: - #$ Substitute('$(ZIP) $$PROJECT.zip $$PROJECT.pro $(SOURCES) $(HEADERS) $(DIST)'); - -clean: - #$ ExpandGlue("OBJECTS","-del ","\n\t-del ",""); - #$ ExpandGlue("SRCMOC" ,"-del ","\n\t-del ",""); - #$ ExpandGlue("OBJMOC" ,"-del ","\n\t-del ",""); - -del $(TARGET) - #$ ExpandGlue("CLEAN_FILES","-del ","\n\t-del ",""); - -####### Compile - -#$ BuildObj(Project("OBJECTS"),Project("SOURCES")); -#$ BuildMocObj(Project("OBJMOC"),Project("SRCMOC")); -#$ BuildMocSrc(Project("HEADERS")); -#$ BuildMocSrc(Project("SOURCES")); diff --git a/tmake/lib/win32-visage/lib.t b/tmake/lib/win32-visage/lib.t deleted file mode 100644 index d8ac6c7..0000000 --- a/tmake/lib/win32-visage/lib.t +++ /dev/null @@ -1,6 +0,0 @@ -############################################################################# -#! -#! This is a tmake template for building Win32 libraries. -#! -#$ Project('TMAKE_LIB_FLAG = 1'); -#$ IncludeTemplate("generic.t"); diff --git a/tmake/lib/win32-visage/subdirs.t b/tmake/lib/win32-visage/subdirs.t deleted file mode 100644 index 8b881ab..0000000 --- a/tmake/lib/win32-visage/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Win32 template -#$ IncludeTemplate("../win32/subdirs.t"); diff --git a/tmake/lib/win32-visage/tmake.conf b/tmake/lib/win32-visage/tmake.conf deleted file mode 100644 index 69d3a82..0000000 --- a/tmake/lib/win32-visage/tmake.conf +++ /dev/null @@ -1,56 +0,0 @@ -# -# -# -# tmake configuration for Win32/IBM Visual Age -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = icc -C -TMAKE_CFLAGS = -Q -Ft -Gd -Gm+ -qrtti=all -TMAKE_CFLAGS_WARN_ON = -W3 -TMAKE_CFLAGS_WARN_OFF = -W0 -TMAKE_CFLAGS_RELEASE = -Gl+ -O -Oc+ -TMAKE_CFLAGS_DEBUG = -Fb* -Ti -Tm -TMAKE_CFLAGS_YACC = - -TMAKE_CXX = $$TMAKE_CC -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_INCDIR_QT = $(QTDIR)\include - -TMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo"$obj" $src -TMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -Fo"$@" $< -TMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$obj" $src -TMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$@" $< - -TMAKE_LINK = icc -Tdp $(CFLAGS) -TMAKE_LFLAGS = -nologo -code:RX -data:RW -def -noe -TMAKE_LFLAGS_RELEASE = -OPTF -TMAKE_LFLAGS_DEBUG = -de -br -TMAKE_LFLAGS_CONSOLE = -pmtype:vio -TMAKE_LFLAGS_WINDOWS = -pmtype:pm -TMAKE_LFLAGS_CONSOLE_DLL= -DLL -TMAKE_LFLAGS_WINDOWS_DLL= -DLL - -TMAKE_LIBS = -TMAKE_LIBS_CONSOLE = -TMAKE_LIBS_WINDOWS = user32.lib gdi32.lib comdlg32.lib imm32.lib ole32.lib uuid.lib wsock32.lib -TMAKE_LIBS_QT = $(QTDIR)\lib\qt.lib -TMAKE_LIBS_QT_DLL = $(QTDIR)\lib\qtmain.lib -TMAKE_LIBS_QT_OPENGL = $(QTDIR)\lib\qgl.lib -TMAKE_LIBS_OPENGL = opengl32.lib glu32.lib - -TMAKE_MOC = moc - -TMAKE_LIB = ilib -TMAKE_RC = rc - -TMAKE_ZIP = zip -r -9 diff --git a/tmake/lib/win32-watcom/app.t b/tmake/lib/win32-watcom/app.t deleted file mode 100644 index fc4dc2c..0000000 --- a/tmake/lib/win32-watcom/app.t +++ /dev/null @@ -1,6 +0,0 @@ -############################################################################# -#! -#! This is a tmake template for building Win32 applications. -#! -#$ Project('TMAKE_APP_FLAG = 1'); -#$ IncludeTemplate("generic.t"); diff --git a/tmake/lib/win32-watcom/generic.t b/tmake/lib/win32-watcom/generic.t deleted file mode 100644 index 883c794..0000000 --- a/tmake/lib/win32-watcom/generic.t +++ /dev/null @@ -1,201 +0,0 @@ -#! -#! This is a tmake template for building Win32 applications or libraries. -#! -#${ - if ( Config("qt") ) { - if ( $ENV{"QT_DLL"} && !$ENV{"QT_NODLL"} ) { - Project('TMAKE_QT_DLL = 1'); - if ( Project("TARGET") eq "qt" ) { - Project('CONFIG += dll'); - } - } - } - if ( Config("dll") || Project("TMAKE_APP_FLAG") ) { - Project('CONFIG -= staticlib'); - Project('TMAKE_APP_OR_DLL = 1'); - } else { - Project('CONFIG += staticlib'); - } - if ( Config("warn_off") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_OFF'); - } elsif ( Config("warn_on") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_WARN_ON'); - } - if ( Config("debug") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_DEBUG'); - Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_DEBUG'); - } elsif ( Config("release") ) { - Project('TMAKE_CFLAGS += $$TMAKE_CFLAGS_RELEASE'); - Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_RELEASE'); - } - if ( Config("qt") || Config("opengl") ) { - Project('CONFIG += windows' ); - } - if ( Config("qt") ) { - $moc_aware = 1; - AddIncludePath(Project('TMAKE_INCDIR_QT')); - if ( Config("opengl") ) { - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_OPENGL'); - } - if ( Project("TARGET") eq "qt" ) { - if ( Project("TMAKE_QT_DLL") && !(Project("DEFINES") =~ /QT_NODLL/) ) { - Project('DEFINES *= QT_MAKEDLL'); - } - } else { - if ( Project("TMAKE_QT_DLL") && !(Project("DEFINES") =~ /QT_NODLL/) ) { - Project('DEFINES *= QT_DLL'); - } - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT'); - if ( (Project("DEFINES") =~ /QT_DLL/) ) { - my $qtver =FindHighestLibVersion($ENV{"QTDIR"} . "/lib", "qt"); - Project("TMAKE_LIBS /= s/qt.lib/qt${qtver}.lib/"); - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_DLL'); - } - } - } - if ( Config("opengl") ) { - Project('TMAKE_LIBS *= $$TMAKE_LIBS_OPENGL'); - } - if ( Config("dll") ) { - Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE_DLL'); - Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS_DLL'); - if ( Project("TMAKE_LIB_FLAG") ) { - my $ver = Project("VERSION"); - $ver =~ s/\.//g; - $project{"TARGET_EXT"} = "${ver}.dll"; - } else { - $project{"TARGET_EXT"} = ".dll"; - } - } else { - Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE'); - Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS'); - if ( Project('TMAKE_APP_FLAG') ) { - $project{"TARGET_EXT"} = ".exe"; - } else { - $project{"TARGET_EXT"} = ".lib"; - } - } - if ( Config("windows") ) { - if ( Config("console") ) { - Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY'); - Project('TMAKE_LIBS *= $$TMAKE_LIBS_CONSOLE'); - } else { - Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_WINDOWS_ANY'); - } - Project('TMAKE_LIBS *= $$TMAKE_LIBS_WINDOWS'); - } else { - Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY'); - Project('TMAKE_LIBS *= $$TMAKE_LIBS_CONSOLE'); - } - Project('TMAKE_LIBS += $$LIBS'); - Project('TMAKE_FILETAGS = HEADERS SOURCES DEF_FILE RC_FILE TARGET TMAKE_LIBS DESTDIR DLLDESTDIR $$FILETAGS'); - foreach ( split(/\s/,Project('TMAKE_FILETAGS')) ) { - $project{$_} =~ s-[/\\]+-\\-g; - } - if ( Project('DEF_FILE') ) { - Project('TMAKE_LFLAGS *= /DEF:$$DEF_FILE'); - } - if ( Project('RC_FILE') ) { - if ( Project('RES_FILE') ) { - tmake_error("Both .rc and .res file specified.\n" . - "Please specify one of them, not both."); - } - $project{"RES_FILE"} = $project{"RC_FILE"}; - $project{"RES_FILE"} =~ s/\.rc$/.res/i; - Project('TARGETDEPS += $$RES_FILE'); - } - if ( Project('RES_FILE') ) { - Project('TMAKE_LIBS *= $$RES_FILE'); - } - $linebreak = '&'; - StdInit(); - if ( Project("VERSION") ) { - $project{"VER_MAJ"} = $project{"VERSION"}; - $project{"VER_MAJ"} =~ s/\.\d+$//; - $project{"VER_MIN"} = $project{"VERSION"}; - $project{"VER_MIN"} =~ s/^\d+\.//; - } -#$} -#! -# Makefile for building #$ Expand("TARGET") -# Generated by tmake at #$ Now(); -# Project: #$ Expand("PROJECT"); -# Template: #$ Expand("TEMPLATE"); -############################################################################# - -####### Compiler, tools and options - -#$ Config("qt") || DisableOutput(); -QTDIR = #$ $text = $ENV{"QTDIR"}; -#$ Config("qt") || EnableOutput(); -CC = #$ Expand("TMAKE_CC"); -CFLAGS = #$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-d="," -d=",""); -INCPATH = #$ ExpandPath("INCPATH",'-i=',' -i=',''); -#$ !Project("TMAKE_APP_OR_DLL") && DisableOutput(); -LINK = #$ Expand("TMAKE_LINK"); -LFLAGS = #$ Expand("TMAKE_LFLAGS"); -LIBS = #$ Expand("TMAKE_LIBS"); -#$ !Project("TMAKE_APP_OR_DLL") && EnableOutput(); -#$ Project("TMAKE_APP_OR_DLL") && DisableOutput(); -LIB = #$ Expand("TMAKE_LIB"); -#$ Project("TMAKE_APP_OR_DLL") && EnableOutput(); -MOC = #$ Expand("TMAKE_MOC"); - -ZIP = #$ Expand("TMAKE_ZIP"); - -####### Files - -HEADERS = #$ ExpandList("HEADERS"); -SOURCES = #$ ExpandList("SOURCES"); -OBJECTS = #$ ExpandList("OBJECTS"); -SRCMOC = #$ ExpandList("SRCMOC"); -OBJMOC = #$ ExpandList("OBJMOC"); -DIST = #$ ExpandList("DISTFILES"); -TARGET = #$ ExpandGlue("TARGET",$project{"DESTDIR"},"",$project{"TARGET_EXT"}); -TMPLIST = #$ ExpandGlue("TARGET","","",".lst"); -####### Build rules - -all: #$ ExpandGlue("ALL_DEPS",""," "," "); $text .= '$(TARGET)'; - -$(TARGET): $(HEADERS) $(OBJECTS) $(OBJMOC) #$ Expand("TARGETDEPS"); - @%create $(TMPLIST) -#$ Project("TMAKE_APP_OR_DLL") || DisableOutput(); - @%append $(TMPLIST) NAME #$ Expand("TARGET"); - #$ ExpandGlue("OBJECTS",'@%append $(TMPLIST) FIL ',",",""); - #$ ExpandGlue("OBJMOC" ,'@%append $(TMPLIST) FIL ',",",""); - #$ ExpandGlue("TMAKE_LIBS" ,'@%append $(TMPLIST) LIBR ',",",""); - $(LINK) $(LFLAGS) @$(TMPLIST) -#$ Project("TMAKE_APP_OR_DLL") || EnableOutput(); -#$ Project("TMAKE_APP_OR_DLL") && DisableOutput(); - @for %i in ( $(OBJECTS) $(OBJMOC) ) do @%append $(TMPLIST) +'%i' - $(LIB) $(TARGET) @$(TMPLIST) -#$ Project("TMAKE_APP_OR_DLL") && EnableOutput(); - del $(TMPLIST) -#$ (Config("dll") && Project("DLLDESTDIR")) || DisableOutput(); - -copy $(TARGET) #$ Expand("DLLDESTDIR"); -#$ (Config("dll") && Project("DLLDESTDIR")) || EnableOutput(); -#$ Project('RC_FILE') || DisableOutput(); - -#$ Substitute("\$\$RES_FILE: \$\$RC_FILE\n\t\$\$TMAKE_RC \$\$RC_FILE"); -#$ Project('RC_FILE') || EnableOutput(); - -moc: $(SRCMOC) - -#$ TmakeSelf(); - -dist: - #$ Substitute('$(ZIP) $$PROJECT.zip $$PROJECT.pro $(SOURCES) $(HEADERS) $(DIST)'); - -clean: - #$ ExpandGlue("OBJECTS","-del ","\n\t-del ",""); - #$ ExpandGlue("SRCMOC" ,"-del ","\n\t-del ",""); - #$ ExpandGlue("OBJMOC" ,"-del ","\n\t-del ",""); - -del $(TARGET) - #$ ExpandGlue("CLEAN_FILES","-del ","\n\t-del ",""); - -####### Compile - -#$ BuildObj(Project("OBJECTS"),Project("SOURCES")); -#$ BuildMocObj(Project("OBJMOC"),Project("SRCMOC")); -#$ BuildMocSrc(Project("HEADERS")); -#$ BuildMocSrc(Project("SOURCES")); diff --git a/tmake/lib/win32-watcom/lib.t b/tmake/lib/win32-watcom/lib.t deleted file mode 100644 index d8ac6c7..0000000 --- a/tmake/lib/win32-watcom/lib.t +++ /dev/null @@ -1,6 +0,0 @@ -############################################################################# -#! -#! This is a tmake template for building Win32 libraries. -#! -#$ Project('TMAKE_LIB_FLAG = 1'); -#$ IncludeTemplate("generic.t"); diff --git a/tmake/lib/win32-watcom/subdirs.t b/tmake/lib/win32-watcom/subdirs.t deleted file mode 100644 index 8b881ab..0000000 --- a/tmake/lib/win32-watcom/subdirs.t +++ /dev/null @@ -1,2 +0,0 @@ -#! Use the common Win32 template -#$ IncludeTemplate("../win32/subdirs.t"); diff --git a/tmake/lib/win32-watcom/tmake.conf b/tmake/lib/win32-watcom/tmake.conf deleted file mode 100644 index 862e915..0000000 --- a/tmake/lib/win32-watcom/tmake.conf +++ /dev/null @@ -1,54 +0,0 @@ -# -# -# -# tmake configuration for Win32/Watcom C++ -# - -TEMPLATE = app -CONFIG = qt warn_on release - -TMAKE_CC = wcl386 -TMAKE_CFLAGS = -zq -TMAKE_CFLAGS_WARN_ON = -w2 -TMAKE_CFLAGS_WARN_OFF = -w0 -TMAKE_CFLAGS_RELEASE = -ox -TMAKE_CFLAGS_DEBUG = -d2 -TMAKE_CFLAGS_YACC = - -TMAKE_CXX = $$TMAKE_CC -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC - -TMAKE_INCDIR = -TMAKE_INCDIR_QT = $(QTDIR)\include - -TMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -fo=$obj $src -TMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -fo=$obj $src - -TMAKE_LINK = wlink -TMAKE_LFLAGS = op quiet op c -TMAKE_LFLAGS_RELEASE = -TMAKE_LFLAGS_DEBUG = d all -TMAKE_LFLAGS_CONSOLE = sys nt -TMAKE_LFLAGS_WINDOWS = sys nt_win -TMAKE_LFLAGS_CONSOLE_DLL= sys nt -TMAKE_LFLAGS_WINDOWS_DLL= sys nt_win - -TMAKE_LIBS = -TMAKE_LIBS_CONSOLE = -TMAKE_LIBS_WINDOWS = -TMAKE_LIBS_QT = %QTDIR%\lib\qt.lib -TMAKE_LIBS_QT_DLL = %QTDIR%\lib\qtmain.lib -TMAKE_LIBS_QT_OPENGL = %QTDIR%\lib\qgl.lib -TMAKE_LIBS_OPENGL = opengl32.lib - -TMAKE_MOC = moc - -TMAKE_LIB = wlib -b -c -n -q -p=512 -TMAKE_RC = rc - -TMAKE_ZIP = zip -r -9 diff --git a/tmake/lib/win32/subdirs.t b/tmake/lib/win32/subdirs.t deleted file mode 100644 index 4c857fd..0000000 --- a/tmake/lib/win32/subdirs.t +++ /dev/null @@ -1,54 +0,0 @@ -############################################################################# -#! -#! This is a tmake template for creating a makefile that invokes make in -#! sub directories - for Win32. -#! -#${ - StdInit(); - $m = ""; - foreach ( split(/\s+/,$project{"SUBDIRS"}) ) { - $m = $m . "\tcd $_\n\tDOMAKE\n\t\@cd ..\n"; - } - $project{"SUBMAKE"} = $m; - Project('MAKEFILE') || Project('MAKEFILE = Makefile'); - Project('TMAKE') || Project('TMAKE = tmake'); -#$} -#! -# Makefile for building targets in sub directories. -# Generated by tmake at #$ Now(); -# Project: #$ Expand("PROJECT"); -# Template: #$ Expand("TEMPLATE"); -############################################################################# - -MAKEFILE= #$ Expand("MAKEFILE"); -TMAKE = #$ Expand("TMAKE"); - -SUBDIRS = #$ ExpandList("SUBDIRS"); - -all: $(SUBDIRS) - -#${ - foreach ( split(/\s+/,$project{"SUBDIRS"}) ) { - if ( Project("TMAKE_NOFORCE") ) { - $text = $text . $_ . ":\n\t" . - "cd $_\n\t\$(MAKE\)\n\t\@cd ..\n\n"; - } else { - $text = $text . $_ . ": FORCE\n\t" . - "cd $_\n\t\$(MAKE\)\n\t\@cd ..\n\n"; - } - } -#$} -#$ TmakeSelf(); - -tmake_all: -#${ - foreach ( split(/\s+/,$project{"SUBDIRS"}) ) { - $text .= "\tcd $_\n\t\$(TMAKE\) $_.pro -o \$(MAKEFILE)\n\t\@cd ..\n"; - } -#$} - -clean: -#$ $text = $project{"SUBMAKE"}; $text =~ s/DOMAKE/\$(MAKE\) clean/g; -#$ Project("TMAKE_NOFORCE") && DisableOutput(); -FORCE: -#$ Project("TMAKE_NOFORCE") && EnableOutput(); diff --git a/vhdlparser/CMakeLists.txt b/vhdlparser/CMakeLists.txt new file mode 100644 index 0000000..e1e4ab1 --- /dev/null +++ b/vhdlparser/CMakeLists.txt @@ -0,0 +1,10 @@ +include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools) +add_library(vhdlparser +CharStream.cc +ParseException.cc +Token.cc +TokenMgrError.cc +VhdlParser.cc +VhdlParserTokenManager.cc +VhdlParserIF.cpp +) |