Diff for /gforth/iss.sh between versions 1.19 and 1.29

version 1.19, 2008/10/06 21:24:32 version 1.29, 2012/10/08 01:10:30
Line 1 Line 1
 #!/bin/bash  #!/bin/bash
   
 #Copyright (C) 2000,2003,2006,2007 Free Software Foundation, Inc.  #Copyright (C) 2000,2003,2006,2007,2009,2011 Free Software Foundation, Inc.
   
 #This file is part of Gforth.  #This file is part of Gforth.
   
Line 27 Line 27
   
 VERSION=$(cat version)  VERSION=$(cat version)
   
   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  cat <<EOT
 ; This is the setup script for Gforth on Windows  ; This is the setup script for Gforth on Windows
 ; Setup program is Inno Setup  ; Setup program is Inno Setup
Line 34  cat <<EOT Line 40  cat <<EOT
 [Setup]  [Setup]
 AppName=Gforth  AppName=Gforth
 AppVerName=Gforth $VERSION  AppVerName=Gforth $VERSION
 AppCopyright=Copyright 1995,1996,1997,1998,2000,2003,2006,2007,2008 Free Software Foundation  AppCopyright=Copyright 1995,1996,1997,1998,2000,2003,2006,2007,2008,2009,2010,2011 Free Software Foundation
 DefaultDirName={pf}\gforth  DefaultDirName={pf}\gforth
 DefaultGroupName=Gforth  DefaultGroupName=Gforth
 AllowNoIcons=1  AllowNoIcons=1
 InfoBeforeFile=COPYING  InfoBeforeFile=COPYING
 Compression=bzip  Compression=lzma
 DisableStartupPrompt=yes  DisableStartupPrompt=yes
 OutputBaseFilename=gforth-$VERSION  OutputBaseFilename=gforth-$VERSION
   
Line 67  done) | sort -u | sed \ Line 73  done) | sort -u | sed \
 Name: "{app}\doc\gforth"  Name: "{app}\doc\gforth"
 Name: "{app}\doc\vmgen"  Name: "{app}\doc\vmgen"
 Name: "{app}\lib\gforth\\$VERSION\libcc-named"  Name: "{app}\lib\gforth\\$VERSION\libcc-named"
   Name: "{app}\include\gforth\\$VERSION"
   
 [Files]  [Files]
 ; Parameter quick reference:  ; Parameter quick reference:
 ;   "Source filename", "Dest. filename", Copy mode, Flags  ;   "Source filename", "Dest. filename", Copy mode, Flags
 Source: "README.txt"; DestDir: "{app}"; Flags: isreadme  Source: "README.txt"; DestDir: "{app}"; Flags: isreadme
 Source: "cygwin1.dll"; DestDir: "{app}"  Source: "c:\cygwin\bin\sh.exe"; DestDir: "{app}"
 Source: "sh.exe"; DestDir: "{app}"  Source: "c:\cygwin\bin\cygwin1.dll"; DestDir: "{app}"
 Source: "cygintl-8.dll"; DestDir: "{app}"  Source: "c:\cygwin\bin\cyggcc_s-1.dll"; DestDir: "{app}"
 Source: "cygiconv-2.dll"; DestDir: "{app}"  Source: "c:\cygwin\bin\cygintl-8.dll"; DestDir: "{app}"
 Source: "cygltdl-3.dll"; DestDir: "{app}"  Source: "c:\cygwin\bin\cygiconv-2.dll"; DestDir: "{app}"
 Source: "cygreadline6.dll"; DestDir: "{app}"  Source: "c:\cygwin\bin\cygltdl-7.dll"; DestDir: "{app}"
 Source: "cygncurses-8.dll"; DestDir: "{app}"  Source: "c:\cygwin\bin\cygreadline7.dll"; DestDir: "{app}"
 Source: "cygffi-2-00-beta.dll"; DestDir: "{app}"  Source: "c:\cygwin\bin\cygncursesw-10.dll"; DestDir: "{app}"
 Source: "gforth.fi"; DestDir: "{app}"  Source: "c:\cygwin\bin\cygffi-4.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/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 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 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 lib/gforth/$VERSION/libcc-named/.libs | sed -e 's:/:\\:g' -e 's,^\(..*\)$,Source: "lib\\gforth\\'$VERSION'\\libcc-named\\.libs\\\1"; DestDir: "{app}\\lib\\gforth\\'$VERSION'\\libcc-named\\.libs",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  $(make distfiles -f Makedist EXE=.exe | tr ' ' '\n' | grep -v engine.*exe | (while read i; do
   if [ ! -d $i ]; then echo $i; fi    if [ ! -d $i ]; then echo $i; fi
 done) | sed \  done) | sed \
