From 13a262af6a44412a71f8879b76fb040af2e3a25a Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Sat, 9 Jan 2010 02:53:05 +0000 Subject: 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 --- Makefile.windows | 17 +++++++++++++++++ windows/makefile | 14 -------------- windows/pandoc-setup.iss | 32 +++++++------------------------- 3 files changed, 24 insertions(+), 39 deletions(-) create mode 100644 Makefile.windows delete mode 100644 windows/makefile diff --git a/Makefile.windows b/Makefile.windows new file mode 100644 index 000000000..81da1cc4d --- /dev/null +++ b/Makefile.windows @@ -0,0 +1,17 @@ +# 'mingw32-make -f Makefile.windows prep' +# prepares for building the Inno Setup installer +# note: we use -f-library in building pandoc, because +# if the library is built, the data file paths will not be relocatable! + +.PHONY: prep +prep: + cabal clean + cabal configure -f-library -fwrappers -fhighlighting --datasubdir= + cabal build + strip dist\build\pandoc\pandoc.exe + strip dist\build\hsmarkdown\hsmarkdown.exe + strip dist\build\markdown2pdf\markdown2pdf.exe + dist\build\pandoc\pandoc.exe -s --template templates\html.template -S README -o README.html + copy COPYING COPYING.txt + copy COPYRIGHT COPYRIGHT.txt + diff --git a/windows/makefile b/windows/makefile deleted file mode 100644 index a847bfd69..000000000 --- a/windows/makefile +++ /dev/null @@ -1,14 +0,0 @@ -# 'mingw32-make prep' prepares for building the Inno Setup installer -# note: before running this, build pandoc using: -# cabal install -f-library -fwrappers -# If the library is built, the data file paths will not be relocatable! - -.PHONY: prep -prep: - strip ..\dist\build\pandoc\pandoc.exe - strip ..\dist\build\hsmarkdown\hsmarkdown.exe - strip ..\dist\build\markdown2pdf\markdown2pdf.exe - pandoc -s -S ..\README -o ..\README.html - copy ..\COPYING ..\COPYING.txt - copy ..\COPYRIGHT ..\COPYRIGHT.txt - diff --git a/windows/pandoc-setup.iss b/windows/pandoc-setup.iss index 522a34f13..5f9de4f75 100644 --- a/windows/pandoc-setup.iss +++ b/windows/pandoc-setup.iss @@ -31,7 +31,7 @@ var Dir: TArrayOfString; begin setArrayLength(Dir, 1) - Dir[0] := ExpandConstant('{app}'); + Dir[0] := ExpandConstant('{app}\bin'); Result := Dir; end; #include "modpath.iss" @@ -53,34 +53,16 @@ end; Name: "english"; MessagesFile: "compiler:Default.isl" [Files] -Source: "..\dist\build\pandoc\pandoc.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\dist\build\hsmarkdown\hsmarkdown.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\dist\build\markdown2pdf\markdown2pdf.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\dist\build\pandoc\pandoc.exe"; DestDir: "{app}\bin"; Flags: ignoreversion +Source: "..\dist\build\hsmarkdown\hsmarkdown.exe"; DestDir: "{app}\bin"; Flags: ignoreversion +Source: "..\dist\build\markdown2pdf\markdown2pdf.exe"; DestDir: "{app}\bin"; Flags: ignoreversion Source: "..\README.html"; DestDir: "{app}"; Flags: ignoreversion Source: "..\COPYRIGHT.txt"; DestDir: "{app}"; Flags: ignoreversion Source: "..\COPYING.txt"; DestDir: "{app}"; Flags: ignoreversion Source: "..\reference.odt"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\templates\html.template"; DestDir: "{app}\templates"; Flags: ignoreversion -Source: "..\templates\docbook.template"; DestDir: "{app}\templates"; Flags: ignoreversion -Source: "..\templates\opendocument.template"; DestDir: "{app}\templates"; Flags: ignoreversion -Source: "..\templates\latex.template"; DestDir: "{app}\templates"; Flags: ignoreversion -Source: "..\templates\context.template"; DestDir: "{app}\templates"; Flags: ignoreversion -Source: "..\templates\texinfo.template"; DestDir: "{app}\templates"; Flags: ignoreversion -Source: "..\templates\man.template"; DestDir: "{app}\templates"; Flags: ignoreversion -Source: "..\templates\markdown.template"; DestDir: "{app}\templates"; Flags: ignoreversion -Source: "..\templates\rst.template"; DestDir: "{app}\templates"; Flags: ignoreversion -Source: "..\templates\mediawiki.template"; DestDir: "{app}\templates"; Flags: ignoreversion -Source: "..\templates\rtf.template"; DestDir: "{app}\templates"; Flags: ignoreversion -Source: "..\data\LaTeXMathML.js.comment"; DestDir: "{app}\data"; Flags: ignoreversion -Source: "..\data\LaTeXMathML.js.packed"; DestDir: "{app}\data"; Flags: ignoreversion -Source: "..\s5\default\slides.js.comment"; DestDir: "{app}\s5\default"; Flags: ignoreversion -Source: "..\s5\default\slides.js.packed"; DestDir: "{app}\s5\default"; Flags: ignoreversion -Source: "..\s5\default\s5-core.css"; DestDir: "{app}\s5\default"; Flags: ignoreversion -Source: "..\s5\default\framing.css"; DestDir: "{app}\s5\default"; Flags: ignoreversion -Source: "..\s5\default\pretty.css"; DestDir: "{app}\s5\default"; Flags: ignoreversion -Source: "..\s5\default\opera.css"; DestDir: "{app}\s5\default"; Flags: ignoreversion -Source: "..\s5\default\outline.css"; DestDir: "{app}\s5\default"; Flags: ignoreversion -Source: "..\s5\default\print.css"; DestDir: "{app}\s5\default"; Flags: ignoreversion +Source: "..\templates\*"; DestDir: "{app}\templates"; Flags: ignoreversion +Source: "..\data\*"; DestDir: "{app}\data"; Flags: ignoreversion +Source: "..\s5\default\*"; DestDir: "{app}\s5\default"; Flags: ignoreversion Source: "pcre-license.txt"; DestDir: "{app}"; Flags: ignoreversion Source: "pcre3.dll"; DestDir: "{sys}"; Flags: onlyifdoesntexist sharedfile ; NOTE: Don't use "Flags: ignoreversion" on any shared system files -- cgit v1.2.3