Changeset 17786


Ignore:
Timestamp:
11/07/08 14:36:58 (12 years ago)
Author:
oranfry
Message:

shifted the responsibility for the source release to the linux release kit. Made the source release contain a single component with the core and sourcecode mixed together

Location:
release-kits
Files:
24 edited

Legend:

Unmodified
Added
Removed
  • release-kits/lirk2/ant-scripts/create-components.xml

    r17721 r17786  
    1313    <target name="prepare-components">
    1414        <antcall target="prepare-core-component" />
     15        <antcall target="prepare-imagemagick-component" />
     16
    1517        <antcall target="prepare-sourcecode-component" />
    16         <antcall target="prepare-imagemagick-component" />
    17         <antcall target="prepare-sourcecode-core-component" />
     18
     19        <antcall target="prepare-source-release" />
    1820    </target>
    1921
    2022    <target name="compress-components">
    2123        <antcall target="compress-core-component" />
    22         <antcall target="compress-sourcecode-component" /> 
    2324        <antcall target="compress-imagemagick-component" />
    24         <antcall target="compress-sourcecode-core-component" />
     25
     26        <!--<antcall target="compress-sourcecode-component" />-->
     27
     28        <antcall target="compress-source-release" />
    2529    </target>
    2630
     
    5660    </target>
    5761
    58     <!-- sourcecode core -->
    59     <target name="prepare-sourcecode-core-component">
    60         <delete dir="components/tmp/sourcecode-core"/>
    61         <mkdir dir="components/tmp/sourcecode-core"/>
    62 
    63         <copy todir="components/tmp/sourcecode-core" overwrite="true">
    64             <fileset dir="distributions/source">
    65                 <include name="macros/**/*"/>
    66                 <include name="images/**/*"/>
    67                 <include name="etc/**/*"/>
    68                 <include name="gli/**/*"/>
    69                 <include name="collect/**/*"/>
    70                 <include name="doc/**/*"/>
    71                 <include name="setup.bash"/>
    72             </fileset>
    73         </copy>
    74         <zip destfile="components/sourcecode-core.comp" basedir="components/tmp/sourcecode-core" compress="false" includes="**/*"/>
    75     </target>
    76    
    77     <target name="compress-sourcecode-core-component">
    78         <sevenzip task="encode" input="components/sourcecode-core.comp" output="components/sourcecode-core.lzma" dictionnary="26"/>
    79     </target>
    80 
    8162    <!-- sourcecode -->
    8263    <target name="prepare-sourcecode-component">
     
    9374        </copy>
    9475               
    95         <zip destfile="components/sourcecode.comp" basedir="components/tmp/sourcecode" compress="false"/>
    9676        <zip destfile="components/Greenstone-${version}-linux-sourcecode.zip"  basedir="components/tmp/sourcecode" compress="true"/>
    9777    </target>
     
    120100    </target>
    121101
     102    <!-- source-release -->
     103    <target name="prepare-source-release">
     104        <delete dir="components/tmp/source-release"/>
     105        <mkdir dir="components/tmp/source-release"/>
     106
     107        <copy todir="components/tmp/source-release" overwrite="true">
     108            <fileset dir="distributions/source"/>
     109        </copy>
     110        <zip destfile="components/source-release.comp" basedir="components/tmp/source-release" compress="false" includes="**/*"/>
     111    </target>
     112   
     113    <target name="compress-source-release">
     114        <sevenzip task="encode" input="components/source-release.comp" output="components/source-release.lzma" dictionnary="26"/>
     115    </target>
     116
     117
    122118</project>
  • release-kits/lirk2/ant-scripts/create-distribution.xml

    r17652 r17786  
    99        <antcall target="drop-in-docs" />
    1010        <antcall target="tweak-files" />
     11        <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk2-targets -->
     12        <antcall target="drop-in-demo-collection" />
     13        <antcall target="insert-export-to-cd-package"/> <!-- from rk2-targets -->
    1114        <antcall target="remove-unneeded-files-1" />
    1215
     
    1417
    1518        <antcall target="drop-in-binaries" />
    16         <antcall target="drop-in-demo-collection" />
    17         <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk2-targets -->
    18         <antcall target="insert-export-to-cd-package"/>     <!-- from rk2-targets -->
    1919        <antcall target="export-imagemagick-linux-binaries" />
    2020        <antcall target="compile-gli" />
     
    8181    <target name="remove-unneeded-files-1">
    8282        <delete file="${basedir}/distributions/web/gli/.greenstonestore" />
    83         <delete><fileset dir="${basedir}/distributions/web/gli" includes="*.bat"/></delete>
    84         <delete><fileset dir="${basedir}/distributions/web" includes="*.bat"/></delete>
    85         <delete dir="${basedir}/distributions/web/common-src/packages/windows"/>
    8683    </target>
    8784
     
    126123    <target name="remove-unneeded-files-2">
    127124        <delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" />
     125        <delete><fileset dir="${basedir}/distributions/web/gli" includes="*.bat"/></delete>
     126        <delete><fileset dir="${basedir}/distributions/web" includes="*.bat"/></delete>
     127        <delete dir="${basedir}/distributions/web/common-src/packages/windows"/>
    128128    </target>
    129129
    130 
    131130</project>
  • release-kits/lirk2/installer/antinstall-config.xml

    r17765 r17786  
    2525
    2626    <!--  simple intro page -->
    27     <page type="input" name="intro" displayText="">
     27    <page
     28        type="input"
     29        name="intro"
     30        displayText=""
     31        <!-- start source release -->
     32        target="Source Release"
     33        <!-- end source release -->
     34        >
     35
    2836        <comment name="welcome-message"/>
    2937    </page>
     
    4250    </page>
    4351
     52    <!-- start binary release -->
    4453    <page type="input" name="selector" displayText="">
    4554        <comment name="choose-components"/>
     
    5362            hidden="true"/>
    5463
    55         <!-- start binary release core -->
    5664        <target
    5765            target="Installing Core System"
     
    6068            defaultValue="true"
    6169            force="true"/>
    62         <!-- end binary release core -->
    63 
    64         <!-- start source release core -->
    65         <target
    66             target="Installing Source Code Core"
    67             diskRequirement="@component.size.sourcecode-core@"
    68             displayText=""
    69             defaultValue="true"
    70             />
    71         <!-- end source release core -->
    7270
    7371        <!-- start bundled components -->
     
    7977        <!-- end bundled components -->
    8078
    81         <!-- start sourcecode -->
    82         <target
    83             target="Installing Source Code"
    84             diskRequirement="@component.size.sourcecode@"
    85             defaultValue="true"
    86             displayText=""/>
    87         <!-- end sourcecode -->
    88 
    8979    </page>
    9080
    91     <!-- start binary release core -->
    9281    <page type="input" name="admin-password" displayText="">
    9382        <comment name="admin-password-expl"/>
    9483        <text property="admin.password" defaultValue="" displayText=""/>
    9584    </page>
    96     <!-- end binary release core -->
     85    <!-- end binary release -->
    9786
    9887    <page type="progress" name="progress" showTargets="true" displayText=""/>
  • release-kits/lirk2/installer/build.xml

    r17765 r17786  
    9898    </target>
    9999
    100     <!-- sourcecode core system -->
    101     <target name="Installing Source Code Core">
     100    <!-- imagemagick -->
     101    <target name="Installing ImageMagick">
     102        <echo>Installing ImageMagick</echo>
     103        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>
     104        <sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/>
     105        <delete file="imagemagick.lzma"/>
     106        <unzip src="${basedir}/imagemagick.comp" dest="${installDir}/bin/linux"/>
     107        <delete file="imagemagick.comp"/>
     108       
     109        <echo>Setting ImageMagick Binaries to Executable</echo>
     110        <chmod dir="${installDir}/bin/linux/imagemagick/bin" includes="*" perm="775"/>
     111       
     112    </target>
    102113
    103         <echo>Installing Source Code Core</echo>
    104         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode-core.lzma"/></patternset></unzip>
    105         <sevenzip task="decode" input="${basedir}/sourcecode-core.lzma" output="${basedir}/sourcecode-core.comp"/>
    106         <delete file="sourcecode-core.lzma"/>
    107         <unzip src="${basedir}/sourcecode-core.comp" dest="${installDir}"/>
    108         <delete file="sourcecode-core.comp"/>
     114    <!-- source release -->
     115    <target name="Source Release">
     116
     117        <echo>Installing Source Release</echo>
     118        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="source-release.lzma"/></patternset></unzip>
     119        <sevenzip task="decode" input="${basedir}/source-release.lzma" output="${basedir}/source-release.comp"/>
     120        <delete file="source-release.lzma"/>
     121        <unzip src="${basedir}/source-release.comp" dest="${installDir}"/>
     122        <delete file="source-release.comp"/>
    109123
    110124        <echo>Set the installation locale in config files</echo>
     
    129143
    130144
    131     <!-- source code -->
    132     <target name="Installing Source Code">
    133         <echo>Installing Source Code</echo>
    134         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip>
    135         <sevenzip task="decode" input="${basedir}/sourcecode.lzma" output="${basedir}/sourcecode.comp"/>
    136         <delete file="sourcecode.lzma"/>
    137         <unzip src="${basedir}/sourcecode.comp" dest="${installDir}"/>
    138         <delete file="sourcecode.comp"/>
    139     </target>
    140 
    141     <!-- imagemagick -->
    142     <target name="Installing ImageMagick">
    143         <echo>Installing ImageMagick</echo>
    144         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>
    145         <sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/>
    146         <delete file="imagemagick.lzma"/>
    147         <unzip src="${basedir}/imagemagick.comp" dest="${installDir}/bin/linux"/>
    148         <delete file="imagemagick.comp"/>
    149        
    150         <echo>Setting ImageMagick Binaries to Executable</echo>
    151         <chmod dir="${installDir}/bin/linux/imagemagick/bin" includes="*" perm="775"/>
    152        
    153     </target>
    154 
    155145</project>
  • release-kits/lirk3/ant-scripts/create-components.xml

    r17721 r17786  
    1313    <target name="prepare-components">
    1414        <antcall target="prepare-core-component" />
    15         <antcall target="prepare-sourcecode-component" />
    1615        <antcall target="prepare-ant-component" />
    1716        <antcall target="prepare-tomcat-component" />
    1817        <antcall target="prepare-imagemagick-component" />
    19         <antcall target="prepare-sourcecode-core-component" />
     18
     19        <antcall target="prepare-sourcecode-component" />
     20
     21        <antcall target="prepare-source-release" />
    2022    </target>
    2123
    2224    <target name="compress-components">
    2325        <antcall target="compress-core-component" />
    24         <antcall target="compress-sourcecode-component" /> 
    2526        <antcall target="compress-ant-component" />
    2627        <antcall target="compress-tomcat-component" />
    2728        <antcall target="compress-imagemagick-component" />
    28         <antcall target="compress-sourcecode-core-component" />
     29
     30        <!--<antcall target="compress-sourcecode-component" />-->
     31
     32        <antcall target="compress-source-release" />
    2933    </target>
    3034
     
    6771    </target>
    6872
    69     <!-- sourcecode-core -->
    70     <target name="prepare-sourcecode-core-component">
    71         <delete dir="components/tmp/sourcecode-core"/>
    72         <mkdir dir="components/tmp/sourcecode-core"/>
    73 
    74         <copy todir="components/tmp/sourcecode-core" overwrite="true">
    75             <fileset dir="distribution/source">
    76                 <include name="gli/**/*"/>
    77                 <include name="docs/**/*"/>
    78                 <include name="resources/**/*"/>
    79                 <include name="web/**/*"/>
    80                 <include name="gs2build/etc/**/*"/>
    81                 <include name="gs2build/setup.bash"/>
    82                 <include name="build.xml"/>
    83                 <include name="build.properties"/>
    84                 <include name="*.sh"/>
    85                 <include name="*.txt"/>
    86             </fileset>
    87         </copy>
    88         <zip destfile="components/sourcecode-core.comp" basedir="components/tmp/sourcecode-core" compress="false"/>
    89     </target>
    90    
    91     <target name="compress-sourcecode-core-component">
    92         <sevenzip task="encode" input="components/sourcecode-core.comp" output="components/sourcecode-core.lzma" dictionnary="26"/>
    93     </target>
    94    
    9573    <!-- sourcecode -->
    9674    <target name="prepare-sourcecode-component">
     
    10886        </copy>
    10987               
    110         <zip destfile="components/sourcecode.comp" basedir="components/tmp/sourcecode" compress="false" />
    11188        <zip destfile="components/Greenstone-${version}-linux-sourcecode.zip"  basedir="components/tmp/sourcecode" compress="true"/>
    11289    </target>
     
    173150    </target>
    174151
     152
     153    <!-- sourcecode-release -->
     154    <target name="prepare-source-release">
     155        <delete dir="components/tmp/source-release"/>
     156        <mkdir dir="components/tmp/source-release"/>
     157
     158        <copy todir="components/tmp/source-release" overwrite="true">
     159            <fileset dir="distribution/source"/>
     160        </copy>
     161        <zip destfile="components/source-release.comp" basedir="components/tmp/source-release" compress="false"/>
     162    </target>
     163   
     164    <target name="compress-source-release">
     165        <sevenzip task="encode" input="components/source-release.comp" output="components/source-release.lzma" dictionnary="26"/>
     166    </target>
     167
     168
    175169</project>
  • release-kits/lirk3/ant-scripts/create-distribution.xml

    r17652 r17786  
    99        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/></antcall>
    1010        <antcall target="insert-user-manual"/>
     11        <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk3-targets -->
    1112
    1213        <antcall target="copy-web-to-source-greenstone3" /> <!-- from gs3-targets -->
     
    1617            <property name="branch.path" value="${branch.path}"/>
    1718        </ant>
    18 
    1919        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-2" inheritAll="false">
    2020            <property name="app.version" value="${version}"/>
    2121            <property name="branch.path" value="${branch.path}"/>
    2222        </ant>
    23 
    2423        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-3" inheritAll="false">
    2524            <property name="app.version" value="${version}"/>
    2625            <property name="branch.path" value="${branch.path}"/>
    2726        </ant>
    28 
    2927        <antcall target="copy-over-build-xml" />
    3028        <antcall target="insert-compiled-binaries"/>
    3129        <antcall target="export-imagemagick-linux-binaries" />
    32         <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk3-targets -->
    3330   
    3431        <antcall target="strip-svn-dirs"><param name="dir" value="distribution"/></antcall> <!-- from init -->
  • release-kits/lirk3/installer/antinstall-config.xml

    r17765 r17786  
    2525
    2626    <!--  simple intro page -->
    27     <page type="input" name="intro" displayText="">
     27    <page
     28        type="input"
     29        name="intro"
     30        displayText=""
     31        <!-- start source release -->
     32        target="Source Release"
     33        <!-- end source release -->
     34        >
     35
    2836        <comment name="welcome-message"/>
     37
    2938    </page>
    3039
     
    5362        <comment name="choose-components"/>
    5463
     64        <!-- start binary release -->
    5565        <target
    5666            target="Initialising"
     
    6171            hidden="true"/>
    6272
    63         <!-- start binary release core -->
    6473        <target
    6574            target="Installing Core System"
     
    6877            defaultValue="true"
    6978            force="true"/>
    70         <!-- end binary release core -->
    71 
    72         <!-- start source release core -->
    73         <target
    74             target="Installing Source Code Core"
    75             diskRequirement="@component.size.sourcecode-core@"
    76             displayText=""
    77             defaultValue="true"
    78             />
    79         <!-- end source release core -->
    8079
    8180        <!-- start bundled components -->
     
    9998        <!-- end bundled components -->
    10099
    101         <!-- start sourcecode -->
    102         <target
    103             target="Installing Source Code"
    104             diskRequirement="@component.size.sourcecode@"
    105             defaultValue="false"
    106             displayText=""/>
    107         <!-- end sourcecode -->
    108 
    109100    </page>
     101    <!-- end binary release -->
    110102
    111103    <!-- start bundled components -->
  • release-kits/lirk3/installer/build.xml

    r17765 r17786  
    7272    </target>
    7373
    74     <!-- sourcecode core system -->
    75     <target name="Installing Source Code Core">
    76 
    77         <echo>Installing Source Code Core</echo>
    78         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode-core.lzma"/></patternset></unzip>
    79         <sevenzip task="decode" input="${basedir}/sourcecode-core.lzma" output="${basedir}/sourcecode-core.comp"/>
    80         <delete file="sourcecode-core.lzma"/>
    81         <unzip src="${basedir}/sourcecode-core.comp" dest="${installDir}"/>
    82         <delete file="sourcecode-core.comp"/>
    83 
    84         <echo>Setting up global properties</echo>
    85         <copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
    86         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
    87         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.server@(.*)" replacement="$1localhost$2" />
    88         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.port@(.*)" replacement="$1${tomcat.port}$2" />
    89 
    90         <echo>Setting up log4j properties</echo>
    91         <copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
    92         <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
    93 
    94         <echo>Creating installation properties file</echo>
    95         <echo file="${installDir}/installation.properties">#this file is just a placeholder for now</echo>
    96 
    97     </target>
    98 
    99 
    100     <!-- Source -->
    101     <target name="Installing Source Code" depends="">
    102 
    103         <echo>Installing Source Code</echo>
    104         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip>
    105         <sevenzip task="decode" input="${basedir}/sourcecode.lzma" output="${basedir}/sourcecode.comp"/>
    106         <delete file="sourcecode.lzma"/>
    107         <unzip src="${basedir}/sourcecode.comp" dest="${installDir}"/>
    108         <delete file="sourcecode.comp"/>
    109 
    110     </target>
    111 
    11274    <!-- imagemagick -->
    11375    <target name="Installing ImageMagick">
     
    160122    </target>
    161123
     124    <!-- source release -->
     125    <target name="Source Release">
     126
     127        <echo>Installing Source Release</echo>
     128        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="source-release.lzma"/></patternset></unzip>
     129        <sevenzip task="decode" input="${basedir}/source-release.lzma" output="${basedir}/source-release.comp"/>
     130        <delete file="source-release.lzma"/>
     131        <unzip src="${basedir}/source-release.comp" dest="${installDir}"/>
     132        <delete file="source-release.comp"/>
     133
     134        <echo>Setting up global properties</echo>
     135        <copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
     136        <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
     137        <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.server@(.*)" replacement="$1localhost$2" />
     138        <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.port@(.*)" replacement="$1${tomcat.port}$2" />
     139
     140        <echo>Setting up log4j properties</echo>
     141        <copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
     142        <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
     143
     144        <echo>Creating installation properties file</echo>
     145        <echo file="${installDir}/installation.properties">#this file is just a placeholder for now</echo>
     146
     147    </target>
     148
     149
    162150</project>
  • release-kits/mark2/ant-scripts/create-components.xml

    r17721 r17786  
    1313    <target name="prepare-components">
    1414        <antcall target="prepare-core-component" />
    15         <antcall target="prepare-sourcecode-component" />
    16         <antcall target="prepare-sourcecode-core-component" />
    1715        <antcall target="prepare-imagemagick-component" />
    1816        <antcall target="prepare-ghostscript-component" />
     17
     18        <!--<antcall target="prepare-sourcecode-component" />-->
    1919    </target>
    2020   
    2121    <target name="compress-components">
    2222        <antcall target="compress-core-component" />
    23         <antcall target="compress-sourcecode-component" />
    24         <antcall target="compress-sourcecode-core-component" />
    2523        <antcall target="compress-imagemagick-component" />
    2624        <antcall target="compress-ghostscript-component" />
     25
     26        <!--<antcall target="compress-sourcecode-component" />-->
    2727    </target>
    2828
     
    6767    <target name="compress-core-component">
    6868        <sevenzip task="encode" input="components/core.comp" output="components/core.lzma" dictionnary="26"/>
    69     </target>
    70 
    71     <!-- sourcecode core -->
    72     <target name="prepare-sourcecode-core-component">
    73         <delete dir="components/tmp/sourcecode-core"/>
    74         <mkdir dir="components/tmp/sourcecode-core"/>
    75 
    76         <copy todir="components/tmp/sourcecode-core" overwrite="true">
    77             <fileset dir="distributions/source">
    78                 <include name="macros/**/*"/>
    79                 <include name="images/**/*"/>
    80                 <include name="etc/**/*"/>
    81                 <include name="gli/**/*"/>
    82                 <include name="collect/**/*"/>
    83                 <include name="doc/**/*"/>
    84                 <include name="setup.bash"/>
    85             </fileset>
    86         </copy>
    87         <zip destfile="components/sourcecode-core.comp" basedir="components/tmp/sourcecode-core" compress="false" includes="**/*"/>
    88     </target>
    89    
    90     <target name="compress-sourcecode-core-component">
    91         <sevenzip task="encode" input="components/sourcecode-core.comp" output="components/sourcecode-core.lzma" dictionnary="26"/>
    9269    </target>
    9370
  • release-kits/mark2/ant-scripts/create-distribution.xml

    r17663 r17786  
    1010        <antcall target="tweak-files" />
    1111        <antcall target="remove-unneeded-files-1" />
    12 
    13         <antcall target="copy-web-to-source" /> <!-- from init -->
    14 
    1512        <antcall target="drop-in-binaries" />
    1613        <antcall target="drop-in-demo-collection" />
  • release-kits/mark2/installer/antinstall-config.xml

    r17742 r17786  
    4242    </page>
    4343
     44    <!-- start binary release -->
    4445    <page type="input" name="selector" displayText="">
    4546        <comment name="choose-components"/>
    4647
    47         <!-- start binary release core -->
    4848        <target
    4949            target="Installing Core System"
     
    5252            defaultValue="true"
    5353            force="true"/>
    54         <!-- end binary release core -->
    55 
    56         <!-- start source release core -->
    57         <target
    58             target="Installing Source Code Core"
    59             diskRequirement="@component.size.sourcecode-core@"
    60             displayText=""
    61             defaultValue="true"
    62             />
    63         <!-- end source release core -->
    64 
    65         <!-- start sourcecode -->
    66         <target
    67             target="Installing Source Code"
    68             diskRequirement="@component.size.sourcecode@"
    69             defaultValue="false"
    70             displayText=""/>
    71         <!-- end sourcecode -->
    7254
    7355    </page>
     56    <!-- end binary release -->
    7457
    7558    <page type="input" name="admin-password" displayText="">
  • release-kits/mark2/installer/build.xml

    r17754 r17786  
    8181    </target>
    8282
    83     <!-- sourcecode core system -->
    84     <target name="Installing Source Code Core">
    85 
    86         <echo>Installing Source Code Core</echo>
    87         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode-core.lzma"/></patternset></unzip>
    88         <sevenzip task="decode" input="${basedir}/sourcecode-core.lzma" output="${basedir}/sourcecode-core.comp"/>
    89         <delete file="sourcecode-core.lzma"/>
    90         <unzip src="${basedir}/sourcecode-core.comp" dest="${installDir}"/>
    91         <delete file="sourcecode-core.comp"/>
    92 
    93         <echo>Set the installation locale in config files</echo>
    94         <rsr file="${installDir}/setup.bash" pattern="^gsdllang=.*" replacement="gsdllang=${language}"/>
    95         <rsr file="${installDir}/gli/gli.sh" pattern="^glilang=.*" replacement="glilang=${language}"/>
    96         <rsr file="${installDir}/gli/gems.sh" pattern="^glilang=.*" replacement="glilang=${language}"/>
    97 
    98         <rsr
    99             file="${installDir}/gli/classes/xml/config.xml"
    100             pattern="(&lt;Argument name=&quot;general.locale&quot;&gt;).*(&lt;/Argument&gt;)"
    101             replacement="$1${language}$2"/>
    102 
    103         <echo file="${installDir}/etc/main.cfg" append="true"
    104             >cgiarg          shortname=l argdefault=${language}</echo>
    105 
    106         <rsr file="${installDir}/etc/main.cfg" pattern="^status .*" replacement="status enabled"/>
    107 
    108         <echo>Creating installation properties file</echo>
    109         <echo file="${installDir}/etc/installation.properties">#this file is just a placeholder for now</echo>
    110 
    111     </target>
    112 
    113     <!-- Source -->
    114     <target name="Installing Source Code" depends="">
    115         <echo message="Installing Source Code"/>
    116         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip>
    117         <sevenzip task="decode" input="${basedir}/sourcecode.lzma" output="${basedir}/sourcecode.comp"/>
    118         <delete file="sourcecode.lzma"/>
    119         <unzip src="${basedir}/sourcecode.comp" dest="${installDir}"/>
    120         <delete file="sourcecode.comp"/>
    121     </target>
    122 
    12383    <!-- ImageMagick -->
    12484    <target name="Installing ImageMagick" depends="">
  • release-kits/mark3/ant-scripts/create-components.xml

    r17721 r17786  
    1313    <target name="prepare-components">
    1414        <antcall target="prepare-core-component" />
    15         <antcall target="prepare-sourcecode-component" />
    1615        <antcall target="prepare-ant-component" />
    1716        <antcall target="prepare-tomcat-component" />
    18         <antcall target="prepare-sourcecode-core-component" />
    1917        <antcall target="prepare-imagemagick-component" />
    2018        <antcall target="prepare-ghostscript-component" />
     19
     20        <!--<antcall target="prepare-sourcecode-component" />-->
    2121    </target>
    2222
    2323    <target name="compress-components">
    2424        <antcall target="compress-core-component" />
    25         <antcall target="compress-sourcecode-component" />
    2625        <antcall target="compress-ant-component" />
    2726        <antcall target="compress-tomcat-component" />
    28         <antcall target="compress-sourcecode-core-component" />
    2927        <antcall target="compress-imagemagick-component" />
    3028        <antcall target="compress-ghostscript-component" />
     29
     30        <!--<antcall target="compress-sourcecode-component" />-->
    3131    </target>
    3232
     
    7474    </target>
    7575   
    76     <!-- sourcecode-core -->
    77     <target name="prepare-sourcecode-core-component">
    78         <delete dir="components/tmp/sourcecode-core"/>
    79         <mkdir dir="components/tmp/sourcecode-core"/>
    80 
    81         <copy todir="components/tmp/sourcecode-core" overwrite="true">
    82             <fileset dir="distribution/source">
    83                 <include name="gli/**/*"/>
    84                 <include name="docs/**/*"/>
    85                 <include name="resources/**/*"/>
    86                 <include name="web/**/*"/>
    87                 <include name="gs2build/etc/**/*"/>
    88                 <include name="gs2build/setup.bash"/>
    89                 <include name="build.xml"/>
    90                 <include name="build.properties"/>
    91                 <include name="*.sh"/>
    92                 <include name="*.txt"/>
    93             </fileset>
    94         </copy>
    95         <zip destfile="components/sourcecode-core.comp" basedir="components/tmp/sourcecode-core" compress="false" includes="**/*"/>
    96     </target>
    97    
    98     <target name="compress-sourcecode-core-component">
    99         <sevenzip task="encode" input="components/sourcecode-core.comp" output="components/sourcecode-core.lzma" dictionnary="26"/>
    100     </target>
    101 
    102 
    10376    <!-- sourcecode -->
    10477    <target name="prepare-sourcecode-component">
  • release-kits/mark3/ant-scripts/create-distribution.xml

    r17662 r17786  
    99        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/></antcall>
    1010        <antcall target="insert-user-manual"/>
    11 
    12         <antcall target="copy-web-to-source-greenstone3" /> <!-- from gs3-targets -->
    1311
    1412        <ant target="create-distribution-1" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
  • release-kits/mark3/installer/antinstall-config.xml

    r17742 r17786  
    4242    </page>
    4343
     44    <!-- start binary release -->
    4445    <page type="input" name="selector" displayText="">
    4546        <comment name="choose-components"/>
    4647
    47         <!-- start binary release core -->
    4848        <target
    4949            target="Installing Core System"
     
    5252            defaultValue="true"
    5353            force="true"/>
    54         <!-- end binary release core -->
    55 
    56         <!-- start source release core -->
    57         <target
    58             target="Installing Source Code Core"
    59             diskRequirement="@component.size.sourcecode-core@"
    60             displayText=""
    61             defaultValue="true"
    62             />
    63         <!-- end source release core -->
    6454
    6555        <!-- start bundled components -->
     
    7767        <!-- end bundled components -->
    7868
    79         <!-- start sourcecode -->
    80         <target
    81             target="Installing Source Code"
    82             diskRequirement="@component.size.sourcecode@"
    83             defaultValue="false"
    84             displayText=""/>
    85         <!-- end sourcecode -->
    86 
    8769    </page>
     70    <!-- end binary release -->
    8871
    8972    <!-- start bundled components -->
  • release-kits/mark3/installer/build.xml

    r17715 r17786  
    6767    </target>
    6868
    69     <!-- sourcecode core system -->
    70     <target name="Installing Source Code Core">
    71 
    72         <echo>Installing Source Code Core</echo>
    73         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode-core.lzma"/></patternset></unzip>
    74         <sevenzip task="decode" input="${basedir}/sourcecode-core.lzma" output="${basedir}/sourcecode-core.comp"/>
    75         <delete file="sourcecode-core.lzma"/>
    76         <unzip src="${basedir}/sourcecode-core.comp" dest="${installDir}"/>
    77         <delete file="sourcecode-core.comp"/>
    78 
    79         <echo>Setting up global properties</echo>
    80         <copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
    81         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
    82         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.server@(.*)" replacement="$1localhost$2" />
    83         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.port@(.*)" replacement="$1${tomcat.port}$2" />
    84 
    85         <echo>Setting up log4j properties</echo>
    86         <copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
    87         <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
    88 
    89         <echo>Creating installation properties file</echo>
    90         <echo file="${installDir}/installation.properties">#this file is just a placeholder for now</echo>
    91 
    92 
    93     </target>
    94 
    95 
    96     <!-- Source -->
    97     <target name="Installing Source Code" depends="">
    98         <echo>Installing Source Code</echo>
    99         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip>
    100         <sevenzip task="decode" input="${basedir}/sourcecode.lzma" output="${basedir}/sourcecode.comp"/>
    101         <delete file="sourcecode.lzma"/>
    102         <unzip src="${basedir}/sourcecode.comp" dest="${installDir}"/>
    103         <delete file="sourcecode.comp"/>
    104     </target>
    105 
    10669    <target name="Installing Tomcat">
    10770        <echo message="Installing Tomcat (packages/tomcat)"/>
  • release-kits/wirk2/ant-scripts/create-components.xml

    r17721 r17786  
    1515        <antcall target="prepare-imagemagick-component" />
    1616        <antcall target="prepare-ghostscript-component" />
    17         <antcall target="prepare-sourcecode-component" />
    18         <antcall target="prepare-sourcecode-core-component" />
     17        <!--<antcall target="prepare-sourcecode-component" />-->
    1918    </target>
    2019   
     
    2322        <antcall target="compress-imagemagick-component" />
    2423        <antcall target="compress-ghostscript-component" />
    25         <antcall target="compress-sourcecode-component" />
    26         <antcall target="compress-sourcecode-core-component" />
     24        <!--<antcall target="compress-sourcecode-component" />-->
    2725    </target>
    2826   
     
    125123    </target>
    126124
    127     <target name="prepare-sourcecode-core-component">
    128         <delete dir="components/tmp/sourcecode-core"/>
    129         <mkdir dir="components/tmp/sourcecode-core"/>
    130 
    131         <copy todir="components/tmp/sourcecode-core" overwrite="true">
    132             <fileset dir="distributions/source">
    133                 <include name="macros/**/*"/>
    134                 <include name="images/**/*"/>
    135                 <include name="etc/**/*"/>
    136                 <include name="gli/**/*"/>
    137                 <include name="collect/**/*"/>
    138                 <include name="doc/**/*"/>
    139                 <include name="setup.bash"/>
    140             </fileset>
    141         </copy>
    142         <zip destfile="components/sourcecode-core.comp" basedir="components/tmp/sourcecode-core" compress="false" includes="**/*"/>
    143     </target>
    144    
    145     <target name="compress-sourcecode-core-component">
    146         <!--<sevenzip task="encode" input="components/sourcecode-core.comp" output="components/sourcecode-core.lzma" dictionnary="26"/>-->
    147         <exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 sourcecode-core.lzma sourcecode-core.comp"/></exec>
    148     </target>
    149 
    150    
    151    
    152125</project>
  • release-kits/wirk2/ant-scripts/create-distribution.xml

    r17652 r17786  
    1010        <antcall target="tweak-files" />
    1111        <antcall target="remove-unneeded-files-1" />
    12 
    13         <antcall target="copy-web-to-source" /> <!-- from init -->
    1412
    1513        <antcall target="drop-in-binaries" />
  • release-kits/wirk2/installer/antinstall-config.xml

    r17742 r17786  
    4242    </page>
    4343
     44    <!-- start binary release -->
    4445    <page type="input" name="selector" displayText="">
    4546        <comment name="choose-components"/>
     
    5354            hidden="true"/>
    5455
    55         <!-- start binary release core -->
    5656        <target
    5757            target="Installing Core System"
     
    6060            defaultValue="true"
    6161            force="true"/>
    62         <!-- end binary release core -->
    63 
    64         <!-- start source release core -->
    65         <target
    66             target="Installing Source Code Core"
    67             diskRequirement="@component.size.sourcecode-core@"
    68             displayText=""
    69             defaultValue="true"
    70             />
    71         <!-- end source release core -->
    7262
    7363        <target
     
    9181        <!-- end bundled components -->
    9282       
    93         <!-- start sourcecode -->
    94         <target
    95             target="Installing Source Code"
    96             diskRequirement="@component.size.sourcecode@"
    97             defaultValue="false"
    98             displayText=""/>
    99         <!-- end sourcecode -->
    100            
    10183    </page>
    10284
     
    10587        <text property="admin.password" defaultValue="" displayText=""/>
    10688    </page>
     89    <!-- end binary release -->
    10790
    10891    <page type="progress" name="progress" showTargets="true" displayText=""/>
  • release-kits/wirk2/installer/build.xml

    r17652 r17786  
    107107    </target>
    108108
    109     <target name="Installing Source Code Core">
    110 
    111         <!-- figure out the start menu path -->
    112         <getfreepath path="${win32.personal.programs_menu}\Greenstone-@version@" property="startmenu.path"/>       
    113         <path id="startmenu.path.path" path="${startmenu.path}"/>
    114         <pathconvert targetos="unix" property="startmenu.path.unix" refid="startmenu.path.path"/>
    115 
    116         <echo>basedir: ${basedir}</echo>
    117         <echo>installDir: ${installDir}</echo>
    118         <echo>antinstaller.jar: ${antinstaller.jar}</echo>
    119         <echo>startmenu.path: ${startmenu.path}</echo>
    120 
    121         <!-- create the installation directory -->
    122         <echo message="Creating Installation directory"/>
    123         <mkdir dir="${installDir}"/>
    124        
    125         <!-- extract 7za tool -->
    126         <unzip src="${antinstaller.jar}" dest="${basedir}">
    127             <patternset><include name="7za.exe"/></patternset>
    128         </unzip>
    129 
    130         <!-- install files -->
    131         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode-core.lzma"/></patternset></unzip>
    132         <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x sourcecode-core.lzma"/></exec>
    133         <delete file="sourcecode-core.lzma"/>
    134         <unzip src="${basedir}/sourcecode-core.comp" dest="${installDir}"/>
    135         <delete file="sourcecode-core.comp"/>
    136        
    137         <echo message="Filling in concrete values in config files"/>
    138         <rsr file="${installDir}/setup.bat" pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/>
    139                
    140         <echo message="Creating installation properties file"/>
    141         <echo file="${installDir}\etc\installation.properties">installed.startmenu.path:${startmenu.path.unix}</echo>
    142        
    143         <echo message="Finished"/>
    144        
    145     </target>
    146 
    147     <!-- Source -->
    148     <target name="Installing Source Code">
    149         <echo message="Installing Source Code"/>
    150         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip>
    151         <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x sourcecode.lzma"/></exec>
    152         <!--<sevenzip task="decode" input="${basedir}/sourcecode.lzma" output="${basedir}/sourcecode.comp"/>-->
    153         <delete file="sourcecode.lzma"/>
    154             <unzip src="${basedir}/sourcecode.comp" dest="${installDir}"/>
    155         <delete file="sourcecode.comp"/>
    156     </target>
    157 
    158109    <target name="Installing ImageMagick">
    159110        <echo message="Installing ImageMagick"/>
  • release-kits/wirk3/ant-scripts/create-components.xml

    r17721 r17786  
    1515        <antcall target="prepare-imagemagick-component" />
    1616        <antcall target="prepare-ghostscript-component" />
    17         <antcall target="prepare-sourcecode-component" />
    1817        <antcall target="prepare-ant-component" />
    1918        <antcall target="prepare-tomcat-component" />
    20         <antcall target="prepare-sourcecode-core-component" />
     19        <!--<antcall target="prepare-sourcecode-component" />-->
    2120    </target>
    2221   
     
    2524        <antcall target="compress-imagemagick-component" />
    2625        <antcall target="compress-ghostscript-component" />
    27         <antcall target="compress-sourcecode-component" />
    2826        <antcall target="compress-ant-component" />
    2927        <antcall target="compress-tomcat-component" />
    30         <antcall target="compress-sourcecode-core-component" />
     28        <!--<antcall target="compress-sourcecode-component" />-->
    3129    </target>
    3230   
     
    151149        <exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 ant.lzma ant.comp"/></exec>
    152150    </target>
    153    
    154    
    155    
     151       
    156152    <target name="prepare-tomcat-component">
    157153        <delete dir="components/tmp/tomcat" quiet="true"/>
     
    169165        <exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 tomcat.lzma tomcat.comp"/></exec>
    170166    </target>   
    171 
    172     <target name="prepare-sourcecode-core-component">
    173         <delete dir="components/tmp/sourcecode-core"/>
    174         <mkdir dir="components/tmp/sourcecode-core"/>
    175 
    176         <copy todir="components/tmp/sourcecode-core" overwrite="true">
    177             <fileset dir="distribution/source">
    178                 <include name="gli/**/*"/>
    179                 <include name="docs/**/*"/>
    180                 <include name="resources/**/*"/>
    181                 <include name="web/**/*"/>
    182                 <include name="gs2build/etc/**/*"/>
    183                 <include name="gs2build/setup.bash"/>
    184                 <include name="build.xml"/>
    185                 <include name="build.properties"/>
    186                 <include name="*.sh"/>
    187                 <include name="*.txt"/>
    188             </fileset>
    189         </copy>
    190         <zip destfile="components/sourcecode-core.comp" basedir="components/tmp/sourcecode-core" compress="false" includes="**/*"/>
    191     </target>
    192    
    193     <target name="compress-sourcecode-core-component">
    194         <!--<sevenzip task="encode" input="components/sourcecode-core.comp" output="components/sourcecode-core.lzma" dictionnary="26"/>-->
    195         <exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 sourcecode-core.lzma sourcecode-core.comp"/></exec>
    196     </target>
    197 
    198 
    199    
    200167   
    201168</project>
  • release-kits/wirk3/ant-scripts/create-distribution.xml

    r17652 r17786  
    1010        <antcall target="insert-user-manual"/>
    1111
    12         <antcall target="copy-web-to-source-greenstone3" /> <!-- from gs3-targets -->
    13 
    1412        <ant target="create-distribution-1" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
    1513            <property name="app.version" value="${version}"/>
     
    1715            <property name="branch.revision" value="${branch.revision}"/>
    1816        </ant>
     17
     18        <antcall target="insert-icon"/>
     19        <antcall target="insert-uninstaller"><param name="script-format" value="bat"/></antcall> <!-- from rk3-targets -->
     20
    1921        <ant target="create-distribution-2" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
    2022            <property name="app.version" value="${version}"/>
     
    2931        <antcall target="copy-over-build-xml" />
    3032        <antcall target="insert-compiled-binaries"/>
    31         <antcall target="insert-icon"/>
    32         <antcall target="insert-uninstaller"><param name="script-format" value="bat"/></antcall> <!-- from rk3-targets -->
     33
    3334    </target>
    3435
  • release-kits/wirk3/installer/antinstall-config.xml

    r17742 r17786  
    4242    </page>
    4343
     44    <!-- start binary release -->
    4445    <page type="input" name="selector" displayText="">
    4546        <comment name="choose-components"/>
     
    5354            hidden="true"/>
    5455
    55         <!-- start binary release core -->
    5656        <target
    5757            target="Installing Core System"
     
    6060            defaultValue="true"
    6161            force="true"/>
    62         <!-- end binary release core -->
    63 
    64         <!-- start source release core -->
    65         <target
    66             target="Installing Source Code Core"
    67             diskRequirement="@component.size.sourcecode-core@"
    68             displayText=""
    69             defaultValue="true"
    70             />
    71         <!-- end source release core -->
    7262
    7363        <target
     
    10393        <!-- end bundled components -->
    10494           
    105         <!-- start sourcecode -->
    106         <target
    107             target="Installing Source Code"
    108             diskRequirement="@component.size.sourcecode@"
    109             defaultValue="false"
    110             displayText=""/>
    111         <!-- end sourcecode -->
    112 
    11395    </page>
     96    <!-- end binary release -->
    11497
    11598    <!-- start bundled components -->
  • release-kits/wirk3/installer/build.xml

    r17658 r17786  
    106106    </target>
    107107
    108     <target name="Installing Source Code Core">
    109 
    110         <!-- figure out the start menu path -->
    111         <getfreepath path="${win32.personal.programs_menu}\Greenstone-@version@" property="startmenu.path"/>
    112         <path id="startmenu.path.path" path="${startmenu.path}"/>
    113         <pathconvert targetos="unix" property="startmenu.path.unix" refid="startmenu.path.path"/>
    114                
    115         <echo>basedir: ${basedir}</echo>
    116         <echo>installDir: ${installDir}</echo>
    117         <echo>antinstaller.jar: ${antinstaller.jar}</echo>
    118         <echo>startmenu.path: ${startmenu.path}</echo>
    119        
    120         <!-- create the installation directory -->
    121         <echo message="Creating Installation directory"/>
    122         <mkdir dir="${installDir}"/>
    123 
    124         <!-- extract 7za tool -->
    125         <unzip src="${antinstaller.jar}" dest="${basedir}">
    126             <patternset><include name="7za.exe"/></patternset>
    127         </unzip>
    128        
    129         <!-- install files -->
    130         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode-core.lzma"/></patternset></unzip>
    131         <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x sourcecode-core.lzma"/></exec>
    132         <delete file="sourcecode-core.lzma"/>
    133         <unzip src="${basedir}/sourcecode-core.comp" dest="${installDir}"/>
    134         <delete file="sourcecode-core.comp"/>
    135 
    136         <!-- change the tomcat ports in build.properties -->
    137         <echo message="Changing tomcat ports in build.properties"/>
    138         <rsr file="${installDir}/build.properties" pattern="(tomcat.port[=:]).*" replacement="$1${tomcat.port}" />
    139         <rsr file="${installDir}/build.properties" pattern="(tomcat.shutdown.port[=:]).*" replacement="$1${tomcat.shutdown.port}" />
    140         <echo message="Changing tomcat ports in resources/tomcat/server.xml"/>
    141         <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir.local}/packages/tomcat/conf/server.xml" overwrite="true"/>
    142        
    143         <!-- set gsdlhome in gs2build setup.bat -->
    144         <echo message="Setting %GSDLHOME% in gs2build\setup.bat"/>
    145         <rsr file="${installDir}/gs2build/setup.bat" pattern="\*\*GSDLHOME\*\*" replacement="${installDir.local}\gs2build" />
    146         <!-- copy the greenstone3.xml file to tomcat -->
    147         <echo message="Copying greenstone3.xml to tomcat directory"/>
    148         <copy file="${installDir}/resources/tomcat/greenstone3.xml" tofile="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true"/>
    149         <rsr file="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" pattern="@gsdl3webhome@" replacement="${installDir.local}\web" />
    150 
    151         <!-- set up global properties -->
    152         <echo message="Setting up global properties"/>
    153         <copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
    154         <rsr file="${installDir}/web/WEB-INF/classes/global.properties">
    155             <job pattern="@gsdl3home@" replacement="${installDir.unix}/web" />
    156             <job pattern="@tomcat.server@" replacement="${tomcat.server}" />
    157             <job pattern="@tomcat.port@" replacement="${tomcat.port}" />
    158         </rsr>
    159 
    160         <!-- set up log4j properties-->
    161         <echo message="Setting up log4j properties"/>
    162         <copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
    163         <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="@gsdl3home@" replacement="${installDir.unix}/web"/>
    164 
    165         <!-- delete unneeded files -->     
    166         <delete dir="${installDir}/resources/icons"/>
    167         <delete file="${installDir}/resources/*.png"/>
    168        
    169         <echo message="Creating installation properties file"/>
    170         <echo file="${installDir}\installation.properties">installed.startmenu.path:${startmenu.path.unix}</echo>
    171        
    172     </target>
    173 
    174 
    175     <!-- Source -->
    176     <target name="Installing Source Code">
    177         <echo message="Installing Source Code (src)"/>
    178         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip>
    179         <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x sourcecode.lzma"/></exec>
    180         <delete file="sourcecode.lzma"/>
    181         <unzip src="${basedir}/sourcecode.comp" dest="${installDir}"/>
    182         <delete file="sourcecode.comp"/>
    183     </target>
    184108
    185109    <target name="Installing Tomcat">
Note: See TracChangeset for help on using the changeset viewer.