Browse Source

Merge pull request #37 from ashkulz/master

remove unused scripts and files
Jakob Truelsen 11 years ago
parent
commit
a82ac85810

+ 0 - 156
README_WKHTMLTOIMAGE

@@ -1,156 +0,0 @@
-======================> wkhtmltoimage 0.10.0 rc2 Manual <=======================
-This file documents wkhtmltoimage, a program capable of converting HTML
-documents into images.
-
-==================================> Contact <===================================
-If you experience bugs or want to request new features please visit 
-<http://code.google.com/p/wkhtmltopdf/issues/list>, if you have any problems or
-comments please feel free to contact me: <uuf6429@gmail.com>
-
-==================================> License <===================================
-Copyright (C) 2010 wkhtmltopdf/wkhtmltoimage Authors.
-
-
-
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
-This is free software: you are free to change and redistribute it. There is NO
-WARRANTY, to the extent permitted by law.
-
-==================================> Authors <===================================
-Written by Jan Habermann, Christian Sciberras and Jakob Truelsen. Patches by
-Mehdi Abbad, Lyes Amazouz, Pascal Bach, Emmanuel Bouthenot, Benoit Garret and
-Mário Silva.
-
-==================================> Synopsis <==================================
-wkhtmltoimage [OPTIONS]... <input file> <output file>
-
-==============================> General Options <===============================
-    --allow <path>                    Allow the file or files from the specified
-                                      folder to be loaded (repeatable)
-    --checkbox-checked-svg <path>     Use this SVG file when rendering checked
-                                      checkboxes
-    --checkbox-svg <path>             Use this SVG file when rendering unchecked
-                                      checkboxes
-    --cookie <name> <value>           Set an additional cookie (repeatable)
-    --cookie-jar <path>               Read and write cookies from and to the
-                                      supplied cookie jar file
-    --crop-h <int>                    Set height for croping
-    --crop-w <int>                    Set width for croping
-    --crop-x <int>                    Set x coordinate for croping
-    --crop-y <int>                    Set y coordinate for croping
-    --custom-header <name> <value>    Set an additional HTTP header (repeatable)
-    --custom-header-propagation       Add HTTP headers specified by
-                                      --custom-header for each resource request.
-    --no-custom-header-propagation    Do not add HTTP headers specified by
-                                      --custom-header for each resource request.
-    --debug-javascript                Show javascript debugging output
-    --no-debug-javascript             Do not show javascript debugging output
-                                      (default)
-    --encoding <encoding>             Set the default text encoding, for input
--H, --extended-help                   Display more extensive help, detailing
-                                      less common command switches
--f, --format <format>                 Output file format (default is jpg)
-    --height <int>                    Set screen height (default is calculated
-                                      from page content) (default 0)
--h, --help                            Display help
-    --htmldoc                         Output program html help
-    --images                          Do load or print images (default)
-    --no-images                       Do not load or print images
--n, --disable-javascript              Do not allow web pages to run javascript
-    --enable-javascript               Do allow web pages to run javascript
-                                      (default)
-    --javascript-delay <msec>         Wait some milliseconds for javascript
-                                      finish (default 200)
-    --load-error-handling <handler>   Specify how to handle pages that fail to
-                                      load: abort, ignore or skip (default
-                                      abort)
-    --disable-local-file-access       Do not allowed conversion of a local file
-                                      to read in other local files, unless
-                                      explecitily allowed with --allow
-    --enable-local-file-access        Allowed conversion of a local file to read
-                                      in other local files. (default)
-    --manpage                         Output program man page
-    --minimum-font-size <int>         Minimum font size
-    --password <password>             HTTP Authentication password
-    --disable-plugins                 Disable installed plugins (default)
-    --enable-plugins                  Enable installed plugins (plugins will
-                                      likely not work)
-    --post <name> <value>             Add an additional post field (repeatable)
-    --post-file <name> <path>         Post an additional file (repeatable)
--p, --proxy <proxy>                   Use a proxy
-    --quality <int>                   Output image quality (between 0 and 100)
-                                      (default 94)
-    --radiobutton-checked-svg <path>  Use this SVG file when rendering checked
-                                      radiobuttons
-    --radiobutton-svg <path>          Use this SVG file when rendering unchecked
-                                      radiobuttons
-    --readme                          Output program readme
-    --run-script <js>                 Run this additional javascript after the
-                                      page is done loading (repeatable)
--0, --disable-smart-width *           Use the specified width even if it is not
-                                      large enough for the content
-    --stop-slow-scripts               Stop slow running javascripts (default)
-    --no-stop-slow-scripts            Do not Stop slow running javascripts
-                                      (default)
-    --transparent *                   Make the background transparent in pngs
-    --use-xserver *                   Use the X server (some plugins and other
-                                      stuff might not work without X11)
-    --user-style-sheet <url>          Specify a user style sheet, to load with
-                                      every page
-    --username <username>             HTTP Authentication username
--V, --version                         Output version information an exit
-    --width <int>                     Set screen width (default is 1024)
-                                      (default 1024)
-    --window-status <windowStatus>    Wait until window.status is equal to this
-                                      string before rendering page
-    --zoom <float>                    Use this zoom factor (default 1)
-
-Items marked * are only available using patched QT.
-
-=============================> Specifying A Proxy <=============================
-By default proxy information will be read from the environment variables: proxy,
-all_proxy and http_proxy, proxy options can also by specified with the -p switch
-
-<type> := "http://" | "socks5://"
-<serif> := <username> (":" <password>)? "@"
-<proxy> := "None" | <type>? <sering>? <host> (":" <port>)?
-
-Here are some examples (In case you are unfamiliar with the BNF):
-
-http://user:password@myproxyserver:8080
-socks5://myproxyserver
-None
-
-===============================> Static version <===============================
-On the wkhtmltopdf website you can download a static version of wkhtmltopdf 
-<http://code.google.com/p/wkhtmltopdf/downloads/list>. This static binary will
-work on most systems and comes with a build in patched QT.
-
-Unfortunately the static binary is not particularly static, on Linux it depends
-on both glibc and openssl, furthermore you will need to have an xserver
-installed but not necessary running. You will need to have different fonts
-install including xfonts-scalable (Type1), and msttcorefonts.  See 
-<http://code.google.com/p/wkhtmltopdf/wiki/static> for trouble shouting.
-
-================================> Compilation <=================================
-It can happen that the static binary does not work for your system for one
-reason or the other, in that case you might need to compile wkhtmltoimage
-yourself.
-
-
-
-================================> Installation <================================
-There are several ways to install wkhtmltoimage.  You can download a already
-compiled binary, or you can compile wkhtmltoimage yourself. 
-
-==================================> Examples <==================================
-This section presents a number of examples of how to invoke wkhtmltoimage.
-
-To convert a remote HTML file to PNG:
-
-wkhtmltoimage http://www.google.com google.png
-
-To convert a local HTML file to PNG:
-
-wkhtmltoimage my.html my.png
-

+ 0 - 510
README_WKHTMLTOPDF

