Changeset 19935 for release-kits/mark3


Ignore:
Timestamp:
2009-06-26T16:18:44+12:00 (15 years ago)
Author:
oranfry
Message:

it's all good stuff

Location:
release-kits/mark3
Files:
5 edited

Legend:

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

    r18502 r19935  
    3131        <antcall target="prepare-documentation" />
    3232
    33     </target>
    34 
    35     <target name="checkout-greenstone3">
    36         <svn javahl="false">
    37             <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="compiled"/>
    38         </svn>
    3933    </target>
    4034
  • release-kits/mark3/ant-scripts/create-distribution.xml

    r19463 r19935  
    1212        <antcall target="insert-uninstaller-jar"/> <!-- from rk3-targets -->
    1313
    14         <ant target="create-distribution-1" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false">
     14        <ant target="create-distribution-1" dir="distributions/web" inheritAll="false">
    1515            <property name="app.version" value="${version}"/>
    1616            <property name="branch.path" value="${branch.path}"/>
     17            <property name="branch.revision" value="${branch.revision}"/>
    1718        </ant>
    1819
    19         <ant target="create-distribution-2" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false">
     20        <ant target="create-distribution-2" dir="distributions/web" inheritAll="false">
    2021            <property name="app.version" value="${version}"/>
    2122            <property name="branch.path" value="${branch.path}"/>
     23            <property name="branch.revision" value="${branch.revision}"/>
    2224        </ant>
    2325
    24         <ant target="create-distribution-3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false">
     26        <ant target="create-distribution-3" dir="distributions/web" inheritAll="false">
    2527            <property name="app.version" value="${version}"/>
    2628            <property name="branch.path" value="${branch.path}"/>
     29            <property name="branch.revision" value="${branch.revision}"/>
    2730        </ant>
    2831
  • release-kits/mark3/ant-scripts/create-installer.xml

    r19006 r19935  
    66        <antcall target="make-installer-files-concrete"/> <!-- from init -->
    77        <antcall target="compile-binary-installer"/> <!-- from init -->
    8         <antcall target="compile-minimal-installer"/> <!-- from init -->
    98    </target>
    109
  • release-kits/mark3/installer/antinstall-config.xml

    r19790 r19935  
    2626    </page>
    2727
    28     <!-- start binary release -->
    2928    <page type="input" name="intro" displayText="">
    3029        <comment name="welcome-greenstone3"/>
    3130    </page>
    32     <!-- end binary release -->
    33 
    34     <!-- start source release -->
    35     <page type="input" name="intro" displayText="" target="Source Release">
    36         <comment name="welcome-message"/>
    37     </page>
    38     <!-- end source release -->
    39 
    4031
    4132    <!--  type="license" shows a license page to click through -->
     
    5445    </page>
    5546
     47    <!-- page to stop you going forward if an IS installation is detected -->
    5648    <page type="input" name="dontBudge" displayText="" ifProperty="(${ISInstallDetected}==true)" showNextButton="false">
    5749        <comment name="is-install-detected"/>
    5850    </page>
    5951
    60     <!-- start binary release -->
     52    <!-- page to choose components -->
    6153    <page type="input" name="selector" displayText="">
    6254        <comment name="choose-components"/>
     
    6961            force="true"/>
    7062
    71         <!-- start bundled components -->
    7263        <target
    7364            target="Installing Tomcat"
     
    9384            defaultValue="true"
    9485            displayText=""/>
    95         <!-- end bundled components -->
    9686
    9787    </page>
    98     <!-- end binary release -->
    9988
    100     <!-- start bundled components -->
     89    <!-- page to setup tomcat -->
    10190    <page type="input" name="tomcat-config" ifProperty="(${Installing Tomcat}==true)" displayText="">
    102 
    10391        <text property="tomcat.server" defaultValue="localhost" displayText=""/>
    10492        <text property="tomcat.port" defaultValue="8080" displayText=""/>
    10593        <text property="tomcat.shutdown.port" defaultValue="8005" displayText=""/>
    106 
    10794    </page>
    108     <!-- end bundled components -->
    10995
    11096    <page type="progress" name="progress" showTargets="true" displayText=""/>
  • release-kits/mark3/installer/build.xml

    r18980 r19935  
    1 <?xml version="1.0"?>
    2 <!--
    3 This is the build.xml run by AntInstaller for the installer
    4 -->
    51
    6 <project name="Installation">
    7 
    8     <!-- this is required to pick up the properties generated during the install pages -->
    9     <property file="${basedir}/ant.install.properties"/>
    10 
    11     <path id="project.classpath">
    12         <pathelement path="${antinstaller.jar}"/>
    13     </path>
    14 
    15     <!-- custom tasks -->
    16     <typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/>
    17     <taskdef name="sevenzip" classname="org.apache.tools.ant.SevenZip" classpathref="project.classpath"/>
    18 
    19     <target name="Installing Core System" depends="">
    20 
    21         <!-- create the installation directory -->
    22         <echo message="Creating Installation directory"/>
    23         <echo>basedir: ${basedir}</echo>
    24         <echo>installDir: ${installDir}</echo>
    25         <echo>antinstaller.jar: ${antinstaller.jar}</echo>
    26         <mkdir dir="${installDir}"/>
    27 
    28         <!-- install files -->
    29         <echo message="Installing Files"/>
    30         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="core.lzma"/></patternset></unzip>
    31         <sevenzip task="decode" input="${basedir}/core.lzma" output="${basedir}/core.comp"/>
    32         <delete file="core.lzma"/>
    33         <unzip src="${basedir}/core.comp" dest="${installDir}"/>
    34         <delete file="core.comp"/>
    35 
    36         <echo message="Setting Binaries to Executable"/>
    37         <chmod dir="${installDir}" includes="*.sh" perm="775"/>
    38         <chmod dir="${installDir}/bin/script" includes="*" perm="775"/>
    39         <chmod dir="${installDir}/bin" includes="*" perm="775"/>
    40         <chmod dir="${installDir}/gs2build/bin/darwin" includes="*" perm="775"/>
    41         <chmod dir="${installDir}/gs2build/bin/script" includes="**/*" perm="775"/>
    42         <chmod dir="${installDir}/gli" includes="*.sh" perm="775"/>
    43         <echo/>
    44 
    45         <!-- change the tomcat ports in build.properties -->
    46         <echo message="Changing tomcat ports in build.properties"/>
    47         <rsr file="${installDir}/build.properties" pattern="(tomcat.port[=:]).*" replacement="$1${tomcat.port}" />
    48         <rsr file="${installDir}/build.properties" pattern="(tomcat.shutdown.port[=:]).*" replacement="$1${tomcat.shutdown.port}" />
    49 
    50         <!-- set up global properties -->
    51         <echo message="Setting up global properties"/>
    52         <copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
    53         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
    54         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.server@(.*)" replacement="$1localhost$2" />
    55         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.port@(.*)" replacement="$1${tomcat.port}$2" />
    56 
    57         <!-- set up log4j properties-->
    58         <echo message="Setting up log4j properties"/>
    59         <copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
    60         <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
    61 
    62         <echo>Creating the english dictionary</echo>
    63         <copy file="${installDir}/gli/classes/dictionary.properties" tofile="${installDir}/gli/classes/dictionary_en.properties"/>
    64         <echo/>
    65 
    66         <echo>Create usage.txt</echo>
    67         <echo file="${installDir}/gs2build/etc/usage.txt"></echo>
    68 
    69         <echo>Creating installation properties file</echo>
    70         <echo file="${installDir}/installation.properties">#this file is just a placeholder for now</echo>
    71 
    72         <echo message="Finished"/>
    73 
    74     </target>
    75 
    76     <target name="Installing Tomcat">
    77         <echo message="Installing Tomcat (packages/tomcat)"/>
    78         <mkdir dir="packages"/>
    79         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="tomcat.lzma"/></patternset></unzip>
    80         <sevenzip task="decode" input="${basedir}/tomcat.lzma" output="${basedir}/tomcat.comp"/>
    81         <delete file="tomcat.lzma"/>
    82         <unzip src="${basedir}/tomcat.comp" dest="${installDir}/packages"/>
    83         <delete file="tomcat.comp"/>
    84 
    85         <!-- change the tomcat ports in tomcats server.xml -->
    86         <echo message="Changing tomcat ports tomcat's server.xml"/>
    87         <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir}/packages/tomcat/conf/server.xml" overwrite="true"/>
    88         <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="(.*)@port@(.*)" replacement="$1${tomcat.port}$2" />
    89         <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="(.*)@shutdown-port@(.*)" replacement="$1${tomcat.shutdown.port}$2" />
    90        
    91         <!-- copy the greenstone3.xml file to tomcat -->
    92         <echo message="Copying greenstone3.xml to tomcat directory"/>
    93         <copy file="${installDir}/resources/tomcat/greenstone3.xml" tofile="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true"/>
    94         <rsr file="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" pattern="(.*)@gsdl3webhome@(.*)" replacement="$1${installDir}/web$2" />
    95 
    96         <!-- set binaries to executable -->
    97         <chmod dir="${installDir}/packages/tomcat/bin" includes="*.sh" perm="775"/>
    98         <echo/>
    99 
    100     </target>
    101 
    102     <target name="Installing Ant">
    103 
    104         <!-- extract the files -->
    105         <echo message="Installing Ant (packages/ant)"/>
    106         <mkdir dir="packages"/>
    107         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="ant.lzma"/></patternset></unzip>
    108         <sevenzip task="decode" input="${basedir}/ant.lzma" output="${basedir}/ant.comp"/>
    109         <delete file="ant.lzma"/>
    110         <unzip src="${basedir}/ant.comp" dest="${installDir}/packages"/>
    111         <delete file="ant.comp"/>
    112 
    113         <!-- set binaries to executable -->
    114         <chmod dir="${installDir}/packages/ant/bin" includes="*" perm="775"/>
    115         <echo/>
    116     </target>
    117 
    118         <!-- ImageMagick -->
    119         <target name="Installing ImageMagick" depends="">
    120                 <echo message="Installing ImageMagick"/>
    121                 <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>
    122                 <sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/>
    123                 <delete file="imagemagick.lzma"/>
    124                 <unzip src="${basedir}/imagemagick.comp" dest="${installDir}/gs2build/bin/darwin" />
    125                 <delete file="imagemagick.comp"/>
    126                 <chmod dir="${installDir}/gs2build/bin/darwin/imagemagick/bin" includes="*" perm="775"/>
    127         </target>
    128        
    129         <!-- Ghostscript -->
    130         <target name="Installing Ghostscript" depends="">
    131                 <echo message="Installing Ghostscript"/>
    132                 <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="ghostscript.lzma"/></patternset></unzip>
    133                 <sevenzip task="decode" input="${basedir}/ghostscript.lzma" output="${basedir}/ghostscript.comp"/>
    134                 <delete file="ghostscript.lzma"/>
    135                 <unzip src="${basedir}/ghostscript.comp" dest="${installDir}/gs2build/bin/darwin" />
    136                 <delete file="ghostscript.comp"/>
    137                 <chmod dir="${installDir}/gs2build/bin/darwin/ghostscript/bin" includes="*" perm="775"/>
    138         </target>
    139 
    140     <target name="Source Release" depends="">
    141 
    142         <!-- create the installation directory -->
    143         <echo message="Creating Installation directory"/>
    144         <mkdir dir="${installDir}"/>
    145 
    146         <echo>Installing Source Release</echo>
    147         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="source-release.lzma"/></patternset></unzip>
    148         <sevenzip task="decode" input="${basedir}/source-release.lzma" output="${basedir}/source-release.comp"/>
    149         <delete file="source-release.lzma"/>
    150         <unzip src="${basedir}/source-release.comp" dest="${installDir}"/>
    151         <delete file="source-release.comp"/>
    152 
    153         <echo message="Setting Binaries to Executable"/>
    154         <chmod dir="${installDir}" includes="*.sh" perm="775"/>
    155         <chmod dir="${installDir}/bin/script" includes="*" perm="775"/>
    156         <chmod dir="${installDir}/bin" includes="*" perm="775"/>
    157         <chmod dir="${installDir}/gs2build/bin/darwin" includes="*" perm="775"/>
    158         <chmod dir="${installDir}/gs2build/bin/script" includes="**/*" perm="775"/>
    159         <chmod dir="${installDir}/gli" includes="*.sh" perm="775"/>
    160         <echo/>
    161 
    162         <!-- set up global properties -->
    163         <echo message="Setting up global properties"/>
    164         <copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
    165         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
    166         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.server@(.*)" replacement="$1localhost$2" />
    167         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.port@(.*)" replacement="$1${tomcat.port}$2" />
    168 
    169         <!-- set up log4j properties-->
    170         <echo message="Setting up log4j properties"/>
    171         <copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
    172         <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
    173 
    174         <echo>Create usage.txt</echo>
    175         <echo file="${installDir}/gs2build/etc/usage.txt"></echo>
    176 
    177         <echo>Creating installation properties file</echo>
    178         <echo file="${installDir}/installation.properties">#this file is just a placeholder for now</echo>
    179 
    180         <echo message="Finished"/>
    181 
    182     </target>
    183 
    184 
    185 
    186 </project>
Note: See TracChangeset for help on using the changeset viewer.