Changeset 1872

Show
Ignore:
Timestamp:
01/26/07 21:02:16 (2 years ago)
Author:
augur
Message:

Fixed lots of other installation location problems per Bill's email.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/swish-e/src/win32/filebase.nsh

    r1868 r1872  
    2828    File "../../COPYING.txt" 
    2929    File "fixperl.pl" 
     30 
     31    ; Misc Documents 
     32    SetOutPath "$INSTDIR\share\doc\swish-e" 
     33    File "../../INSTALL" 
     34    File "../../README.txt" 
     35    File "../../README.cvs" 
    3036     
    3137    ; Local Helper Files 
     
    3440    File "../../prog-bin/spider.pl.in" 
    3541     
     42 
     43 
    3644    ; Create shorcuts on the Start Menu 
    3745    SetOutPath "$SMPROGRAMS\SWISH-E\" 
     
    4452    WriteINIStr "$SMPROGRAMS\\SWISH-E\\PERL_Resources\\CPAN_PERL_Modules.url" "InternetShortcut" "URL" "http://search.cpan.org/" 
    4553SectionEnd ; end of default section 
     54 
     55; User and Developer Documentation 
     56Section "Documentation" SecDoc 
     57    SetOutPath "$INSTDIR\share\doc\swish-e\html" 
     58    File "../../html/*.html" 
     59    File "../../html/*.css" 
     60    SetOutPath "$INSTDIR\share\doc\swish-e\pod" 
     61    File "../../pod/*.pod" 
     62SectionEnd 
    4663 
    4764; the static libraries are 20 MB. 
     
    148165        File "../../filters/swish-filter-test.in" 
    149166         
    150         SetOutPath "$INSTDIR\share\doc\swish-e\filter-bin\" 
     167        SetOutPath "$INSTDIR\share\doc\swish-e\examples\filter-bin\" 
    151168        ; Example Filter Scripts 
    152169        File "../../filter-bin/_binfilter.sh" 
    153170        File "../../filter-bin/_pdf2html.pl" 
    154          
    155         # Generic SWISH::Filter Filter 
    156         SetOutPath "$INSTDIR\lib\swish-e\" 
    157171        File "../../filter-bin/swish_filter.pl.in" 
    158172 
    159173        # SWISH::Filter API 
    160         SetOutPath "$INSTDIR\lib\swish-e\perl\
    161         File "../../filters/SWISH/*
    162         SetOutPath "$INSTDIR\lib\swish-e\perl\Filters\
    163         File "../../filters/SWISH/Filters/*
     174        SetOutPath "$INSTDIR\lib\swish-e\perl\SWISH\
     175        File "../../filters/SWISH/Filter.pm.in
     176        SetOutPath "$INSTDIR\lib\swish-e\perl\SWISH\Filters
     177        File "../../filters/SWISH/Filters/*.pm
    164178 
    165179    SectionEnd 
     
    168182        WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\SWISH-E Team\SWISH-E\${VERSION}\Options" "Perl" "1" 
    169183        WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\SWISH-E Team\SWISH-E\${VERSION}\Options" "PerlMethods" "1" 
    170         SetOutPath "$INSTDIR\share\doc\swish-e\prog-bin\" 
     184        SetOutPath "$INSTDIR\share\doc\swish-e\examples\prog-bin\" 
    171185        File "../../prog-bin/*.pl" 
    172         File "../../prog-bin/*.in" 
     186        File "../../prog-bin/*.pl.in" 
    173187        File "../../prog-bin/*.pm" 
    174188    SectionEnd 
     
    176190  
    177191Section "Examples" SecExample 
    178     SetOutPath "$INSTDIR\share\doc\swish-e\conf\" 
    179     File "../../conf/*" 
    180     SetOutPath "$INSTDIR\share\doc\swish-e\conf\stopwords\" 
    181     File "../../conf/stopwords/*" 
     192    SetOutPath "$INSTDIR\share\doc\swish-e\examples\conf\" 
     193    File "../../conf/*.config" 
     194    File "../../conf/README.txt" 
     195    SetOutPath "$INSTDIR\share\doc\swish-e\examples\conf\stopwords\" 
     196    File "../../conf/stopwords/*.txt" 
    182197 
    183198    ; Rename text files so Windows has a clue 
     
    203218     
    204219    ; Add swish-e.exe to the Win32 Path 
    205     WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\AppPaths\swish-e.exe" "" "$INSTDIR\swish-e.exe" 
    206     WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\AppPaths\swish-e.exe" "Path" "$INSTDIR;$INSTDIR\lib\swish-e" 
     220    WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\AppPaths\swish-e.exe" "" "$INSTDIR\bin\swish-e.exe" 
     221    WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\AppPaths\swish-e.exe" "Path" "$INSTDIR\bin;$INSTDIR\lib\swish-e" 
    207222     
    208223    WriteUninstaller "uninst.exe"