@@ -1,510 +0,0 @@
-=======================> wkhtmltopdf 0.10.0 rc2 Manual <========================
-This file documents wkhtmltopdf, a program capable of converting html documents
-into PDF documents.
-
-==================================> Contact <===================================
-If you experience bugs or want to request new features please visit 
-<http://code.google.com/p/wkhtmltopdf/issues/list>, if you have any problems or
-comments please feel free to contact me: see 
-<http://www.madalgo.au.dk/~jakobt/#about>
-
-===========================> Reduced Functionality <============================
-Some versions of wkhtmltopdf are compiled against a version of QT without the
-wkhtmltopdf patches. These versions are missing some features, you can find out
-if your version of wkhtmltopdf is one of these by running wkhtmltopdf --version
-if your version is against an unpatched QT, you can use the static version to
-get all functionality.
-
-Currently the list of features only supported with patch QT includes:
-
- * Printing more then one HTML document into a PDF file.
- * Running without an X11 server.
- * Adding a document outline to the PDF file.
- * Adding headers and footers to the PDF file.
- * Generating a table of contents.
- * Adding links in the generated PDF file.
- * Printing using the screen media-type.
- * Disabling the smart shrink feature of webkit.
-
-==================================> License <===================================
-Copyright (C) 2010 wkhtmltopdf/wkhtmltoimage Authors.
-
-
-
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
-This is free software: you are free to change and redistribute it. There is NO
-WARRANTY, to the extent permitted by law.
-
-==================================> Authors <===================================
-Written by Jan Habermann, Christian Sciberras and Jakob Truelsen. Patches by
-Mehdi Abbad, Lyes Amazouz, Pascal Bach, Emmanuel Bouthenot, Benoit Garret and
-Mário Silva.
-
-==================================> Synopsis <==================================
-wkhtmltopdf [GLOBAL OPTION]... [OBJECT]... <output file>
-
-==============================> Document objects <==============================
-wkhtmltopdf is able to put several objects into the output file, an object is
-either a single webpage, a cover webpage or a table of content.  The objects are
-put into the output document in the order they are specified on the command
-line, options can be specified on a per object basis or in the global options
-area. Options from the Global Options section can only be placed in the global
-options area
-
-A page objects puts the content of a singe webpage into the output document.
-
-(page)? <input url/file name> [PAGE OPTION]...
-Options for the page object can be placed in the global options and the page
-options areas. The applicable options can be found in the Page Options and 
-Headers And Footer Options sections.
-
-A cover objects puts the content of a singe webpage into the output document,
-the page does not appear in the table of content, and does not have headers and
-footers.
-
-cover <input url/file name> [PAGE OPTION]...
-All options that can be specified for a page object can also be specified for a
-cover.
-
-A table of content object inserts a table of content into the output document.
-
-toc [TOC OPTION]...
-All options that can be specified for a page object can also be specified for a
-toc, further more the options from the TOC Options section can also be applied.
-The table of content is generated via XSLT which means that it can be styled to
-look however you want it to look. To get an aide of how to do this you can dump
-the default xslt document by supplying the --dump-default-toc-xsl, and the
-outline it works on by supplying --dump-outline, see the Outline Options
-section.
-
-===============================> Global Options <===============================
-    --collate                         Collate when printing multiple copies
-                                      (default)
-    --no-collate                      Do not collate when printing multiple
-                                      copies
-    --cookie-jar <path>               Read and write cookies from and to the
-                                      supplied cookie jar file
-    --copies <number>                 Number of copies to print into the pdf
-                                      file (default 1)
--d, --dpi <dpi>                       Change the dpi explicitly (this has no
-                                      effect on X11 based systems)
--H, --extended-help                   Display more extensive help, detailing
-                                      less common command switches
--g, --grayscale                       PDF will be generated in grayscale
--h, --help                            Display help
-    --htmldoc                         Output program html help
-    --image-dpi * <integer>           When embedding images scale them down to
-                                      this dpi (default 600)
-    --image-quality * <integer>       When jpeg compressing images use this
-                                      quality (default 94)
--l, --lowquality                      Generates lower quality pdf/ps. Useful to
-                                      shrink the result document space
-    --manpage                         Output program man page
--B, --margin-bottom <unitreal>        Set the page bottom margin (default 10mm)
--L, --margin-left <unitreal>          Set the page left margin (default 10mm)
--R, --margin-right <unitreal>         Set the page right margin (default 10mm)
--T, --margin-top <unitreal>           Set the page top margin (default 10mm)
--O, --orientation <orientation>       Set orientation to Landscape or Portrait
-                                      (default Portrait)
-    --output-format <format>          Specify an output format to use pdf or ps,
-                                      instead of looking at the extention of the
-                                      output filename
-    --page-height <unitreal>          Page height
--s, --page-size <Size>                Set paper size to: A4, Letter, etc.
-                                      (default A4)
-    --page-width <unitreal>           Page width
-    --no-pdf-compression *            Do not use lossless compression on pdf
-                                      objects
--q, --quiet                           Be less verbose
-    --read-args-from-stdin            Read command line arguments from stdin
-    --readme                          Output program readme
-    --title <text>                    The title of the generated pdf file (The
-                                      title of the first document is used if not
-                                      specified)
-    --use-xserver *                   Use the X server (some plugins and other
-                                      stuff might not work without X11)
--V, --version                         Output version information an exit
-
-Items marked * are only available using patched QT.
-
-==============================> Outline Options <===============================
-    --dump-default-toc-xsl *          Dump the default TOC xsl style sheet to
-                                      stdout
-    --dump-outline * <file>           Dump the outline to a file
-    --outline *                       Put an outline into the pdf (default)
-    --no-outline *                    Do not put an outline into the pdf
-    --outline-depth * <level>         Set the depth of the outline (default 4)
-
-Items marked * are only available using patched QT.
-
-================================> Page Options <================================
-    --allow <path>                    Allow the file or files from the specified
-                                      folder to be loaded (repeatable)
-    --background                      Do print background (default)
-    --no-background                   Do not print background
-    --checkbox-checked-svg <path>     Use this SVG file when rendering checked
-                                      checkboxes
-    --checkbox-svg <path>             Use this SVG file when rendering unchecked
-                                      checkboxes
-    --cookie <name> <value>           Set an additional cookie (repeatable)
-    --custom-header <name> <value>    Set an additional HTTP header (repeatable)
-    --custom-header-propagation       Add HTTP headers specified by
-                                      --custom-header for each resource request.
-    --no-custom-header-propagation    Do not add HTTP headers specified by
-                                      --custom-header for each resource request.
-    --debug-javascript                Show javascript debugging output
-    --no-debug-javascript             Do not show javascript debugging output
-                                      (default)
-    --default-header *                Add a default header, with the name of the
-                                      page to the left, and the page number to
-                                      the right, this is short for:
-                                      --header-left='[webpage]'
-                                      --header-right='[page]/[toPage]' --top 2cm
-                                      --header-line
-    --encoding <encoding>             Set the default text encoding, for input
-    --disable-external-links *        Do not make links to remote web pages
-    --enable-external-links *         Make links to remote web pages (default)
-    --disable-forms *                 Do not turn HTML form fields into pdf form
-                                      fields (default)
-    --enable-forms *                  Turn HTML form fields into pdf form fields
-    --images                          Do load or print images (default)
-    --no-images                       Do not load or print images
-    --disable-internal-links *        Do not make local links
-    --enable-internal-links *         Make local links (default)
--n, --disable-javascript              Do not allow web pages to run javascript
-    --enable-javascript               Do allow web pages to run javascript
-                                      (default)
-    --javascript-delay <msec>         Wait some milliseconds for javascript
-                                      finish (default 200)
-    --load-error-handling <handler>   Specify how to handle pages that fail to
-                                      load: abort, ignore or skip (default
-                                      abort)
-    --disable-local-file-access       Do not allowed conversion of a local file
-                                      to read in other local files, unless
-                                      explecitily allowed with --allow
-    --enable-local-file-access        Allowed conversion of a local file to read
-                                      in other local files. (default)
-    --minimum-font-size <int>         Minimum font size
-    --exclude-from-outline *          Do not include the page in the table of
-                                      contents and outlines
-    --include-in-outline *            Include the page in the table of contents
-                                      and outlines (default)
-    --page-offset <offset>            Set the starting page number (default 0)
-    --password <password>             HTTP Authentication password
-    --disable-plugins                 Disable installed plugins (default)
-    --enable-plugins                  Enable installed plugins (plugins will
-                                      likely not work)
-    --post <name> <value>             Add an additional post field (repeatable)
-    --post-file <name> <path>         Post an additional file (repeatable)
-    --print-media-type *              Use print media-type instead of screen
-    --no-print-media-type *           Do not use print media-type instead of
-                                      screen (default)
--p, --proxy <proxy>                   Use a proxy
-    --radiobutton-checked-svg <path>  Use this SVG file when rendering checked
-                                      radiobuttons
-    --radiobutton-svg <path>          Use this SVG file when rendering unchecked
-                                      radiobuttons
-    --run-script <js>                 Run this additional javascript after the
-                                      page is done loading (repeatable)
-    --disable-smart-shrinking *       Disable the intelligent shrinking strategy
-                                      used by WebKit that makes the pixel/dpi
-                                      ratio none constant
-    --enable-smart-shrinking *        Enable the intelligent shrinking strategy
-                                      used by WebKit that makes the pixel/dpi
-                                      ratio none constant (default)
-    --stop-slow-scripts               Stop slow running javascripts (default)
-    --no-stop-slow-scripts            Do not Stop slow running javascripts
-                                      (default)
-    --disable-toc-back-links *        Do not link from section header to toc
-                                      (default)
-    --enable-toc-back-links *         Link from section header to toc
-    --user-style-sheet <url>          Specify a user style sheet, to load with
-                                      every page
-    --username <username>             HTTP Authentication username
-    --window-status <windowStatus>    Wait until window.status is equal to this
-                                      string before rendering page
-    --zoom <float>                    Use this zoom factor (default 1)
-
-Items marked * are only available using patched QT.
-
-=========================> Headers And Footer Options <=========================
-    --footer-center * <text>          Centered footer text
-    --footer-font-name * <name>       Set footer font name (default Arial)
-    --footer-font-size * <size>       Set footer font size (default 12)
-    --footer-html * <url>             Adds a html footer
-    --footer-left * <text>            Left aligned footer text
-    --footer-line *                   Display line above the footer
-    --no-footer-line *                Do not display line above the footer
-                                      (default)
-    --footer-right * <text>           Right aligned footer text
-    --footer-spacing * <real>         Spacing between footer and content in mm
-                                      (default 0)
-    --header-center * <text>          Centered header text
-    --header-font-name * <name>       Set header font name (default Arial)
-    --header-font-size * <size>       Set header font size (default 12)
-    --header-html * <url>             Adds a html header
-    --header-left * <text>            Left aligned header text
-    --header-line *                   Display line below the header
-    --no-header-line *                Do not display line below the header
-                                      (default)
-    --header-right * <text>           Right aligned header text
-    --header-spacing * <real>         Spacing between header and content in mm
-                                      (default 0)
-    --replace * <name> <value>        Replace [name] with value in header and
-                                      footer (repeatable)
-
-Items marked * are only available using patched QT.
-
-================================> TOC Options <=================================
-    --disable-dotted-lines *          Do not use dotted lines in the toc
-    --toc-header-text * <text>        The header text of the toc (default Table
-                                      of Content)
-    --toc-level-indentation * <width> For each level of headings in the toc
-                                      indent by this length (default 1em)
-    --disable-toc-links *             Do not link from toc to sections
-    --toc-text-size-shrink * <real>   For each level of headings in the toc the
-                                      font is scaled by this facter (default
-                                      0.8)
-    --xsl-style-sheet * <file>        Use the supplied xsl style sheet for
-                                      printing the table of content
-
-Items marked * are only available using patched QT.
-
-=============================> Specifying A Proxy <=============================
-By default proxy information will be read from the environment variables: proxy,
-all_proxy and http_proxy, proxy options can also by specified with the -p switch
-
-<type> := "http://" | "socks5://"
-<serif> := <username> (":" <password>)? "@"
-<proxy> := "None" | <type>? <sering>? <host> (":" <port>)?
-
-Here are some examples (In case you are unfamiliar with the BNF):
-
-http://user:password@myproxyserver:8080
-socks5://myproxyserver
-None
-
-============================> Footers And Headers <=============================
-Headers and footers can be added to the document by the --header-* and --footer*
-arguments respectfully.  In header and footer text string supplied to e.g.
---header-left, the following variables will be substituted.
-
- * [page]       Replaced by the number of the pages currently being printed
- * [frompage]   Replaced by the number of the first page to be printed
- * [topage]     Replaced by the number of the last page to be printed
- * [webpage]    Replaced by the URL of the page being printed
- * [section]    Replaced by the name of the current section
- * [subsection] Replaced by the name of the current subsection
- * [date]       Replaced by the current date in system local format
- * [time]       Replaced by the current time in system local format
- * [title]      Replaced by the title of the of the current page object
- * [doctitle]   Replaced by the title of the output document
-
-
-As an example specifying --header-right "Page [page] of [toPage]", will result
-in the text "Page x of y" where x is the number of the current page and y is the
-number of the last page, to appear in the upper left corner in the document.
-
-Headers and footers can also be supplied with HTML documents. As an example one
-could specify --header-html header.html, and use the following content in
-header.html:
-
-<html><head><script>
-function subst() {
-  var vars={};
-  var x=document.location.search.substring(1).split('&');
-  for (var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
-  var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
-  for (var i in x) {
-    var y = document.getElementsByClassName(x[i]);
-    for (var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
-  }
-}
-</script></head><body style="border:0; margin: 0;" onload="subst()">
-<table style="border-bottom: 1px solid black; width: 100%">
-  <tr>
-    <td class="section"></td>
-    <td style="text-align:right">
-      Page <span class="page"></span> of <span class="topage"></span>
-    </td>
-  </tr>
-</table>
-</body></html>
-
-
-As can be seen from the example, the arguments are sent to the header/footer
-html documents in get fashion.
-
-==================================> Outlines <==================================
-Wkhtmltopdf with patched qt has support for PDF outlines also known as book
-marks, this can be enabled by specifying the --outline switch. The outlines are
-generated based on the <h?> tags, for a in-depth description of how this is done
-see the Table Of Contest section. 
-
-The outline tree can sometimes be very deep, if the <h?> tags where spread to
-generous in the HTML document.  The --outline-depth switch can be used to bound
-this.
-
-==============================> Table Of Content <==============================
-A table of content can be added to the document by adding a toc objectto the
-command line. For example:
-
-wkhtmltopdf toc http://doc.trolltech.com/4.6/qstring.html qstring.pdf
-
-The table of content is generated based on the H tags in the input documents.
-First a XML document is generated, then it is converted to HTML using XSLT.
-
-The generated XML document can be viewed by dumping it to a file using the
---dump-outline switch. For example:
-
-wkhtmltopdf --dump-outline toc.xml http://doc.trolltech.com/4.6/qstring.html qstring.pdf
-
-The XSLT document can be specified using the --xsl-style-sheet switch. For
-example:
-
-wkhtmltopdf toc --xsl-style-sheet my.xsl http://doc.trolltech.com/4.6/qstring.html qstring.pdf
-
-The --dump-default-toc-xsl switch can be used to dump the default XSLT style
-sheet to stdout. This is a good start for writing your own style sheet
-
-wkhtmltopdf --dump-default-toc-xsl
-The XML document is in the namespace
-"http://code.google.com/p/wkhtmltopdf/outline" it has a root node called
-"outline" which contains a number of "item" nodes. An item can contain any
-number of item. These are the outline subsections to the section the item
-represents. A item node has the following attributes:
-
- * "title" the name of the section.
- * "page" the page number the section occurs on.
- * "link" a URL that links to the section.
- * "backLink" the name of the anchor the the section will link back to.
-
-The remaining TOC options only affect the default style sheet so they will not
-work when specifying a custom style sheet.
-
-===============================> Page Breaking <================================
-The current page breaking algorithm of WebKit leaves much to be desired.
-Basically webkit will render everything into one long page, and then cut it up
-into pages. This means that if you have two columns of text where one is
-vertically shifted by half a line. Then webkit will cut a line into to pieces
-display the top half on one page. And the bottom half on another page. It will
-also break image in two and so on.  If you are using the patched version of QT
-you can use the CSS page-break-inside property to remedy this somewhat. There is
-no easy solution to this problem, until this is solved try organising your HTML
-documents such that it contains many lines on which pages can be cut cleanly.
-
-See also: <http://code.google.com/p/wkhtmltopdf/issues/detail?id=9>, 
-<http://code.google.com/p/wkhtmltopdf/issues/detail?id=33> and 
-<http://code.google.com/p/wkhtmltopdf/issues/detail?id=57>.
-
-=================================> Page sizes <=================================
-The default page size of the rendered document is A4, but using this --page-size
-optionthis can be changed to almost anything else, such as: A3, Letter and
-Legal.  For a full list of supported pages sizes please see 
-<http://doc.trolltech.com/4.6/qprinter.html#PageSize-enum>.
-
-For a more fine grained control over the page size the --page-height and
---page-width options may be used
-
-========================> Reading arguments from stdin <========================
-If you need to convert a lot of pages in a batch, and you feel that wkhtmltopdf
-is a bit to slow to start up, then you should try --read-args-from-stdin,
-
-When --read-args-from-stdin each line of input sent to wkhtmltopdf on stdin will
-act as a separate invocation of wkhtmltopdf, with the arguments specified on the
-given line combined with the arguments given to wkhtmltopdf
-
-For example one could do the following:
-
-echo "http://doc.trolltech.com/4.5/qapplication.html qapplication.pdf" >> cmds
-echo "cover google.com http://en.wikipedia.org/wiki/Qt_(toolkit) qt.pdf" >> cmds
-wkhtmltopdf --read-args-from-stdin --book < cmds
-
-===============================> Static version <===============================
-On the wkhtmltopdf website you can download a static version of wkhtmltopdf 
-<http://code.google.com/p/wkhtmltopdf/downloads/list>. This static binary will
-work on most systems and comes with a build in patched QT.
-
-Unfortunately the static binary is not particularly static, on Linux it depends
-on both glibc and openssl, furthermore you will need to have an xserver
-installed but not necessary running. You will need to have different fonts
-install including xfonts-scalable (Type1), and msttcorefonts.  See 
-<http://code.google.com/p/wkhtmltopdf/wiki/static> for trouble shouting.
-
-================================> Compilation <=================================
-It can happen that the static binary does not work for your system for one
-reason or the other, in that case you might need to compile wkhtmltopdf
-yourself.
-
-*GNU/Linux:*
-
-Before compilation you will need to install dependencies: X11, gcc, git and
-openssl. On Debian/Ubuntu this can be done as follows:
-
-sudo apt-get build-dep libqt4-gui libqt4-network libqt4-webkit
-sudo apt-get install openssl build-essential xorg git-core git-doc libssl-dev
-
-On other systems you must use your own package manager, the packages might be
-named differently.
-
-First you must check out the modified version of QT
-
-git clone git://gitorious.org/~antialize/qt/antializes-qt.git wkhtmltopdf-qt
-Next you must configure, compile and install QT, note this will take quite some
-time, depending on what arguments you use to configure qt
-
-cd wkhtmltopdf-qt
-./configure -nomake tools,examples,demos,docs,translations -opensource -prefix ../wkqt
-git checkout 4.8.4
-make -j3
-make install
-cd ..
-
-All that is needed now is, to compile wkhtmltopdf.
-
-git clone git://github.com/antialize/wkhtmltopdf.git wkhtmltopdf
-cd wkhtmltopdf
-../wkqt/bin/qmake
-make -j3
-
-You show now have a binary called wkhtmltopdf in the currently folder that you
-can use, you can optionally install it by running
-
-make install
-*Other operative systems and advanced features*
-
-If you want more details or want to compile under other operative systemsother
-then GNU/Linux, please see
-<http://code.google.com/p/wkhtmltopdf/wiki/compilation>.
-
-================================> Installation <================================
-There are several ways to install wkhtmltopdf.  You can download a already
-compiled binary, or you can compile wkhtmltopdf yourself. On windows the easiest
-way to install wkhtmltopdf is to download the latest installer. On linux you can
-download the latest static binary, however you still need to install some other
-pieces of software, to learn more about this read the static version section of
-the manual.
-
-==================================> Examples <==================================
-This section presents a number of examples of how to invoke wkhtmltopdf.
-
-To convert a remote HTML file to PDF:
-
-wkhtmltopdf http://www.google.com google.pdf
-
-To convert a local HTML file to PDF:
-
-wkhtmltopdf my.html my.pdf
-
-You can also convert to PS files if you like:
-
-wkhtmltopdf my.html my.ps
-
-Produce the eler2.pdf sample file:
-
-wkhtmltopdf -H  http://geekz.co.uk/lovesraymond/archive/eler-highlights-2008 eler2.pdf
-
-Printing a book with a table of content:
-
-wkhtmltopdf -H cover cover.html toc chapter1.html chapter2.html chapter3.html book.pdf
-

+ 0 - 110
scripts/release.sh

@@ -1,110 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2010, 2011 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 Lesser 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 Lesser General Public License
-# along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
-
-function usage() {
-    echo "Usage $0: [Options] Major Minor Patch [Build]"
-    echo ""
-    echo "Options:"
-    echo "-h           Display this help message"
-    echo "-q           Build against this branch of QT"
-}
-
-while getopts hq: O; do
-    case "$O" in
-	[?h])
-	    usage;
-	    exit 1
-	    ;;
-	q)
-	    shift 2
-	    QB="-q $OPTARG"
-	    ;;
-    esac
-done
-
-git status
-if [[ $1 == "" ]] || [[ $2 == "" ]] || [[ $3 == "" ]]; then
-    echo "Bad version"
-    exit 1
-fi
-v="$1.$2.$3"
-if [[ "$4" != "" ]]; then
-    v="${v}_$4"
-fi
-
-echo "About to release $v"
-read -p "Are you sure you are ready: " N
-[ "$N" != "YES" ] && exit
-
-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 "TEMPORARY DO NOT COMMIT $v" version.pri
-
-rm -rf bin
-mkdir bin
-./scripts/static-build.sh $QB linux-i386 || (echo Build failed; git reset $HEAD --hard; exit 1)
-cp bin/wkhtmltopdf-i386 bin/wkhtmltopdf
-cp bin/wkhtmltoimage-i386 bin/wkhtmltoimage
-if ! ./scripts/test.sh -q; then
-    echo "Test failed"
-    git reset $HEAD --hard
-    exit 1
-fi
-
-./bin/wkhtmltopdf-i386 --readme > README_WKHTMLTOPDF
-./bin/wkhtmltoimage-i386 --readme > README_WKHTMLTOIMAGE
-./scripts/static-build.sh $QB linux-amd64 || (echo Build failed; git reset $HEAD --hard; exit 1)
-./scripts/static-build.sh $QB windows || (echo Build failed; git reset $HEAD --hard; exit 1)
-
-git commit --amend -m "Version $v" version.pri README_WKHTMLTOPDF README_WKHTMLTOIMAGE
-git tag "$v"
-
-rm -rf "release-$v"
-mkdir "release-$v"
-./bin/wkhtmltopdf-i386 --htmldoc > "./release-$v/wkhtmltopdf-$v-doc.html"
-./bin/wkhtmltoimage-i386 --htmldoc > "./release-$v/wkhtmltoimage-$v-doc.html"
-
-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 -c --bzip2 -vf "release-$v/wkhtmltopdf-$v.tar.bz2" -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.bz2 "release-$v/libwkhtmltox-$v-i386.tar.bz2"
-cp bin/libwkhtmltox-amd64.tar.bz2 "release-$v/libwkhtmltox-$v-amd64.tar.bz2"
-m4 -D "WKVERSION=$v" wkhtmltopdf.nsi.m4 > "release-$v/wkhtmltopdf.nsi"
-cd bin
-tar -c --bzip2 -vf "../release-$v/wkhtmltopdf-$v-static-i386.tar.bz2" wkhtmltopdf-i386
-tar -c --bzip2 -vf "../release-$v/wkhtmltopdf-$v-static-amd64.tar.bz2" wkhtmltopdf-amd64
-tar -c --bzip2 -vf "../release-$v/wkhtmltoimage-$v-static-i386.tar.bz2" wkhtmltoimage-i386
-tar -c --bzip2 -vf "../release-$v/wkhtmltoimage-$v-static-amd64.tar.bz2" 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
-	l=$(find ../static-build/windows/drive_c/mingw/bin -name "$x")
-	[ -f "$l" ] && cp "$l" "$x" && continue
-    wget "http://wkhtmltopdf.googlecode.com/files/$x" -O "$x" && continue
-done
-makensis wkhtmltopdf.nsi

