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/mark3/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="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 target="create-distribution-1" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false"> 
     15        <ant target="create-distribution-1" antfile="${mark3.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}"/> 
    1818        </ant> 
    1919 
    20         <ant target="create-distribution-2" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false"> 
     20        <ant target="create-distribution-2" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false"> 
    2121            <property name="app.version" value="${version}"/> 
    2222            <property name="branch.path" value="${branch.path}"/> 
    2323        </ant> 
    2424 
    25         <ant target="create-distribution-3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false"> 
     25        <ant target="create-distribution-3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false"> 
    2626            <property name="app.version" value="${version}"/> 
    2727            <property name="branch.path" value="${branch.path}"/> 
     
    3232        <antcall target="export-imagemagick-darwin-binaries" /> 
    3333        <antcall target="export-ghostscript-darwin-binaries" /> 
    34         <antcall target="strip-svn-dirs"><param name="dir" value="distribution"/></antcall> <!-- from init --> 
     34        <antcall target="strip-svn-dirs"><param name="dir" value="distributions"/></antcall> <!-- from init --> 
    3535    </target> 
    3636 
    3737    <target name="export-greenstone3-gli"> 
    38         <mkdir dir="distribution"/> 
    39         <delete dir="distribution/greenstone3"/> 
     38        <mkdir dir="distributions"/> 
     39        <delete dir="distributions/web"/> 
    4040        <svn javahl="false"> 
    41             <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3"/> 
    42             <export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution/greenstone3/gli"/> 
     41            <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distributions/web"/> 
     42            <export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli"/> 
    4343        </svn> 
    4444    </target> 
    4545     
    4646    <target name="export-imagemagick-darwin-binaries"> 
    47         <delete dir="distribution/greenstone3/gs2build/bin/darwin/imagemagick"/> 
     47        <delete dir="distributions/web/gs2build/bin/darwin/imagemagick"/> 
    4848        <svn> 
    49             <export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/imagemagick" destPath="distribution/greenstone3/gs2build/bin/darwin/imagemagick"/> 
     49            <export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/imagemagick" destPath="distributions/web/gs2build/bin/darwin/imagemagick"/> 
    5050        </svn> 
    5151    </target> 
    5252     
    5353    <target name="export-ghostscript-darwin-binaries"> 
    54         <delete dir="distribution/greenstone3/gs2build/bin/darwin/ghostscript"/> 
     54        <delete dir="distributions/web/gs2build/bin/darwin/ghostscript"/> 
    5555        <svn> 
    56             <export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/ghostscript" destPath="distribution/greenstone3/gs2build/bin/darwin/ghostscript"/> 
     56            <export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/ghostscript" destPath="distributions/web/gs2build/bin/darwin/ghostscript"/> 
    5757        </svn> 
    5858    </target> 
    5959 
    60     <target name="dist-set-version-number-property"> 
    61         <rsr 
    62             file="distribution/greenstone3/resources/java/global.properties.in" 
    63             pattern="(.*)@gsdl3version@(.*)" 
    64             replacement="$1${version}$2" /> 
    65     </target> 
    66  
    6760    <target name="copy-over-build-xml"> 
    68         <move file="distribution/greenstone3/modified-build.xml" tofile="distribution/greenstone3/build.xml"/> 
     61        <move file="distributions/web/modified-build.xml" tofile="distributions/web/build.xml"/> 
    6962    </target> 
    7063 
    7164    <target name="insert-user-manual"> 
    72         <copy file="greenstone3/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distribution/greenstone3/docs/manual/gs2_user_en.pdf"/> 
     65        <copy file="compiled/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distributions/web/docs/manual/gs2_user_en.pdf"/> 
    7366    </target> 
    7467 
    7568    <target name="insert-compiled-binaries"> 
    76         <delete dir="distribution/greenstone3/lib/jni"/> 
    77         <exec executable="cp"><arg line="-r greenstone3/lib/jni distribution/greenstone3/lib"/></exec> 
     69        <delete dir="distributions/web/lib/jni"/> 
     70        <exec executable="cp"><arg line="-r compiled/lib/jni distributions/web/lib"/></exec> 
    7871 
    79         <delete dir="distribution/greenstone3/gs2build/bin/darwin"/> 
    80         <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/darwin distribution/greenstone3/gs2build/bin"/></exec> 
     72        <delete dir="distributions/web/gs2build/bin/darwin"/> 
     73        <exec executable="cp"><arg line="-r compiled/gs2build/bin/darwin distributions/web/gs2build/bin"/></exec> 
    8174 
    82         <delete dir="distribution/greenstone3/gs2build/bin/java"/> 
    83         <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/java distribution/greenstone3/gs2build/bin"/></exec> 
    84         <exec executable="cp"><arg line="greenstone3/bin/search4j distribution/greenstone3/bin"/></exec> 
     75        <delete dir="distributions/web/gs2build/bin/java"/> 
     76        <exec executable="cp"><arg line="-r compiled/gs2build/bin/java distributions/web/gs2build/bin"/></exec> 
     77        <exec executable="cp"><arg line="compiled/bin/search4j distributions/web/bin"/></exec> 
    8578    </target> 
    8679 
    87     <target name="rename-build-xml-for-transit"> 
    88         <move file="distribution/greenstone3/build.xml" tofile="distribution/greenstone3/greenstone3-build.xml"/> 
    89     </target> 
    90  
    91  
    9280</project>