Navigation

Changeset 17378

Timestamp:

2008-09-25 12:20:31 (4 months ago)

Author:

oranfry

Message:

use the individually zipped components instead of loose files

Files:

r17308	r17378
19	19	<property name="rk.os" value="windows" />
20	20
	21	<property name="bundled.version.imagemagick" value="6.4.3"/>
	22	<property name="bundled.version.ghostscript" value="8.63"/>
	23
21	24	<!-- IMPORT OTHER ANT SCRIPTS -->
22	25	<import file="shared-ant-scripts/init.xml"/>
…	…
25	28	<import file="compile.xml"/>
26	29	<import file="create-distribution.xml"/>
	30	<import file="create-components.xml"/>
27	31	<import file="create-installer.xml"/>
28	32	<import file="wrap.xml"/>
…	…
32	36	<antcall target="compile"/>
33	37	<antcall target="create-distribution"/>
	38	<antcall target="create-components"/>
34	39	<antcall target="create-installer"/>
35	40	<antcall target="wrap"/>

r17308	r17378
16	16	<fileset dir="${wirk2.home}/greenstone2/installer-classes"/>
17	17	<fileset dir="${wirk2.home}/windows/installer-classes"/>
	18	<fileset dir="${wirk2.home}/packages/7za" includes="7za.exe"/>
	19	<fileset file="${basedir}/distributions/web/LICENSE.txt"/>
18	20	</copy>
19	21	<unjar src="${wirk2.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
…	…
24	26
25	27	<target name="compile-installer">
	28
26	29	<installer file="${basedir}/installer/greenstone-${version}-win32.jar"
27	30	compress="true"
…	…
35	38
36	39	<zipfileset dir="${basedir}/installer/classes" includes="*/" />
37		<zipfileset dir="${basedir}/distributions/web" includes="*/" />
	40	<zipfileset dir="${basedir}/components" includes="*.lzma" />
	41	</installer>
	42
	43	<dcff file="${basedir}/installer/antinstall-config.xml" startTag=".<!-- start full -->." endTag=".<!-- end full -->." />
	44
	45	<installer file="${basedir}/installer/Greenstone-${version}-win32-minimal.jar"
	46	compress="true"
	47	extractType="NonExtractor"
	48	installConfig="${basedir}/installer/antinstall-config.xml"
	49	buildFile="${basedir}/installer/build.xml"
	50	antInstallLib="${wirk2.home}/packages/ant-installer/lib"
	51	antLib="${wirk2.home}/packages/ant/lib"
	52	validateConfig="true"
	53	icons="bluecurve">
	54
	55	<zipfileset dir="${basedir}/installer/classes" includes="*/" />
	56	<zipfileset dir="${basedir}/components" includes="core.lzma" />
38	57	</installer>
39	58

r17308	r17378
100	100	<target name="link-wrapper">
101	101	<exec executable="link" dir="${basedir}/wrapped-installer/build">
102		<arg line="/OUT:..\greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/>
	102	<arg line="/OUT:..\Greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/>
103	103	</exec>
104	104	</target>