Update project files to install stuff

scripts/release.sh

@@ -52,7 +52,13 @@ echo "About to release $v"
 read -p "Are you sure you are ready: " N
 [ "$N" != "YES" ] && exit
 
-echo "DEFINES += MAJOR_VERSION=$1 MINOR_VERSION=$2 PATCH_VERSION=$3 BUILD=\"$4\"" > version.pri
+echo "MAJOR_VERSION=$1
+MINOR_VERSION=$2
+PATCH_VERSION=$3
+BUILD=\"$4\"
+
+DEFINES += MAJOR_VERSION=\$\$MAJOR_VERSION MINOR_VERSION=\$\$MINOR_VERSION PATCH_VERSION=\$\$PATCH_VERSION BUILD=\$\$BUILD" > version.pri
+
 HEAD="$(git log --pretty=oneline  -n 1 | sed -e 's/ .*//')"
 git commit -m "TEMPORERY DO NOT COMMIT $v" version.pri
 

src/image/image.pro

@@ -24,20 +24,20 @@ DESTDIR = ../../bin
 DEPENDPATH += . ../shared
 INCLUDEPATH += . ../shared
 
-readme.target=README_WKHTMLTOIMAGE
-readme.commands=./wkhtmltoimage --readme > README_WKHTMLTOIMAGE
-readme.depends=wkhtmltoimage
+readme.target=../../README_WKHTMLTOIMAGE
+readme.commands=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --readme > ../../README_WKHTMLTOIMAGE
+readme.depends=../../bin/wkhtmltoimage
 
 QMAKE_EXTRA_TARGETS += readme
 
 unix {
-    man.target=wkhtmltoimage.1.gz
-    man.commands=./wkhtmltoimage --manpage | gzip > $@
-    man.depends=wkhtmltoimage
+    man.target=../../wkhtmltoimage.1.gz
+    man.commands=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --manpage | gzip > $@
+    man.depends=../../bin/wkhtmltoimage
 
     manins.target=manins
     manins.depends=man
-    manins.files=wkhtmltoimage.1.gz
+    manins.files=../../wkhtmltoimage.1.gz
     manins.path=$$INSTALLBASE/share/man/man1
 
     QMAKE_EXTRA_TARGETS += manins man

src/lib/lib.pro

@@ -18,11 +18,24 @@
 TEMPLATE = lib
 CONFIG += dll
 
-CXX += -fvisibility=hidden -fvisibility-inlines-hidden
-
 include(../../version.pri)
 include(../../common.pri)
 include(lib.pri)
 
-TARGET = wkhtmltox
+unix {
+   headers.targit=headers
+   headers.files=../../include/wkhtmltox/*
+   headers.path=$$INSTALLBASE/include/wkhtmltox
+
+   QMAKE_EXTRA_TARGETS += headers
+   INSTALLS += headers
+}
+
+VERSION=$${MAJOR_VERSION}.$${MINOR_VERSION}.$${PATCH_VERSION}
+
+TARGET=wkhtmltox
+INSTALLS += target
+wkhtmltox.path=$$INSTALLBASE/lib
+
 DESTDIR = ../../bin
+target.path=$$INSTALLBASE/lib

src/pdf/pdf.pro

@@ -19,25 +19,25 @@ include(../../version.pri)
 include(../../common.pri)
 
 TEMPLATE = app
-DESTDIR = ../../bin
 TARGET = wkhtmltopdf
+DESTDIR = ../../bin
 DEPENDPATH += . ../shared
 INCLUDEPATH += . ../shared
 
-readme.target=README
-readme.commands=./wkhtmltopdf --readme > README
-readme.depends=wkhtmltopdf
+readme.target=../../README_WKHTMLTOPDF
+readme.commands=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltopdf --readme > ../../README_WKHTMLTOPDF
+readme.depends=../../bin/wkhtmltopdf
 
 QMAKE_EXTRA_TARGETS += readme
 
 unix {
-    man.target=wkhtmltopdf.1.gz
-    man.commands=./wkhtmltopdf --manpage | gzip > $@
-    man.depends=wkhtmltopdf
+    man.target=../../wkhtmltopdf.1.gz
+    man.commands=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltopdf --manpage | gzip > $@
+    man.depends=../../bin/wkhtmltopdf
 
     manins.target=manins
     manins.depends=man
-    manins.files=wkhtmltopdf.1.gz
+    manins.files=../../wkhtmltopdf.1.gz
     manins.path=$$INSTALLBASE/share/man/man1
 
     QMAKE_EXTRA_TARGETS += manins man

version.pri

@@ -1 +1,23 @@
-DEFINES += MAJOR_VERSION=0 MINOR_VERSION=10 PATCH_VERSION=0 BUILD="beta4"
+# Copyright 2010 wkhtmltopdf authors
+#
+# This file is part of wkhtmltopdf.
+#
+# wkhtmltopdf is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# wkhtmltopdf 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
+
+MAJOR_VERSION=0
+MINOR_VERSION=10
+PATCH_VERSION=0
+BUILD="beta4"
+
+DEFINES += MAJOR_VERSION=$$MAJOR_VERSION MINOR_VERSION=$$MINOR_VERSION PATCH_VERSION=$$PATCH_VERSION BUILD=$$BUILD