lee/pandoc
1
0
Fork 0
mirror of https://github.com/jgm/pandoc.git synced 2026-08-31 12:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,083 Commits 87 Branches 298 Tags
8a9f5915ab822b476c270f46e8a800982b018ba3
Commit Graph
137 Commits
Author SHA1 Message Date
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