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

205 commits

Author SHA1 Message Date
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
John MacFarlane
1cb12d42a5 make-windows-installer.bat: Use WiX instead of Inno. 2013-02-09 21:54:29 -08:00
John MacFarlane
ddc4287d27 Added pandoc.wxs: definition file for WiX msi generator. 2013-02-09 21:49:50 -08:00
John MacFarlane
f3b1b8e720 Version bump to 1.10.1. 2013-01-28 10:54:34 -08:00
John MacFarlane
a5da6898c9 Changes to make-windows-installer.bat. 
* Exit batch file if any of the cabal-dev installs fail.
* There's no longer any need to reinstall highlighting-kate.
* Don't start with a 'cabal update'; leave that to the user.
 2013-01-22 19:43:32 -08:00
John MacFarlane
613a872c01 windowns installer: Removed --disable-library-for-ghci. 2013-01-22 08:47:03 -08:00
John MacFarlane
d1e3bc7df4 Force reinstall for windows package. 2013-01-22 08:16:40 -08:00
John MacFarlane
65528e48f8 make-windows-installer: force reinstall of citeproc-hs and h-k. 2013-01-20 19:36:44 -08:00
John MacFarlane
a00c0344d8 Updated windows installer so it doesn't copy data files. 
These are now embedded in the binary itself.
 2012-12-29 19:42:34 -08:00
John MacFarlane
bce1522f97 Updated windows installer to use embed_data_files flag. 2012-12-29 18:51:41 -08:00
John MacFarlane
b3ad94bde9 Moved man page creation out of Setup.hs. 
* MakeManPage.hs has been transformed into
  man/make-pandoc-man-pages.hs.
* There is now a cabal stanza for this, so the dependencies are
  handled by cabal.
* Special treatment in Setup.hs ensures that this never gets installed;
  it is built and used to create the man pages.
* Setup.hs cleaned up.
 2012-10-15 21:26:24 -07:00
John MacFarlane
fbab8e5286 Removed pcre3.dll from windows package. 
It isn't needed unless highlighting-kate is compilled with the
pcre-light flag. By default, regex-prce-builtin is used.
 2012-09-05 19:05:13 -07:00
John MacFarlane
786d01fd1d Bump version to 1.10. 2012-07-26 10:02:27 -07:00
John MacFarlane
8a7895d3de Bump version on windows installer. 2012-06-28 19:26:35 -07:00
John MacFarlane
80f9619948 Have windows installer make man page first. 
In cabal-dev, makemanpage fails.
 2012-06-03 13:06:43 -07:00
John MacFarlane
fbefdd040b Version bump to 1.9.4. 2012-05-31 19:29:13 -07:00
John MacFarlane
0233dfaa89 Bumped version for windows package. 2012-05-12 10:31:06 -07:00
John MacFarlane
6d99fd235b windows installer: use blaze html 0.5. 2012-05-12 10:18:16 -07:00
John MacFarlane
f22a2d72e5 Bumped version in windows installer. 2012-04-01 21:17:45 -07:00
John MacFarlane
acb267ef33 Windows installer: fix dzslides directory. Closes #446. 2012-03-12 22:14:26 -07:00
John MacFarlane
6787cf2fbf Bump version to 1.9.1.2. 2012-03-09 09:30:32 -08:00
John MacFarlane
b44fec5877 Windows installer: require XP or higher. 
Trying to run pandoc on Win2K yields:
"addrinfo could not be located in the dynamic link library WS2_32.dll".
This is a function added in XP.
 2012-03-05 00:23:31 -08:00
John MacFarlane
5c30bce6e8 Version bump to 1.9.1.1. 2012-02-11 13:35:53 -08:00
John MacFarlane
61bde14523 Version bump in windows setup. 2012-02-09 08:59:27 -08:00
John MacFarlane
857524353e pandoc-setup.iss: Removed markdown2pdf. 2012-02-05 19:01:28 -08:00
John MacFarlane
819f815a6b Fixed template name in windows installer. 2012-02-05 18:59:57 -08:00
John MacFarlane
2ea45c345b Revert "Fixed some paths on windows installer script." 
This reverts commit 4ee779c768.
 2012-02-05 18:29:55 -08:00
