Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

added make install support to VdomBrowser.pro

  • Loading branch information...
commit 3b1edd56ae024ca687fbac886be8f6308133163a 1 parent 9871df2
agentzh authored
Showing with 14 additions and 3 deletions.
  1. +6 −0 VdomBrowser.pro
  2. +2 −1  build.sh
  3. +6 −2 pack.sh
View
6 VdomBrowser.pro
@@ -49,6 +49,8 @@ isEmpty(QJSON_DIR) {
QMAKE_LIBDIR_FLAGS += -L$$QJSON_DIR/lib
}
+INCLUDEPATH += $$QTDIR/include/QtWebKit
+
CONFIG += $$(QT_WEBKIT)
webkit_trunk {
WEBKITDIR = $$(WEBKITDIR)
@@ -70,3 +72,7 @@ webkit_trunk {
QMAKE_RPATHDIR = $$WEBKITBUILD $$QMAKE_RPATHDIR
}
+QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
+target.path = $$OUTPUT_DIR/bin
+INSTALLS += target
+
View
3  build.sh
@@ -7,7 +7,8 @@ if [ -z "$QTDIR" ]; then
fi
export PATH=$QTDIR/bin:$PATH
#make distclean
-$QTDIR/bin/qmake "CONFIG-=debug" -r
+export QJSON_DIR=/export/vdom/yqjson
+$QTDIR/bin/qmake "CONFIG-=debug" "QJSON_DIR=/export/vdom/yqjson" "OUTPUT_DIR=/tmp/a/b" -r
#qmake -r
make -j2
View
8 pack.sh
@@ -1,15 +1,19 @@
#!/bin/sh
-if [ -z $1 ]; then
+if [ -z "$1" ]; then
echo Version not specified on the command line.
exit 1
fi
-verison=$1
+version=$1
cd ..
vb_dir=VdomBrowser-$version
+echo "$vb_dir"
+echo "$version"
+#exit
rm -rf $vb_dir
git clone VdomBrowser $vb_dir
tar -cvzf $vb_dir.tar.gz $vb_dir
+echo cp $vb_dir.tar.gz `rpm -E '%{_sourcedir}'`
cp $vb_dir.tar.gz `rpm -E '%{_sourcedir}'`
Please sign in to comment.
Something went wrong with that request. Please try again.