Jakob Truelsen пре 16 година
родитељ
комит
da601c850a
2 измењених фајлова са 12 додато и 6 уклоњено
  1. 10 4
      scripts/static-build.sh
  2. 2 2
      scripts/test.sh

+ 10 - 4
scripts/static-build.sh

@@ -40,6 +40,14 @@ function applypatch() {
 	patch -p1 < $1 && cp $1 $2;
 }
 
+function exportHere() {
+	rm -rf wkhtmltopdf
+	local HERE=${PWD}
+	cd $BASE || exti 1
+	git checkout-index --prefix=${HERE}/wkhtmltopdf/ -a -f || exit 1	
+	cd $HERE
+}
+
 BUILD=/tmp/build
 #Create static build directory
 mkdir -p $BUILD
@@ -74,8 +82,7 @@ if [[ "$1" == "all" ]] || [[ "$1" == "linux" ]]; then
  		make install || exit 1
 	fi
 	cd ..
-	rm -rf wkhtmltopdf
-	git checkout-index --prefix=./wkhtmltopdf/ -a -f || exit 1
+	exportHere
 	cd wkhtmltopdf
 	../qt/bin/qmake || exit 1
 	make -j5 || exit 1
@@ -130,8 +137,7 @@ EOF
 		wine mingw32-make install || exit 1
 	fi
 	cd ..
-	rm -rf wkhtmltopdf
-	git checkout-index --prefix=./wkhtmltopdf/ -a -f || exit 1
+	exportHere
 	cd wkhtmltopdf
 	wine ../qt/bin/qmake.exe wkhtmltopdf.pro -o Makefile -spec win32-g++ || exit 1
 	wine mingw32-make -j5 || exit 1

+ 2 - 2
scripts/test.sh

@@ -17,7 +17,7 @@
 #This script will test a compiled wkhtmltopdf for some basic functionality
 
 #This is just some random image
-img=http://upload.wikimedia.org/wikipedia/en/thumb/0/0e/TS3_logo_4.JPG/200px-TS3_logo_4.JPG
+img=http://madalgo.au.dk/img/Forside/KatrinebjMay-05.jpg
 [ -d test ] || mkdir test
 cd test
 
@@ -138,7 +138,7 @@ testImgSupport png
 testRemote 
 testSSL
 testHeaderFooter
-testBuild qmake
+#testBuild qmake
 #testBuild cmake
 #Lets clean up
 rm tmp.html tmp.pdf