John MacFarlane
4ee779c768 Fixed some paths on windows installer script. 2012-02-05 18:27:44 -08:00
John MacFarlane
9acb5e4d69 Tweaks to pandoc-setup for windows. 2012-02-05 18:14:48 -08:00
John MacFarlane
e16d747d82 make-windows-installer: We no longer need wrappers, highlighting flags. 2012-02-04 22:32:22 -08:00
John MacFarlane
1d615908c2 Removed markdown2pdf and documentation. 2012-01-20 21:22:51 -08:00
John MacFarlane
858844556a Modified windows installer generater to use cabal-dev. 2011-10-24 00:05:08 -07:00
John MacFarlane
8270d2f9b0 Bumped version on windows package. 2011-07-28 23:49:15 -07:00
John MacFarlane
aeb1349894 Bumped version in windows setup iss. 2011-07-16 14:53:36 -07:00
John MacFarlane
07fcc4bff2 Updated pandoc-setup to 1.8. 2011-01-29 13:09:32 -08:00
John MacFarlane
ca7e81fd87 Updated pandoc-setup.iss. 2011-01-01 10:21:50 -08:00
John MacFarlane
c21319f950 Added slidy data files to windows installer. 2010-07-24 09:03:52 -07:00
John MacFarlane
ae3a5d5a75 Updated windows setup file. 2010-07-20 23:58:25 -07:00
John MacFarlane
be1e542e3b Updated version in windows setup file. 2010-03-29 07:31:42 -07:00
John MacFarlane
666a51b7fc Version bump to 1.5.1. 2010-03-23 00:46:54 -07:00
John MacFarlane
f7d896b07f Bump version in windows setup file. 2010-03-21 23:24:26 -07:00
fiddlosopher
b8382f798d Changes to Windows installer. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1913 788f1e2b-df1e-0410-8736-df70ead52e1b
 2010-03-19 07:30:18 +00:00
fiddlosopher
7cf373dd88 New batch file to make-windows-installer. 
+ Removed old Makefile.windows
+ Added make-windows-installer.bat
+ Modified default installer name in pandoc-setup.iss

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1815 788f1e2b-df1e-0410-8736-df70ead52e1b
 2010-01-17 00:37:44 +00:00
fiddlosopher
13a262af6a Windows installer - fixed bug in data file locations. 
Resolves Issue #197.

+ Moved windows/makefile to Makefile.windows
+ Minor fixes in Makefile.windows
+ Use globbing to simplify pandoc-setup.iss
+ Put binaries in bin/ subdirectory of install dir
+ Specify null datafile subdirectory, so that data files
  go right in install dir, rather than in {installdir}/pandoc-{version}.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1798 788f1e2b-df1e-0410-8736-df70ead52e1b
 2010-01-09 02:53:05 +00:00
fiddlosopher
3f4d06d015 Include markdown2pdf and hsmarkdown in windows binary package. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1778 788f1e2b-df1e-0410-8736-df70ead52e1b
 2010-01-02 18:19:14 +00:00
fiddlosopher
0fbdd037db Windows installer: install data files. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1765 788f1e2b-df1e-0410-8736-df70ead52e1b
 2010-01-01 01:49:12 +00:00
fiddlosopher
445f89b9f2 Added windows package build intsructions in windows makefile. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1755 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-31 17:19:32 +00:00
fiddlosopher
c4915eace0 Bumped version to 1.3 in inno setup script. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1642 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-01 20:45:20 +00:00
fiddlosopher
d855599769 Install pcre3 dll in windows setup. 
This is required for highlighting.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1640 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-01 20:35:44 +00:00
fiddlosopher
4a83fc12a6 Added pcre3.dll and license to windows directory. 
This is needed for the windows package.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1639 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-01 20:35:37 +00:00
fiddlosopher
d84c678cdc Bump version in pandoc-setup.iss and make license path relative. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1599 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-07-15 17:52:17 +00:00
fiddlosopher
27ebda48c2 Added makefile for Inno Setup prep work. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1597 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-07-15 07:06:45 +00:00
fiddlosopher
f0e7d25592 Bumped version in windows installer to 1.1. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1483 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-11-02 18:06:52 +00:00
fiddlosopher
1b4a79726a pandoc-setup.iss: Don't require admin privileges to run installer. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1465 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-10-18 18:48:31 +00:00
fiddlosopher
1aed6a9ee4 Modified modpath.iss to modify HKCU path if user lacks admin privileges. 
Also fixed case where oldpath is empty (previously this led to the new
path beginning with a semicolon).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1464 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-10-18 18:48:23 +00:00
fiddlosopher
aaf6d72b17 Added scripts for Windows Inno Setup installer in windows/. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1440 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-09-12 00:05:43 +00:00