Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
15332 commits 2 branches 0 tags 65 MiB
Commit graph

205 commits

Author SHA1 Message Date
John MacFarlane
c28c16d463 Use doctemplates 0.1.0.2. 2016-10-02 12:29:37 +02:00
John MacFarlane
fcb45c3505 Use doctemplates 0.1.0.1. 2016-10-02 11:07:10 +02:00
John MacFarlane
5ec9b6352c Moved template compiling/rendering code to a separate library. 
jgm/doctemplates.

This allows the pandoc templating system to be used independently.
 2016-10-02 09:30:26 +02:00
John MacFarlane
cacb9c0fcb USe latest pandoc-citeproc in binary package stack.yaml. 2016-09-25 23:06:18 +02:00
John MacFarlane
86f6d7921d Added pandoc-citeproc back to extra-deps. 2016-09-23 13:00:18 +02:00
John MacFarlane
c1d26a20cc Use lts-7.0 in stack.yaml files. 2016-09-23 12:50:56 +02:00
John MacFarlane
d2464de2af Use texmath 0.8.6.5. Closes #3040. 2016-07-24 10:56:19 -07:00
John MacFarlane
1a3d753b0e Fix MANUAL.txt path in make-windows-installer.txt. 2016-07-22 15:55:35 -07:00
Albert Krewinkel
a396003a31 Rename README to MANUAL.txt 2016-07-20 21:16:45 +02:00
John MacFarlane
e71a0e5712 Add aeson-pretty to stack.yaml for deb, windows. 2016-07-16 15:27:14 -07:00
John MacFarlane
e9c20314d0 Use cmark-0.5.3.1 in stack.yaml. 2016-07-16 08:49:46 -07:00
John MacFarlane
c2bcefb39e Use cmark-0.5.3 in stack.yaml. 2016-07-15 12:32:25 -07:00
John MacFarlane
75a9ba5dca Use pandoc-citeproc-0.10.1 for packages. 2016-07-14 22:57:58 -07:00
John MacFarlane
6ea8ff19c3 Added http-client dependencies to stack.yaml files. 2016-07-04 10:24:28 -07:00
John MacFarlane
44ce21e134 stack.yaml: use 6.5 resolver. 2016-07-03 11:54:11 -07:00
John MacFarlane
7ded9d4af0 Include table of contents in README.html in Windows package. 2016-06-26 17:24:15 -07:00
John MacFarlane
5bdf217135 Added texmath 0.8.6.4 to windows/stack.yaml. 2016-06-24 10:45:01 -07:00
John MacFarlane
7f4ee830c9 Improved Windows installer - don't ignore properties set on command-line. 
See #2708.  Needs testing to see if this resolves the issue.

Thanks to @nkalvi.
 2016-06-23 11:09:25 -07:00
