Changeset 16204
- Timestamp:
- 2008-06-26 12:50:39 (3 months ago)
- Files:
-
- release-kits/wirk2/ant-scripts/build.xml (modified) (2 diffs)
- release-kits/wirk2/ant-scripts/wrap.xml (modified) (3 diffs)
- release-kits/wirk2/bin/wirk2.exe (modified) (previous)
- release-kits/wirk2/src/wirk2.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
release-kits/wirk2/ant-scripts/build.xml
r16194 r16204 1 1 <?xml version="1.0" encoding="utf-8" ?> 2 3 2 <!-- 4 3 .......................................................... … … 8 7 .......................................................... 9 8 --> 10 11 9 <project name="wirk2-build" default="wirk2"> 12 10 13 11 <!-- CONSTANTS --> 14 12 15 <!-- create a localised basedir property --> 16 <path id="basedir.path"><pathelement location="${basedir}"/></path> 17 <property name="basedir.local" refid="basedir.path"/> 13 <!-- the size of the resourse chunks to be put in the wrapped installer --> 14 <property name="resources.chunksize" value="8388608"/><!-- 8MiB --> 18 15 19 16 <!-- for the benefit of the shared scripts, set release-kit home --> 20 <property name="rk.home" value="${ lirk2.home}" />17 <property name="rk.home" value="${wirk2.home}" /> 21 18 22 19 release-kits/wirk2/ant-scripts/wrap.xml
r16197 r16204 18 18 19 19 <!-- copy source files --> 20 <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/w rapper/wrapper.cpp"/>20 <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/windows/wrapper/wrapper.cpp"/> 21 21 <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.cpp"/> 22 22 <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.h"/> … … 57 57 58 58 <echo>getting the template resource script</echo> 59 <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/w rapper/wrapper.rc" overwrite="true"/>59 <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/windows/wrapper/wrapper.rc" overwrite="true"/> 60 60 61 61 <echo>copying the small resource files into place</echo> … … 63 63 <fileset dir="${wirk2.home}/windows/wrapper" includes="*.bmp"/> 64 64 <fileset dir="${wirk2.home}/greenstone2/wrapper" includes="*.bmp"/> 65 <fileset dir="${wirk2.home}/greenstone2/icon" includes=" gs2.ico"/>65 <fileset dir="${wirk2.home}/greenstone2/icon" includes="icon.ico"/> 66 66 </copy> 67 67 release-kits/wirk2/src/wirk2.cpp
r16190 r16204 37 37 38 38 //set the classpath 39 classpath = pwd + "\\installer\\classes;" + JAVA_HOME + "\\lib\\tools.jar;" + WIRK2_HOME + "\\lib\\serializer.jar;" + WIRK2_HOME + "\\lib\\xalan.jar;" + WIRK2_HOME + "\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\ bin\\apache-ant-1.6.5\\lib\\ant-antlr.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-bcel.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-bsf.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-log4j.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-oro.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-regexp.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-resolver.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-commons-logging.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-commons-net.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-icontract.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jai.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-javamail.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jdepend.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jmf.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jsch.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-junit.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-launcher.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-netrexx.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-nodeps.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-starteam.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-stylebook.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-swing.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-trax.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-vaj.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-weblogic.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-xalan1.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-xslp.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\ai-icons-amaranth.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\ai-icons-bluecurve.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\ai-icons-crystalsvg.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\ai-icons-eclipse.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\ai-icons-krystaline.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\ant-installer-ext.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\ant-installer.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\jgoodies-edited-1_2_2.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\classes";39 classpath = pwd + "\\installer\\classes;" + JAVA_HOME + "\\lib\\tools.jar;" + WIRK2_HOME + "\\lib\\serializer.jar;" + WIRK2_HOME + "\\lib\\xalan.jar;" + WIRK2_HOME + "\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-antlr.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-bcel.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-bsf.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-log4j.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-oro.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-regexp.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-resolver.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-commons-logging.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-commons-net.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-icontract.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-jai.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-javamail.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-jdepend.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-jmf.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-jsch.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-junit.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-launcher.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-netrexx.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-nodeps.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-starteam.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-stylebook.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-swing.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-trax.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-vaj.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-weblogic.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-xalan1.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-xslp.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-amaranth.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-bluecurve.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-crystalsvg.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-eclipse.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-krystaline.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ant-installer-ext.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ant-installer.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\jgoodies-edited-1_2_2.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\classes"; 40 40 putenv( ("CLASSPATH=" + classpath).c_str() ); 41 41 … … 45 45 46 46 //create the command 47 command = WIRK2_HOME + "\\ bin\\apache-ant-1.6.5\\bin\\ant.bat -f " + WIRK2_HOME + "\\ant-scripts\\build.xml -Dwirk2.home=" + WIRK2_HOME;47 command = WIRK2_HOME + "\\packages\\ant\\bin\\ant.bat -f " + WIRK2_HOME + "\\ant-scripts\\build.xml -Dwirk2.home=" + WIRK2_HOME; 48 48 //pass on the arguments 49 49 string a;
