--- gforth/iss.sh	2007/12/31 19:02:24	1.17
+++ gforth/iss.sh	2009/12/31 15:32:35	1.24
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#Copyright (C) 2000,2003,2006,2007 Free Software Foundation, Inc.
+#Copyright (C) 2000,2003,2006,2007,2009 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -25,20 +25,31 @@
 # copy the resulting *.iss to the location of your Windows installation
 # of Gforth, and start the setup compiler there.
 
+VERSION=$(cat version)
+
+sed "s/@PACKAGE_VERSION@/$VERSION/g" <gforthmi.sh.in >gforthmi.sh
+
+for i in lib/gforth/$VERSION/libcc-named/*.la
+do
+    sed "s/dependency_libs='.*'/dependency_libs=''/g" <$i >$i+
+    mv $i+ $i
+done
+
 cat <<EOT
 ; This is the setup script for Gforth on Windows
 ; Setup program is Inno Setup
 
 [Setup]
 AppName=Gforth
-AppVerName=Gforth $(cat version)
-AppCopyright=Copyright © 1995,1996,1997,1998,2000,2003,2006,2007 Free Software Foundation
+AppVerName=Gforth $VERSION
+AppCopyright=Copyright © 1995,1996,1997,1998,2000,2003,2006,2007,2008,2009 Free Software Foundation
 DefaultDirName={pf}\gforth
 DefaultGroupName=Gforth
 AllowNoIcons=1
 InfoBeforeFile=COPYING
-Compression=bzip
+Compression=lzma
 DisableStartupPrompt=yes
+OutputBaseFilename=gforth-$VERSION
 
 [Messages]
 WizardInfoBefore=License Agreement
@@ -63,21 +74,26 @@ done) | sort -u | sed \
   -e 's,^\(..*\)$,Name: "{app}\\\1",g')
 Name: "{app}\doc\gforth"
 Name: "{app}\doc\vmgen"
+Name: "{app}\lib\gforth\\$VERSION\libcc-named"
+Name: "{app}\include\gforth\\$VERSION"
 
 [Files]
 ; Parameter quick reference:
 ;   "Source filename", "Dest. filename", Copy mode, Flags
 Source: "README.txt"; DestDir: "{app}"; Flags: isreadme
-Source: "cygwin1.dll"; DestDir: "{app}"
-Source: "sh.exe"; DestDir: "{app}"
-Source: "cygintl-3.dll"; DestDir: "{app}"
-Source: "cygiconv-2.dll"; DestDir: "{app}"
-Source: "cygreadline6.dll"; DestDir: "{app}"
-Source: "cygncurses-8.dll"; DestDir: "{app}"
-Source: "cygffi-2-00-beta.dll"; DestDir: "{app}"
-Source: "gforth.fi"; DestDir: "{app}"
+Source: "c:\cygwin\bin\cygwin1.dll"; DestDir: "{app}"
+Source: "c:\cygwin\bin\sh.exe"; DestDir: "{app}"
+Source: "c:\cygwin\bin\cygintl-8.dll"; DestDir: "{app}"
+Source: "c:\cygwin\bin\cygiconv-2.dll"; DestDir: "{app}"
+Source: "c:\cygwin\bin\cygltdl-3.dll"; DestDir: "{app}"
+Source: "c:\cygwin\bin\cygreadline6.dll"; DestDir: "{app}"
+Source: "c:\cygwin\bin\cygncurses-8.dll"; DestDir: "{app}"
+Source: "c:\cygwin\bin\cygffi-2-00-beta.dll"; DestDir: "{app}"
+Source: "gforthmi.sh"; DestDir: "{app}"
 $(ls doc/gforth | sed -e 's:/:\\:g' -e 's,^\(..*\)$,Source: "doc\\gforth\\\1"; DestDir: "{app}\\doc\\gforth"; Components: help,g')
 $(ls doc/vmgen | sed -e 's:/:\\:g' -e 's,^\(..*\)$,Source: "doc\\vmgen\\\1"; DestDir: "{app}\\doc\\vmgen"; Components: help,g')
+$(ls lib/gforth/$VERSION/libcc-named | sed -e 's:/:\\:g' -e 's,^\(..*\)$,Source: "lib\\gforth\\'$VERSION'\\libcc-named\\\1"; DestDir: "{app}\\lib\\gforth\\'$VERSION'\\libcc-named",g')
+$(ls include/gforth/$VERSION | sed -e 's:/:\\:g' -e 's,^\(..*\)$,Source: "engine\\\1"; DestDir: "{app}\\include\\gforth\\'$VERSION'",g')
 $(make distfiles -f Makedist EXE=.exe | tr ' ' '\n' | grep -v engine.*exe | (while read i; do
   if [ ! -d $i ]; then echo $i; fi
 done) | sed \
@@ -104,11 +120,17 @@ Name: "{group}\Bash"; Filename: "{app}\s
 Name: "{group}\Uninstall Gforth"; Filename: "{uninstallexe}"
 
 [Run]
-Filename: "{app}\gforth.exe"; WorkingDir: "{app}"; Parameters: "fixpath.fs {app} gforth-fast.exe"
-Filename: "{app}\gforth.exe"; WorkingDir: "{app}"; Parameters: "fixpath.fs {app} gforth-ditc.exe"
-Filename: "{app}\gforth.exe"; WorkingDir: "{app}"; Parameters: "fixpath.fs {app} gforth-itc.exe"
-Filename: "{app}\gforth.exe"; WorkingDir: "{app}"; Parameters: "fixpath.fs {app} gforth-prof.exe"
-Filename: "{app}\gforth-fast.exe"; WorkingDir: "{app}"; Parameters: "fixpath.fs {app} gforth.exe"
+Filename: "{app}\gforth.exe"; WorkingDir: "{app}"; Parameters: "fixpath.fs gforth-fast.exe"
+Filename: "{app}\gforth.exe"; WorkingDir: "{app}"; Parameters: "fixpath.fs gforth-ditc.exe"
+Filename: "{app}\gforth.exe"; WorkingDir: "{app}"; Parameters: "fixpath.fs gforth-itc.exe"
+Filename: "{app}\gforth.exe"; WorkingDir: "{app}"; Parameters: "fixpath.fs gforth-prof.exe"
+Filename: "{app}\gforth-fast.exe"; WorkingDir: "{app}"; Parameters: "fixpath.fs gforth.exe"
+Filename: "{app}\sh.exe"; WorkingDir: "{app}"; Parameters: "./gforthmi.sh"
+
+[UninstallDelete]
+Type: files; Name: "{app}\gforth.fi"
+Type: files; Name: "{app}\temp-image.fi1"
+Type: files; Name: "{app}\temp-image.fi2"
 
 ;[Registry]
 ;registry commented out
@@ -127,3 +149,5 @@ Filename: "{app}\gforth-fast.exe"; Worki
 ;HKCR, "forthblock", "EditFlags", DWORD, "00000000",
 ;HKCR, "forthblock\DefaultIcon"; STRING, "{sys}\System32\shell32.dll,61"
 EOT
+
+sed -e 's/$/\r/' <README >README.txt