John MacFarlane
97f8f4ad4b Use pandoc-citeproc-0.10 in binary pkgs. 2016-06-04 15:42:07 -07:00
John MacFarlane
146c7a78e5 Improved Windows installer (nkalvi, #2708, #2389). 
* Scope selection in the first screen. Since I couldn't detect if the
  user is 'real' admin user, default is still per user.
* Scope is limited to per machine on servers. Though not perfect
  (couldn't detect `DisableMSI` policy), it should handle #2389 better.
* For per machine, location can be changed by selecting Advanced.
  Localization: modified templates from WiX toolkit support localization
  very well. A short sample localization file for en-us is used.
* Dialog elements are moved to their own files.
 2016-06-04 11:34:41 -07:00
John MacFarlane
9a77544813 Fixed windows/stack.yaml. 
Can't set flag on something not in extra-deps.
 2016-06-03 14:42:55 -07:00
John MacFarlane
dc0ade3513 Use windows/stack.yaml for appveyor build. 
Use released pandoc-citeproc, not git.
 2016-06-03 13:41:48 -07:00
John MacFarlane
c00783b510 Windows build: create pandoc-citeproc on appveyor, so we can put in msi. 
Updated stackage resolver.
 2016-06-03 12:06:25 -07:00
John MacFarlane
0160e85017 Added pandoc-citeproc to stack-appveyor.yaml extra-deps. 2016-05-19 13:09:50 -07:00
John MacFarlane
ad669e486e stack.yamls - make sure proper flags used for texmath, pandoc-citeproc. 2016-05-16 20:50:08 -07:00
Jan Schulz
7590d19445 Use windows stack.yaml on appveyor to embedded the templates 2016-05-11 23:51:26 +02:00
John MacFarlane
c7df80e0c3 Removed strip commands from make-windows-installer.bat. 2016-03-20 09:01:52 -07:00
John MacFarlane
6a4c17642c Build binary packages with with latest texmath. 2016-03-19 14:45:25 -07:00
John MacFarlane
33bad8de18 Depend on most recent aeson, highlighting-kate. 
These aren't in stackage yet.
 2016-03-19 14:19:13 -07:00
John MacFarlane
3dadc1b1bd Use lts-5.8 resolver. 2016-03-19 14:16:08 -07:00
John MacFarlane
52794d8d52 Removed aeson extra-dep from stack.yaml. 2016-02-09 17:28:37 -08:00
John MacFarlane
1aaf4b8c83 Changed aeson version in stack.yaml to 0.11.0.0. 2016-02-09 14:08:51 -08:00
John MacFarlane
522f8f3b47 Updated to lts-5.2 resolver, aeson 0.11 in stack.yaml. 2016-02-09 09:34:51 -08:00
John MacFarlane
5eb80872af Updated stack.yaml. 2016-01-09 13:54:36 -08:00
John MacFarlane
a6d20b32c7 windows/stack.yaml - use local pandoc-citeproc. 
I'm not sure why this is needed, but it is. Otherwise
the build fails.
 2016-01-04 07:59:07 -08:00
John MacFarlane
1cee48158e Updated binary package stack.yamls to ensure pandoc-citeproc... 
is built with embed_data_files. This fixes a problem with
the original 1.16 binary packages.
 2016-01-03 20:52:59 -08:00
John MacFarlane
13f04ce1cc Fixed windows stack.yaml. 2016-01-02 15:54:23 -08:00
John MacFarlane
4edd1a7873 Updated stack.yaml files. 
Use latest resolver.
Use latest pandoc-citeproc and pandoc-types release.
 2016-01-02 12:37:23 -08:00
John MacFarlane
a2fa46065d stack.yaml - use simpler extra-deps field. 2015-12-30 13:27:17 -08:00
John MacFarlane
b27783e2ec Use cmark 0.5. 
Closes #2605.
 2015-12-29 19:52:06 -08:00
John MacFarlane
6c8a93050f Use lts-3.18 resolver to avoid Windows build problems. 2015-12-13 16:30:27 -08:00
John MacFarlane
ad6578f673 Use lts-3.16. 2015-12-01 22:55:42 -08:00
John MacFarlane
87f20f11e2 Use stack for Windows installer. 2015-11-14 22:23:47 -08:00
John MacFarlane
acbd8beb95 make-windows-installer.bat: run tests. 2015-11-13 19:04:34 -08:00
John MacFarlane
95201a0885 Revert "New approach to stack build on appveyor." 
This reverts commit cdd6389e91.
 2015-10-28 12:41:06 -07:00
John MacFarlane
cdd6389e91 New approach to stack build on appveyor. 
This uses system lua library.
See https://github.com/osa1/hslua/issues/22#issuecomment-151281274
 2015-10-28 11:01:38 -07:00
John MacFarlane
eaca413df7 make-windows-installer.bat: add copying to shared drive. 2015-10-16 09:36:38 -07:00
John MacFarlane
cb2c81b45b Updated pandoc.wxs. 
From @nkalvi with a few modifications (custom variables).

- when per-machine installation is chosen, the system path
  is updated instead of the user's
- an appropriate default is used for per-machine installation directory.
 2015-07-09 22:02:30 -07:00
John MacFarlane
48cd774714 Changes in WiX installer. 
These should allow a per-user install without elevated
privileges, while still allowing a systemwide install with
privileges.
 2015-07-05 13:59:27 -07:00
John MacFarlane
4df8c32a53 WiX: Set InstallPrivileges to limited. 
Default is "elevated", which requires admin privileges.
 2015-07-02 20:47:56 -07:00
John MacFarlane
d0ed2560ab Windows installer: use AppData\Local\Pandoc by default. 
Not AppData\Local\Apps\Pandoc as wix was now doing.

It is going to be easier if we don't change the install
directory so that users end up with two versions.
 2015-06-29 09:39:39 -07:00
John MacFarlane
5f198c019b pandoc.wxs: removed line breaks in RegistryValue. 
See #2205
 2015-06-28 22:43:05 -07:00
John MacFarlane
2768d1c2d2 New pandoc.wxs. 
This should allow the user to select a per-user or systemwide install.
It also shows install location in the list of installed programs.

Thanks to @nkalvi.
See #2205.
 2015-06-27 20:47:37 -07:00
John MacFarlane
1d04797d5c Updated pandoc.wxs (from @nvalki). 2015-06-12 21:30:18 -07:00
Pablo Rodríguez
c18e93ca6e replace old url with pandoc.org 2015-06-09 22:22:58 +02:00
John MacFarlane
f47f53d959 Windows msi changes (nkalvi): 
* Allow setting of installation path.
* Use cleaner wix syntax for setting the path:
  https://www.firegiant.com/wix/tutorial/com-expression-syntax-miscellanea/environmentally-friendly/
* Show the user what changes, in a new command window.

See #2205.
 2015-06-03 00:16:38 +02:00
John MacFarlane
b241472a90 Better fix for #2187. 
* Reverted kludgy change to make-windows-installer.bat.
* Removed make-reference-fiels.hs.
* Moved the individual ingredients of reference.docx and
  reference.odt to the data directory.
* Removed reference.docx and reference.odt from data directory.
* We now build the reference archives from their ingredient pieces
  in the docx and odt writers, instead of having a reference.docx
  or reference.odt intermediary.

This should fix #2187.

It also simplifies the bulid procedure.

The one thing users may notice is different is that you can
no longer get the reference.docx or reference.odt using
`--print-default-data-file`.  Instead, simply generate a
docx or odt using pandoc with a blank or minimal input,
and use that (or a customized version) with `--reference-docx`
or `--reference-odt`.
 2015-05-28 18:15:01 -07:00
John MacFarlane
f5087d84a1 More fixes to make-windows-installer for #2187. 2015-05-28 11:38:31 -07:00
John MacFarlane
9b19ae5694 Ensure that docx and odt are built in windows installer. 
Closes #2187.
 2015-05-28 11:20:05 -07:00
John MacFarlane
8c1e0543d7 windows, osx package scripts: don't need alex, happy. 2014-08-14 00:23:27 -07:00
John MacFarlane
072411e522 Windows installer: Use one install command for pandoc, pandoc-citeproc. 2014-05-28 12:15:44 -07:00
John MacFarlane
63865e4670 Windows install script: force install of pandoc-citeproc. 2014-05-28 10:41:40 -07:00
John MacFarlane
0915967d84 Windows build script: add -windows to file name. 2014-05-16 21:55:07 -07:00
John MacFarlane
ef8de35505 Windows installer: more typos from transition from cabal-dev. 2014-05-06 08:56:52 -07:00
John MacFarlane
7019069a32 Windows install script: Fixed typo in path. 2014-05-06 08:42:30 -07:00
John MacFarlane
0e46173ae4 Windows install script: install alex, happy. 2014-05-06 07:22:40 -07:00
John MacFarlane
7524e8e1f0 Windows package script: use cabal sandbox, not cabal-dev. 2014-05-05 07:08:57 -07:00
John MacFarlane
3dd1b1f73a Removed references to biblio2yaml in installers. 2014-01-05 23:18:14 -08:00
John MacFarlane
3334c7be52 Added --force in make-windows-installer.bat. 2013-09-20 17:56:11 -07:00
John MacFarlane
b0a26d7193 Windows: make citation support a separable component. 2013-09-14 16:52:16 -07:00
John MacFarlane
e3775528dd Updated windows installer batch file. 2013-09-14 16:06:54 -07:00
John MacFarlane
43a077e302 Tweaked windows install script. 
Assumes that pandoc-types and pandoc-citeproc are in Hackage.
 2013-09-06 22:29:47 -07:00
John MacFarlane
f49749c46d More windows package tweaks. 
Make sure subordinate packages are reinstalled.
 2013-09-05 21:01:56 -07:00
John MacFarlane
7803c012df Windows installer: gave up on unicode collation. 2013-09-05 20:52:57 -07:00
John MacFarlane
8f6c27920d Preliminary changes to windows installer script. 2013-09-05 09:22:37 -07:00
John MacFarlane
af898dd44f Removed citeproc-hs from osx, windows build process. 2013-08-24 22:43:22 -07:00
John MacFarlane
7e584dade0 make-windows-installer.bat: Removed explicit paths for executables. 2013-07-04 10:37:20 -07:00
Fyodor Sheremetyev
b4277c1658 WiX: Remove unnecessary parameter for candle.exe. 2013-03-15 21:45:08 +00:00
Fyodor Sheremetyev
7c572acbd6 WiX: Revert back to “Minimal” template. 
The “Advanced” template doesn’t uninstall previous version if it was installed per-machine. FindRelatedProducts action executes before ALLUSERS property is set and search is performed in per-user products only.
 2013-03-15 21:43:47 +00:00
Fyodor Sheremetyev
ef40aa9393 WiX: Update system PATH environment variable when installing per-machine. 
Had to create two separate components because System property of Environment element cannot be set on condition.
 2013-03-15 16:52:53 +00:00
Fyodor Sheremetyev
6269ba03b0 WiX: Install to %APPLOCALDATA%\Pandoc in per-user setup. 
The “Advanced” template installs to %APPLOCALDATA%\Apps\Pandoc by default.
 2013-03-15 16:37:08 +00:00
Fyodor Sheremetyev
5b3ad33066 WiX: Set non-empty feature name. 
It can be displayed in Advanced mode.
 2013-03-15 15:42:34 +00:00
Fyodor Sheremetyev
d7b6da66c4 WiX: Use APPLICATIONFOLDER property name as required by “Advanced” template. 
Followup to cd4ad4bc96.
 2013-03-15 15:40:48 +00:00
Fyodor Sheremetyev
842661ee18 WiX: Install shortcut for all users when installing per-machine. Use HKMU to write registry values to either HKCU or HKLM. 
http://stackoverflow.com/a/3824949
http://wix.sourceforge.net/manual-wix2/wix_xsd_registry.htm
 2013-03-15 15:10:24 +00:00
Fyodor Sheremetyev
c3bdc422b2 WiX: Use file as key path for User’s Guide component. 2013-03-15 14:28:54 +00:00
Fyodor Sheremetyev
e6f32806fd WiX: Refactoring: Place all components inside single directory structure. 
For the sake of simplicity.
 2013-03-15 14:25:40 +00:00
Fyodor Sheremetyev
cd4ad4bc96 WiX: Use “Advanced” template that supports selection of per-user or per-machine mode. 
http://wix.sourceforge.net/manual-wix3/WixUI_advanced.htm

To install for all users installer should be started from admin account.
 2013-03-15 13:46:07 +00:00
Fyodor Sheremetyev
aed8a2c841 WiX: Add empty lines for readability. 2013-03-15 12:50:08 +00:00
Fyodor Sheremetyev
7ee0dffb84 WiX: Replace tabs with spaces. 2013-03-15 12:47:04 +00:00
Fyodor Sheremetyev
7fa4fc1503 WiX: extract upgrade code into a define to avoid duplication. 2013-02-13 00:34:45 +04:00
Fyodor Sheremetyev
6315161ac2 WiX: uninstall any previously installed version. 2013-02-13 00:32:09 +04:00
Fyodor Sheremetyev
a65740f776 WiX: add product URL to the installation package metadata. 2013-02-13 00:24:31 +04:00
Fyodor Sheremetyev
bf9819585f WiX: remove unused reference to Desktop. 2013-02-13 00:22:15 +04:00
Fyodor Sheremetyev
fec852e181 Disable WiX warning LGHT1076 ICE91. 
It’s harmless. http://msdn.microsoft.com/en-us/library/aa369053(VS.85).aspx
 2013-02-13 00:21:09 +04:00
Fyodor Sheremetyev
1d9d8a6a90 Install Pandoc per-user on Windows. 2013-02-13 00:19:35 +04:00
John MacFarlane
f4429e4de6 Windows installer improvements. 
* Handle upgrades better:  the old version will be removed
  automatically.
* Detect version in batch file, so pandoc.wxs need not be modified
  when the version number changes.
* Create pandoc-VERSION.msi.
 2013-02-10 16:25:58 -08:00
John MacFarlane
68e7ae101c windows installer: Add start menu entry with link to documentation. 2013-02-10 11:45:43 -08:00
John MacFarlane
b86bdb90f7 windows installer: UI with license, etc. 2013-02-09 23:19:55 -08:00
John MacFarlane
eb6e8b5c88 Fixed make-windows-installer to use double quotes for path. 2013-02-09 23:01:21 -08:00
John MacFarlane
bbfba90980 Removed Inno setup config files. 2013-02-09 21:55:40 -08:00