Navigation

← Previous Changeset
Next Changeset →

Changeset 1816

Timestamp:

09/11/06 00:15:16 (2 years ago)

Author:

augur

Message:

Updated Windows NSIS installer in prep for Swish-e 2.4.4 release.
Lots of weird bugs in NSIS 2.0.6. "File /r" results in mov to null address at run time. NSIS is getting confused sometimes between \ and /.
Removed html documentation. Replaced with a link to swish-e.org/docs/

Files:

trunk/swish-e/src/win32/filebase.nsh (modified) (6 diffs)
trunk/swish-e/src/win32/release.nsi (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/swish-e/src/win32/filebase.nsh

r1763	r1816
4	4
5	5	; System Files
6		SetOutPath "$SYSDIR"
7		; Expat, LibXML2, and ZLib
8		File ../../../libxml2/lib/*.dll
9		;File ../../../libxml2/bin/*.dll
10		File ../../../zlib/bin/*.dll
11		File ../../../pcre/bin/*.dll
12		;File ../expat/bin/*.dll
13		File ../.libs/*.dll
14
	6	SetOutPath "$INSTDIR\bin\"
	7
	8	; LibXML2, PCRE, and ZLib
	9	File "../../../libxml2/bin/libxml2-2.dll"
	10	File "../../../zlib/bin/zlib1.dll"
	11	File "../../../pcre/bin/pcre.dll"
	12	File "../../../pcre/bin/pcreposix.dll"
	13	File "../.libs/libswish-e-2.dll"
	14	File "../.libs/swish-e.exe"
	15
	16	; We really need to do this instead but NSIS 2.06 segfaults when using UpgradeDLL.
	17	;!define UPGRADEDLL_NOREGISTER 1
	18	;!insertmacro UpgradeDLL "../../../libxml2/bin/libxml2-2.dll" "$SYSDIR\libxml2-2.dll" "$SYSDIR"
	19	;!insertmacro UpgradeDLL "../../../zlib/bin/zlib1.dll" "$SYSDIR\zlib1.dll" "$SYSDIR"
	20	;!insertmacro UpgradeDLL "../../../pcre/bin/pcre.dll" "$SYSDIR\pcre.dll" "$SYSDIR"
	21	;!insertmacro UpgradeDLL "../../../pcre/bin/pcreposix.dll" "$SYSDIR\pcreposix.dll" "$SYSDIR"
	22	;!insertmacro UpgradeDLL "../.libs/libswish-e-2.dll" "$SYSDIR\libswish-e-2.dll" "$SYSDIR"
	23
	24
15	25
16	26	; Local Files
17		SetOutPath "$INSTDIR"
18		File ../../COPYING.txt
19		File ../.libs/swish-e.exe
20		File fixperl.pl
21		Delete /REBOOTOK "$INSTDIR/*.dll"
	27	SetOutPath "$INSTDIR\"
	28	File "../../COPYING.txt"
	29	File "fixperl.pl"
22	30
23	31	; Local Helper Files
24		SetOutPath "$INSTDIR\lib\swish-e"
25		File ~~../swishspider~~
26		File ~~../../prog-bin/spider.pl.in~~
	32	SetOutPath "$INSTDIR\lib\swish-e\"
	33	File "../swishspider"
	34	File "../../prog-bin/spider.pl.in"
27	35
28	36	; Create shorcuts on the Start Menu
29	37	SetOutPath "$SMPROGRAMS\SWISH-E\"
30		CreateShortcut "$SMPROGRAMS/SWISH-E/Browse Files.lnk" "$INSTDIR/"
31		WriteINIStr "$SMPROGRAMS/SWISH-E/Website.url" "InternetShortcut" "URL" "http://swish-e.org/"
32		CreateShortcut "$SMPROGRAMS/SWISH-E/License.lnk" "$INSTDIR/COPYING.txt"
33		SetOutPath "$SMPROGRAMS\SWISH-E\PERL_Resources"
34		WriteINIStr "$SMPROGRAMS/SWISH-E/PERL_Resources/Install_ActivePerl.url" "InternetShortcut" "URL" "http://www.activestate.com/Products/Download/Download.plex?id=ActivePerl"
35		WriteINIStr "$SMPROGRAMS/SWISH-E/PERL_Resources/CPAN_PERL_Modules.url" "InternetShortcut" "URL" "http://search.cpan.org/"
	38	CreateShortcut "$SMPROGRAMS\\SWISH-E\\Browse Files.lnk" "$INSTDIR\\"
	39	WriteINIStr "$SMPROGRAMS\\SWISH-E\\Website.url" "InternetShortcut" "URL" "http://swish-e.org/"
	40	WriteINIStr "$SMPROGRAMS\\SWISH-E\\Documentation.url" "InternetShortcut" "URL" "http://swish-e.org/docs/"
	41	CreateShortcut "$SMPROGRAMS\\SWISH-E\\License.lnk" "$INSTDIR\\COPYING.txt"
	42	SetOutPath "$SMPROGRAMS\SWISH-E\PERL_Resources\"
	43	WriteINIStr "$SMPROGRAMS\\SWISH-E\\PERL_Resources\\Install_ActivePerl.url" "InternetShortcut" "URL" "http://www.activestate.com/Products/Download/Download.plex?id=ActivePerl"
	44	WriteINIStr "$SMPROGRAMS\\SWISH-E\\PERL_Resources\\CPAN_PERL_Modules.url" "InternetShortcut" "URL" "http://search.cpan.org/"
36	45	SectionEnd ; end of default section
37	46
38		Section "Documentation" SecDocs
39		SectionIn 1
40		SetOutPath "$INSTDIR\share\doc\swish-e"
41		RMDIR /r "$INSTDIR/html"
42		File /r ../../html
43
44		; Create shorcuts on the Start Menu
45		SetOutPath "$SMPROGRAMS\SWISH-E\Documentation\"
46		;WriteINIStr "$SMPROGRAMS/SWISH-E/Documentation/Docs.url" "InternetShortcut" "URL" "file://$INSTDIR/share/doc/swish-e/html/index.html"
47		WriteINIStr "$SMPROGRAMS/SWISH-E/Documentation/Readme.url" "InternetShortcut" "URL" "file://$INSTDIR/share/doc/swish-e/html/README.html"
48		WriteINIStr "$SMPROGRAMS/SWISH-E/Documentation/CONFIG-Config_File_Directives.url" "InternetShortcut" "URL" "file://$INSTDIR/share/doc/swish-e/html/SWISH-CONFIG.html"
49		WriteINIStr "$SMPROGRAMS/SWISH-E/Documentation/RUN-Command_Line_Switches.url" "InternetShortcut" "URL" "file://$INSTDIR/share/doc/swish-e/html/SWISH-RUN.html"
50		WriteINIStr "$SMPROGRAMS/SWISH-E/Documentation/SEARCH-Searching_Instructions.url" "InternetShortcut" "URL" "file://$INSTDIR/share/doc/swish-e/html/SWISH-SEARCH.html"
51		WriteINIStr "$SMPROGRAMS/SWISH-E/Documentation/FAQ-Frequently_Asked_Questions.url" "InternetShortcut" "URL" "file://$INSTDIR/share/doc/swish-e/html/SWISH-FAQ.html"
52		WriteINIStr "$SMPROGRAMS/SWISH-E/Documentation/CGI-Web_Interfacing.url" "InternetShortcut" "URL" "file://$INSTDIR/share/doc/swish-e/html/swish.html"
53		WriteINIStr "$SMPROGRAMS/SWISH-E/Documentation/Spidering_Remote_Websites.url" "InternetShortcut" "URL" "file://$INSTDIR/share/doc/swish-e/html/spider.html"
54		WriteINIStr "$SMPROGRAMS/SWISH-E/Documentation/Filtering_Documents.url" "InternetShortcut" "URL" "file://$INSTDIR/share/doc/swish-e/html/Filter.html"
55		WriteINIStr "$SMPROGRAMS/SWISH-E/Documentation/Known_Bugs.url" "InternetShortcut" "URL" "file://$INSTDIR/share/doc/swish-e/html/SWISH-BUGS.html"
56		;WriteINIStr "$SMPROGRAMS/SWISH-E/Questions_and_Troubleshooting.url" "InternetShortcut" "URL" "file://$INSTDIR/share/doc/swish-e/html/INSTALL.html#QUESTIONS_AND_TROUBLESHOOTING"
57		SectionEnd ; end of section 'Documentation'
58
59		;Section "ActiveX Control" SecSwishCtl
60		; System Files
61		; SetOutPath "$SYSDIR"
62		; SWISH-E Control
63		; File ../../../swishctl/swishctl.dll
64		; RegDLL $SYSDIR/swishctl.dll
65
66		; Local Files
67		; SetOutPath "$INSTDIR"
68		; JavaScript ActiveX Search Example
69		; File /r ../../../swishctl/example
70
71		; Create shorcuts on the Start Menu
72		; SetOutPath "$SMPROGRAMS/SWISH-E/"
73		; WriteINIStr "$SMPROGRAMS/SWISH-E/Search_Documentation.url" "InternetShortcut" "URL" "file://$INSTDIR/example/index.htm"
74		; WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE/SWISH-E Team/SwishCtl/Options" "DLLVersion" "1007"
75		; WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE/SWISH-E Team/SwishCtl/Options" "IndexLocation" "$INSTDIR/example"
76		; WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE/SWISH-E Team/SwishCtl/Options" "swishdocs" "docs.idx"
77		;SectionEnd ; end of ActiveX section
	47	; the static libraries are 20 MB.
	48	;Section "Developer Files" SecDev
	49	; SetOutPath "$INSTDIR\lib\"
	50	; File "../.libs/libswish-e.a"
	51	; File "../.libs/libswish-e.dll.a"
	52	; File "../.libs/libswishindex.a"
	53	;
	54	; SetOutPath "$INSTDIR\include\"
	55	; File "../swish-e.h"
	56	;SectionEnd
78	57
79	58	SubSection "Document Filters" SubSecFilters
80		Section "~~Word Doc~~ Filters" SecDocFilter
	59	Section "MS Office Filters" SecDocFilter
81	60	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\SWISH-E Team\SWISH-E\${VERSION}\Options" "catdoc" "1"
82		~~SetOutPath "$INSTDIR\lib\swish-e"~~
83
84		~~; catdoc~~
85		File ~~../../../catdoc/win32/catdoc.exe~~
86		File /oname=COPYING-catdoc ../../../catdoc/COPYING
87		~~File /r ../../../catdoc/charsets~~
88
89		; This needs to be rebuilt against SWISH-E libraries. I can't really include the binary from GnuWin32.
90		; wvware
91		~~;WriteRedStr HKEY_LOCAL_MACHINE "SOFTWARE/SWISH-E Team/SWISH-E/${VERSION}/Options" "wvware" "1~~"
92		~~;File ../../../wvware/bin/wvware.exe~~
	61
	62	SetOutPath "$INSTDIR\bin\"
	63	File "../../../catdoc/catdoc.exe"
	64	File "../../../catdoc/catppt.exe"
	65	File "../../../catdoc/xls2csv.exe"
	66
	67	SetOutPath "$INSTDIR\share\doc\catdoc"
	68	File "../../../catdoc/COPYING"
	69
	70	SetOutPath "$INSTDIR\charsets\"
	71	File "../../../catdoc/charsets/*"
93	72	SectionEnd
94	73	Section "PDF Filter" SecPDFFilter
95	74	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\SWISH-E Team\SWISH-E\${VERSION}\Options" "xpdf" "1"
96		SetOutPath "$INSTDIR\lib\swish-e"
97		File /oname=COPYING-xpdf ../../../xpdf/COPYING
98		File ../../../xpdf/pdfinfo.*
99		File ../../../xpdf/pdftotext.*
100		File ../../../xpdf/sample-xpdfrc
101		File ../../../xpdf/xpdfrc.txt
	75
	76	SetOutPath "$INSTDIR\bin\"
	77	File "../../../xpdf/pdfinfo.exe"
	78	File "../../../xpdf/pdftotext.exe"
	79
	80	SetOutPath "$INSTDIR\share\doc\xpdf\"
	81	File "../../../xpdf/COPYING"
	82	File "../../../xpdf/README"
	83	File "../../../xpdf/pdfinfo.txt"
	84	File "../../../xpdf/pdftotext.txt"
	85	File "../../../xpdf/sample-xpdfrc"
	86	File "../../../xpdf/xpdfrc.txt"
102	87	SectionEnd
103	88	SubSectionEnd
…	…
109	94
110	95	; SWISH::API Scripts
111		SetOutPath "$INSTDIR\lib\swish-e\perl\SWISH"
112		; File /r ../../perl/blib/lib/SWISH
113		File ../../perl/API.pm
	96	SetOutPath "$INSTDIR\lib\swish-e\perl\SWISH\"
	97	File "../../perl/API.pm"
114	98
115	99	; SWISH::API Binaries go into $PERL/lib/auto/SWISH/API
116	100	Call ActivePerlLocation
117	101	Pop $R1
118		SetOutPath "$R1\lib"
119		File ~~/r ../../perl/blib/arch/auto~~
	102	SetOutPath "$R1\lib\SWISH\API\"
	103	File "../../perl/blib/arch/auto/SWISH/API/*"
120	104	SectionEnd
121	105
…	…
124	108
125	109	; swish.cgi scripts
126		SetOutPath "$INSTDIR\lib\swish-e"
127		File ~~../../example/swish.cgi.in~~
128		File ~~../../example/search.cgi.in~~
	110	SetOutPath "$INSTDIR\lib\swish-e\"
	111	File "../../example/swish.cgi.in"
	112	File "../../example/search.cgi.in"
129	113
130	114	; swish.cgi other stuff
131		SetOutPath "$INSTDIR\share\swish-e"
132		File ~~../../example/swish.tt~~
133		File ~~../../example/swish.tmpl~~
134		File ~~../../example/swish.gif~~
135		File ~~../../example/README.txt~~
	115	SetOutPath "$INSTDIR\share\swish-e\"
	116	File "../../example/swish.tt"
	117	File "../../example/swish.tmpl"
	118	File "../../example/swish.gif"
	119	File "../../example/README.txt"
136	120
137	121	; swish.cgi templates
138		SetOutPath "$INSTDIR\share\swish-e\templates"
139		File ~~../../example/templates/search.tt~~
140		File ~~../../example/templates/page_layout~~
141		File ~~../../example/templates/common_header~~
142		File ~~../../example/templates/common_footer~~
143		File ~~../../example/templates/style.css~~
144		File ~~../../example/templates/markup.css~~
	122	SetOutPath "$INSTDIR\share\swish-e\templates\"
	123	File "../../example/templates/search.tt"
	124	File "../../example/templates/page_layout"
	125	File "../../example/templates/common_header"
	126	File "../../example/templates/common_footer"
	127	File "../../example/templates/style.css"
	128	File "../../example/templates/markup.css"
145	129
146	130	; swish.cgi Modules
147		SetOutPath "$INSTDIR\lib\swish-e\perl\SWISH"
148		File ~~../../example/modules/SWISH/DateRanges.pm~~
149		File ~~../../example/modules/SWISH/DefaultHighlight.pm~~
150		File ~~../../example/modules/SWISH/PhraseHighlight.pm~~
151		File ~~../../example/modules/SWISH/SimpleHighlight.pm~~
152		File ~~../../example/modules/SWISH/TemplateDefault.pm~~
153		File ~~../../example/modules/SWISH/TemplateDumper.pm~~
154		File ~~../../example/modules/SWISH/TemplateFrame.pm~~
155		File ~~../../example/modules/SWISH/TemplateHTMLTemplate.pm~~
156		File ~~../../example/modules/SWISH/TemplateToolkit.pm~~
157		File ~~../../example/modules/SWISH/ParseQuery.pm~~
	131	SetOutPath "$INSTDIR\lib\swish-e\perl\SWISH\"
	132	File "../../example/modules/SWISH/DateRanges.pm"
	133	File "../../example/modules/SWISH/DefaultHighlight.pm"
	134	File "../../example/modules/SWISH/PhraseHighlight.pm"
	135	File "../../example/modules/SWISH/SimpleHighlight.pm"
	136	File "../../example/modules/SWISH/TemplateDefault.pm"
	137	File "../../example/modules/SWISH/TemplateDumper.pm"
	138	File "../../example/modules/SWISH/TemplateFrame.pm"
	139	File "../../example/modules/SWISH/TemplateHTMLTemplate.pm"
	140	File "../../example/modules/SWISH/TemplateToolkit.pm"
	141	File "../../example/modules/SWISH/ParseQuery.pm"
158	142	SectionEnd
159	143
…	…
161	145	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\SWISH-E Team\SWISH-E\${VERSION}\Options" "Perl" "1"
162	146	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\SWISH-E Team\SWISH-E\${VERSION}\Options" "PerlFilters" "1"
163		SetOutPath "$INSTDIR"
164		File ~~../../filters/swish-filter-test.in~~
165
166		SetOutPath "$INSTDIR\share\doc\swish-e\filter-bin"
	147	SetOutPath "$INSTDIR\bin\"
	148	File "../../filters/swish-filter-test.in"
	149
	150	SetOutPath "$INSTDIR\share\doc\swish-e\filter-bin\"
167	151	; Example Filter Scripts
168		File ~~../../filter-bin/_binfilter.sh~~
169		File ~~../../filter-bin/_pdf2html.pl~~
	152	File "../../filter-bin/_binfilter.sh"
	153	File "../../filter-bin/_pdf2html.pl"
170	154
171	155	# Generic SWISH::Filter Filter
172		SetOutPath "$INSTDIR\lib\swish-e"
173		File ~~../../filter-bin/swish_filter.pl.in~~
	156	SetOutPath "$INSTDIR\lib\swish-e\"
	157	File "../../filter-bin/swish_filter.pl.in"
174	158
175	159	# SWISH::Filter API
176		SetOutPath "$INSTDIR\lib\swish-e\perl"
177		File /r ../../filters/SWISH
	160	SetOutPath "$INSTDIR\lib\swish-e\perl\"
	161	File "../../filters/SWISH/*"
	162	SetOutPath "$INSTDIR\lib\swish-e\perl\Filters\"
	163	File "../../filters/SWISH/Filters/*"
	164
178	165	SectionEnd
179	166
…	…
181	168	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\SWISH-E Team\SWISH-E\${VERSION}\Options" "Perl" "1"
182	169	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\SWISH-E Team\SWISH-E\${VERSION}\Options" "PerlMethods" "1"
183		SetOutPath "$INSTDIR\share\doc\swish-e\prog-bin"
184		File ~~../../prog-bin/*.pl~~
185		File ~~../../prog-bin/*.in~~
186		File ~~../../prog-bin/*.pm~~
	170	SetOutPath "$INSTDIR\share\doc\swish-e\prog-bin\"
	171	File "../../prog-bin/*.pl"
	172	File "../../prog-bin/*.in"
	173	File "../../prog-bin/*.pm"
187	174	SectionEnd
188	175	SubSectionEnd
189	176
190	177	Section "Examples" SecExample
191		SetOutPath "$INSTDIR\share\doc\swish-e\"
192		File /r ../../conf
	178	SetOutPath "$INSTDIR\share\doc\swish-e\conf\"
	179	File "../../conf/*"
	180	SetOutPath "$INSTDIR\share\doc\swish-e\conf\stopwords\"
	181	File "../../conf/stopwords/*"
193	182
194	183	; Rename text files so Windows has a clue
…	…
218	207
219	208	WriteUninstaller "uninst.exe"
	209
	210	; Clean out older versions of Swish-e and libs
	211	Delete "$INSTDIR/swish-e.exe"
	212	Delete "$INSTDIR/*.dll"
220	213
221	214	; Is ActivePerl Installed?

trunk/swish-e/src/win32/release.nsi

r1764	r1816
15	15	LicenseData "../../COPYING.txt"
16	16
17		InstallDir "~~$PROGRAMFILES~~\SWISH-E"
	17	InstallDir "C:\SWISH-E"
18	18	InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\SWISH-E Team\SWISH-E\${VERSION}" ""
19	19	;DirShow show ; (make this hide to not let the user change it)
…	…
36	36
37	37	; Basic Sections
	38	;!include UpgradeDLL.nsh
38	39	!include filebase.nsh
39	40

Navigation

Changeset 1816

Legend:

trunk/swish-e/src/win32/filebase.nsh

trunk/swish-e/src/win32/release.nsi

Download in other formats: