Changeset 16198 for release-kits/wirk3


Ignore:
Timestamp:
06/26/08 11:54:45 (13 years ago)
Author:
oranfry
Message:

made wirk3 work with the new shared code scheme

Location:
release-kits/wirk3
Files:
2 deleted
8 edited
1 moved

Legend:

Unmodified
Added
Removed
  • release-kits/wirk3/ant-scripts/build.xml

    r15095 r16198  
    11<?xml version="1.0" encoding="utf-8" ?>
    2 
    32<!--
    43        ..........................................................
    5         September 2007
    6         Greenstone3 'release maker' script
     4        February 2008
     5        Windows Release Kit for greenstone3
    76        Oran Fry
    87        ..........................................................
    98-->
    10 
    119<project name="wirk3-build" default="wirk3">
    1210
    13     <import file="init.xml"/>
     11    <!-- CONSTANTS -->
    1412   
     13    <!-- the size of the resourse chunks to be put in the wrapped installer -->
     14    <property name="resources.chunksize" value="8388608"/><!-- 8MiB -->
     15
     16    <!-- the version numbers of bundled things -->
     17    <property name="bundled.version.tomcat" value="5.5.25"/>
     18    <property name="bundled.version.ant" value="1.6.5"/>
     19
     20    <!-- for the benefit of the shared scripts, set release-kit home -->
     21    <property name="rk.home" value="${wirk3.home}" />
     22
     23    <!-- IMPORT OTHER ANT SCRIPTS -->
     24    <import file="shared-ant-scripts/init.xml"/>
    1525    <import file="compile.xml"/>
    1626    <import file="create-distribution.xml"/>
    1727    <import file="create-installer.xml"/>
    1828    <import file="wrap.xml"/>
    19 
     29   
     30    <!-- THE MAIN TARGET -->
    2031    <target name="wirk3" depends="init">
    21         <echo>Local Basedir: ${basedir.local}</echo>
    22        
    2332        <addressedcall target="compile"/>
    2433        <addressedcall target="create-distribution"/>
  • release-kits/wirk3/ant-scripts/compile.xml

    r15053 r16198  
    11<?xml version="1.0" encoding="utf-8" ?>
    2 
    3 <!--
    4         ..........................................................
    5         September 2007
    6         Greenstone3 'release maker' script
    7         Oran Fry
    8         ..........................................................
    9 -->
    10 
    112<project name="wirk3-compile" default="compile">
    123
    13 
    144    <target name="compile">
    15 
    165        <addressedcall target="checkout-greenstone3" />
    176        <addressedcall target="set-version-number-property" />
     
    198        <addressedcall target="dist-build-windows" />
    209        <addressedcall target="prepare-documentation" />
    21 
    2210    </target>
    23 
    24 
    25     <!--
    26 
    27         second level targets
    28 
    29     -->
    3011
    3112    <target name="checkout-greenstone3">
  • release-kits/wirk3/ant-scripts/create-distribution.xml

    r15812 r16198  
    11<?xml version="1.0" encoding="utf-8" ?>
    2 
    3 <!--
    4         ..........................................................
    5         September 2007
    6         Greenstone3 'release maker' script
    7         Oran Fry
    8         ..........................................................
    9 -->
    10 
    112<project name="wirk3-create-distribution" default="create-distribution">
    123
     
    2516    </target>
    2617
    27 
    28 
    29     <!--
    30 
    31         second level targets
    32 
    33     -->
    34    
    3518    <target name="export-greenstone3">
    3619        <if><bool><istrue value="${execute}"/></bool>
  • release-kits/wirk3/ant-scripts/create-installer.xml

    r16078 r16198  
    11<?xml version="1.0" encoding="utf-8" ?>
    2 
    3 <!--
    4         ..........................................................
    5         September 2007
    6         Greenstone3 'release maker' script
    7         Oran Fry
    8         ..........................................................
    9 -->
    10 
    112<project name="wirk3-create-installer" default="create-installer">
    123
     
    1910        <if><bool><istrue value="${execute}"/></bool>
    2011           
    21             <mkdir dir="${basedir}/installer"/>
     12            <mkdir dir="${basedir}/installer/resources"/>
    2213            <copy todir="${basedir}/installer" file="${wirk3.home}/installer/antinstall-config.xml"/>
    2314            <copy todir="${basedir}/installer" file="${wirk3.home}/installer/build.xml"/>
    24             <copy todir="${basedir}/installer/resources">
    25                 <fileset dir="${wirk3.home}/installer/resources-windows"/>
    26                 <fileset dir="${wirk3.home}/installer/resources-greenstone3"/>
     15            <copy todir="${basedir}/installer/classes">
     16                <fileset dir="${wirk3.home}/windows/installer-classes"/>
     17                <fileset dir="${wirk3.home}/greenstone3/installer-classes"/>
    2718            </copy>
    2819           
     
    3324            <!-- put the concrete values of things in the text -->
    3425            <!-- default -->
    35             <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@version@" replacement="${version}"/>
    36             <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
    37             <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/>
    38             <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
    39             <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}"/>
    4031           
    4132            <!-- chinese -->
    42             <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@version@" replacement="${version}"/>
    43             <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
    44             <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/>
    45             <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
    46             <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
     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}"/>
    4738           
    4839           
     
    5849                    installConfig="${basedir}/installer/antinstall-config.xml"
    5950                    buildFile="${basedir}/installer/build.xml"
    60                     antInstallLib="${wirk3.home}/bin/ant-installer/lib"
    61                     antLib="${wirk3.home}/bin/ant-installer/antlib"
     51                    antInstallLib="${wirk3.home}/packages/ant-installer/lib"
     52                    antLib="${wirk3.home}/packages/ant/lib"
    6253                    validateConfig="true"
    6354                    icons="bluecurve">
    6455
    65                 <zipfileset dir="${basedir}/installer/resources" prefix="resources"><include name="**/*"/></zipfileset>
     56                <zipfileset dir="${basedir}/installer/classes"><include name="**/*"/></zipfileset>
    6657                <zipfileset dir="${wirk3.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
    6758
     
    7768                <zipfileset dir="${basedir}/distribution/greenstone3/winutil" prefix="winutil"><include name="**/*"/></zipfileset>
    7869                <zipfileset dir="${basedir}/distribution/greenstone3/src" prefix="src"><include name="**/*"/></zipfileset>
    79 
     70               
    8071            </installer>
    81 
    8272           
    8373        </if>
  • release-kits/wirk3/ant-scripts/operations-on-gs3home.xml

    r15966 r16198  
    148148 
    149149    <target name="run-xslt-binary" depends="init">
    150         <xslt in="${basedir}/build.xml" out="${basedir}/modified-build.xml" style="${wirk3.home}/xsl/convert-build-xml.xsl"/>
     150        <xslt in="${basedir}/build.xml" out="${basedir}/modified-build.xml" style="${wirk3.home}/greenstone3/xsl/convert-build-xml.xsl"/>
    151151    </target>
    152152 
  • release-kits/wirk3/ant-scripts/wrap.xml

    r15900 r16198  
    11<?xml version="1.0" encoding="utf-8" ?>
    2 
    3 <!--
    4         ..........................................................
    5         September 2007
    6         Greenstone3 'release maker' script
    7         Oran Fry
    8         ..........................................................
    9 -->
    10 
    112<project name="wirk3-wrap" default="wrap">
    123
     
    2718
    2819            <!-- copy source files -->
    29             <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/wrapper/wrapper.cpp"/>
    30             <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/search4j/libsearch4j.cpp"/>
    31             <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/search4j/libsearch4j.h"/>
     20            <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/windows/wrapper/wrapper.cpp"/>
     21            <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/packages/search4j/libsearch4j.cpp"/>
     22            <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/packages/search4j/libsearch4j.h"/>
    3223       
    3324        </if>
     
    3930            <!-- substitute the real java installer filename and min version into various files -->
    4031            <echo>Substitute concrete values of things into source files</echo>
    41             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${java.installer}"/>
    4232            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
    43             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/>
     33            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${windows-java.installer}"/>
     34            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/>
    4435           
    4536        </if>
     
    5344                    <not>
    5445                        <uptodate targetfile="${basedir}/wrapped-installer/build/wrapper.RES">
    55                             <srcfiles dir="${wirk3.home}/icon" includes="gs3.ico"/>
    56                             <srcfiles dir="${wirk3.home}/wrapper" includes="${java.installer}"/>
    57                             <srcfiles dir="${wirk3.home}/wrapper" includes="*.bmp"/>
    58                             <srcfiles dir="${wirk3.home}/wrapper" includes="*.rc"/>
     46                            <srcfiles dir="${wirk3.home}/greenstone3/icon" includes="gs3.ico"/>
     47                            <srcfiles dir="${wirk3.home}/windows/wrapper" includes="${windows-java.installer}"/>
     48                            <srcfiles dir="${wirk3.home}/windows/wrapper" includes="*.bmp"/>
     49                            <srcfiles dir="${wirk3.home}/windows/wrapper" includes="*.rc"/>
     50                            <srcfiles dir="${wirk3.home}/greenstone3/wrapper" includes="*.bmp"/>
    5951                            <srcfiles dir="${basedir}/installer" includes="greenstone3.jar"/>
    6052                        </uptodate>
     
    6557               
    6658                <echo>getting the template resource script</echo>
    67                 <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/wrapper/wrapper.rc" overwrite="true"/>
     59                <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/windows/wrapper/wrapper.rc" overwrite="true"/>
    6860               
    6961                <echo>copying the small resource files into place</echo>
    7062                <copy todir="${basedir}/wrapped-installer/build">
    71                     <fileset dir="${wirk3.home}/wrapper" includes="*.bmp"/>
    72                     <fileset dir="${wirk3.home}/icon" includes="gs3.ico"/>
     63                    <fileset dir="${wirk3.home}/windows/wrapper" includes="*.bmp"/>
     64                    <fileset dir="${wirk3.home}/greenstone3/wrapper" includes="*.bmp"/>
     65                    <fileset dir="${wirk3.home}/greenstone3/icon" includes="gs3.ico"/>
    7366                </copy>
    7467               
     
    9184                <copy file="${basedir}/wrapped-installer/build/wrapper.rc" tofile="${basedir}/wrapped-installer/build/wrapper-with-jre.rc"/>
    9285               
    93                 <echo>adding ${java.installer} to the copy as chunks</echo>
     86                <echo>adding ${windows-java.installer} to the copy as chunks</echo>
    9487                <rsplit
    95                     resource="${wirk3.home}/wrapper/${java.installer}"
     88                    resource="${wirk3.home}/windows/wrapper/${windows-java.installer}"
    9689                    outputDir="${basedir}/wrapped-installer/build"                 
    9790                    resourceScript="${basedir}/wrapped-installer/build/wrapper-with-jre.rc"
  • release-kits/wirk3/installer/antinstall-config.xml

    r16078 r16198  
    77            debug="false"
    88            lookAndFeel="org.tp23.jgoodies.plaf.plastic.PlasticXPLookAndFeel"
    9             name="Greenstone3 @version@ Installer"
     9            name="Greenstone@version@ Installer"
    1010            windowIcon="/resources/icon.png"
    1111            defaultImageResource="/resources/header.png"
  • release-kits/wirk3/src/make.bat

    r16175 r16198  
    1 cl -GX ..\src\wirk3.cpp -o wirk3.exe
     1cl -GX wirk3.cpp -o ..\bin\wirk3.exe
    22del wirk3.obj
  • release-kits/wirk3/src/wirk3.cpp

    r16078 r16198  
    3737   
    3838    //set the classpath
    39     //WIRK3_HOME + "\\ant-scripts\\tasks\\orangevolt\\roxes-win32forjava-1.1.1.jar;" + WIRK3_HOME + "\\ant-scripts\\tasks\\orangevolt\\orangevolt-ant-tasks-1.3.8.jar;" +
    40     classpath = pwd + "\\installer;" + JAVA_HOME + "\\lib\\tools.jar;" + WIRK3_HOME + "\\lib\\serializer.jar;" + WIRK3_HOME + "\\lib\\xalan.jar;" + WIRK3_HOME + "\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-antlr.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-bcel.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-bsf.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-log4j.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-oro.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-regexp.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-resolver.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-commons-logging.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-commons-net.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-icontract.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jai.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-javamail.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jdepend.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jmf.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jsch.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-junit.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-launcher.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-netrexx.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-nodeps.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-starteam.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-stylebook.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-swing.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-trax.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-vaj.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-weblogic.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-xalan1.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-xslp.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ai-icons-amaranth.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ai-icons-bluecurve.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ai-icons-crystalsvg.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ai-icons-eclipse.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ai-icons-krystaline.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ant-installer-ext.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\ant-installer.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\jgoodies-edited-1_2_2.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\bin\\ant-installer\\classes";
     39    classpath = pwd + "\\installer\\classes;" + JAVA_HOME + "\\lib\\tools.jar;" + WIRK3_HOME + "\\lib\\serializer.jar;" + WIRK3_HOME + "\\lib\\xalan.jar;" + WIRK3_HOME + "\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-antlr.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-bcel.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-bsf.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-log4j.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-oro.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-regexp.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-resolver.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-commons-logging.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-commons-net.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-icontract.jar;" + WIRK3_HOME + "\\packages\\ant-1.6.5\\lib\\ant-jai.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-javamail.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-jdepend.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-jmf.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-jsch.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-junit.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-launcher.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-netrexx.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-nodeps.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-starteam.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-stylebook.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-swing.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-trax.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-vaj.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-weblogic.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-xalan1.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-xslp.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-amaranth.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-bluecurve.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-crystalsvg.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-eclipse.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-krystaline.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ant-installer-ext.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ant-installer.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\jgoodies-edited-1_2_2.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\classes";
    4140    putenv( ("CLASSPATH=" + classpath).c_str() );
    4241
    43     //check that it worked
    44     //string changed_classpath = getenv("CLASSPATH");
    45     //cout << "classpath: " << changed_classpath << endl;
    46    
    4742    //create the command
    48     command = WIRK3_HOME + "\\bin\\apache-ant-1.6.5\\bin\\ant.bat -f " + WIRK3_HOME + "\\ant-scripts\\build.xml -Dwirk3.home=" + WIRK3_HOME;
     43    command = WIRK3_HOME + "\\packages\\ant\\bin\\ant.bat -f " + WIRK3_HOME + "\\ant-scripts\\build.xml -Dwirk3.home=" + WIRK3_HOME;
    4944    //pass on the arguments
    5045    string a;
Note: See TracChangeset for help on using the changeset viewer.