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/lirk3/ant-scripts/create-distribution.xml

    r17816 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="sh"/></antcall> <!-- from rk3-targets --> 
    1212 
    13         <antcall target="copy-web-to-source-greenstone3" /> <!-- from gs3-targets --> 
     13        <antcall target="copy-web-to-source" /> <!-- from init --> 
    1414 
    15         <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-1" inheritAll="false"> 
     15        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" target="create-distribution-1" inheritAll="false"> 
    1616            <property name="app.version" value="${version}"/> 
    1717            <property name="branch.path" value="${branch.path}"/> 
    1818        </ant> 
    19         <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-2" inheritAll="false"> 
     19        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" target="create-distribution-2" inheritAll="false"> 
    2020            <property name="app.version" value="${version}"/> 
    2121            <property name="branch.path" value="${branch.path}"/> 
    2222        </ant> 
    23         <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-3" inheritAll="false"> 
     23        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" target="create-distribution-3" inheritAll="false"> 
    2424            <property name="app.version" value="${version}"/> 
    2525            <property name="branch.path" value="${branch.path}"/> 
     
    2929        <antcall target="export-imagemagick-linux-binaries" /> 
    3030     
    31         <antcall target="strip-svn-dirs"><param name="dir" value="distribution"/></antcall> <!-- from init --> 
     31        <antcall target="strip-svn-dirs"><param name="dir" value="distributions"/></antcall> <!-- from init --> 
    3232 
    3333    </target> 
    3434 
    3535    <target name="export-greenstone3-gli"> 
    36         <mkdir dir="distribution"/> 
    37         <delete dir="distribution/greenstone3"/> 
     36        <mkdir dir="distributions"/> 
     37        <delete dir="distributions/web"/> 
    3838        <svn> 
    39             <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3"/> 
    40             <export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution/greenstone3/gli"/> 
     39            <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distributions/web"/> 
     40            <export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli"/> 
    4141        </svn> 
    4242    </target> 
    4343     
    4444    <target name="export-imagemagick-linux-binaries"> 
    45         <delete dir="distribution/greenstone3/gs2build/bin/linux/imagemagick"/> 
     45        <delete dir="distributions/web/gs2build/bin/linux/imagemagick"/> 
    4646        <svn> 
    47             <export srcurl="${svn.root}/other-projects/trunk/linux-binaries/imagemagick" destPath="distribution/greenstone3/gs2build/bin/linux/imagemagick"/> 
     47            <export srcurl="${svn.root}/other-projects/trunk/linux-binaries/imagemagick" destPath="distributions/web/gs2build/bin/linux/imagemagick"/> 
    4848        </svn> 
    4949    </target> 
    5050 
    5151    <target name="copy-over-build-xml"> 
    52         <move file="distribution/greenstone3/modified-build.xml" tofile="distribution/greenstone3/build.xml"/> 
     52        <move file="distributions/web/modified-build.xml" tofile="distributions/web/build.xml"/> 
    5353    </target> 
    5454 
    5555    <target name="insert-user-manual"> 
    56         <copy file="greenstone3/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distribution/greenstone3/docs/manual/gs2_user_en.pdf"/> 
     56        <copy file="compiled/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distributions/web/docs/manual/gs2_user_en.pdf"/> 
    5757    </target> 
    5858 
    5959    <target name="insert-compiled-binaries"> 
    60         <delete dir="distribution/greenstone3/lib/jni"/> 
    61         <exec executable="cp"><arg line="-r greenstone3/lib/jni distribution/greenstone3/lib"/></exec> 
     60        <delete dir="distributions/web/lib/jni"/> 
     61        <exec executable="cp"><arg line="-r compiled/lib/jni distributions/web/lib"/></exec> 
    6262 
    63         <delete dir="distribution/greenstone3/gs2build/bin/linux"/> 
    64         <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/linux distribution/greenstone3/gs2build/bin"/></exec> 
     63        <delete dir="distributions/web/gs2build/bin/linux"/> 
     64        <exec executable="cp"><arg line="-r compiled/gs2build/bin/linux distributions/web/gs2build/bin"/></exec> 
    6565 
    66         <delete dir="distribution/greenstone3/gs2build/bin/java"/> 
    67         <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/java distribution/greenstone3/gs2build/bin"/></exec> 
     66        <delete dir="distributions/web/gs2build/bin/java"/> 
     67        <exec executable="cp"><arg line="-r compiled/gs2build/bin/java distributions/web/gs2build/bin"/></exec> 
    6868 
    69         <exec executable="cp"><arg line="greenstone3/bin/search4j distribution/greenstone3/bin"/></exec> 
     69        <exec executable="cp"><arg line="compiled/bin/search4j distributions/web/bin"/></exec> 
    7070 
    7171    </target>