Show
Ignore:
Timestamp:
20.11.2008 16:33:21 (11 years ago)
Author:
oranfry
Message:

Standardised names of directories used in release kits

  • gsdl and greenstone3 -> compiled
  • distribution and distributions -> distributions
  • greenstone3 and web -> web

And, expect more specifically named properties files, e.g., lirk3-build.properties, wirk2-build.properties

Files:
1 modified

Legend:

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

    r17604 r17898  
    44    <target name="compile"> 
    55        <antcall target="checkout-greenstone3" /> 
    6         <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/greenstone3" /></antcall> 
    7         <ant target="prepare-windows" dir="greenstone3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"> 
     6        <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/compiled" /></antcall> 
     7        <ant target="prepare-windows" dir="compiled" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"> 
    88            <property name="app.version" value="${version}"/> 
    99            <property name="branch.path" value="${branch.path}"/> 
    1010            <property name="branch.revision" value="${branch.revision}"/> 
    1111        </ant> 
    12         <ant target="build-windows" dir="greenstone3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"> 
     12        <ant target="build-windows" dir="compiled" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"> 
    1313            <property name="app.version" value="${version}"/> 
    1414            <property name="branch.path" value="${branch.path}"/> 
     
    2121    <target name="checkout-greenstone3"> 
    2222        <svn> 
    23             <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="greenstone3" revision="${branch.revision}"/> 
     23            <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="compiled" revision="${branch.revision}"/> 
    2424        </svn> 
    2525    </target> 
     
    3232 
    3333    <target name="prepare-documentation"> 
    34         <mkdir dir="greenstone3/gsdl-manuals"/> 
     34        <mkdir dir="compiled/gsdl-manuals"/> 
    3535        <svn> 
    36             <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="greenstone3/gsdl-manuals/manuals" revision="${branch.revision}"/> 
    37             <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="greenstone3/gsdl-manuals/shared" revision="${branch.revision}"/> 
     36            <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="compiled/gsdl-manuals/manuals" revision="${branch.revision}"/> 
     37            <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="compiled/gsdl-manuals/shared" revision="${branch.revision}"/> 
    3838        </svn> 
    39         <javac srcdir="greenstone3/gsdl-manuals/shared" destdir="greenstone3/gsdl-manuals/shared" debug="on"><include name="*.java"/></javac> 
    40         <unzip src="greenstone3/gsdl-manuals/shared/fop.zip" dest="greenstone3/gsdl-manuals/shared"/> 
     39        <javac srcdir="compiled/gsdl-manuals/shared" destdir="compiled/gsdl-manuals/shared" debug="on"><include name="*.java"/></javac> 
     40        <unzip src="compiled/gsdl-manuals/shared/fop.zip" dest="compiled/gsdl-manuals/shared"/> 
    4141 
    4242        <echo>Define Classpath</echo> 
    4343        <path id="documentation.compile.classpath"> 
    44             <fileset dir="greenstone3/gsdl-manuals"> 
     44            <fileset dir="compiled/gsdl-manuals"> 
    4545                <include name="**/*.jar"/> 
    4646            </fileset> 
    47             <pathelement path="greenstone3/gsdl-manuals/shared"/> 
    48             <pathelement path="greenstone3/gsdl-manuals/manuals"/> 
    49             <pathelement path="greenstone3/gli/classes"/> 
     47            <pathelement path="compiled/gsdl-manuals/shared"/> 
     48            <pathelement path="compiled/gsdl-manuals/manuals"/> 
     49            <pathelement path="compiled/gli/classes"/> 
    5050        </path> 
    5151                     
     
    5353        <java classname="org.apache.xalan.xslt.Process" classpathref="documentation.compile.classpath" fork="true"> 
    5454            <jvmarg value="-DGSDLHOME=${basedir}/greenstone" /> 
    55             <arg value="-IN"/><arg file="greenstone3/gli/help/en/help.xml" /> 
    56             <arg value="-XSL"/><arg file="greenstone3/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" /> 
    57             <arg value="-OUT"/><arg file="greenstone3/gsdl-manuals/manuals/xml-source/en/help-en.xml" /> 
     55            <arg value="-IN"/><arg file="compiled/gli/help/en/help.xml" /> 
     56            <arg value="-XSL"/><arg file="compiled/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" /> 
     57            <arg value="-OUT"/><arg file="compiled/gsdl-manuals/manuals/xml-source/en/help-en.xml" /> 
    5858        </java> 
    5959                     
    6060        <echo>Run generate-pdf.bat</echo> 
    61         <exec dir="${basedir}\greenstone3/gsdl-manuals/manuals" executable="cmd"> 
     61        <exec dir="${basedir}\compiled/gsdl-manuals/manuals" executable="cmd"> 
    6262            <arg value="/C" /> 
    63             <arg file="${basedir}/greenstone3/gsdl-manuals/manuals/generate-pdf.bat" /> 
     63            <arg file="${basedir}/compiled/gsdl-manuals/manuals/generate-pdf.bat" /> 
    6464            <arg value="u" /> 
    6565            <arg value="en" />