Changeset 1560

Show
Ignore:
Timestamp:
12/03/04 03:13:59 (4 years ago)
Author:
augur
Message:

Update version numbers.
Change build-perl to pass -MD instead of -MT.
Fixed NSIS filenames. / and \ are not interchangable on the Windows makensis.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/swish-e/src/win32/acconfig.h

    r1556 r1560  
    4040 
    4141/* Macros which rewrite values  */ 
    42 #define SWISH_VERSION "2.4.3" /* Should we find a better way to handle this */ 
     42#define SWISH_VERSION "2.4.3-pr1"     /* Should we find a better way to handle this */ 
    4343#define VERSION SWISH_VERSION   /* Some things want this  */ 
    4444 
  • trunk/swish-e/src/win32/build-perl.bat

    r1460 r1560  
    1 perl Makefile.pl LIBS="../src/win32/libswish-e-mt.lib ../../zlib/lib/zlib.lib libcmt.lib" OPTIMIZE="-MT -Zi -DNDEBUG -O1 -I../src" 
     1 
     2perl Makefile.pl LIBS="../src/win32/libswish-e.lib ../../zlib/lib/zlib.lib msvcrt.lib" OPTIMIZE="-MD -Zi -DNDEBUG -O1 -I../src" SWISHIGNOREVER=1  SWISHSKIPTEST=1 
  • trunk/swish-e/src/win32/filebase.nsh

    r1521 r1560  
    77    ; Expat, LibXML2, and ZLib 
    88    File ..\..\..\iconv\lib\*.dll 
    9     File ..\..\..\libxml2\lib\*.dll 
    10     File ..\..\..\zlib\lib\*.dll 
     9    File ..\..\..\libxml2\bin\*.dll 
     10    File ..\..\..\zlib\bin\*.dll 
    1111    File ..\..\..\pcre\bin\*.dll 
    1212    File ..\expat\bin\*.dll 
     
    121121        ; swish.cgi scripts 
    122122        SetOutPath "$INSTDIR\lib\swish-e" 
    123         File ../../examples/swish.cgi.in 
    124         File ../../examples/search.cgi.in 
     123        File ..\..\example\swish.cgi.in 
     124        File ..\..\example\search.cgi.in 
    125125 
    126126        ; swish.cgi other stuff 
    127127        SetOutPath "$INSTDIR\share\swish-e" 
    128         File ../../examples/swish.tt 
    129         File ../../examples/swish.tmpl 
    130         File ../../examples/swish.gif 
    131         File ../../examples/README 
     128        File ..\..\example\swish.tt 
     129        File ..\..\example\swish.tmpl 
     130        File ..\..\example\swish.gif 
     131        File ..\..\example\README 
    132132 
    133133        ; swish.cgi templates 
    134134        SetOutPath "$INSTDIR\share\swish-e\templates" 
    135         File ../../examples/templates/search.tt 
    136         File ../../examples/templates/page_layout 
    137         File ../../examples/templates/common_header 
    138         File ../../examples/templates/common_footer 
    139         File ../../examples/templates/style.css 
    140         File ../../examples/templates/markup.css 
     135        File ..\..\example\templates\search.tt 
     136        File ..\..\example\templates\page_layout 
     137        File ..\..\example\templates\common_header 
     138        File ..\..\example\templates\common_footer 
     139        File ..\..\example\templates\style.css 
     140        File ..\..\example\templates\markup.css 
    141141 
    142142        ; swish.cgi Modules 
    143143        SetOutPath "$INSTDIR\lib\swish-e\perl\SWISH" 
    144         File ../../examples/modules/SWISH/DateRanges.pm 
    145         File ../../examples/modules/SWISH/DefaultHighlight.pm 
    146         File ../../examples/modules/SWISH/PhraseHighlight.pm 
    147         File ../../examples/modules/SWISH/SimpleHighlight.pm 
    148         File ../../examples/modules/SWISH/TemplateDefault.pm 
    149         File ../../examples/modules/SWISH/TemplateDumper.pm 
    150         File ../../examples/modules/SWISH/TemplateFrame.pm 
    151         File ../../examples/modules/SWISH/TemplateHTMLTemplate.pm 
    152         File ../../examples/modules/SWISH/TemplateToolkit.pm 
    153         File ../../examples/modules/SWISH/ParseQuery.pm 
     144        File ..\..\example\modules\SWISH\DateRanges.pm 
     145        File ..\..\example\modules\SWISH\DefaultHighlight.pm 
     146        File ..\..\example\modules\SWISH\PhraseHighlight.pm 
     147        File ..\..\example\modules\SWISH\SimpleHighlight.pm 
     148        File ..\..\example\modules\SWISH\TemplateDefault.pm 
     149        File ..\..\example\modules\SWISH\TemplateDumper.pm 
     150        File ..\..\example\modules\SWISH\TemplateFrame.pm 
     151        File ..\..\example\modules\SWISH\TemplateHTMLTemplate.pm 
     152        File ..\..\example\modules\SWISH\TemplateToolkit.pm 
     153        File ..\..\example\modules\SWISH\ParseQuery.pm 
    154154    SectionEnd 
    155155     
  • trunk/swish-e/src/win32/release.nsi

    r1440 r1560  
    22OutFile "swishsetup.exe" 
    33 
    4 !define VERSION "2.4.1" 
     4!define VERSION "2.4.3-pr1" 
    55 
    66; Some default compiler settings (uncomment and change at will):