Line 102  Name: "{group}\Gforth"; Filename: "{app} Line 112  Name: "{group}\Gforth"; Filename: "{app}
 Name: "{group}\Gforth-fast"; Filename: "{app}\gforth-fast.exe"; WorkingDir: "{app}"  Name: "{group}\Gforth-fast"; Filename: "{app}\gforth-fast.exe"; WorkingDir: "{app}"
 Name: "{group}\Gforth-dict"; Filename: "{app}\gforth-dict.exe"; WorkingDir: "{app}"  Name: "{group}\Gforth-dict"; Filename: "{app}\gforth-dict.exe"; WorkingDir: "{app}"
 Name: "{group}\Gforth-itc"; Filename: "{app}\gforth-itc.exe"; WorkingDir: "{app}"  Name: "{group}\Gforth-itc"; Filename: "{app}\gforth-itc.exe"; WorkingDir: "{app}"
 Name: "{group}\Gforth-prof"; Filename: "{app}\gforth-prof.exe"; WorkingDir: "{app}"  
 Name: "{group}\Gforth Manual"; Filename: "{app}\doc\gforth\index.html"; WorkingDir: "{app}"; Components: help  Name: "{group}\Gforth Manual"; Filename: "{app}\doc\gforth\index.html"; WorkingDir: "{app}"; Components: help
 Name: "{group}\Gforth Manual (PDF)"; Filename: "{app}\doc\gforth.pdf"; WorkingDir: "{app}"; Components: help  Name: "{group}\Gforth Manual (PDF)"; Filename: "{app}\doc\gforth.pdf"; WorkingDir: "{app}"; Components: help
 Name: "{group}\VMgen Manual"; Filename: "{app}\doc\vmgen\index.html"; WorkingDir: "{app}"; Components: help  Name: "{group}\VMgen Manual"; Filename: "{app}\doc\vmgen\index.html"; WorkingDir: "{app}"; Components: help
Line 110  Name: "{group}\Bash"; Filename: "{app}\s Line 119  Name: "{group}\Bash"; Filename: "{app}\s
 Name: "{group}\Uninstall Gforth"; Filename: "{uninstallexe}"  Name: "{group}\Uninstall Gforth"; Filename: "{uninstallexe}"
   
 [Run]  [Run]
 Filename: "{app}\gforth.exe"; WorkingDir: "{app}"; Parameters: "fixpath.fs {app} gforth-fast.exe"  Filename: "{app}\sh.exe"; WorkingDir: "{app}"; Parameters: "-c ""./gforthmi.sh || read"""
 Filename: "{app}\gforth.exe"; WorkingDir: "{app}"; Parameters: "fixpath.fs {app} gforth-ditc.exe"  Filename: "{app}\sh.exe"; WorkingDir: "{app}"; Parameters: "-c ""./gforth fixpath.fs gforth-fast.exe || read"""
 Filename: "{app}\gforth.exe"; WorkingDir: "{app}"; Parameters: "fixpath.fs {app} gforth-itc.exe"  Filename: "{app}\sh.exe"; WorkingDir: "{app}"; Parameters: "-c ""./gforth fixpath.fs gforth-ditc.exe || read"""
 Filename: "{app}\gforth.exe"; WorkingDir: "{app}"; Parameters: "fixpath.fs {app} gforth-prof.exe"  Filename: "{app}\sh.exe"; WorkingDir: "{app}"; Parameters: "-c ""./gforth fixpath.fs gforth-itc.exe || read"""
 Filename: "{app}\gforth-fast.exe"; WorkingDir: "{app}"; Parameters: "fixpath.fs {app} gforth.exe"  Filename: "{app}\sh.exe"; WorkingDir: "{app}"; Parameters: "-c ""./gforth-fast fixpath.fs gforth.exe || read"""
   
   [UninstallDelete]
   Type: files; Name: "{app}\gforth.fi"
   Type: files; Name: "{app}\temp-image.fi1"
   Type: files; Name: "{app}\temp-image.fi2"
   
   [Registry]
   Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}"; Check: NeedsAddPath(ExpandConstant('{app}'))
   
 ;[Registry]  ;[Registry]
 ;registry commented out  ;registry commented out
Line 132  Filename: "{app}\gforth-fast.exe"; Worki Line 149  Filename: "{app}\gforth-fast.exe"; Worki
 ;HKCR, "forthblock"; STRING, "Forth Block",  ;HKCR, "forthblock"; STRING, "Forth Block",
 ;HKCR, "forthblock", "EditFlags", DWORD, "00000000",  ;HKCR, "forthblock", "EditFlags", DWORD, "00000000",
 ;HKCR, "forthblock\DefaultIcon"; STRING, "{sys}\System32\shell32.dll,61"  ;HKCR, "forthblock\DefaultIcon"; STRING, "{sys}\System32\shell32.dll,61"
   
   [Code]
   function NeedsAddPath(Param: string): boolean;
   var
     OrigPath: string;
   begin
     if not RegQueryStringValue(HKEY_LOCAL_MACHINE,'SYSTEM\CurrentControlSet\Control\Session Manager\Environment', 'Path', OrigPath)
     then begin
       Result := True;
       exit;
     end;
     // look for the path with leading and trailing semicolon
     // Pos() returns 0 if not found
     Result := Pos(';' + UpperCase(Param) + ';', ';' + UpperCase(OrigPath) + ';') = 0;  
     if Result = True then
        Result := Pos(';' + UpperCase(Param) + '\;', ';' + UpperCase(OrigPath) + ';') = 0; 
   end;
 EOT  EOT
   
 recode utf8..l1/cl <README >README.txt  sed -e 's/$/\r/' <README >README.txt

Removed from v.1.19  
changed lines
  Added in v.1.29


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>