Skip to content

Commit 669db38

Browse files
committed
small stuff
1 parent ed44ed7 commit 669db38

File tree

4 files changed

+21
-16
lines changed

4 files changed

+21
-16
lines changed

.qmake.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ load(qt_build_config)
33
CONFIG += warning_clean exceptions
44
DEFINES += QT_DEPRECATED_WARNINGS QT_ASCII_CAST_WARNINGS
55

6-
MODULE_VERSION = 2.1.2
6+
MODULE_VERSION = 2.1.3

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ before_cache:
4646
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
4747
cache:
4848
directories:
49+
- $HOME/.cache/Skycoder42/qpmx
4950
- $HOME/.gradle/caches/
5051
- $HOME/.gradle/wrapper/
5152
- $HOME/.android/build-cache

appveyor.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,6 @@ deploy:
4545
force_update: false
4646
on:
4747
appveyor_repo_tag: true
48+
49+
cache:
50+
- 'C:\Users\appveyor\AppData\Local\Skycoder42\qpmx\cache -> appveyor.yml'

doc/makedoc.sh

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,34 +16,35 @@ qtBins=$3
1616
qtHeaders=$4
1717
qtDocs=$5
1818
doxyTemplate="$srcDir/Doxyfile"
19+
doxyRes=Doxyfile.generated
1920
readme="$destDir/README.md"
2021
doxme="$scriptDir/doxme.py"
2122

2223
python3 "$doxme" "$srcDir/../README.md"
2324

24-
cat "$doxyTemplate" > Doxyfile
25-
echo "PROJECT_NUMBER = \"$version\"" >> Doxyfile
26-
echo "INPUT += \"$readme\"" >> Doxyfile
27-
echo "USE_MDFILE_AS_MAINPAGE = \"$readme\"" >> Doxyfile
28-
echo "OUTPUT_DIRECTORY = \"$destDir\"" >> Doxyfile
29-
echo "QHP_NAMESPACE = \"de.skycoder42.qtautoupdater.$verTag\"" >> Doxyfile
30-
echo "QHP_CUST_FILTER_NAME = \"AutoUpdater $version\"" >> Doxyfile
31-
echo "QHP_CUST_FILTER_ATTRS = \"qtautoupdater $version\"" >> Doxyfile
32-
echo "QHG_LOCATION = \"$qtBins/qhelpgenerator\"" >> Doxyfile
33-
echo "INCLUDE_PATH += \"$qtHeaders\"" >> Doxyfile
34-
echo "GENERATE_TAGFILE = \"$destDir/qtautoupdater/qtautoupdater.tags\"" >> Doxyfile
25+
cat "$doxyTemplate" > $doxyRes
26+
echo "PROJECT_NUMBER = \"$version\"" >> $doxyRes
27+
echo "INPUT += \"$readme\"" >> $doxyRes
28+
echo "USE_MDFILE_AS_MAINPAGE = \"$readme\"" >> $doxyRes
29+
echo "OUTPUT_DIRECTORY = \"$destDir\"" >> $doxyRes
30+
echo "QHP_NAMESPACE = \"de.skycoder42.qtautoupdater.$verTag\"" >> $doxyRes
31+
echo "QHP_CUST_FILTER_NAME = \"AutoUpdater $version\"" >> $doxyRes
32+
echo "QHP_CUST_FILTER_ATTRS = \"qtautoupdater $version\"" >> $doxyRes
33+
echo "QHG_LOCATION = \"$qtBins/qhelpgenerator\"" >> $doxyRes
34+
echo "INCLUDE_PATH += \"$qtHeaders\"" >> $doxyRes
35+
echo "GENERATE_TAGFILE = \"$destDir/qtautoupdater/qtautoupdater.tags\"" >> $doxyRes
3536
if [ "$DOXY_STYLE" ]; then
36-
echo "HTML_STYLESHEET = \"$DOXY_STYLE\"" >> Doxyfile
37+
echo "HTML_STYLESHEET = \"$DOXY_STYLE\"" >> $doxyRes
3738
fi
3839
if [ "$DOXY_STYLE_EXTRA" ]; then
39-
echo "HTML_EXTRA_STYLESHEET = \"$DOXY_STYLE_EXTRA\"" >> Doxyfile
40+
echo "HTML_EXTRA_STYLESHEET = \"$DOXY_STYLE_EXTRA\"" >> $doxyRes
4041
fi
4142

4243
for tagFile in $(find "$qtDocs" -name *.tags); do
4344
if [ $(basename "$tagFile") != "qtautoupdater.tags" ]; then
44-
echo "TAGFILES += "$tagFile=https://doc.qt.io/qt-5"" >> Doxyfile
45+
echo "TAGFILES += \"$tagFile=https://doc.qt.io/qt-5\"" >> $doxyRes
4546
fi
4647
done
4748

4849
cd "$srcDir"
49-
doxygen "$destDir/Doxyfile"
50+
doxygen "$destDir/$doxyRes"

0 commit comments

Comments
 (0)