Changeset 17898 for release-kits/wirk3

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

Location:
release-kits/wirk3/ant-scripts
Files:
5 modified

Legend:

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

    r17597 r17898  
    1616 
    1717    <!-- for the benefit of the shared scripts, set release-kit home --> 
     18    <property name="rk.name" value="wirk3"/> 
    1819    <property name="rk.home" value="${wirk3.home}" /> 
    1920    <property name="rk.os" value="windows" /> 
  • 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" /> 
  • release-kits/wirk3/ant-scripts/create-components.xml

    r17814 r17898  
    22<project name="wirk3-create-components" default="create-components"> 
    33 
    4     <!-- create components from the distribution folder --> 
     4    <!-- create components from the distributions folder --> 
    55 
    66    <!-- 1st level --> 
     
    4444                 
    4545        <copy todir="components/tmp/core" overwrite="true"> 
    46             <fileset dir="distribution/greenstone3"> 
     46            <fileset dir="distributions/web"> 
    4747                <include name="**/*"/> 
    4848 
     
    9090        <mkdir dir="components/tmp/imagemagick"/> 
    9191        <copy todir="components/tmp/imagemagick" overwrite="true"> 
    92             <fileset dir="distribution/greenstone3/gs2build/bin/windows/"> 
     92            <fileset dir="distributions/web/gs2build/bin/windows/"> 
    9393                <include name="imagemagick/**/*"/> 
    9494            </fileset> 
     
    108108        <mkdir dir="components/tmp/ghostscript"/> 
    109109        <copy todir="components/tmp/ghostscript" overwrite="true"> 
    110             <fileset dir="distribution/greenstone3/gs2build/bin/windows/"> 
     110            <fileset dir="distributions/web/gs2build/bin/windows/"> 
    111111                <include name="ghostscript/**/*"/> 
    112112            </fileset> 
     
    124124        <mkdir dir="components/tmp/sourcecode"/> 
    125125        <copy todir="components/tmp/sourcecode" overwrite="true"> 
    126                 <fileset dir="distribution/greenstone3"> 
     126                <fileset dir="distributions/web"> 
    127127                    <include name="src/**/*"/> 
    128128                    <include name="gs2build/common-src/**/*"/> 
     
    145145 
    146146        <copy todir="components/tmp/ant" overwrite="true"> 
    147             <fileset dir="distribution/greenstone3/packages"> 
     147            <fileset dir="distributions/web/packages"> 
    148148                <include name="ant/**/*"/> 
    149149            </fileset> 
     
    161161        <mkdir dir="components/tmp/tomcat"/> 
    162162        <copy todir="components/tmp/tomcat" overwrite="true"> 
    163             <fileset dir="distribution/greenstone3/packages"> 
     163            <fileset dir="distributions/web/packages"> 
    164164                <include name="tomcat/**/*"/> 
    165165            </fileset> 
  • release-kits/wirk3/ant-scripts/create-distribution.xml

    r17833 r17898  
    66        <!-- create distribution --> 
    77        <antcall target="export-greenstone3-gli" /> 
    8         <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distribution/greenstone3" /></antcall> 
    9         <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution/greenstone3/gli" /></antcall> 
     8        <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distributions/web" /></antcall> 
     9        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli" /></antcall> 
    1010        <antcall target="insert-user-manual"/> 
    1111        <antcall target="insert-uninstaller"><param name="script-format" value="bat"/></antcall> <!-- from rk3-targets --> 
    1212 
    13         <antcall target="copy-web-to-source-greenstone3" /> <!-- from gs3-targets --> 
     13        <antcall target="copy-web-to-source" /> <!-- from gs3-targets --> 
    1414 
    15         <ant target="create-distribution-1" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false"> 
     15        <ant target="create-distribution-1" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false"> 
    1616            <property name="app.version" value="${version}"/> 
    1717            <property name="branch.path" value="${branch.path}"/> 
     
    2121        <antcall target="insert-icon"/> 
    2222 
    23         <ant target="create-distribution-2" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false"> 
     23        <ant target="create-distribution-2" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false"> 
    2424            <property name="app.version" value="${version}"/> 
    2525            <property name="branch.path" value="${branch.path}"/> 
    2626            <property name="branch.revision" value="${branch.revision}"/> 
    2727        </ant> 
    28         <ant target="create-distribution-3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false"> 
     28        <ant target="create-distribution-3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false"> 
    2929            <property name="app.version" value="${version}"/> 
    3030            <property name="branch.path" value="${branch.path}"/> 
     
    3737 
    3838    <target name="export-greenstone3-gli"> 
    39         <mkdir dir="distribution"/> 
    40         <delete dir="distribution/greenstone3"/> 
     39        <mkdir dir="distributions"/> 
     40        <delete dir="distributions/web"/> 
    4141        <svn> 
    42             <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3" revision="${branch.revision}"/> 
    43             <export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution/greenstone3/gli" revision="${branch.revision}"/> 
     42            <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distributions/web" revision="${branch.revision}"/> 
     43            <export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli" revision="${branch.revision}"/> 
    4444        </svn> 
    4545    </target> 
     
    4747    <target name="copy-over-build-xml"> 
    4848        <if><bool><istrue value="${execute}"/></bool> 
    49             <move file="distribution/greenstone3/modified-build.xml" tofile="distribution/greenstone3/build.xml"/> 
     49            <move file="distributions/web/modified-build.xml" tofile="distributions/web/build.xml"/> 
    5050        </if> 
    5151    </target> 
    5252 
    5353    <target name="insert-user-manual"> 
    54         <copy file="greenstone3/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distribution/greenstone3/docs/manual/gs2_user_en.pdf"/> 
     54        <copy file="compiled/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distributions/web/docs/manual/gs2_user_en.pdf"/> 
    5555    </target> 
    5656 
    5757    <target name="insert-compiled-binaries"> 
    5858 
    59         <delete dir="distribution/greenstone3/lib/jni"/> 
    60         <copy todir="distribution/greenstone3/lib/jni"><fileset dir="greenstone3/lib/jni"/></copy> 
     59        <delete dir="distributions/web/lib/jni"/> 
     60        <copy todir="distributions/web/lib/jni"><fileset dir="compiled/lib/jni"/></copy> 
    6161         
    62         <delete dir="distribution/greenstone3/gs2build/bin/windows"/> 
    63         <copy todir="distribution/greenstone3/gs2build/bin/windows"><fileset dir="greenstone3/gs2build/bin/windows"/></copy> 
     62        <delete dir="distributions/web/gs2build/bin/windows"/> 
     63        <copy todir="distributions/web/gs2build/bin/windows"><fileset dir="compiled/gs2build/bin/windows"/></copy> 
    6464 
    65         <delete dir="distribution/greenstone3/gs2build/bin/java"/> 
    66         <copy todir="distribution/greenstone3/gs2build/bin/java"><fileset dir="greenstone3/gs2build/bin/java"/></copy> 
     65        <delete dir="distributions/web/gs2build/bin/java"/> 
     66        <copy todir="distributions/web/gs2build/bin/java"><fileset dir="compiled/gs2build/bin/java"/></copy> 
    6767 
    68         <copy todir="distribution/greenstone3/bin" file="greenstone3/bin/search4j.exe"/> 
     68        <copy todir="distributions/web/bin" file="compiled/bin/search4j.exe"/> 
    6969    </target> 
    7070     
     
    7272        <copy 
    7373            file="${wirk3.home}/greenstone3/icon/icon.ico" 
    74             tofile="distribution/greenstone3/resources/images/gs3.ico"/> 
    75     </target> 
    76  
    77     <target name="rename-build-xml-for-transit"> 
    78         <move 
    79             file="distribution/greenstone3/build.xml" 
    80             tofile="distribution/greenstone3/greenstone3-build.xml" /> 
     74            tofile="distributions/web/resources/images/gs3.ico"/> 
    8175    </target> 
    8276 
  • release-kits/wirk3/ant-scripts/create-installer.xml

    r17697 r17898  
    1515        <copy todir="${basedir}/installer/classes" overwrite="true"> 
    1616            <fileset dir="${wirk3.home}/packages/7za" includes="7za.exe"/> 
    17             <fileset file="${basedir}/distribution/greenstone3/LICENSE.txt"/> 
     17            <fileset file="${basedir}/distributions/web/LICENSE.txt"/> 
    1818        </copy> 
    1919