mirror of
https://github.com/pocoproject/poco.git
synced 2024-12-12 10:13:51 +01:00
Merge pull request #1986 from Kampbell/poco-1.8.0
Poco 1.8.0: update on PocoDoc config file and Travis mkdoc & mkrel
This commit is contained in:
Günter Obiltschnig
GitHub
commit
60ffb229ec
17
.travis.yml
17
.travis.yml
@ -9,11 +9,18 @@ before_install:
|
||||
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then wget --no-check-certificate https://www.cmake.org/files/v3.2/cmake-3.2.3-Linux-x86_64.tar.gz; fi
|
||||
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then tar -xzvf cmake-3.2.3-Linux-x86_64.tar.gz; fi
|
||||
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PATH=$PWD/cmake-3.2.3-Linux-x86_64/bin:$PATH; fi
|
||||
- sudo apt-get update -qq
|
||||
- sudo apt-get install -qq -y unixodbc-dev libmysqlclient-dev g++-arm-linux-gnueabi g++-arm-linux-gnueabihf clang-3.5 libc++-dev sloccount cppcheck
|
||||
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi
|
||||
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq -y unixodbc-dev libmysqlclient-dev g++-arm-linux-gnueabi g++-arm-linux-gnueabihf clang-3.5 libc++-dev sloccount cppcheck; fi
|
||||
|
||||
services:
|
||||
- mongodb
|
||||
- redis-server
|
||||
- postgresql
|
||||
- mysql
|
||||
|
||||
addons:
|
||||
postgresql: "9.4"
|
||||
|
||||
|
||||
notifications:
|
||||
slack: pocoproject:ItIUZvs8aJGyPdaKxIKMnS1t
|
||||
@ -87,12 +94,10 @@ matrix:
|
||||
|
||||
# build documentation and release
|
||||
- env: TEST_NAME="documentation & release"
|
||||
compiler: gcc
|
||||
compiler: clang
|
||||
script:
|
||||
- $CXX --version
|
||||
- . env.sh && mkdoc all && mkrel all
|
||||
- find releases/poco*-all
|
||||
- find releases/poco*-all-doc
|
||||
- ls -l releases
|
||||
|
||||
# QA jobs for code analytics and metrics
|
||||
# static code analysis with cppcheck (we can add --enable=all later)
|
||||
|
||||
135
PocoDoc/cfg/mkdoc.xml
Normal file
135
PocoDoc/cfg/mkdoc.xml
Normal file
@ -0,0 +1,135 @@
|
||||
<AppConfig>
|
||||
<PocoDoc>
|
||||
<files>
|
||||
<include>
|
||||
${PocoBuild}/*/include/Poco/*.h
|
||||
${PocoBuild}/*/include/Poco/*/*.h
|
||||
${PocoBuild}/*/include/Poco/*/*/*.h
|
||||
${PocoBuild}/*/include/Poco/*/*.h
|
||||
${PocoBuild}/*/*/include/Poco/*/*/*.h
|
||||
</include>
|
||||
<exclude>
|
||||
*_*.h,
|
||||
expat*.h,
|
||||
zconf.h,
|
||||
zlib.h,
|
||||
Alignment.h,
|
||||
QName.h,
|
||||
CppUnitException.h,
|
||||
Constants.h,
|
||||
inffast.h,
|
||||
PDF/include/*.h,
|
||||
CppParser/include/*.h
|
||||
</exclude>
|
||||
</files>
|
||||
<pages>
|
||||
${PocoBuild}/doc/*.page,
|
||||
${PocoBuild}/*/doc/*.page
|
||||
${PocoBuild}/*/*/doc/*.page
|
||||
</pages>
|
||||
<resources>
|
||||
${PocoBase}/PocoDoc/resources/css,
|
||||
${PocoBase}/PocoDoc/resources/js,
|
||||
${PocoBase}/PocoDoc/resources/images,
|
||||
${PocoBase}/PocoDoc/resources/index.thtml,
|
||||
${PocoBuild}/*/doc/images
|
||||
</resources>
|
||||
<compiler>
|
||||
<windows>
|
||||
<exec>cl.exe</exec>
|
||||
<options>
|
||||
${Includes},
|
||||
/I${PocoBase}/openssl/include
|
||||
/I${VC}/include,
|
||||
/I${WDK}/shared
|
||||
/I${WDK}/um
|
||||
/I${WDK}/ucrt
|
||||
/nologo,
|
||||
/D_DEBUG,
|
||||
/E,
|
||||
/C,
|
||||
/DPOCO_NO_GCC_API_ATTRIBUTE
|
||||
/DPOCO_NO_WINDOWS_H
|
||||
</options>
|
||||
<path>${VC}/bin</path>
|
||||
<usePipe>true</usePipe>
|
||||
</windows>
|
||||
<unix>
|
||||
<exec>${CXX} ${CXXFLAGS}</exec>
|
||||
<options>
|
||||
${Includes},
|
||||
-I/usr/local/mysql/include,
|
||||
-I/usr/include/mysql,
|
||||
-I/usr/include/postgresql,
|
||||
-D_DEBUG,
|
||||
-E,
|
||||
-C,
|
||||
-DPOCO_NO_GCC_API_ATTRIBUTE
|
||||
-DPOCO_NO_WINDOWS_H
|
||||
</options>
|
||||
<path></path>
|
||||
<usePipe>true</usePipe>
|
||||
</unix>
|
||||
</compiler>
|
||||
<language>EN</language>
|
||||
<charset>utf-8</charset>
|
||||
<software>POCO C++ Libraries</software>
|
||||
<company>Applied Informatics Software Engineering GmbH and Contributors</company>
|
||||
<companyURI>http://pocoproject.org/</companyURI>
|
||||
</PocoDoc>
|
||||
<Translations>
|
||||
<EN>
|
||||
<All_Base_Classes>All Base Classes</All_Base_Classes>
|
||||
<All_Symbols>All Symbols</All_Symbols>
|
||||
<Anonymous>Anonymous</Anonymous>
|
||||
<Constructors>Constructors</Constructors>
|
||||
<Class>Class</Class>
|
||||
<Deprecated>Deprecated</Deprecated>
|
||||
<Description>Description</Description>
|
||||
<Destructor>Destructor</Destructor>
|
||||
<Direct_Base_Classes>Direct Base Classes</Direct_Base_Classes>
|
||||
<Enumerations>Enumerations</Enumerations>
|
||||
<Functions>Functions</Functions>
|
||||
<Header>Header</Header>
|
||||
<iff>if and only if</iff>
|
||||
<Inheritance>Inheritance</Inheritance>
|
||||
<Inherited_Functions>Inherited Functions</Inherited_Functions>
|
||||
<is_deprecated>is deprecated and should no longer be used</is_deprecated>
|
||||
<Known_Derived_Classes>Known Derived Classes</Known_Derived_Classes>
|
||||
<Library>Library</Library>
|
||||
<Member_Functions>Member Functions</Member_Functions>
|
||||
<Member_Summary>Member Summary</Member_Summary>
|
||||
<more>more...</more>
|
||||
<Namespaces>Namespaces</Namespaces>
|
||||
<Namespace>Namespace</Namespace>
|
||||
<Nested_Classes>Nested Classes</Nested_Classes>
|
||||
<Package>Package</Package>
|
||||
<Packages>Packages</Packages>
|
||||
<Package_Index>Package Index</Package_Index>
|
||||
<See_also>See also</See_also>
|
||||
<Struct>Struct</Struct>
|
||||
<Symbol_Index>Symbol Index</Symbol_Index>
|
||||
<This>This</This>
|
||||
<Types>Types</Types>
|
||||
<Variables>Variables</Variables>
|
||||
<TOC>Contents</TOC>
|
||||
<Guides>User Guides and Tutorials</Guides>
|
||||
<AAAIntroduction>Introduction</AAAIntroduction>
|
||||
</EN>
|
||||
</Translations>
|
||||
|
||||
<logging>
|
||||
<loggers>
|
||||
<root>
|
||||
<channel>c1</channel>
|
||||
<level>warning</level>
|
||||
</root>
|
||||
</loggers>
|
||||
<channels>
|
||||
<c1>
|
||||
<class>ConsoleChannel</class>
|
||||
<pattern>%s: [%p] %t</pattern>
|
||||
</c1>
|
||||
</channels>
|
||||
</logging>
|
||||
</AppConfig>
|
||||
@ -768,18 +768,18 @@ task pocoDoc(type: Exec) {
|
||||
if (os.windows) {
|
||||
environment "Path", "$rootDir\\bin;$Path"
|
||||
executable "PocoDoc/bin/PocoDoc.exe"
|
||||
args "/config=$rootDir/PocoDoc/cfg/mkdoc-poco.xml"
|
||||
args "/config=$rootDir/PocoDoc/cfg/mkdoc.xml"
|
||||
args "/config=$rootDir/PocoDoc/PocoDoc.ini"
|
||||
}
|
||||
if (os.linux) {
|
||||
environment "LD_LIBRARY_PATH", "$rootDir/lib64:$LD_LIBRARY_PATH"
|
||||
executable "PocoDoc/bin64/PocoDoc"
|
||||
args "-config=$rootDir/PocoDoc/cfg/mkdoc-poco.xml"
|
||||
args "-config=$rootDir/PocoDoc/cfg/mkdoc.xml"
|
||||
args "-config=$rootDir/PocoDoc/PocoDoc.ini"
|
||||
}
|
||||
if (os.macOsX) {
|
||||
//FIXME environment "LD_LIBRARY_PATH", "$rootDir/bin:$LD_LIBRARY_PATH"
|
||||
args "-config=$rootDir/PocoDoc/cfg/mkdoc-poco.xml"
|
||||
args "-config=$rootDir/PocoDoc/cfg/mkdoc.xml"
|
||||
args "-config=$rootDir/PocoDoc/PocoDoc.ini"
|
||||
}
|
||||
// inputs.files(tasks.getByPath(':production').outputs.files)
|
||||
@ -802,7 +802,7 @@ task zipDoc(type: Zip) {
|
||||
def candle(VSYEAR, VERSION, target, os) {
|
||||
return tasks.create("Candle-${VSYEAR}-${VERSION}-${target}", Exec) {
|
||||
dependsOn ':pocos'
|
||||
dependsOn ':pocoDoc'
|
||||
//dependsOn ':pocoDoc'
|
||||
executable "${WiXHome}/bin/Candle.exe"
|
||||
workingDir "packaging/Windows/WiX"
|
||||
args "-arch", "${target}"
|
||||
|
||||
@ -20,9 +20,11 @@ fi
|
||||
osname=`uname -s | tr ' ' '_'`
|
||||
osarch=`uname -m | tr ' ' '_'`
|
||||
|
||||
if [ ${osname:0:6} = "CYGWIN" ] ; then
|
||||
osname="CYGWIN"
|
||||
fi
|
||||
case `uname` in
|
||||
CYGWIN*) osname="CYGWIN"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
if [ $osname = "Darwin" ] ; then
|
||||
archpath=`dirname stage/tools/PocoDoc/bin/Darwin/*/PocoDoc`
|
||||
|
||||
Loading…
Reference in New Issue
Block a user