Changeset 17583
- Timestamp:
- 2008-10-23 15:40:07 (3 months ago)
- Files:
-
- release-kits/wirk2/ant-scripts/compile.xml (modified) (1 diff)
- release-kits/wirk2/ant-scripts/create-distribution.xml (modified) (1 diff)
- release-kits/wirk2/ant-scripts/create-installer.xml (modified) (2 diffs)
- release-kits/wirk2/installer/antinstall-config.xml (modified) (5 diffs)
- release-kits/wirk2/installer/build.xml (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
release-kits/wirk2/ant-scripts/compile.xml
r17437 r17583 9 9 <antcall target="insert-perl" /> 10 10 <antcall target="compile-c-code" /> 11 <antcall target="compile-search4j-windows" /> <!-- from rk2-targets -->12 11 <antcall target="compile-uninstaller" /> <!-- from rk2-targets --> 13 12 <antcall target="build-demo-collection" /> release-kits/wirk2/ant-scripts/create-distribution.xml
r17441 r17583 36 36 <fileset dir="${basedir}/gsdl/bin/windows" includes="**/*"/> 37 37 </copy> 38 <copy todir="${basedir}/distributions/web/bin" file="${basedir}/gsdl/bin/search4j.exe"/>39 38 <copy todir="${basedir}/distributions/web" file="${basedir}/gsdl/bin/windows/server.exe"/> 40 39 </target> release-kits/wirk2/ant-scripts/create-installer.xml
r17523 r17583 29 29 30 30 <target name="compile-installer"> 31 31 32 <!-- binary installer --> 33 <copy file="${basedir}/installer/antinstall-config.xml" tofile="${basedir}/installer/antinstall-config-binary.xml"/> 34 <dcff file="${basedir}/installer/antinstall-config-binary.xml" startTag=".*<!-- start sourcecode -->.*" endTag=".*<!-- end sourcecode -->.*" /> 32 35 <installer file="${basedir}/installer/greenstone-${version}-win32.jar" 33 36 compress="true" 34 37 extractType="NonExtractor" 35 installConfig="${basedir}/installer/antinstall-config .xml"38 installConfig="${basedir}/installer/antinstall-config-binary.xml" 36 39 buildFile="${basedir}/installer/build.xml" 37 40 antInstallLib="${wirk2.home}/packages/ant-installer/lib" … … 41 44 42 45 <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> 43 <zipfileset dir="${basedir}/components" includes="*.lzma" />46 <zipfileset dir="${basedir}/components" includes="*.lzma" excludes="sourcecode.lzma" /> 44 47 </installer> 45 48 46 <dcff file="${basedir}/installer/antinstall-config.xml" startTag=".*<!-- start full -->.*" endTag=".*<!-- end full -->.*" /> 47 49 <!-- minimal installer --> 50 <copy file="${basedir}/installer/antinstall-config.xml" tofile="${basedir}/installer/antinstall-config-minimal.xml"/> 51 <dcff file="${basedir}/installer/antinstall-config-minimal.xml" startTag=".*<!-- start bundled components -->.*" endTag=".*<!-- end bundled components -->.*" /> 52 <dcff file="${basedir}/installer/antinstall-config-minimal.xml" startTag=".*<!-- start sourcecode -->.*" endTag=".*<!-- end sourcecode -->.*" /> 48 53 <installer file="${basedir}/installer/Greenstone-${version}-win32-minimal.jar" 49 54 compress="true" 50 55 extractType="NonExtractor" 51 installConfig="${basedir}/installer/antinstall-config .xml"56 installConfig="${basedir}/installer/antinstall-config-minimal.xml" 52 57 buildFile="${basedir}/installer/build.xml" 53 58 antInstallLib="${wirk2.home}/packages/ant-installer/lib" release-kits/wirk2/installer/antinstall-config.xml
r17576 r17583 46 46 47 47 <target 48 target="Looking For Previous Installation" 49 diskRequirement="x" 50 defaultValue="true" 51 displayText="x" 52 force="true" 53 hidden="true"/> 54 55 <target 48 56 target="Installing Core System" 49 57 diskRequirement="@component.size.core@" … … 58 66 displayText=""/> 59 67 60 <!-- start full-->68 <!-- start bundled components --> 61 69 <target 62 target="Install ImageMagick"70 target="Installing ImageMagick" 63 71 diskRequirement="@component.size.imagemagick@" 64 72 defaultValue="true" 65 73 displayText=""/> 66 67 74 <target 68 75 target="Installing Ghostscript" … … 70 77 defaultValue="true" 71 78 displayText=""/> 72 79 <!-- end bundled components --> 80 81 <!-- start sourcecode --> 73 82 <target 74 83 target="Installing Source Code" … … 76 85 defaultValue="false" 77 86 displayText=""/> 78 <!-- end full-->87 <!-- end sourcecode --> 79 88 80 89 </page> … … 85 94 </page> 86 95 87 <page type="progress" name="progress" showTargets=" false" displayText=""></page>96 <page type="progress" name="progress" showTargets="true" displayText=""></page> 88 97 89 98 </installer> release-kits/wirk2/installer/build.xml
r17576 r17583 29 29 <property name="installDir.local" refid="installDir.path"/> 30 30 31 <target name=" load-previous-props" if="is.overinstall">31 <target name="Looking For Previous Installation" if="is.overinstall"> 32 32 <property file="${installDir}\etc\installation.properties"/> 33 33 </target> 34 34 35 <target name="Installing Core System" depends="load-previous-props">35 <target name="Installing Core System"> 36 36 37 37 <!-- figure out the start menu path (if not already set from previous installation) --> … … 63 63 <!-- jre --> 64 64 <mkdir dir="${installDir}/packages"/> 65 <copy todir="${installDir}/packages/jre" >65 <copy todir="${installDir}/packages/jre" failonerror="false"> 66 66 <fileset dir="../@windows-java.extracted@"/> 67 67 </copy> … … 115 115 </target> 116 116 117 <target name="Install ImageMagick">117 <target name="Installing ImageMagick"> 118 118 <echo message="Installing ImageMagick"/> 119 119 <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>
