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

3 files changed, 16 insertions, 18 deletions

diff --git a/Makefile.windows b/Makefile.windows
deleted file mode 100644
index 81da1cc4d..000000000
--- a/Makefile.windows
+++ /dev/null
@@ -1,17 +0,0 @@
-# '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/make-windows-installer.bat b/windows/make-windows-installer.bat
new file mode 100644
index 000000000..2dffc6967
--- /dev/null
+++ b/windows/make-windows-installer.bat
@@ -0,0 +1,15 @@
+@echo off

+cd ..

+cabal clean

+rem note: we use -f-library in building pandoc, because

+rem if the library is built, the data file paths will not be relocatable!

+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

+cd windows

+ISCC pandoc-setup.iss

diff --git a/windows/pandoc-setup.iss b/windows/pandoc-setup.iss
index 5f9de4f75..a196372ae 100644
--- a/windows/pandoc-setup.iss
+++ b/windows/pandoc-setup.iss
@@ -16,7 +16,7 @@ DefaultDirName={code:DefDirRoot}\Pandoc
 DefaultGroupName=Pandoc

 AllowNoIcons=yes

 LicenseFile="..\COPYING.txt"

-OutputBaseFilename=setup

+OutputBaseFilename=pandoc-setup

 Compression=lzma

 SolidCompression=yes

 ChangesEnvironment=yes