Update build scripts

scripts/pre-commit-hook.sh

@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 
-git diff --staged --name-only HEAD | xargs -d '\n' python scripts/sourcefix.py || exit 1
+git diff --staged --name-only HEAD | grep -v version.pri | xargs -d '\n' python scripts/sourcefix.py || exit 1

scripts/release.sh

@@ -88,15 +88,18 @@ mkdir "release-$v"
 
 git checkout-index --prefix="./release-$v/wkhtmltopdf-$v/" -a
 wget "http://code.google.com/p/wkhtmltopdf/wiki/ChangeLog" -qO - | sed -nre 's/.*<p>CHANGELOGBEGIN[ ]*<\/p>(.*)<p>CHANGELOGEND.*/\1/p' | html2text -utf8 -nobs | sed -e 's/ //g' > "./release-$v/wkhtmltopdf-$v/changelog"
-tar -cjvf "release-$v/wkhtmltopdf-$v.tar.bz2" -C "release-$v" "wkhtmltopdf-$v"
+tar -c --lzma -vf "release-$v/wkhtmltopdf-$v.tar.lzma" -C "release-$v" "wkhtmltopdf-$v"
 cp bin/wkhtmltopdf.exe "release-$v/wkhtmltopdf.exe"
 cp bin/wkhtmltoimage.exe "release-$v/wkhtmltoimage.exe"
+cp bin/libwkhtmltox.zip "release-$v/libwkhtmltox-$v.zip"
+cp bin/libwkhtmltox-i386.tar.lzma "release-$v/libwkhtmltox-$v-i386.tar.lzma"
+cp bin/libwkhtmltox-amd64.tar.lzma "release-$v/libwkhtmltox-$v-amd64.tar.lzma"
 m4 -D "WKVERSION=$v" wkhtmltopdf.nsi.m4 > "release-$v/wkhtmltopdf.nsi"
 cd bin
-tar -cjvf "../release-$v/wkhtmltopdf-$v-static-i386.tar.bz2" wkhtmltopdf-i386
-tar -cjvf "../release-$v/wkhtmltopdf-$v-static-amd64.tar.bz2" wkhtmltopdf-amd64
-tar -cjvf "../release-$v/wkhtmltoimage-$v-static-i386.tar.bz2" wkhtmltoimage-i386
-tar -cjvf "../release-$v/wkhtmltoimage-$v-static-amd64.tar.bz2" wkhtmltoimage-amd64
+tar -c --lzma -vf "../release-$v/wkhtmltopdf-$v-static-i386.tar.lzma" wkhtmltopdf-i386
+tar -c --lzma -vf "../release-$v/wkhtmltopdf-$v-static-amd64.tar.lzma" wkhtmltopdf-amd64
+tar -c --lzma -vf "../release-$v/wkhtmltoimage-$v-static-i386.tar.lzma" wkhtmltoimage-i386
+tar -c --lzma -vf "../release-$v/wkhtmltoimage-$v-static-amd64.tar.lzma" wkhtmltoimage-amd64
 cd "../release-$v"
 for x in libgcc_s_dw2-1.dll ssleay32.dll libeay32.dll mingwm10.dll EnvVarUpdate.nsh; do
 	[ -f "$x" ] && continue

scripts/static-build.sh

@@ -184,7 +184,7 @@ function packandcopylinux() {
     rm -rf ${WK}/lib
     mkdir -p ${WK}/lib
     cp ${WK}/bin/libwkhtmltox*.so ${WK}/lib || exit 1
-    cd ${WK} && tar -c --lzma -f ${BASE}/bin/libwkhtmltopdf-$1.tar.lzma lib include examples/Makefile examples/pdf_c_api.c
+    cd ${WK} && tar -c --lzma -f ${BASE}/bin/libwkhtmltox-$1.tar.lzma lib include examples/Makefile examples/pdf_c_api.c
 }
 
 
@@ -286,13 +286,13 @@ EOF
     wine strip.exe bin/wkhtmltopdf.exe || exit 1
     wine strip.exe bin/wkhtmltoimage.exe || exit 1
 
