git.iko.soy/typeable/pandoc
on master help sign in
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

commit13a262af6a44412a71f8879b76fb040af2e3a25a authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateSat 9 Jan 2010, 02:53 (17 years ago) parent66c4f90
3 files changed+24−39
compare with master
unifiedsplit
Makefile.windows+17 windows/makefile−14 windows/pandoc-setup.iss+7−25
Makefile.windowsnew file+17
@@ -0,0 +1,17 @@
1+# 'mingw32-make -f Makefile.windows prep'
2+# prepares for building the Inno Setup installer
3+# note: we use -f-library in building pandoc, because
4+# if the library is built, the data file paths will not be relocatable!
5+
6+.PHONY: prep
7+prep:
8+ cabal clean
9+ cabal configure -f-library -fwrappers -fhighlighting --datasubdir=
10+ cabal build
11+ strip dist\build\pandoc\pandoc.exe
12+ strip dist\build\hsmarkdown\hsmarkdown.exe
13+ strip dist\build\markdown2pdf\markdown2pdf.exe
14+ dist\build\pandoc\pandoc.exe -s --template templates\html.template -S README -o README.html
15+ copy COPYING COPYING.txt
16+ copy COPYRIGHT COPYRIGHT.txt
17+
windows/makefiledeleted−14
@@ -1,14 +0,0 @@
1−# 'mingw32-make prep' prepares for building the Inno Setup installer
2−# note: before running this, build pandoc using:
3−# cabal install -f-library -fwrappers
4−# If the library is built, the data file paths will not be relocatable!
5−
6−.PHONY: prep
7−prep:
8− strip ..\dist\build\pandoc\pandoc.exe
9− strip ..\dist\build\hsmarkdown\hsmarkdown.exe
10− strip ..\dist\build\markdown2pdf\markdown2pdf.exe
11− pandoc -s -S ..\README -o ..\README.html
12− copy ..\COPYING ..\COPYING.txt
13− copy ..\COPYRIGHT ..\COPYRIGHT.txt
14−
windows/pandoc-setup.iss+7−25
@@ -31,7 +31,7 @@ var
3131 Dir: TArrayOfString;
3232begin
3333 setArrayLength(Dir, 1)
34− Dir[0] := ExpandConstant('{app}');
34+ Dir[0] := ExpandConstant('{app}\bin');
3535 Result := Dir;
3636end;
3737#include "modpath.iss"
@@ -53,34 +53,16 @@ end;
5353Name: "english"; MessagesFile: "compiler:Default.isl"
5454
5555[Files]
56−Source: "..\dist\build\pandoc\pandoc.exe"; DestDir: "{app}"; Flags: ignoreversion
57−Source: "..\dist\build\hsmarkdown\hsmarkdown.exe"; DestDir: "{app}"; Flags: ignoreversion
58−Source: "..\dist\build\markdown2pdf\markdown2pdf.exe"; DestDir: "{app}"; Flags: ignoreversion
56+Source: "..\dist\build\pandoc\pandoc.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
57+Source: "..\dist\build\hsmarkdown\hsmarkdown.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
58+Source: "..\dist\build\markdown2pdf\markdown2pdf.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
5959Source: "..\README.html"; DestDir: "{app}"; Flags: ignoreversion
6060Source: "..\COPYRIGHT.txt"; DestDir: "{app}"; Flags: ignoreversion
6161Source: "..\COPYING.txt"; DestDir: "{app}"; Flags: ignoreversion
6262Source: "..\reference.odt"; DestDir: "{app}"; Flags: ignoreversion
63−Source: "..\templates\html.template"; DestDir: "{app}\templates"; Flags: ignoreversion
64−Source: "..\templates\docbook.template"; DestDir: "{app}\templates"; Flags: ignoreversion
65−Source: "..\templates\opendocument.template"; DestDir: "{app}\templates"; Flags: ignoreversion
66−Source: "..\templates\latex.template"; DestDir: "{app}\templates"; Flags: ignoreversion
67−Source: "..\templates\context.template"; DestDir: "{app}\templates"; Flags: ignoreversion
68−Source: "..\templates\texinfo.template"; DestDir: "{app}\templates"; Flags: ignoreversion
69−Source: "..\templates\man.template"; DestDir: "{app}\templates"; Flags: ignoreversion
70−Source: "..\templates\markdown.template"; DestDir: "{app}\templates"; Flags: ignoreversion
71−Source: "..\templates\rst.template"; DestDir: "{app}\templates"; Flags: ignoreversion
72−Source: "..\templates\mediawiki.template"; DestDir: "{app}\templates"; Flags: ignoreversion
73−Source: "..\templates\rtf.template"; DestDir: "{app}\templates"; Flags: ignoreversion
74−Source: "..\data\LaTeXMathML.js.comment"; DestDir: "{app}\data"; Flags: ignoreversion
75−Source: "..\data\LaTeXMathML.js.packed"; DestDir: "{app}\data"; Flags: ignoreversion
76−Source: "..\s5\default\slides.js.comment"; DestDir: "{app}\s5\default"; Flags: ignoreversion
77−Source: "..\s5\default\slides.js.packed"; DestDir: "{app}\s5\default"; Flags: ignoreversion
78−Source: "..\s5\default\s5-core.css"; DestDir: "{app}\s5\default"; Flags: ignoreversion
79−Source: "..\s5\default\framing.css"; DestDir: "{app}\s5\default"; Flags: ignoreversion
80−Source: "..\s5\default\pretty.css"; DestDir: "{app}\s5\default"; Flags: ignoreversion
81−Source: "..\s5\default\opera.css"; DestDir: "{app}\s5\default"; Flags: ignoreversion
82−Source: "..\s5\default\outline.css"; DestDir: "{app}\s5\default"; Flags: ignoreversion
83−Source: "..\s5\default\print.css"; DestDir: "{app}\s5\default"; Flags: ignoreversion
63+Source: "..\templates\*"; DestDir: "{app}\templates"; Flags: ignoreversion
64+Source: "..\data\*"; DestDir: "{app}\data"; Flags: ignoreversion
65+Source: "..\s5\default\*"; DestDir: "{app}\s5\default"; Flags: ignoreversion
8466Source: "pcre-license.txt"; DestDir: "{app}"; Flags: ignoreversion
8567Source: "pcre3.dll"; DestDir: "{sys}"; Flags: onlyifdoesntexist sharedfile
8668; NOTE: Don't use "Flags: ignoreversion" on any shared system files