Changeset 20112

Show
Ignore:
Timestamp:
03.08.2009 11:49:27 (10 years ago)
Author:
oranfry
Message:

more generalisation, and wrok on mark3

Location:
release-kits
Files:
13 modified

Legend:

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

    r19953 r20112  
    11<?xml version="1.0" encoding="utf-8" ?> 
    22<project name="lirk3-compile" default="compile"> 
    3  
    4     <target name="compile"> 
    5         <antcall target="checkout-greenstone3" /> 
    6         <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="compiled"/></antcall> 
    7         <ant dir="compiled" inheritAll="false"> 
    8             <target name="prepare"/> 
    9             <propertyset refid="forward.properties"/> 
    10         </ant> 
    11         <antcall target="gli-set-version-numbers"><param name="glibasedir" value="compiled/gli" /></antcall> 
    12         <ant dir="compiled" inheritAll="false"> 
    13             <target name="install"/> 
    14                         <!-- we are temporarily leaving in src code --> 
    15                         <target name="distclean"/> 
    16             <target name="dist-tidy"/> 
    17             <propertyset refid="forward.properties"/> 
    18         </ant> 
    19         <antcall target="insert-xml-parser"/> 
    20         <antcall target="insert-ant"/> 
    21         <antcall target="insert-documented-examples"/> 
    22         <antcall target="insert-imagemagick-linux-binaries"/> 
    23         <antcall target="compile-uninstaller" /> <!-- from rk3-targets --> 
    24         <antcall target="prepare-documentation"/> <!-- from rk3-targets --> 
    25     </target> 
    26  
    27     <target name="insert-imagemagick-linux-binaries"> 
    28         <delete dir="compiled/bin/linux/imagemagick"/> 
    29         <svn> 
    30             <export srcurl="${svn.root}/other-projects/trunk/linux-binaries/imagemagick" destPath="compiled/gs2build/bin/linux/imagemagick"/> 
    31         </svn> 
    32     </target> 
    33  
     3    <target name="compile" depends="greenstone3-compile"/> 
    344</project> 
  • release-kits/lirk3/ant-scripts/create-components.xml

    r20060 r20112  
    1919 
    2020    <target name="compress-components"> 
    21                 <antcall target="compress-component"><param name="component" value="core"/></antcall> 
    22                 <antcall target="compress-component"><param name="component" value="tomcat"/></antcall> 
    23                 <antcall target="compress-component"><param name="component" value="imagemagick"/></antcall> 
    24     </target> 
     21        <antcall target="compress-component"><param name="component" value="core"/></antcall> 
     22        <antcall target="compress-component"><param name="component" value="tomcat"/></antcall> 
     23        <antcall target="compress-component"><param name="component" value="imagemagick"/></antcall> 
     24    </target> 
    2525 
    2626</project> 
  • release-kits/lirk3/ant-scripts/create-distribution.xml

    r19936 r20112  
    11<?xml version="1.0" encoding="utf-8" ?> 
    22<project name="lirk3-create-distribution" default="create-distribution"> 
    3  
    4     <target name="create-distribution"> 
    5         <!-- create distribution --> 
    6         <antcall target="copy-compiled-to-dist"/> <!-- from init --> 
    7         <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from init --> 
    8         <antcall target="clean-user-manual"/> 
    9         <antcall target="clean-uninstaller"/> 
    10         <antcall target="strip-svn-dirs"><param name="dir" value="distributions"/></antcall> <!-- from init --> 
    11     </target> 
    12  
     3    <target name="create-distribution" depends="greenstone3-create-distribution"/> 
    134</project> 
  • release-kits/mark3/ant-scripts/build.xml

    r19154 r20112  
    1818    <property name="rk.name" value="mark3"/> 
    1919    <property name="rk.home" value="${mark3.home}" /> 
    20     <property name="rk.os" value="linux" /> 
     20    <property name="rk.os" value="mac" /> 
    2121    <!-- os.suffix set dynamically below --> 
    2222 
     
    5353        <antcall target="compile"/> 
    5454        <antcall target="create-distribution"/> 
    55         <antcall target="create-components"/> 
     55        <ant dir="." antfile="${mark3.home}/ant-scripts/create-components.xml" target="create-components"/> 
    5656        <antcall target="create-installer"/> 
    5757        <antcall target="wrap"/> 
  • release-kits/mark3/ant-scripts/compile.xml

    r19936 r20112  
    11<?xml version="1.0" encoding="utf-8" ?> 
    22<project name="mark3-compile" default="compile"> 
    3  
    4     <target name="compile"> 
    5  
    6         <!-- checkout --> 
    7         <antcall target="checkout-greenstone3" /> 
    8  
    9         <!-- preparation --> 
    10         <antcall target="greenstone3-set-version-numbers"> 
    11             <param name="greenstone3basedir" value="${basedir}/compiled"/> 
    12         </antcall> 
    13         <ant target="prepare-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/> 
    14          
    15         <!-- update --> 
    16         <ant target="update-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/> 
    17  
    18         <!-- configure --> 
    19         <ant target="configure-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/> 
    20         <antcall target="tweak-makefiles" /> 
    21  
    22         <!-- build --> 
    23         <ant target="build-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/> 
    24         <antcall target="linux-strip-execs" /> 
    25  
    26         <!-- uninstaller --> 
    27         <antcall target="compile-uninstaller" /> <!-- from rk3-targets --> 
    28  
    29         <!-- documentation --> 
    30         <antcall target="prepare-documentation" /> 
    31  
    32     </target> 
    33  
    34     <target name="set-version-number-property"> 
    35         <rsr file="compiled/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" /> 
    36     </target> 
    37  
    38  
    39     <target name="linux-strip-execs"> 
    40         <exec dir="compiled/gs2build/bin/darwin" executable="find"> 
    41             <arg line=". ! -name . -exec strip {} &#59;"/> 
    42         </exec> 
    43     </target> 
    44  
     3    <target name="compile" depends="greenstone3-compile"/> 
    454</project> 
    465 
    47  
  • release-kits/mark3/ant-scripts/create-components.xml

    r17964 r20112  
    22<project name="mark3-create-components" default="create-components"> 
    33 
     4    <import file="${basedir}/distributions/web/resources/xml/components.xml"/> 
     5    <import file="${rk.home}/greenstone3/ant-scripts/rk3-targets.xml"/> 
     6 
    47    <!-- create components from the distributions folder --> 
    58 
    6     <!-- 1st level --> 
    79    <target name="create-components"> 
    810        <antcall target="prepare-components" /> 
     
    1012    </target> 
    1113 
    12     <!-- 2nd level --> 
    1314    <target name="prepare-components"> 
    14         <antcall target="prepare-core-component" /> 
    15         <antcall target="prepare-ant-component" /> 
    16         <antcall target="prepare-tomcat-component" /> 
    17         <antcall target="prepare-imagemagick-component" /> 
    18         <antcall target="prepare-ghostscript-component" /> 
    19  
    20         <antcall target="prepare-sourcecode-component" /> 
    21  
     15        <antcall target="prepare-component"><param name="component" value="core"/></antcall> 
     16        <antcall target="prepare-component"><param name="component" value="tomcat"/></antcall> 
     17        <antcall target="prepare-component"><param name="component" value="imagemagick"/></antcall> 
     18        <antcall target="prepare-component"><param name="component" value="ghostscript"/></antcall> 
    2219    </target> 
    2320 
    2421    <target name="compress-components"> 
    25         <antcall target="compress-core-component" /> 
    26         <antcall target="compress-ant-component" /> 
    27         <antcall target="compress-tomcat-component" /> 
    28         <antcall target="compress-imagemagick-component" /> 
    29         <antcall target="compress-ghostscript-component" /> 
    30  
    31         <antcall target="compress-zipped-binary-release" /> <!-- from init --> 
    32  
     22        <antcall target="compress-component"><param name="component" value="core"/></antcall> 
     23        <antcall target="compress-component"><param name="component" value="tomcat"/></antcall> 
     24        <antcall target="compress-component"><param name="component" value="imagemagick"/></antcall> 
     25        <antcall target="compress-component"><param name="component" value="ghostscript"/></antcall> 
    3326    </target> 
    3427 
    35     <!-- 3rd level --> 
    36     <!-- core --> 
    37     <target name="prepare-core-component"> 
    38  
    39         <delete dir="components/tmp/core"/> 
    40         <mkdir dir="components/tmp/core"/> 
    41                  
    42         <copy todir="components/tmp/core" overwrite="true"> 
    43             <fileset dir="distributions/web"> 
    44                 <include name="**/*"/> 
    45  
    46                 <!-- exclude sourcecode --> 
    47                 <exclude name="src"/> 
    48                 <exclude name="src/**/*"/> 
    49                 <exclude name="gs2build/common-src"/> 
    50                 <exclude name="gs2build/common-src/**/*"/> 
    51                 <exclude name="gs2build/build-src"/> 
    52                 <exclude name="gs2build/build-src/**/*"/> 
    53                 <exclude name="gs2build/runtime-src"/> 
    54                 <exclude name="gs2build/runtime-src/**/*"/> 
    55                  
    56                 <!-- exclude ant --> 
    57                 <exclude name="packages/ant"/> 
    58                 <exclude name="packages/ant/**/*"/> 
    59  
    60                 <!-- exclude tomcat --> 
    61                 <exclude name="packages/tomcat"/> 
    62                 <exclude name="packages/tomcat/**/*"/> 
    63  
    64                 <!-- exclude imagemagick --> 
    65                 <exclude name="gs2build/bin/darwin/imagemagick"/> 
    66                 <exclude name="gs2build/bin/darwin/imagemagick/**/*"/> 
    67  
    68             </fileset> 
    69         </copy> 
    70                  
    71         <zip destfile="components/core.comp" basedir="components/tmp/core" compress="false" /> 
    72     </target> 
    73      
    74     <target name="compress-core-component"> 
    75         <sevenzip task="encode" input="components/core.comp" output="components/core.lzma" dictionnary="26"/> 
    76     </target> 
    77      
    78     <!-- sourcecode --> 
    79     <target name="prepare-sourcecode-component"> 
    80  
    81         <delete dir="components/tmp/sourcecode"/> 
    82         <mkdir dir="components/tmp/sourcecode"/> 
    83  
    84         <copy todir="components/tmp/sourcecode" overwrite="true"> 
    85                 <fileset dir="distributions/web"> 
    86                     <include name="src/**/*"/> 
    87                     <include name="gs2build/common-src/**/*"/> 
    88                     <include name="gs2build/build-src/**/*"/> 
    89                     <include name="gs2build/runtime-src/**/*"/> 
    90                 </fileset> 
    91         </copy> 
    92                  
    93         <mkdir dir="products"/> 
    94         <tar destfile="products/Greenstone-${version}-${os.suffix}-sourcecode-component.tar.gz" basedir="components/tmp/sourcecode" compression="gzip" longfile="gnu"/> 
    95     </target> 
    96          
    97     <target name="compress-sourcecode-component"> 
    98         <sevenzip task="encode" input="components/sourcecode.comp" output="components/sourcecode.lzma" dictionnary="26"/> 
    99     </target> 
    100      
    101     <!-- ant --> 
    102     <target name="prepare-ant-component"> 
    103  
    104         <delete dir="components/tmp/ant"/> 
    105         <mkdir dir="components/tmp/ant"/> 
    106  
    107         <copy todir="components/tmp/ant" overwrite="true"> 
    108             <fileset dir="distributions/web/packages"> 
    109                 <include name="ant/**/*"/> 
    110             </fileset> 
    111         </copy> 
    112          
    113         <zip destfile="components/ant.comp" basedir="components/tmp/ant" compress="false" /> 
    114     </target> 
    115          
    116     <target name="compress-ant-component"> 
    117         <sevenzip task="encode" input="components/ant.comp" output="components/ant.lzma" dictionnary="26"/> 
    118     </target> 
    119      
    120     <!-- tomcat --> 
    121     <target name="prepare-tomcat-component"> 
    122  
    123         <delete dir="components/tmp/tomcat"/> 
    124         <mkdir dir="components/tmp/tomcat"/> 
    125  
    126         <copy todir="components/tmp/tomcat" overwrite="true"> 
    127             <fileset dir="distributions/web/packages"> 
    128                 <include name="tomcat/**/*"/> 
    129             </fileset> 
    130         </copy> 
    131          
    132         <zip destfile="components/tomcat.comp" basedir="components/tmp/tomcat" compress="false" /> 
    133     </target> 
    134          
    135     <target name="compress-tomcat-component"> 
    136         <sevenzip task="encode" input="components/tomcat.comp" output="components/tomcat.lzma" dictionnary="26"/> 
    137     </target> 
    138  
    139     <!-- imagemagick --> 
    140     <target name="prepare-imagemagick-component"> 
    141  
    142         <delete dir="components/tmp/imagemagick"/> 
    143         <mkdir dir="components/tmp/imagemagick"/> 
    144  
    145         <copy todir="components/tmp/imagemagick" overwrite="true"> 
    146             <fileset dir="distributions/web/gs2build/bin/darwin"> 
    147                 <include name="imagemagick/**/*"/> 
    148             </fileset> 
    149         </copy> 
    150                  
    151         <zip destfile="components/imagemagick.comp" basedir="components/tmp/imagemagick" compress="false" includes="**/*"/> 
    152     </target> 
    153          
    154     <target name="compress-imagemagick-component"> 
    155         <sevenzip task="encode" input="components/imagemagick.comp" output="components/imagemagick.lzma" dictionnary="26"/> 
    156     </target> 
    157      
    158     <!-- ghostscript --> 
    159     <target name="prepare-ghostscript-component"> 
    160  
    161         <delete dir="components/tmp/ghostscript"/> 
    162         <mkdir dir="components/tmp/ghostscript"/> 
    163  
    164         <copy todir="components/tmp/ghostscript" overwrite="true"> 
    165             <fileset dir="distributions/web/gs2build/bin/darwin"> 
    166                 <include name="ghostscript/**/*"/> 
    167             </fileset> 
    168         </copy> 
    169                  
    170         <zip destfile="components/ghostscript.comp" basedir="components/tmp/ghostscript" compress="false" includes="**/*"/> 
    171     </target> 
    172          
    173     <target name="compress-ghostscript-component"> 
    174         <sevenzip task="encode" input="components/ghostscript.comp" output="components/ghostscript.lzma" dictionnary="26"/> 
    175     </target> 
    176  
    177 </project> 
  • release-kits/mark3/ant-scripts/create-distribution.xml

    r19935 r20112  
    11<?xml version="1.0" encoding="utf-8" ?> 
    22<project name="mark3-create-distribution" default="create-distribution"> 
    3  
    4     <target name="create-distribution"> 
    5  
    6         <!-- create distribution --> 
    7         <antcall target="export-greenstone3-gli" /> 
    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> 
    10         <antcall target="insert-user-manual"/> 
    11         <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from init --> 
    12         <antcall target="insert-uninstaller-jar"/> <!-- from rk3-targets --> 
    13  
    14         <ant target="create-distribution-1" dir="distributions/web" inheritAll="false"> 
    15             <property name="app.version" value="${version}"/> 
    16             <property name="branch.path" value="${branch.path}"/> 
    17             <property name="branch.revision" value="${branch.revision}"/> 
    18         </ant> 
    19  
    20         <ant target="create-distribution-2" dir="distributions/web" inheritAll="false"> 
    21             <property name="app.version" value="${version}"/> 
    22             <property name="branch.path" value="${branch.path}"/> 
    23             <property name="branch.revision" value="${branch.revision}"/> 
    24         </ant> 
    25  
    26         <ant target="create-distribution-3" dir="distributions/web" inheritAll="false"> 
    27             <property name="app.version" value="${version}"/> 
    28             <property name="branch.path" value="${branch.path}"/> 
    29             <property name="branch.revision" value="${branch.revision}"/> 
    30         </ant> 
    31  
    32         <antcall target="copy-over-build-xml" /> 
    33         <antcall target="insert-compiled-binaries"/> 
    34         <antcall target="export-imagemagick-darwin-binaries" /> 
    35         <antcall target="export-ghostscript-darwin-binaries" /> 
    36         <antcall target="strip-svn-dirs"><param name="dir" value="distributions"/></antcall> <!-- from init --> 
    37     </target> 
    38  
    39     <target name="export-greenstone3-gli"> 
    40         <mkdir dir="distributions"/> 
    41         <delete dir="distributions/web"/> 
    42         <svn javahl="false"> 
    43             <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distributions/web"/> 
    44             <export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli"/> 
    45         </svn> 
    46     </target> 
    47      
    48     <target name="export-imagemagick-darwin-binaries"> 
    49         <delete dir="distributions/web/gs2build/bin/darwin/imagemagick"/> 
    50         <svn> 
    51             <export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/imagemagick" destPath="distributions/web/gs2build/bin/darwin/imagemagick"/> 
    52         </svn> 
    53     </target> 
    54      
    55     <target name="export-ghostscript-darwin-binaries"> 
    56         <delete dir="distributions/web/gs2build/bin/darwin/ghostscript"/> 
    57         <svn> 
    58             <export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/ghostscript" destPath="distributions/web/gs2build/bin/darwin/ghostscript"/> 
    59         </svn> 
    60     </target> 
    61  
    62     <target name="copy-over-build-xml"> 
    63         <move file="distributions/web/modified-build.xml" tofile="distributions/web/build.xml"/> 
    64     </target> 
    65  
    66     <target name="insert-user-manual"> 
    67         <copy file="compiled/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distributions/web/docs/manual/gs2_user_en.pdf"/> 
    68     </target> 
    69  
    70     <target name="insert-compiled-binaries"> 
    71         <delete dir="distributions/web/lib/jni"/> 
    72         <exec executable="cp"><arg line="-r compiled/lib/jni distributions/web/lib"/></exec> 
    73  
    74         <delete dir="distributions/web/gs2build/bin/darwin"/> 
    75         <exec executable="cp"><arg line="-r compiled/gs2build/bin/darwin distributions/web/gs2build/bin"/></exec> 
    76  
    77         <delete dir="distributions/web/gs2build/bin/java"/> 
    78         <exec executable="cp"><arg line="-r compiled/gs2build/bin/java distributions/web/gs2build/bin"/></exec> 
    79         <exec executable="cp"><arg line="compiled/bin/search4j distributions/web/bin"/></exec> 
    80     </target> 
    81  
     3    <target name="create-distribution" depends="greenstone3-create-distribution"/> 
    824</project> 
  • release-kits/shared/core/ant-scripts/init.xml

    r20107 r20112  
    309309    <!-- copy the uninstaller script from the rk to web distribution --> 
    310310    <target name="insert-uninstaller"> 
    311         <copy file="${rk.home}/core/uninstaller/Uninstall.${script-format}" todir="distributions/web" /> 
     311 
     312        <!-- linux and mac --> 
     313        <if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool> 
     314            <copy file="${rk.home}/core/uninstaller/Uninstall.sh" todir="distributions/web"/> 
     315 
     316        <!-- windows --> 
     317        <else><if><bool><equals arg1="${rk.os}" arg2="windows"/></bool> 
     318            <copy file="${rk.home}/core/uninstaller/Uninstall.sh" todir="distributions/web"/> 
     319 
     320        <!-- else fail --> 
     321        <else> 
     322            <fail>this target does not support the current os</fail> 
     323 
     324        </else></if></else></if> 
    312325    </target> 
    313326 
  • release-kits/shared/greenstone3/ant-scripts/rk3-targets.xml

    r19982 r20112  
    228228    </target> 
    229229     
     230    <target name="greenstone3-compile"> 
     231        <antcall target="checkout-greenstone3" /> 
     232        <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="compiled"/></antcall> 
     233        <ant dir="compiled" inheritAll="false"> 
     234            <target name="prepare"/> 
     235            <propertyset refid="forward.properties"/> 
     236        </ant> 
     237        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="compiled/gli" /></antcall> 
     238        <ant dir="compiled" inheritAll="false"> 
     239            <target name="install"/> 
     240            <target name="dist-tidy"/> 
     241            <propertyset refid="forward.properties"/> 
     242        </ant> 
     243        <antcall target="insert-xml-parser"/> 
     244        <antcall target="insert-ant"/> 
     245        <antcall target="insert-documented-examples"/> 
     246        <antcall target="compile-uninstaller" /> <!-- from rk3-targets --> 
     247        <antcall target="prepare-documentation"/> <!-- from rk3-targets --> 
     248    </target> 
     249 
     250    <target name="create-distribution"> 
     251        <!-- create distribution --> 
     252        <antcall target="copy-compiled-to-dist"/> <!-- from init --> 
     253        <antcall target="insert-uninstaller"/> 
     254        <antcall target="clean-user-manual"/> 
     255        <antcall target="clean-uninstaller"/> 
     256        <antcall target="strip-svn-dirs"><param name="dir" value="distributions"/></antcall> <!-- from init --> 
     257    </target> 
     258 
    230259 
    231260</project> 
  • release-kits/wirk3/ant-scripts/compile.xml

    r20057 r20112  
    11<?xml version="1.0" encoding="utf-8" ?> 
    22<project name="wirk3-compile" default="compile"> 
    3  
    4     <target name="compile"> 
    5         <antcall target="checkout-greenstone3" /> 
    6         <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="compiled" /></antcall> 
    7         <ant dir="compiled" inheritAll="false"> 
    8             <target name="prepare"/> 
    9             <propertyset refid="forward.properties"/> 
    10         </ant> 
    11         <antcall target="gli-set-version-numbers"><param name="glibasedir" value="compiled/gli" /></antcall> 
    12         <ant dir="compiled" inheritAll="false"> 
    13             <target name="install"/> 
    14             <target name="dist-tidy"/> 
    15             <propertyset refid="forward.properties"/> 
    16         </ant> 
     3    <target name="compile" depends="greenstone3-compile"> 
    174        <antcall target="insert-windows-perl"><param name="todir" value="compiled/gs2build/bin/windows"/></antcall> 
    18         <antcall target="insert-xml-parser"/> 
    19         <antcall target="insert-ant"/> 
    20         <antcall target="insert-documented-examples"/> 
    21         <antcall target="compile-uninstaller" /> <!-- from rk3-targets --> 
    22         <antcall target="prepare-documentation"/> <!-- from rk3-targets --> 
    235        <antcall target="insert-icon"/> 
    246    </target> 
    25      
    267    <target name="insert-icon"> 
    278        <copy 
     
    2910            tofile="compiled/resources/images/gs3.ico"/> 
    3011    </target> 
    31  
    32      
    3312</project> 
  • release-kits/wirk3/ant-scripts/create-components.xml

    r20060 r20112  
    22<project name="wirk3-create-components" default="create-components"> 
    33 
    4        <import file="${basedir}/distributions/web/resources/xml/components.xml"/> 
    5        <import file="${rk.home}/greenstone3/ant-scripts/rk3-targets.xml"/> 
     4    <import file="${basedir}/distributions/web/resources/xml/components.xml"/> 
     5    <import file="${rk.home}/greenstone3/ant-scripts/rk3-targets.xml"/> 
    66 
    77    <!-- create components from the distributions folder --> 
     
    2020 
    2121    <target name="compress-components"> 
    22                 <antcall target="compress-component"><param name="component" value="core"/></antcall> 
    23                 <antcall target="compress-component"><param name="component" value="tomcat"/></antcall> 
    24                 <antcall target="compress-component"><param name="component" value="imagemagick"/></antcall> 
    25                 <antcall target="compress-component"><param name="component" value="ghostscript"/></antcall> 
    26     </target> 
     22        <antcall target="compress-component"><param name="component" value="core"/></antcall> 
     23        <antcall target="compress-component"><param name="component" value="tomcat"/></antcall> 
     24        <antcall target="compress-component"><param name="component" value="imagemagick"/></antcall> 
     25        <antcall target="compress-component"><param name="component" value="ghostscript"/></antcall> 
     26    </target> 
    2727 
    2828</project> 
  • release-kits/wirk3/ant-scripts/create-distribution.xml

    r20057 r20112  
    11<?xml version="1.0" encoding="utf-8" ?> 
    22<project name="wirk3-create-distribution" default="create-distribution"> 
    3  
    4     <target name="create-distribution"> 
    5         <!-- create distribution --> 
    6         <antcall target="copy-compiled-to-dist"/> <!-- from init --> 
    7         <antcall target="insert-uninstaller"><param name="script-format" value="bat"/></antcall> <!-- from init --> 
    8         <antcall target="clean-user-manual"/> 
    9         <antcall target="clean-uninstaller"/> 
    10         <antcall target="strip-svn-dirs"><param name="dir" value="distributions"/></antcall> <!-- from init --> 
    11     </target> 
    12  
     3    <target name="create-distribution" depends="greenstone3-create-distribution"/> 
    134</project> 
  • release-kits/wirk3/ant-scripts/create-installer.xml

    r19958 r20112  
    1010    <target name="copy-installer-files" depends="copy-main-installer-files,copy-greenstone3-installer-files"> <!-- from init --> 
    1111 
    12         <!-- some canned resources for the installer --> 
    1312        <copy todir="${basedir}/installer/classes" overwrite="true"> 
    1413            <fileset dir="${wirk3.home}/windows/7za" includes="7za.exe"/> 
     
    1615        </copy> 
    1716 
    18         <!-- some classes from jars, unpacked to be repacked into installer --> 
    1917        <unjar src="${wirk3.home}/core/ant-tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/> 
    2018        <delete dir="${basedir}/installer/classes/META-INF"/>