From ba9bb02abf6f6922a83beb2092e7bc270e6f25c1 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Thu, 18 Jun 2015 21:33:39 +0200 Subject: Further cleanups related to the cmake build system --- .gitignore | 15 - CMakeLists.txt | 2 +- PLATFORMS | 32 - VERSION | 2 +- addon/doxyapp/doxyapp.cpp | 9 +- winbuild/.gitignore | 7 - winbuild/Config.rules | 30 - winbuild/Doxygen.sln | 71 - winbuild/Doxygen.vcproj | 5016 ------------------------- winbuild/Doxywizard.vcproj | 718 ---- winbuild/GenResources.rules | 19 - winbuild/Gen_head.rules | 19 - winbuild/Languages.rules | 862 ----- winbuild/Lex.rules | 34 - winbuild/Settings.rules | 59 - winbuild/Unistd.rules | 18 - winbuild/Version.rules | 19 - winbuild/doxyindexer.vcproj | 363 -- winbuild/doxysearch.vcproj | 359 -- winbuild/iconv.h | 141 - winbuild/iconv.vcproj | 468 --- winbuild/moc.rules | 20 - winbuild/pack_the_distribution_for_windows.py | 234 -- winbuild/qtools.vcproj | 1583 -------- winbuild/unistd.py | 16 - 25 files changed, 7 insertions(+), 10109 deletions(-) delete mode 100644 PLATFORMS delete mode 100644 winbuild/Config.rules delete mode 100644 winbuild/Doxygen.sln delete mode 100644 winbuild/Doxygen.vcproj delete mode 100755 winbuild/Doxywizard.vcproj delete mode 100644 winbuild/GenResources.rules delete mode 100644 winbuild/Gen_head.rules delete mode 100755 winbuild/Languages.rules delete mode 100644 winbuild/Lex.rules delete mode 100644 winbuild/Settings.rules delete mode 100755 winbuild/Unistd.rules delete mode 100644 winbuild/Version.rules delete mode 100644 winbuild/doxyindexer.vcproj delete mode 100644 winbuild/doxysearch.vcproj delete mode 100644 winbuild/iconv.h delete mode 100644 winbuild/iconv.vcproj delete mode 100644 winbuild/moc.rules delete mode 100644 winbuild/pack_the_distribution_for_windows.py delete mode 100644 winbuild/qtools.vcproj delete mode 100644 winbuild/unistd.py diff --git a/.gitignore b/.gitignore index 83de798..3e575a1 100644 --- a/.gitignore +++ b/.gitignore @@ -11,22 +11,7 @@ *.idb *.pdb - -/doc/translator_report.txt -/doc/config.doc -/doc/language.doc - /doxygen_docs /doxygen.tag -/examples/*/html -/html -/latex -/rtf -/xml -/man -/docbook -/perlmod -!/templates/html -!/templates/latex diff --git a/CMakeLists.txt b/CMakeLists.txt index 26b35c1..b0def45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ # 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) +cmake_minimum_required(VERSION 2.8.12) project(doxygen) option(build_wizard "Build the GUI frontend for doxygen." OFF) diff --git a/PLATFORMS b/PLATFORMS deleted file mode 100644 index 22a8d8c..0000000 --- a/PLATFORMS +++ /dev/null @@ -1,32 +0,0 @@ -aix-g++ -aix-xlc -beos-g++ -dgux-g++ -freebsd-g++ -gnu-g++ -hpux-acc -hpux-cc -hpux-g++ -irix-64 -irix-dcc -irix-g++ -irix-n32 -linux-g++ -linux-64 -macosx-c++ -macosx-uni-c++ -m68k-atari-mint-g++ -netbsd-g++ -openbsd-g++ -osf1-cxx -osf1-g++ -qnx-g++ -sco-g++ -solaris-cc -solaris-cc-64 -solaris-g++ -sunos-g++ -ultrix-g++ -unixware-g++ -win32-g++ -win32-mingw diff --git a/VERSION b/VERSION index 57590a0..d9a03a9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.8.9.1 +1.8.10 diff --git a/addon/doxyapp/doxyapp.cpp b/addon/doxyapp/doxyapp.cpp index 466a77d..6564981 100644 --- a/addon/doxyapp/doxyapp.cpp +++ b/addon/doxyapp/doxyapp.cpp @@ -26,7 +26,8 @@ */ #include -#include +#include +#include #include "doxygen.h" #include "outputgen.h" #include "parserintf.h" @@ -308,10 +309,10 @@ int main(int argc,char **argv) } // remove temporary files - if (!Doxygen::objDBFileName.isEmpty()) unlink(Doxygen::objDBFileName); - if (!Doxygen::entryDBFileName.isEmpty()) unlink(Doxygen::entryDBFileName); + if (!Doxygen::objDBFileName.isEmpty()) QFile::remove(Doxygen::objDBFileName); + if (!Doxygen::entryDBFileName.isEmpty()) QFile::remove(Doxygen::entryDBFileName); // clean up after us - rmdir("/tmp/doxygen"); + QDir().rmdir("/tmp/doxygen"); while (1) { diff --git a/winbuild/.gitignore b/winbuild/.gitignore index a073474..e69de29 100644 --- a/winbuild/.gitignore +++ b/winbuild/.gitignore @@ -1,7 +0,0 @@ -Debug/ -Debug64/ -Release/ -Release64/ -Doxygen.ncb -Doxygen.suo -*.user \ No newline at end of file diff --git a/winbuild/Config.rules b/winbuild/Config.rules deleted file mode 100644 index 788497d..0000000 --- a/winbuild/Config.rules +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - diff --git a/winbuild/Doxygen.sln b/winbuild/Doxygen.sln deleted file mode 100644 index 98e1c36..0000000 --- a/winbuild/Doxygen.sln +++ /dev/null @@ -1,71 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Doxygen", "Doxygen.vcproj", "{309C9A4A-94D2-4837-9A11-45B0A6CF35C3}" - ProjectSection(ProjectDependencies) = postProject - {B6BB4771-8A4E-4656-AC08-1EF8AC182F64} = {B6BB4771-8A4E-4656-AC08-1EF8AC182F64} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qtools", "qtools.vcproj", "{B6BB4771-8A4E-4656-AC08-1EF8AC182F64}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doxywizard", "Doxywizard.vcproj", "{77C9C2D3-EA3F-3D59-8B4C-0ED852890172}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doxysearch", "doxysearch.vcproj", "{F3F3408F-F6F7-46C7-BF1E-1FA056E0AE20}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doxyindexer", "doxyindexer.vcproj", "{E543983A-D5BF-4865-B4A1-6D7EF2E1051C}" - ProjectSection(ProjectDependencies) = postProject - {B6BB4771-8A4E-4656-AC08-1EF8AC182F64} = {B6BB4771-8A4E-4656-AC08-1EF8AC182F64} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Debug|Win32.ActiveCfg = Debug|Win32 - {309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Debug|Win32.Build.0 = Debug|Win32 - {309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Debug|x64.ActiveCfg = Debug|x64 - {309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Debug|x64.Build.0 = Debug|x64 - {309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Release|Win32.ActiveCfg = Release|Win32 - {309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Release|Win32.Build.0 = Release|Win32 - {309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Release|x64.ActiveCfg = Release|x64 - {309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Release|x64.Build.0 = Release|x64 - {B6BB4771-8A4E-4656-AC08-1EF8AC182F64}.Debug|Win32.ActiveCfg = Debug|Win32 - {B6BB4771-8A4E-4656-AC08-1EF8AC182F64}.Debug|Win32.Build.0 = Debug|Win32 - {B6BB4771-8A4E-4656-AC08-1EF8AC182F64}.Debug|x64.ActiveCfg = Debug|x64 - {B6BB4771-8A4E-4656-AC08-1EF8AC182F64}.Debug|x64.Build.0 = Debug|x64 - {B6BB4771-8A4E-4656-AC08-1EF8AC182F64}.Release|Win32.ActiveCfg = Release|Win32 - {B6BB4771-8A4E-4656-AC08-1EF8AC182F64}.Release|Win32.Build.0 = Release|Win32 - {B6BB4771-8A4E-4656-AC08-1EF8AC182F64}.Release|x64.ActiveCfg = Release|x64 - {B6BB4771-8A4E-4656-AC08-1EF8AC182F64}.Release|x64.Build.0 = Release|x64 - {77C9C2D3-EA3F-3D59-8B4C-0ED852890172}.Debug|Win32.ActiveCfg = Debug|Win32 - {77C9C2D3-EA3F-3D59-8B4C-0ED852890172}.Debug|Win32.Build.0 = Debug|Win32 - {77C9C2D3-EA3F-3D59-8B4C-0ED852890172}.Debug|x64.ActiveCfg = Debug|x64 - {77C9C2D3-EA3F-3D59-8B4C-0ED852890172}.Debug|x64.Build.0 = Debug|x64 - {77C9C2D3-EA3F-3D59-8B4C-0ED852890172}.Release|Win32.ActiveCfg = Release|Win32 - {77C9C2D3-EA3F-3D59-8B4C-0ED852890172}.Release|Win32.Build.0 = Release|Win32 - {77C9C2D3-EA3F-3D59-8B4C-0ED852890172}.Release|x64.ActiveCfg = Release|x64 - {77C9C2D3-EA3F-3D59-8B4C-0ED852890172}.Release|x64.Build.0 = Release|x64 - {F3F3408F-F6F7-46C7-BF1E-1FA056E0AE20}.Debug|Win32.ActiveCfg = Debug|Win32 - {F3F3408F-F6F7-46C7-BF1E-1FA056E0AE20}.Debug|Win32.Build.0 = Debug|Win32 - {F3F3408F-F6F7-46C7-BF1E-1FA056E0AE20}.Debug|x64.ActiveCfg = Debug|Win32 - {F3F3408F-F6F7-46C7-BF1E-1FA056E0AE20}.Release|Win32.ActiveCfg = Release|Win32 - {F3F3408F-F6F7-46C7-BF1E-1FA056E0AE20}.Release|Win32.Build.0 = Release|Win32 - {F3F3408F-F6F7-46C7-BF1E-1FA056E0AE20}.Release|x64.ActiveCfg = Release|Win32 - {F3F3408F-F6F7-46C7-BF1E-1FA056E0AE20}.Release|x64.Build.0 = Release|Win32 - {E543983A-D5BF-4865-B4A1-6D7EF2E1051C}.Debug|Win32.ActiveCfg = Debug|Win32 - {E543983A-D5BF-4865-B4A1-6D7EF2E1051C}.Debug|Win32.Build.0 = Debug|Win32 - {E543983A-D5BF-4865-B4A1-6D7EF2E1051C}.Debug|x64.ActiveCfg = Debug|x64 - {E543983A-D5BF-4865-B4A1-6D7EF2E1051C}.Debug|x64.Build.0 = Debug|x64 - {E543983A-D5BF-4865-B4A1-6D7EF2E1051C}.Release|Win32.ActiveCfg = Release|Win32 - {E543983A-D5BF-4865-B4A1-6D7EF2E1051C}.Release|Win32.Build.0 = Release|Win32 - {E543983A-D5BF-4865-B4A1-6D7EF2E1051C}.Release|x64.ActiveCfg = Release|x64 - {E543983A-D5BF-4865-B4A1-6D7EF2E1051C}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/winbuild/Doxygen.vcproj b/winbuild/Doxygen.vcproj deleted file mode 100644 index 3d0b2ba..0000000 --- a/winbuild/Doxygen.vcproj +++ /dev/null @@ -1,5016 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/winbuild/Doxywizard.vcproj b/winbuild/Doxywizard.vcproj deleted file mode 100755 index c424dc6..0000000 --- a/winbuild/Doxywizard.vcproj +++ /dev/null @@ -1,718 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/winbuild/GenResources.rules b/winbuild/GenResources.rules deleted file mode 100644 index a496ea5..0000000 --- a/winbuild/GenResources.rules +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - diff --git a/winbuild/Gen_head.rules b/winbuild/Gen_head.rules deleted file mode 100644 index c2e7550..0000000 --- a/winbuild/Gen_head.rules +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - diff --git a/winbuild/Languages.rules b/winbuild/Languages.rules deleted file mode 100755 index 8ff018a..0000000 --- a/winbuild/Languages.rules +++ /dev/null @@ -1,862 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/winbuild/Lex.rules b/winbuild/Lex.rules deleted file mode 100644 index 52df322..0000000 --- a/winbuild/Lex.rules +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - diff --git a/winbuild/Settings.rules b/winbuild/Settings.rules deleted file mode 100644 index 29e7266..0000000 --- a/winbuild/Settings.rules +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/winbuild/Unistd.rules b/winbuild/Unistd.rules deleted file mode 100755 index bd25661..0000000 --- a/winbuild/Unistd.rules +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - diff --git a/winbuild/Version.rules b/winbuild/Version.rules deleted file mode 100644 index 3dfdf04..0000000 --- a/winbuild/Version.rules +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - diff --git a/winbuild/doxyindexer.vcproj b/winbuild/doxyindexer.vcproj deleted file mode 100644 index 499741f..0000000 --- a/winbuild/doxyindexer.vcproj +++ /dev/null @@ -1,363 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/winbuild/doxysearch.vcproj b/winbuild/doxysearch.vcproj deleted file mode 100644 index a21168c..0000000 --- a/winbuild/doxysearch.vcproj +++ /dev/null @@ -1,359 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/winbuild/iconv.h b/winbuild/iconv.h deleted file mode 100644 index 0cc3f0c..0000000 --- a/winbuild/iconv.h +++ /dev/null @@ -1,141 +0,0 @@ -/* Copyright (C) 1999-2003 Free Software Foundation, Inc. - This file is part of the GNU LIBICONV Library. - - The GNU LIBICONV Library is free software; you can redistribute it - and/or modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - The GNU LIBICONV Library is distributed in the hope that it will be - useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU LIBICONV Library; see the file COPYING.LIB. - If not, write to the Free Software Foundation, Inc., 59 Temple Place - - Suite 330, Boston, MA 02111-1307, USA. */ - -/* When installed, this file is called "iconv.h". */ - -#ifndef _LIBICONV_H -#define _LIBICONV_H - -#define _LIBICONV_VERSION 0x0109 /* version number: (major<<8) + minor */ - -#ifdef LIBICONV_STATIC -#define LIBICONV_DLL_EXPORTED -#else /* LIBICONV_STATIC */ -#ifdef BUILDING_LIBICONV -#define LIBICONV_DLL_EXPORTED __declspec(dllexport) -#else -#define LIBICONV_DLL_EXPORTED __declspec(dllimport) -#endif -#endif /* LIBICONV_STATIC */ -extern LIBICONV_DLL_EXPORTED int _libiconv_version; /* Likewise */ - -/* We would like to #include any system header file which could define - iconv_t, 1. in order to eliminate the risk that the user gets compilation - errors because some other system header file includes /usr/include/iconv.h - which defines iconv_t or declares iconv after this file, 2. when compiling - for LIBICONV_PLUG, we need the proper iconv_t type in order to produce - binary compatible code. - But gcc's #include_next is not portable. Thus, once libiconv's iconv.h - has been installed in /usr/local/include, there is no way any more to - include the original /usr/include/iconv.h. We simply have to get away - without it. - Ad 1. The risk that a system header file does - #include "iconv.h" or #include_next "iconv.h" - is small. They all do #include . - Ad 2. The iconv_t type is a pointer type in all cases I have seen. (It - has to be a scalar type because (iconv_t)(-1) is a possible return value - from iconv_open().) */ - -/* Define iconv_t ourselves. */ -#undef iconv_t -#define iconv_t libiconv_t -typedef void* iconv_t; - -/* Get size_t declaration. */ -#include - -/* Get errno declaration and values. */ -#include -/* Some systems, like SunOS 4, don't have EILSEQ. Some systems, like BSD/OS, - have EILSEQ in a different header. On these systems, define EILSEQ - ourselves. */ -#ifndef EILSEQ -#define EILSEQ -#endif - - -#ifdef __cplusplus -extern "C" { -#endif - - -/* Allocates descriptor for code conversion from encoding `fromcode' to - encoding `tocode'. */ -#ifndef LIBICONV_PLUG -#define iconv_open libiconv_open -#endif -extern LIBICONV_DLL_EXPORTED iconv_t iconv_open (const char* tocode, const char* fromcode); - -/* Converts, using conversion descriptor `cd', at most `*inbytesleft' bytes - starting at `*inbuf', writing at most `*outbytesleft' bytes starting at - `*outbuf'. - Decrements `*inbytesleft' and increments `*inbuf' by the same amount. - Decrements `*outbytesleft' and increments `*outbuf' by the same amount. */ -#ifndef LIBICONV_PLUG -#define iconv libiconv -#endif -extern LIBICONV_DLL_EXPORTED size_t iconv (iconv_t cd, const char* * inbuf, size_t *inbytesleft, char* * outbuf, size_t *outbytesleft); - -/* Frees resources allocated for conversion descriptor `cd'. */ -#ifndef LIBICONV_PLUG -#define iconv_close libiconv_close -#endif -extern LIBICONV_DLL_EXPORTED int iconv_close (iconv_t cd); - - -#ifndef LIBICONV_PLUG - -/* Nonstandard extensions. */ - -/* Control of attributes. */ -#define iconvctl libiconvctl -extern LIBICONV_DLL_EXPORTED int iconvctl (iconv_t cd, int request, void* argument); - -/* Requests for iconvctl. */ -#define ICONV_TRIVIALP 0 /* int *argument */ -#define ICONV_GET_TRANSLITERATE 1 /* int *argument */ -#define ICONV_SET_TRANSLITERATE 2 /* const int *argument */ -#define ICONV_GET_DISCARD_ILSEQ 3 /* int *argument */ -#define ICONV_SET_DISCARD_ILSEQ 4 /* const int *argument */ - -/* Listing of locale independent encodings. */ -#define iconvlist libiconvlist -extern LIBICONV_DLL_EXPORTED void iconvlist (int (*do_one) (unsigned int namescount, - const char * const * names, - void* data), - void* data); - -/* Support for relocatable packages. */ - -/* Sets the original and the current installation prefix of the package. - Relocation simply replaces a pathname starting with the original prefix - by the corresponding pathname with the current prefix instead. Both - prefixes should be directory names without trailing slash (i.e. use "" - instead of "/"). */ -extern LIBICONV_DLL_EXPORTED void libiconv_set_relocation_prefix (const char *orig_prefix, - const char *curr_prefix); - -#endif - - -#ifdef __cplusplus -} -#endif - - -#endif /* _LIBICONV_H */ diff --git a/winbuild/iconv.vcproj b/winbuild/iconv.vcproj deleted file mode 100644 index 1d50d39..0000000 --- a/winbuild/iconv.vcproj +++ /dev/null @@ -1,468 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/winbuild/moc.rules b/winbuild/moc.rules deleted file mode 100644 index efe0f7f..0000000 --- a/winbuild/moc.rules +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - diff --git a/winbuild/pack_the_distribution_for_windows.py b/winbuild/pack_the_distribution_for_windows.py deleted file mode 100644 index dc2c3d9..0000000 --- a/winbuild/pack_the_distribution_for_windows.py +++ /dev/null @@ -1,234 +0,0 @@ -#!python2 - -from __future__ import print_function - -import os -import re -import shutil -import subprocess -import sys -import textwrap - - -def gitSHA_date_time(): - cmd = 'git rev-parse --short HEAD' - p = subprocess.Popen(cmd, stdout=subprocess.PIPE) - output = p.communicate()[0] - output = output.decode('ASCII') - p.wait() - sha = output.strip() - - cmd = 'git show -s --format="%ci" ' + sha - p = subprocess.Popen(cmd, stdout=subprocess.PIPE) - output = p.communicate()[0] - output = output.decode('ASCII') - p.wait() - date = output.strip() - lst = date.split() # string like '2013-06-21 09:23:47 +0200' - dstamp = lst[0].replace('-', '') # '20130621' for the date - tstamp = lst[1].replace(':', '') # '092347' for the time - - return sha, dstamp, tstamp - - -def getDoxygenVersion(): - # ... from the VERSION file. - sdir, fname = getThisScriptPathAndName() - version_fname = os.path.join(sdir, '..', 'VERSION') - - with open(version_fname) as f: - lst = f.readlines() - - doxver = lst[0].strip() - - m = re.match(r'^(?P[0-9.]+)(-(?P\d{8}))?', doxver) - assert m - ver = m.group('ver') - return ver - - -def getThisScriptPathAndName(): - script_fname = os.path.realpath(__file__) - sdir, fname = os.path.split(script_fname) - return sdir, fname - - -def getEmptyDistribDir(): - # Get this script full path, name, and the script subdir name - # (for checking the location). - sdir, fname = getThisScriptPathAndName() - subdir = os.path.basename(sdir) - assert subdir == 'winbuild' - - # The distribution directory will be a subdirectory of the "../__put" - # (created if it does not exist, not the part of the git repo). - target_dir = os.path.normpath(os.path.join(sdir, '..', '__put')) - if not os.path.exists(target_dir): - os.mkdir(target_dir) - assert os.path.isdir(target_dir) - - # The distribution subdir is composed out of 'Doxygen-', version stamp, - # timestamp, and commit id (partial SHA). Ignore the date from the VERSION - # file, take the commit date. - ver = getDoxygenVersion() - sha, dstamp, tstamp = gitSHA_date_time() - dist_subdir = 'Doxygen-' + ver + '-' + dstamp + tstamp - dist_dir = os.path.join(target_dir, dist_subdir) - print(dist_dir) - if os.path.isdir(dist_dir): - print("Removing the existing '{}'".format(dist_dir)) - shutil.rmtree(dist_dir) - assert not os.path.exists(dist_dir) - print("Creating the new '{}'".format(dist_dir)) - os.mkdir(dist_dir) - assert os.path.isdir(dist_dir) - - return dist_dir - - -def copyBinaries(dist_dir, subdir): - '''Copy the Windows binaries (doxygen.exe only) to the dist_dir directory.''' - - # Source file should exist. - sdir, fname = getThisScriptPathAndName() - src = os.path.normpath(os.path.join(sdir, '..', 'bin', subdir, 'doxygen.exe')) - if os.path.isfile(src): - # Destination directory must not exist. It must be created first. - dst_dir = os.path.normpath(os.path.join(dist_dir, 'bin', subdir)) - assert not os.path.isdir(dst_dir) - os.makedirs(dst_dir) - - # Copy the file. - print("Copying '{}'".format(src)) - shutil.copy2(src, dst_dir) - else: - print("The binary '" + src + "'") - print('was not found. It will not be present in the distribution.') - - -def getBinariesZipBareName(): - ver = getDoxygenVersion() - sha, dstamp, tstamp = gitSHA_date_time() - fname = 'doxygenw{}_{}.zip'.format(dstamp, ver.replace('.', '_')) - return fname - - -def getTranslatorReportZipBareName(): - ver = getDoxygenVersion() - sha, dstamp, tstamp = gitSHA_date_time() - fname = 'tr{}_{}.zip'.format(dstamp, ver.replace('.', '_')) - return fname - - -def zipBinaries(distr_dir): - # Build the zip filename. It is to be located at the same level as distr_dir. - zip_bare_name = getBinariesZipBareName() - dst, distr_subdir = os.path.split(distr_dir) - zip_full_name = os.path.join(dst, zip_bare_name) - - if os.path.isfile(zip_full_name): - print("Removing the existing '{}'".format(zip_full_name)) - os.remove(zip_full_name) - - # Change the working directory to destination directory and zip from - # there using the bare names so that the full path is not zipped inside. - wd = os.getcwd() - os.chdir(dst) - print("Zipping new '{}'".format(zip_full_name)) - subprocess.call('zip -r {} {}'.format(zip_bare_name, distr_subdir), shell=True) - os.chdir(wd) # back to the original working directory - - -def buildAndZipTranslatorReport(distr_dir): - # Build the translator report zip filename. It is to be located at the same - # level as distr_dir. - zip_bare_name = getTranslatorReportZipBareName() - dst, subdir = os.path.split(distr_dir) - zip_full_name = os.path.join(dst, zip_bare_name) - - if os.path.isfile(zip_full_name): - print("Removing the existing '{}'".format(zip_full_name)) - os.remove(zip_full_name) - print("Zipping new '{}'".format(zip_full_name)) - - # Change the working directory to the doc one and generate - # the translator report. - sdir, fname = getThisScriptPathAndName() - docdir = os.path.join(sdir, '..', 'doc') - assert os.path.isdir(docdir) - wd = os.getcwd() - os.chdir(docdir) - subprocess.call('python translator.py', shell=True) - - # Zip the generated translator_report.txt. - subprocess.call('zip -r {} {}'.format(zip_full_name, - 'translator_report.txt'), shell=True) - - os.chdir(wd) # back to the original working directory - - -def mailto(): - - # Information for the letter. - ver = getDoxygenVersion() - sha, dstamp, tstamp = gitSHA_date_time() - doxzipname = getBinariesZipBareName() - trzipname = getTranslatorReportZipBareName() - - subject = 'Windows binaries available for {}-{} at SourceForge'.format(ver, dstamp) - subject = subject.replace(' ', '%20') - - body = textwrap.dedent('''\ - Hi, - - If interested, you can download the doxygen binaries - compiled for MS Windows from - - http://sourceforge.net/projects/doxygen/files/snapshots/doxygen-1.8-svn/windows - - This is the place where you should find also the next - releases. Name of the archive file is - - {} - - The related translator report can be found inside the directory - - http://sourceforge.net/projects/doxygen/files/snapshots/doxygen-1.8-svn/translator_reports/ - - Name of the archive file is - - {} - - The binaries are NOT created automatically, so it may - happen that some newer sources were not compiled - because I am not present to do that or I forgot... ;) - - Regards, - Petr - - -- - Petr Prikryl (prikryl at atlas dot cz)''').format(doxzipname, trzipname) - body = body.replace('\n', '%0d') - - # Make the mailto URI and launch the mailer. - to_addr = 'doxygen-users@lists.sourceforge.net' - mailtoURI = 'mailto:%s?subject=%s&body=%s' % (to_addr, subject, body) - os.startfile(mailtoURI) - - -if __name__ == '__main__': - # Create the empty directory for the distribution files. - dist_dir = getEmptyDistribDir() - - # Copy the compiled binaries to the distribution directory and zip them. - copyBinaries(dist_dir, 'Debug') - copyBinaries(dist_dir, 'Debug64') - copyBinaries(dist_dir, 'Release') - copyBinaries(dist_dir, 'Release64') - zipBinaries(dist_dir) - - # The translator report... - buildAndZipTranslatorReport(dist_dir) - - # Launch the mailer with the generated message body. - mailto() \ No newline at end of file diff --git a/winbuild/qtools.vcproj b/winbuild/qtools.vcproj deleted file mode 100644 index 6e94d3f..0000000 --- a/winbuild/qtools.vcproj +++ /dev/null @@ -1,1583 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/winbuild/unistd.py b/winbuild/unistd.py deleted file mode 100644 index 93b9341..0000000 --- a/winbuild/unistd.py +++ /dev/null @@ -1,16 +0,0 @@ -# - -import sys -import os - -f1 = open(os.path.join(sys.argv[1],'unistd.h'),'w') - -f1.write("#ifndef UNISTD_H\n") -f1.write("#define UNISTD_H\n") -f1.write("/* this is a dummy file, that is needed for compiling files that are\n") -f1.write(" * generated with flex under Windows 95/NT.\n") -f1.write(" */\n") -f1.write("#if defined(_MSC_VER)\n") -f1.write(" #include \n") -f1.write("#endif\n") -f1.write("#endif\n") -- cgit v0.12