Update release scripts a bit

AddedBytes · Mar 16, 2011 · 83d9f54 · 83d9f54
1 parent ed0dde5
commit 83d9f54
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 24 deletions.
diff --git a/scripts/static-build.sh b/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/libwkhtmltox-$1.tar.lzma lib include examples/Makefile examples/pdf_c_api.c
+    cd ${WK} && tar -c --bzip2 -f ${BASE}/bin/libwkhtmltox-$1.tar.bz2 lib include examples/Makefile examples/pdf_c_api.c examples/image_c_api.c
 }
 
 

diff --git a/scripts/upload.sh b/scripts/upload.sh
@@ -25,25 +25,29 @@ function ul() {
 	python googlecode_upload.py -u "$USER" -w "$PASS" -s "$1" -p "wkhtmltopdf" -l "$2" "$3"
 }
 
-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.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
+function checkf() {
+    if ! [ -f "$1" ] ; then
+	echo "$1 is missing"
+	exit 1;
+    fi
+}
+
+checkf "wkhtmltopdf-$1.tar.bz2"
+checkf "wkhtmltopdf-$1-static-i386.tar.bz2"
+checkf "wkhtmltopdf-$1-static-amd64.tar.bz2"
+checkf "wkhtmltox-$1-installer.exe"
+checkf "wkhtmltoimage-$1-static-i386.tar.bz2"
+checkf "wkhtmltoimage-$1-static-amd64.tar.bz2"
+checkf "libwkhtmltox-$1.zip"
+checkf "libwkhtmltox-$1-i386.tar.bz2"
+checkf "libwkhtmltox-$1-amd64.tar.bz2"
 
-ul "wkhtmltopdf-$1 Source" "Type-Source,OpSys-All,Featured" "wkhtmltopdf-$1.tar.lzma"
-ul "wkhtmltopdf-$1 Linux Static Binary (i368)" "Type-Executable,OpSys-Linux,Featured" "wkhtmltopdf-$1-static-i386.tar.lzma"
-ul "wkhtmltopdf-$1 Linux Static Binary (amd64)" "Type-Executable,OpSys-Linux,Featured" "wkhtmltopdf-$1-static-amd64.tar.lzma"
+ul "wkhtmltopdf-$1 Source" "Type-Source,OpSys-All,Featured" "wkhtmltopdf-$1.tar.bz2"
+ul "wkhtmltopdf-$1 Linux Static Binary (i368)" "Type-Executable,OpSys-Linux,Featured" "wkhtmltopdf-$1-static-i386.tar.bz2"
+ul "wkhtmltopdf-$1 Linux Static Binary (amd64)" "Type-Executable,OpSys-Linux,Featured" "wkhtmltopdf-$1-static-amd64.tar.bz2"
 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.lzma"
-ul "wkhtmltoimage-$1 Linux Static Binary (amd64)" "Type-Executable,OpSys-Linux,Featured" "wkhtmltoimage-$1-static-amd64.tar.lzma"
-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 "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.bz2"
+ul "libwxhtmltox-$1 Linux Static Library (amd64)" "Type-Archive,OpSys-Linux" "libwkhtmltox-$1-amd64.tar.bz2"
 ul "libwkhtmltox-$1 Windows Static Library (i368)" "Type-Archive,OpSys-Windows" "libwkhtmltox-$1.zip"
diff --git a/wkhtmltopdf.nsi.m4 b/wkhtmltopdf.nsi.m4
@@ -36,20 +36,30 @@ InstallDirRegKey HKCU "Software\wkhtmltopdf" ""
 ;--------------------------------
 ;Installer Sections
 
-Section Wkhtmltopdf 
+Section "Wkhtmltopdf" pdf
   SetOutPath "$INSTDIR"
   file wkhtmltopdf.exe
 SectionEnd
 
-Section Wkhtmltoimage
+Section "Wkhtmltoimage" image
   SetOutPath "$INSTDIR"
   file wkhtmltoimage.exe
 SectionEnd
 
-Section \o "Update PATH, WILL BREAK PATH IN VISTA AN WIN7"
+Section /o "Modify PATH" mpath
   ${EnvVarUpdate} $0 "PATH" "A" "HKLM" "$INSTDIR" 
 SectionEnd
 
+LangString DESC_pdf   ${LANG_ENGLISH} "Install wkhtmltopdf"
+LangString DESC_image ${LANG_ENGLISH} "Install wkhtmltoimage"
+LangString DESC_mpath ${LANG_ENGLISH} "Update PATH, WILL BREAK PATH IN VISTA AN WIN7"
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+    !insertmacro MUI_DESCRIPTION_TEXT ${pdf} $(DESC_pdf)
+    !insertmacro MUI_DESCRIPTION_TEXT ${image} $(DESC_image)
+    !insertmacro MUI_DESCRIPTION_TEXT ${mpath} $(DESC_mpath)
+ !insertmacro MUI_FUNCTION_DESCRIPTION_END
+
 Section
   SetOutPath "$INSTDIR"
   file libgcc_s_dw2-1.dll
@@ -80,4 +90,4 @@ Section "Uninstall"
   Delete "$INSTDIR\uninstall.exe"
   RMDir "$INSTDIR"
   DeleteRegKey /ifempty HKCU "Software\wkhtmltopdf"
-SectionEnd
+SectionEnd