Changeset 16194
- Timestamp:
- 2008-06-26 09:46:52 (2 months ago)
- Files:
-
- release-kits/wirk2/ant-scripts/build.xml (modified) (1 diff)
- release-kits/wirk2/ant-scripts/compile.xml (modified) (2 diffs)
- release-kits/wirk2/ant-scripts/create-distribution.xml (modified) (1 diff)
- release-kits/wirk2/ant-scripts/create-installer.xml (modified) (3 diffs)
- release-kits/wirk2/ant-scripts/create-launcher.xml (deleted)
- release-kits/wirk2/ant-scripts/init.xml (deleted)
- release-kits/wirk2/ant-scripts/wrap.xml (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
release-kits/wirk2/ant-scripts/build.xml
r16087 r16194 11 11 <project name="wirk2-build" default="wirk2"> 12 12 13 <import file="init.xml"/> 13 <!-- CONSTANTS --> 14 15 <!-- create a localised basedir property --> 16 <path id="basedir.path"><pathelement location="${basedir}"/></path> 17 <property name="basedir.local" refid="basedir.path"/> 18 19 <!-- for the benefit of the shared scripts, set release-kit home --> 20 <property name="rk.home" value="${lirk2.home}" /> 21 22 23 <!-- IMPORT OTHER ANT SCRIPTS --> 24 <import file="shared-ant-scripts/init.xml"/> 14 25 <import file="compile.xml"/> 15 26 <import file="create-distribution.xml"/> 16 27 <import file="create-installer.xml"/> 17 < !--<import file="wrap.xml"/>-->28 <import file="wrap.xml"/> 18 29 30 <!-- THE MAIN TARGET --> 19 31 <target name="wirk2" depends="init"> 20 32 <addressedcall target="compile"/> 21 33 <addressedcall target="create-distribution"/> 22 34 <addressedcall target="create-installer"/> 23 < !--<addressedcall target="wrap"/>-->35 <addressedcall target="wrap"/> 24 36 </target> 25 37 release-kits/wirk2/ant-scripts/compile.xml
r16087 r16194 1 1 <?xml version="1.0" encoding="utf-8" ?> 2 2 <project name="wirk2-compile" default="compile"> 3 4 3 5 4 <target name="compile"> … … 63 62 <target name="compile-c-code"> 64 63 <if><bool><istrue value="${execute}"/></bool> 65 <copy file="${wirk2.home}/ compile/compile.bat" todir="${basedir}/gsdl" overwrite="true"/>64 <copy file="${wirk2.home}/resources/compile.bat" todir="${basedir}/gsdl" overwrite="true"/> 66 65 <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/compile.bat"/> 67 66 release-kits/wirk2/ant-scripts/create-distribution.xml
r16087 r16194 1 1 <?xml version="1.0" encoding="utf-8" ?> 2 <project name="wirk 3-create-distribution" default="create-distribution">2 <project name="wirk2-create-distribution" default="create-distribution"> 3 3 4 4 <target name="create-distribution"> release-kits/wirk2/ant-scripts/create-installer.xml
r16087 r16194 10 10 <if><bool><istrue value="${execute}"/></bool> 11 11 12 <mkdir dir="${basedir}/installer "/>12 <mkdir dir="${basedir}/installer/classes"/> 13 13 <copy todir="${basedir}/installer" file="${wirk2.home}/installer/antinstall-config.xml"/> 14 14 <copy todir="${basedir}/installer" file="${wirk2.home}/installer/build.xml"/> 15 <copy todir="${basedir}/installer/ resources">16 <fileset dir="${wirk2.home}/ installer/resources-windows"/>17 <fileset dir="${wirk2.home}/ installer/resources-greenstone2"/>15 <copy todir="${basedir}/installer/classes"> 16 <fileset dir="${wirk2.home}/greenstone2/installer-classes"/> 17 <fileset dir="${wirk2.home}/windows/installer-classes"/> 18 18 </copy> 19 19 … … 24 24 <!-- put the concrete values of things in the text --> 25 25 <!-- default --> 26 <rsr file="${basedir}/installer/ resources/LanguagePack.properties" pattern="@version@" replacement="${version}"/>27 <rsr file="${basedir}/installer/ resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>28 <rsr file="${basedir}/installer/ resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/>29 <rsr file="${basedir}/installer/ resources/LanguagePack.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>30 <rsr file="${basedir}/installer/ resources/LanguagePack.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>26 <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@version@" replacement="${version}"/> 27 <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/> 28 <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/> 29 <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/> 30 <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/> 31 31 32 32 <!-- chinese --> 33 <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@version@" replacement="${version}"/> 34 <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@java.min.version@" replacement="${java.min.version}"/> 35 <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/> 36 <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/> 37 <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/> 38 33 <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@version@" replacement="${version}"/> 34 <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@java.min.version@" replacement="${java.min.version}"/> 35 <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/> 36 <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/> 37 <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/> 39 38 40 39 </if> … … 49 48 installConfig="${basedir}/installer/antinstall-config.xml" 50 49 buildFile="${basedir}/installer/build.xml" 51 antInstallLib="${wirk2.home}/ bin/ant-installer/lib"52 antLib="${wirk2.home}/ bin/apache-ant-1.6.5/lib"50 antInstallLib="${wirk2.home}/packages/ant-installer/lib" 51 antLib="${wirk2.home}/packages/ant/lib" 53 52 validateConfig="true" 54 53 icons="bluecurve"> 55 54 56 <zipfileset dir="${basedir}/installer/ resources" prefix="resources"><include name="**/*"/></zipfileset>55 <zipfileset dir="${basedir}/installer/classes"><include name="**/*"/></zipfileset> 57 56 <zipfileset dir="${wirk2.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset> 58 57 <zipfileset dir="${basedir}/distributions/web" includes="**/*"/> release-kits/wirk2/ant-scripts/wrap.xml
r16087 r16194 1 1 <?xml version="1.0" encoding="utf-8" ?> 2 <project name="wirk 3-wrap" default="wrap">2 <project name="wirk2-wrap" default="wrap"> 3 3 4 4 <target name="wrap"> … … 19 19 <!-- copy source files --> 20 20 <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/wrapper/wrapper.cpp"/> 21 <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/ search4j/libsearch4j.cpp"/>22 <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/ search4j/libsearch4j.h"/>21 <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.cpp"/> 22 <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.h"/> 23 23 24 24 </if> … … 30 30 <!-- substitute the real java installer filename and min version into various files --> 31 31 <echo>Substitute concrete values of things into source files</echo> 32 <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${ java.installer}"/>32 <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${windows-java.installer}"/> 33 33 <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/> 34 <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@bundled.version.java@" replacement="${bundled.version. java}"/>34 <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/> 35 35 36 36 </if> … … 45 45 <uptodate targetfile="${basedir}/wrapped-installer/build/wrapper.RES"> 46 46 <srcfiles dir="${wirk3.home}/icon" includes="gs3.ico"/> 47 <srcfiles dir="${wirk3.home}/wrapper" includes="${ java.installer}"/>47 <srcfiles dir="${wirk3.home}/wrapper" includes="${windows-java.installer}"/> 48 48 <srcfiles dir="${wirk3.home}/wrapper" includes="*.bmp"/> 49 49 <srcfiles dir="${wirk3.home}/wrapper" includes="*.rc"/> … … 82 82 <copy file="${basedir}/wrapped-installer/build/wrapper.rc" tofile="${basedir}/wrapped-installer/build/wrapper-with-jre.rc"/> 83 83 84 <echo>adding ${ java.installer} to the copy as chunks</echo>84 <echo>adding ${windows-java.installer} to the copy as chunks</echo> 85 85 <rsplit 86 resource="${wirk3.home}/wrapper/${ java.installer}"86 resource="${wirk3.home}/wrapper/${windows-java.installer}" 87 87 outputDir="${basedir}/wrapped-installer/build" 88 88 resourceScript="${basedir}/wrapped-installer/build/wrapper-with-jre.rc"