+ 0 - 328
scripts/static-build.sh

@@ -1,328 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2010, 2011 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 Lesser 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 Lesser General Public License
-# along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
-
-# This script will compile static versions of wkhtmltopdf for linux and for windows (it must run in linux)
-# It requires build-essential and wine to run. Please note that it will take quite a while
-
-#Configuration for the static build
-
-MIRROR=garr
-MINGWFILES="binutils-2.19.1-mingw32-bin.tar.gz \
-mingw32-make-3.81-20090910.tar.gz \
-gcc-full-4.4.0-mingw32-bin-2.tar.lzma \
-w32api-3.13-mingw32-dev.tar.gz \
-mingwrt-3.16-mingw32-dev.tar.gz \
-mingwrt-3.16-mingw32-dll.tar.gz"
-
-GNUWIN32FILES="openssl-0.9.8h-1-lib.zip \
-openssl-0.9.8h-1-bin.zip "
-#freetype-2.3.5-1-bin.zip \
-#freetype-2.3.5-1-lib.zip "
-QTREPO=https://github.com/wkhtmltopdf/qt.git
-QTBRANCH=wk_4.8.5
-J="$((1 + $(cat /proc/cpuinfo | grep -c processor)))"
-
-function usage() {
-	echo "Usage: $0 [OPTIONS] target"
-	echo ""
-	echo "Options:"
-	echo "-h            Display this help message"
-	echo "-q branch     Use this qt branch"
-	echo "-v version    Compile this version of wkhtmltopdf"
-	echo ""
-	echo "Target:"
-	echo "linux-local   Compile under local linux distro"
-	echo "linux-amd64   Compile under debian 64bit chroot"
-	echo "linux-i386    Compile under debian 32bit chroot"
-	echo "windows       Compile windows binary using wine"
-}
-VERSION=""
-
-
-while getopts hq:v: O; do
-	case "$O" in
-		[h?])
-			usage
-			exit 1
-			;;
-		v)
-			shift 2
-			VERSION=$OPTARG
-			;;
-		q)
-			shift 2
-			QTBRANCH=$OPTARG
-			;;
-	esac
-done
-
-
-if file /bin/true | grep -q 64-bit; then
-    UPX=upx-3.03-amd64_linux
-else
-    UPX=upx-3.03-i386_linux
-fi
-
-#Helper functions
-function get() {
-    [ -f $2.download ] || (rm -rf $2; wget $1 -O $2 && touch $2.download)
-}
-function unpack() {
-    [ -f $1.unpack ] || (echo "unpacking $1"; (tar -xf $1 || unzip -o $1) && touch $1.unpack)
-}
-
-
-BASE=${PWD}
-BUILD=${BASE}/static-build
-
-VERSION=$2
-
-function git_fetch_and_update() {
-    if [ ! -d "$1" ]; then
-	git clone "$2" "$1" || (rm -rf "$1" && return 1)
-    fi
-    cd "$1"
-    git fetch origin
-    if ! (git checkout "$3" -f 2>/dev/null && git pull origin "$3" 2>/dev/null); then
-	git branch -a
-	git checkout origin/"$3" -f 2>/dev/null || return 1
-	git branch -D "$3" 2>/dev/null
-	git checkout origin/"$3" -b "$3" || return 1
-	git pull origin "$3" -f || return 1
-    fi
-    cd ..
-}
-
-
-function checkout() {
-    #Create static build directory
-    mkdir -p $BUILD
-    cd ${BUILD}
-
-    #Fetch and unpack upx
-    get http://upx.sourceforge.net/download/${UPX}.tar.bz2 ${UPX}.tar.bz2 || exit 1
-    unpack ${UPX}.tar.bz2 || exit 1
-
-    #Fetch most recent version of qt
-    echo "Updating qt from remote"
-    git_fetch_and_update qt "$QTREPO" "$QTBRANCH" || exit 1
-    cd qt
-}
-
-function setup_build() {
-    echo "Updating QT"
-	git_fetch_and_update qts ${BUILD}/qt "$QTBRANCH" || exit 1
-    cd qts
-    if ! [ -z "$VERSION" ] ; then
-		git checkout wkhtmltopdf-$VERSION || exit 1
-    fi
-    touch conf
-    cat ${BASE}/static_qt_conf_base ${BASE}/static_qt_conf_${1} | sed -re 's/#.*//' | sed -re '/^[ \t]*$/d' | sort -u > conf_new
-    cd ..
-
-    echo "$(cd ${BASE} && git branch --no-color | sed -nre 's/\* //p')"
-	git_fetch_and_update wkhtmltopdf "${BASE}" "$(cd ${BASE} && git branch --no-color | sed -nre 's/\* //p')" || exit 1
-	cd wkhtmltopdf
-    if ! [ -z "$VERSION" ] ; then
-		git checkout "$VERSION" || exit 1
-    fi
-    cd ..
-    [ "$1" == "win" ] && return
-    cat > build.sh <<EOF
-unset LANG
-unset LC_ALL
-unset LANGUAGE
-HERE="\${PWD}"
-mkdir -p qt/lib
-
-cd qts
-
-function do_configure() {
-   echo "Configuring QT"
-   (yes yes | ./configure \`cat conf_new\` -prefix "\${HERE}/qt" && cp conf_new conf) || exit 1
-}
-
-if ! cmp conf conf_new; then
-  QTDIR=. bin/syncqt || exit 1
-  do_configure
-fi
-
-if ! make -j${J} -q; then
-   echo "Building QT"
-   (make -j${J} && make install) || (make distclean; do_configure && make -j${J} && make install) || exit 1
-fi
-cd ../wkhtmltopdf
-
-echo "Building wkhtmltopdfe"
-(make distclean; ../qt/bin/qmake && make -j${J}) || exit 1
-strip ./bin/wkhtmltopdf || exit 1
-strip ./bin/wkhtmltoimage || exit 1
-EOF
-    chmod +x build.sh
-}
-
-function packandcopylinux() {
-    mkdir -p ${BASE}/bin
-    WK=${BUILD}/linux-$1/build/wkhtmltopdf
-    rm -rf  ${BASE}/bin/wkhtmltopdf-$1  ${BASE}/bin/wkhtmltoimage-$1 ${BASE}/bin/libwkhtmltopdf-$1.tar.lzma
-    ${BUILD}/${UPX}/upx --best ${WK}/bin/wkhtmltopdf -o ${BASE}/bin/wkhtmltopdf-$1 || exit 1
-    ${BUILD}/${UPX}/upx --best ${WK}/bin/wkhtmltoimage -o ${BASE}/bin/wkhtmltoimage-$1 || exit 1
-    rm -rf ${WK}/lib
-    mkdir -p ${WK}/lib
-    cp ${WK}/bin/libwkhtmltox*.so ${WK}/lib || exit 1
-    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
-}
-
-
-function build_linux_local() {
-    cd ${BUILD}
-    mkdir -p linux-local/build
-    cd linux-local/build
-    setup_build linux
-    ./build.sh || exit 1
-    packandcopylinux local
-}
-
-function setup_chroot() {
-    if [ ! -f linux-$2/strapped ]; then
-	sudo rm -rf linux-$2
-	(sudo debootstrap --arch=$2 --variant=buildd $1 ./linux-$2 http://ftp.us.debian.org/debian/ && sudo touch linux-$2/strapped) || exit 1
-    fi
-    if [ ! -d linux-$2/build ]; then
-	sudo mkdir -p linux-$2/build || exit 1
-	sudo chown --reference=. linux-$2/build -Rv || exit 1
-    fi
-
-    if [ ! -f linux-$2/installed ]; then
-	echo -e "deb http://ftp.us.debian.org/debian/ $1 main non-free contrib\ndeb-src http://ftp.us.debian.org/debian/ $1 main non-free contrib" | sudo tee linux-$2/etc/apt/sources.list || exit 1
-	sudo chroot linux-$2 apt-get -y update || exit 1
-	sudo chroot linux-$2 apt-get -y build-dep libqt4-core && sudo touch linux-$2/installed || exit 1
-    fi
-    cat > linux-$2/build/buildw.sh <<EOF
-#!/bin/bash
-cd /build && ./build.sh
-EOF
-    chmod +x linux-$2/build/buildw.sh || exit 1
-}
-
-function build_linux_chroot() {
-    cd ${BUILD}
-    setup_chroot squeeze $1
-    cd linux-$1/build
-    setup_build linux
-    if [  "$1" == 'i386' ]; then
-	sudo linux32 chroot ${BUILD}/linux-$1/ /build/buildw.sh || exit 1
-    else
-	sudo chroot ${BUILD}/linux-$1/ /build/buildw.sh || exit 1
-    fi
-    packandcopylinux $1
-}
-
-function build_windows() {
-    cd ${BUILD}
-
-    export WINEPREFIX=${BUILD}/windows
-    if [ ! -f ${BUILD}/windows/create ]; then
-	    cat > tmp <<EOF
-REGEDIT4
-
-[HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment]
-"PATH"="C:\\\\windows;C:\\\\windows\\\\system32;C:\\\\mingw\\\\bin"
-"INCLUDE"="C:\\\\mingw\\\\include;C:\\\\mingw\\\\include\\\\c++\\\\3.4.5"
-"LIB"="C:\\\\mingw\\\\lib"
-EOF
-	    wine regedit tmp || exit 1
-	    touch ${BUILD}/windows/create
-    fi
-#http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/fontconfig-2.4.2-tml-20071015.zip
-    mkdir -p windows/drive_c/mingw
-    cd windows/drive_c/mingw
-    for file in ${MINGWFILES}; do
- 		get http://${MIRROR}.dl.sourceforge.net/sourceforge/mingw/${file} ${file} || exit 1
- 		unpack ${file} || exit 1
-    done
-    for file in ${GNUWIN32FILES}; do
-		get http://downloads.sourceforge.net/gnuwin32/${file} ${file} || exit 1
-		unpack ${file} || exit 1
-    done
-
-    cd ..
-    setup_build win
-
-    unset CPLUS_INCLUDE_PATH
-    unset C_INCLUDE_PATH
-    export CPLUS_INCLUDE_PATH=
-    export C_INCLUDE_PATH=C:\qts\include
-
-    mkdir -p qt
-    cp -r qts/mkspecs qt
-    cd qts
-    if ! [ -f Makefile ] || ! cmp conf conf_new; then
-		QTDIR=. bin/syncqt || exit 1
-		(yes | wine configure.exe -I "C:\qts\include" -I "C:\mingw32\include\freetype2" `cat conf_new` -prefix "C:\qt" && cp conf_new conf) || exit 1
-    fi
-    if ! wine mingw32-make -j${J} -q; then
-		wine mingw32-make -j${J} || exit 1
-		wine mingw32-make install || exit 1
-    fi
-
-    cd ../wkhtmltopdf
-    wine mingw32-make dist-clean
-    wine ../qt/bin/qmake.exe wkhtmltopdf.pro -o Makefile -spec win32-g++ || exit 1
-    wine mingw32-make clean || exit 1
-    wine mingw32-make -j${J} || exit 1
-    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/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 bin/libwkhtmltox*.a lib || exit 1
-    zip -r9 ${BASE}/bin/libwkhtmltox.zip lib include examples/Makefile examples/pdf_c_api.c
-}
-
-case "$1" in
-'linux-local')
-	checkout
-	build_linux_local
-	;;
-'linux-i386')
-	checkout
-	build_linux_chroot i386
-	;;
-'linux-amd64')
-	checkout
-	build_linux_chroot amd64
-	;;
-'windows')
-	checkout
-	build_windows
-	;;
-'release')
-	checkout
-	build_linux_chroot i386
-	build_linux_chroot amd64
-	build_windows
-	;;
-*)
-	usage
-	;;
-esac

+ 0 - 297
scripts/test.sh

@@ -1,297 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2010, 2011 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 Lesser 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 Lesser General Public License
-# along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
-
-#This script will test a compiled wkhtmltopdf for some basic functionality
-
-function result() { printf "%-30s [%-4s]\n" "$1" "$2";}
-function good() { result "$1" " OK ";}
-function bad() { result "$1" "Fail"; [ "$2" != "false" ] && export failed=$(($failed+1));}
-function fs() { du -b "$1" | sed -re 's/([0-9]*).*/\1/';}
-function wk() { $WK -q "$@"; }
-
-function pages() {
-    pdfinfo $1 | sed -nre 's/Pages:[\n ]*//p'
-}
-
-function testTest() {
-    (which pdftotext > $LEVEL1 && which pdfinfo > $LEVEL1) && good $1 || bad $1
-}
-
-#Test if we can convert a html file containing
-#An image of some format
-function doTestImgSupport() {
-    [ -f img.$1 ] || convert img.jpg img.$1
-    rm -rf tmp.pdf
-    echo "<html><head><title>Img test $1</title></head><body><h1>The $1 image</h1><img src=\"img.$1\" /></body></html>" > tmp.html
-    wk tmp.html tmp.pdf 2>$LEVEL2 >$LEVEL1
-    S=`fs tmp.pdf`
-    ([ -f tmp.pdf ] && [[ $S -ge 20000 ]]) && good "$1 Suppport ($S)" || bad "$1 Support ($S)" "$2"
-}
-
-function testJPEGSupport() {
-    doTestImgSupport jpg true
-}
-
-function testGIFSupport() {
-    doTestImgSupport gif true
-}
-
-function testPNGSupport() {
-    doTestImgSupport png true
-}
-
-function testMNGSupport() {
-    doTestImgSupport mng false
-}
-
-function testTIFFSupport() {
-    doTestImgSupport tiff false
-}
-
-function testLocalFile() {
-    echo "<html><head><title>Local Test</title></head><body><h1>Hello</h1></body></html>" > tmp.html
-    wk tmp.html tmp.pdf 2>$LEVEL2 >$LEVEL1
-    ([ -f tmp.pdf ] && pdftotext tmp.pdf /dev/stdout | grep -q Hello) && good $1 || bad $1
-}
-
-function testUserStyleSheet() {
-    echo "<html><head><title>Local Test</title></head><body><p>.</p></body></html>" > tmp.html
-    echo "p:before {content: \"Hello \"}" > tmp.css
-    wk tmp.html --user-style-sheet tmp.css tmp.pdf 2>$LEVEL2 >$LEVEL1
-    ([ -f tmp.pdf ] && pdftotext tmp.pdf /dev/stdout | grep -q Hello) && good $1 || bad $1 false
-}
-
-function testPipeIn() {
-    rm -rf tmp.pdf
-    echo "<html><head><title>Local Test</title></head><body><h1>Hello</h1></body></html>" > tmp.html
-    cat tmp.html | wk - tmp.pdf 2>$LEVEL2 >$LEVEL1
-    ([ -f tmp.pdf ] && pdftotext tmp.pdf /dev/stdout | grep -q Hello) && good $1 || bad $1
-}
-
-function testPipeOutSupport() {
-    echo "<html><head><title>Local Test</title></head><body><h1>Hello</h1></body></html>" > tmp.html
-    wk tmp.html - > tmp.pdf  2>$LEVEL2
-    ([ -f tmp.pdf ] && pdftotext tmp.pdf /dev/stdout | grep -q Hello) && good $1 || bad $1
-}
-
-function testRemote() {
-    wk http://www.google.dk/ tmp.pdf 2>$LEVEL2 >$LEVEL1
-    [ -f tmp.pdf ] && good $1 || bad $1
-}
-
-function testSSL() {
-    wk https://www.google.com/accouts tmp.pdf 2>$LEVEL2 >$LEVEL1
-    [ -f tmp.pdf ] && good $1 || bad $1
-}
-
-function testHeaderFooter() {
-    echo "<html><head><title>Local Test</title></head><body><h1>monster</h1></body></html>" > tmp.html
-    wk tmp.html --footer-left hat --header-right emacs tmp.pdf 2>$LEVEL2 >$LEVEL1
-    ([ -f tmp.pdf ] &&
-	pdftotext tmp.pdf /dev/stdout | grep -q monster &&
-	pdftotext tmp.pdf /dev/stdout | grep -q emacs &&
-	pdftotext tmp.pdf /dev/stdout | grep -q hat) && good $1 || bad $1
-}
-
-function testLoadError() {
-    wk about:blank http://a.nstld --load-error-handling abort tmp.pdf 2>$LEVEL1 >$LEVEL1 && (bad $1 && return)
-    wk about:blank http://a.nstld --load-error-handling skip tmp1.pdf 2>$LEVEL2 >$LEVEL1 || (bad $1 && return)
-    wk about:blank http://a.nstld --load-error-handling ignore tmp2.pdf 2>$LEVEL2 >$LEVEL1 || (bad $1 && return)
-    ([ -f tmp1.pdf ] && [ -f tmp2.pdf ] &&
-	[ "$(pages tmp1.pdf)" == 1 ] &&
-	[ "$(pages tmp2.pdf)" == 2 ] ) && good $1 || bad $1
-}
-
-function testFontSpacing() {
-	echo "<html><body style=\"font-size: 7pt; font-family: Arial;\">vii vaa vuu vvv vee</body></html>" > tmp.html
-    wk tmp.html tmp.pdf 2>$LEVEL2 >$LEVEL1
-    ([ -f tmp.pdf ] &&
-	pdftotext tmp.pdf /dev/stdout | grep -q "vii vaa vuu vvv vee") && good $1 || bad $1 false
-
-}
-
-function testToc() {
-    echo "<html><head></head><body><h1>foo</h1><h2>bar</h2><h3>baz</h3></body>" > tmp.html
-    wk toc tmp.html tmp.pdf 2>$LEVEL2 >$LEVEL1
-    ([ -f tmp.pdf ] &&
-	[ "$(pdftotext tmp.pdf /dev/stdout | grep -c foo)" == 2 ] &&
-	[ "$(pdftotext tmp.pdf /dev/stdout | grep -c bar)" == 2 ]) && good $1 || bad $1
-}
-
-function testOutline() {
-    echo "<html><head></head><body><h1>foo</h1><h2>bar</h2><h3>baz</h3></body>" > tmp.html
-    wk --outline --outline-depth 2 tmp.html tmp.pdf 2>$LEVEL2 >$LEVEL1
-    ([ -f tmp.pdf ] &&
-	cat tmp.pdf | grep -q ".f.o.o" &&
-	cat tmp.pdf | grep -q ".b.a.r" &&
-	! cat tmp.pdf | grep -q ".b.a.z") && good $1 || bad $1
-}
-
-function testJSRedirect() {
-    wk http://madalgo.au.dk/~jakobt/jsredirect.html tmp.pdf 2>$LEVEL2 >$LEVEL1
-    ([ -f tmp.pdf ] &&
-	pdftotext tmp.pdf /dev/stdout | grep -q Right) && good $1 || bad $1
-}
-
-function testServersideRedirect() {
-    wk http://madalgo.au.dk/~jakobt/redirect.php tmp.pdf 2>$LEVEL2 >$LEVEL1
-    ([ -f tmp.pdf ] &&
-	pdftotext tmp.pdf /dev/stdout | grep -q Right) && good $1 || bad $1
-}
-
-function test404() {
-    wk http://madalgo.au.dk/~jakobt/nosuchfile.nsf tmp.pdf 2>$LEVEL2 >$LEVEL1 && bad $1 || good $1
-}
-
-function testBadDest() {
-    echo "<html><head></head><body><h1>foo</h1><h2>bar</h2><h3>baz</h3></body>" > tmp.html
-    (! wk tmp.html /proc/cpuinfo 2> tmp.out >$LEVEL1 && grep -q "Error" tmp.out) && good $1 || bad $1
-}
-
-function testMultipleInputDocuments() {
-    echo "<html><head><title>Local Test</title></head><body><h1>Hello</h1></body></html>" > tmp.html
-    echo "<html><head><title>Local Test</title></head><body><h1>world</h1></body></html>" > tmp2.html
-    wk tmp.html tmp2.html tmp.pdf 2>$LEVEL2 >$LEVEL1
-    ([ -f tmp.pdf ] &&
-	pdftotext tmp.pdf /dev/stdout | grep -q Hello &&
-	pdftotext tmp.pdf /dev/stdout | grep -q world) && good $1 || bad $1
-}
-
-function testHtmlHeader() {
-    echo "<html><body>Header</body></html>" > tmp.html
-    echo "<html><head><title>Local Test</title></head><body><h1>world</h1></body></html>" > tmp2.html
-    wk --header-html tmp.html tmp2.html tmp.pdf 2>$LEVEL2 >$LEVEL1
-    ([ -f tmp.pdf ] &&
-	pdftotext tmp.pdf /dev/stdout | grep -q Header &&
-	pdftotext tmp.pdf /dev/stdout | grep -q world) && good $1 || bad $1
-}
-
-function testCustomHeader() {
-    wk http://madalgo.au.dk/~jakobt/cookiewrite.php --custom-header "Cookie" "cookie=hello" tmp.pdf 2>$LEVEL2 >$LEVEL1
-    ([ -f tmp.pdf ] &&
-	pdftotext tmp.pdf /dev/stdout | grep -q hello) && good $1 || bad $1
-}
-
-function testCookies() {
-    wk --cookie mykey myvalue1 --cookie mykey2 myvalue2 --cookie-jar tmp.jar http://cs.au.dk/~jakobt/cookie.php tmp.pdf 2>$LEVEL2 >$LEVEL1
-    wk --cookie-jar tmp.jar http://cs.au.dk/~jakobt/cookie.php tmp2.pdf 2>$LEVEL2 >$LEVEL1
-    (   [ -f tmp.pdf ] &&
-	pdftotext tmp.pdf /dev/stdout | grep -q "mykey:myvalue1;" &&
-	pdftotext tmp.pdf /dev/stdout | grep -q "mykey2:myvalue2;" &&
-	[ -f tmp2.pdf ] &&
-	pdftotext tmp2.pdf /dev/stdout | grep -q "writetest:success;") &&
-    good $1 || bad $1
-}
-
-function testTitle() {
-    title="\()fooæøåおさか おかみ"
-    wk  --title "$title" http://google.com tmp.pdf 2>$LEVEL2 >$LEVEL1
-    ([ -f tmp.pdf ] && [[ "$(pdfinfo tmp.pdf  | sed -nre 's/Title:[\t ]*//p')" == "$title" ]]) && good $1 || bad $1
-}
-
-
-function testQMakeBuild() {
-    (cd .. && git checkout-index --prefix=./test/wkhtmltopdf/ -a) || (bad "$1 (1)" && return 1)
-    cd wkhtmltopdf
-    qmake 2>$LEVEL2 >$LEVEL1 || (bad "$1 (2)" && return 1)
-    make -j2 2>$LEVEL2 >$LEVEL1 && good $1 || bad $1
-    cd ..
-}
-
-function testArgumentFromStdin() {
-    echo "<html><body>XFooZ</body></html>" > tmp.html
-    wk --read-args-from-stdin 2>$LEVEL2 >$LEVEL1 <<EOF
--q tmp.html tmp1.pdf
--q tmp.html tmp2.pdf
-EOF
-    (   [ -f tmp1.pdf ] && pdftotext tmp1.pdf /dev/stdout | grep -q XFooZ &&
-	[ -f tmp2.pdf ] && pdftotext tmp2.pdf /dev/stdout | grep -q XFooZ) && good $1 || bad $1
-}
-
-function testWindowPrint() {
-    echo "<html><body>abe <script language=\"javascript\">setTimeout(\"window.print();\",12);</script></body></html>" > tmp.html
-    cp tmp.html abe.html
-    wk --javascript-delay 10000 tmp.html tmp.pdf &
-    p=$!
-    (sleep 5 && kill "$p" 2>/dev/null) &
-    wait $p && good $1 || bad $1
-}
-
-function usage() {
-    echo "Usage $0 [OPTIONS] [EXPRESSION]"
-    echo ""
-    echo "Options:"
-    echo "-h         Display this message"
-    echo "-v         Be more verbose"
-    echo "-q         Be more quiet"
-    echo "-w path    wkhtmltopdf binary to test"
-    echo ""
-    echo "Expression:"
-    echo "grep regular expresion on what tests to run"
-}
-
-LEVEL1=/dev/null
-LEVEL2=/dev/stdout
-LEVEL3=/dev/stdout
-
-export WK=../bin/wkhtmltopdf
-
-while getopts hvqw: O; do
-    case "$O" in
-	[h?])
-	    usage
-	    exit 1
-	    ;;
-	v)
-	    shift 1
-	    LEVEL1=/dev/stdout
-	    ;;
-	q)
-	    shift 1
-	    LEVEL2=/dev/null
-	    ;;
-	w)
-	    shift 2
-	    export WK=$OPTARG
-	    ;;
-    esac
-done
-R=$1
-if [ -z "$R" ]; then
-    R=.*
-fi
-
-TESTS=$(cat $0 | sed -nre 's/^function test(.*)\(\)\ \{.*/\1/p' | grep "$R");
-
-#This is just some random image
-img=http://madalgo.au.dk/img/Forside/KatrinebjMay-05.jpg
-[ -d test ] || mkdir test
-cd test
-[ -f img.jpg ] || wget $img -O img.jpg
-
-failed=0
-
-TMPFILES="tmp.pdf tmp.html tmp.css tmp2.html tmp.jar tmp1.pdf tmp2.pdf wkhtmltopdf/"
-
-for test in $TESTS; do
-    rm -rf $TMPFILES
-    eval test$test $test
-done
-rm -rf $TMPFILES
-exit $failed

+ 0 - 43
scripts/test/issue267.html

@@ -1,43 +0,0 @@
-<html>
-<body>
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-</body>
-</html>

+ 0 - 55
scripts/test/issue268.html

@@ -1,55 +0,0 @@
-<html>
-<head>
-  <style type="text/css">
-  body{
-		margin-top:0px;
-		margin-right:0px;
-		margin-bottom:0px;
-		margin-left:0px;
-		width:800px;		
-
-  }
-  </style>
-</head>
-<body>
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-All work and no play makes Jack a dull boy.
-</body>
-</html>

+ 0 - 10
scripts/test/test-cropping.bat

@@ -1,10 +0,0 @@
-@ECHO off
-ECHO.
-ECHO Test: Original size
-"../../bin/wkhtmltoimage" http://google.com/ out/google-crop-orig.png
-ECHO Test: 200x200 from origin
-"../../bin/wkhtmltoimage" --crop-w 500 --crop-h 300 http://google.com/ out/google-crop-500x300.png
-ECHO Test: 200x200 from 100x100
-"../../bin/wkhtmltoimage" --crop-x 150 --crop-y 100 --crop-w 500 --crop-h 300 http://google.com/ out/google-crop-150x100x500x300.png
-ECHO.
-PAUSE

+ 0 - 20
scripts/test/test-formats.bat

@@ -1,20 +0,0 @@
-@ECHO off
-ECHO.
-ECHO Test: ICO (note: it is autosized to 256x256 because )
-"../../bin/wkhtmltoimage" http://google.com/ out/google.ico
-ECHO.
-ECHO Test: TIF
-"../../bin/wkhtmltoimage" http://google.com/ out/google.tif
-ECHO.
-ECHO Test: GIF
-"../../bin/wkhtmltoimage" http://google.com/ out/google.gif
-ECHO.
-ECHO Test: JPG
-"../../bin/wkhtmltoimage" http://google.com/ out/google.jpg
-ECHO.
-ECHO Test: PNG
-"../../bin/wkhtmltoimage" http://google.com/ out/google.png
-ECHO.
-ECHO Test: BMP
-"../../bin/wkhtmltoimage" http://google.com/ out/google.bmp
-PAUSE

+ 0 - 6
scripts/test/test-issue267.bat

@@ -1,6 +0,0 @@
-@ECHO off
-ECHO.
-ECHO Test: fix for Issue 267
-"../../bin/wkhtmltoimage" --crop-w 640 --crop-h 480 issue267.html out/issue267.png
-ECHO.
-PAUSE

+ 0 - 6
scripts/test/test-issue268.bat

@@ -1,6 +0,0 @@
-@ECHO off
-ECHO.
-ECHO Test: fix for Issue 268
-"../../bin/wkhtmltoimage" --scale-w 200 issue268.html out/issue268.png
-ECHO.
-PAUSE

+ 0 - 10
scripts/test/test-performance.bat

@@ -1,10 +0,0 @@
-@ECHO off
-ECHO.
-ECHO Test: Performance/load testing.
-ECHO Run through cvpldbg
-SET iter=0
-:loop
-ECHO Iteration #%iter%
-"../../bin/wkhtmltoimage" http://google.com/ tmp/google%iter%.png
-SET /A iter+=1
-GOTO :loop

+ 0 - 10
scripts/test/test-scaling.bat

@@ -1,10 +0,0 @@
-@ECHO off
-ECHO.
-ECHO Test: Original size
-"../../bin/wkhtmltoimage" http://google.com/ out/google-scale-orig.png
-ECHO Test: scale to 300x200
-"../../bin/wkhtmltoimage" --scale-w 300 --scale-h 200 http://google.com/ out/google-scale-300x200.png
-ECHO Test: crop to 500x300 and scale to 300x200
-"../../bin/wkhtmltoimage" --crop-w 500 --crop-h 300 --scale-w 300 --scale-h 200 http://google.com/ out/google-scale-500x300x300x200.png
-ECHO.
-PAUSE

+ 0 - 14
scripts/test/test-switches.bat

@@ -1,14 +0,0 @@
-@ECHO off
-ECHO.
-ECHO Test: Show version
-"../../bin/wkhtmltoimage" --version
-ECHO.
-ECHO Test: Show help
-"../../bin/wkhtmltoimage" --help
-ECHO.
-ECHO Test: Show more help
-"../../bin/wkhtmltoimage" --extended-help
-ECHO.
-ECHO Test: Show readme
-"../../bin/wkhtmltoimage" --readme
-PAUSE

+ 0 - 54
static_qt_conf_base

@@ -1,54 +0,0 @@
-# This file is part of wkhtmltopdf.
-#
-# wkhtmltopdf is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser 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 Lesser  General Public License
-# along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
--release
--static
--fast
--exceptions
--no-accessibility
--no-stl
--no-sql-ibase
--no-sql-mysql
--no-sql-odbc
--no-sql-psql
--no-sql-sqlite
--no-sql-sqlite2
--no-qt3support
--xmlpatterns
--no-phonon
--no-phonon-backend
--webkit
--xrender
--no-scripttools
--no-mmx
--no-3dnow
--no-sse
--no-sse2 
--qt-zlib
--qt-libtiff
--qt-libpng
--qt-libmng
--qt-libjpeg
--graphicssystem raster
--opensource
--nomake tools
--nomake examples
--nomake demos
--nomake docs
--nomake translations
--no-opengl
--no-dbus
--no-multimedia
--openssl
--no-declarative

+ 0 - 42
static_qt_conf_linux

@@ -1,42 +0,0 @@
-# This file is part of wkhtmltopdf.
-#
-# wkhtmltopdf is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser 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 Lesser General Public License
-# along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
--largefile
--rpath
--no-nis
--no-cups
--no-iconv
--no-pch
--no-gtkstyle
--no-nas-sound
--no-sm
--no-xshape
--no-xinerama
--no-xcursor
--no-xfixes
--no-xrandr
--no-mitshm
--no-xinput
--no-xkb
--no-glib
--no-openvg
-# -no-opengl
--no-xsync
--no-audio-backend
--no-sse3
--no-ssse3
--no-sse4.1
--no-sse4.2
--no-avx
--no-neon

+ 0 - 45
static_qt_conf_osx

@@ -1,45 +0,0 @@
-# This file is part of wkhtmltopdf.
-#
-# wkhtmltopdf is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser 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 Lesser General Public License
-# along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
--largefile
--rpath
--no-nis
--no-cups
--no-iconv
--no-pch
--no-gtkstyle
--no-nas-sound
--no-sm
--no-xshape
--no-xinerama
--no-xfixes
--no-xrandr
--no-xrender
--no-mitshm
--no-xkb
--no-glib
--no-openvg
--no-opengl
--no-xsync
--no-javascript-jit
--no-egl
-# Use the carbon version as cocoa doesn't support static build
--carbon
-# Use the Snow Leopard SDK
--sdk /Developer/SDKs/MacOSX10.6.sdk
-# Use the Leopard SDK
-# -sdk /Developer/SDKs/MacOSX10.5.sdk
--arch x86 
--no-dwarf2 
--no-framework

+ 0 - 22
static_qt_conf_win

@@ -1,22 +0,0 @@
-# This file is part of wkhtmltopdf.
-#
-# wkhtmltopdf is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser 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 Lesser General Public License
-# along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
--qt-style-windows    #Required for cleanlooks
--qt-style-cleanlooks
--no-style-windowsxp
--no-style-windowsvista
--no-style-plastique
--no-style-motif
--no-style-cde
-

+ 0 - 94
wkhtmltopdf.nsi.m4

@@ -1,94 +0,0 @@
-!include "MUI2.nsh"
-!include "EnvVarUpdate.nsh"
-
-Name "wkhtmltox WKVERSION"
-OutFile "wkhtmltox-WKVERSION-installer.exe"
-
-RequestExecutionLevel admin
-
-;Default installation folder
-InstallDir "$PROGRAMFILES\wkhtmltopdf"
-  
-;Get installation folder from registry if available
-InstallDirRegKey HKCU "Software\wkhtmltopdf" ""
-
-;--------------------------------
-;Interface Settings
-
-!define MUI_ABORTWARNING
-
-;--------------------------------
-;Pages
-	
-!insertmacro MUI_PAGE_LICENSE "../COPYING"
-!insertmacro MUI_PAGE_COMPONENTS
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-  
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-  
-;--------------------------------
-;Languages
- 
-  !insertmacro MUI_LANGUAGE "English"
-
-;--------------------------------
-;Installer Sections
-
-Section "Wkhtmltopdf" pdf
-  SetOutPath "$INSTDIR"
-  file wkhtmltopdf.exe
-SectionEnd
-
-Section "Wkhtmltoimage" image
-  SetOutPath "$INSTDIR"
-  file wkhtmltoimage.exe
-SectionEnd
-
-Section /o "Modify PATH" mpath
-	;Commented out because it's overwriting and not appending
-  ;${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} "Updating PATH will break the PATH in Windows Vista and Windows 7."
-
-!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
-  file ssleay32.dll
-  file libeay32.dll
-  file mingwm10.dll
-  WriteRegStr HKCU "Software\wkhtmltopdf" "" $INSTDIR
-  WriteUninstaller "$INSTDIR\uninstall.exe"
-
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\wkhtmltopdf" \
-                   "DisplayName" "wkhtmltopdf"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\wkhtmltopdf" \
-                   "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
-SectionEnd
-
-
-;--------------------------------
-;Uninstaller Section
-
-Section "Uninstall"
-  Delete "$INSTDIR\wkhtmltoimage.exe"
-  Delete "$INSTDIR\wkhtmltopdf.exe"
-  Delete "$INSTDIR\libgcc_s_dw2-1.dll"
-  Delete "$INSTDIR\ssleay32.dll"
-  Delete "$INSTDIR\libeay32.dll"
-  Delete "$INSTDIR\mingwm10.dll"
-;  ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR"
-  Delete "$INSTDIR\uninstall.exe"
-  RMDir "$INSTDIR"
-  DeleteRegKey /ifempty HKCU "Software\wkhtmltopdf"
-SectionEnd