-    rm -rf  ${BASE}/bin/wkhtmltopdf.exe  ${BASE}/bin/wkhtmltoimage.exe ${BASE}/bin/libwkhtmltopdf.zip
+    rm -rf  ${BASE}/bin/wkhtmltopdf.exe  ${BASE}/bin/wkhtmltoimage.exe ${BASE}/bin/libwkhtmltox.zip
     ${BUILD}/${UPX}/upx --best bin/wkhtmltopdf.exe -o ${BASE}/bin/wkhtmltopdf.exe || exit 1
     ${BUILD}/${UPX}/upx --best bin/wkhtmltoimage.exe -o ${BASE}/bin/wkhtmltoimage.exe || exit 1
     rm -rf lib
     mkdir -p lib
     cp bin/wkhtmltox*.dll lib || exit 1
-    zip -9 ${BASE}/bin/libwkhtmltopdf.zip  lib include examples/Makefile examples/pdf_c_api.c
+    zip -9 ${BASE}/bin/libwkhtmltox.zip  lib include examples/Makefile examples/pdf_c_api.c
 }
 
 case "$1" in

scripts/upload.sh

@@ -25,12 +25,15 @@ function ul() {
 	python googlecode_upload.py -u "$USER" -w "$PASS" -s "$1" -p "wkhtmltopdf" -l "$2" "$3"
 }
 
-if ! [ -f "wkhtmltopdf-$1.tar.bz2" ] ||
-   ! [ -f "wkhtmltopdf-$1-static-i386.tar.bz2" ] ||
-   ! [ -f "wkhtmltopdf-$1-static-amd64.tar.bz2" ] ||
+if ! [ -f "wkhtmltopdf-$1.tar.lzma" ] ||
+   ! [ -f "wkhtmltopdf-$1-static-i386.tar.lzma" ] ||
+   ! [ -f "wkhtmltopdf-$1-static-amd64.tar.lzma" ] ||
    ! [ -f "wkhtmltox-$1-installer.exe" ] ||
-   ! [ -f "wkhtmltoimage-$1-static-i386.tar.bz2" ] ||
-   ! [ -f "wkhtmltoimage-$1-static-amd64.tar.bz2" ]; then
+   ! [ -f "wkhtmltoimage-$1-static-i386.tar.lzma" ] ||
+   ! [ -f "wkhtmltoimage-$1-static-amd64.tar.lzma" ] ||
+   ! [ -f "libwkhtmltox-$1.zip" ] ||
+   ! [ -f "libwkhtmltox-$1-i386.tar.lzma" ] ||
+   ! [ -f "libwkhtmltox-$1-amd64.tar.lzma" ];; then
 	echo "File Missing"
 	exit 1
 fi
@@ -41,3 +44,6 @@ ul "wkhtmltopdf-$1 Linux Static Binary (amd64)" "Type-Executable,OpSys-Linux,Fea
 ul "wkhtmltox-$1 Windows Installer (i368)" "Type-Installer,OpSys-Windows,Featured" "wkhtmltox-$1-installer.exe"
 ul "wkhtmltoimage-$1 Linux Static Binary (i368)" "Type-Executable,OpSys-Linux,Featured" "wkhtmltoimage-$1-static-i386.tar.bz2"
 ul "wkhtmltoimage-$1 Linux Static Binary (amd64)" "Type-Executable,OpSys-Linux,Featured" "wkhtmltoimage-$1-static-amd64.tar.bz2"
+ul "libwkhtmltox-$1 Linux Static Library (i368)" "Type-Archive,OpSys-Linux" "libwkhtmltox-$1-i386.tar.lzma"
+ul "libwxhtmltox-$1 Linux Static Library (amd64)" "Type-Archive,OpSys-Linux" "libwkhtmltox-$1-amd64.tar.lzma"
+ul "libwkhtmltox-$1 Windows Static Library (i368)" "Type-Archive,OpSys-Windows" "libwkhtmltox-$1.zip"