Changeset 19935


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

it's all good stuff

Location:
release-kits
Files:
78 added
1 deleted
23 edited
1 moved

Legend:

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

    r19460 r19935  
    3939    </target>
    4040
    41     <target name="export-imagemagick-linux-binaries">
    42         <delete dir="distributions/web/bin/linux/imagemagick"/>
    43         <svn>
    44             <export srcurl="${svn.root}/other-projects/trunk/linux-binaries/imagemagick" destPath="distributions/web/bin/linux/imagemagick"/>
    45         </svn>
    46     </target>
    4741   
    4842    <target name="export-wvware-linux-binaries">
  • release-kits/lirk3/ant-scripts/build.xml

    r19154 r19935  
    3131
    3232    <!-- THE MAIN TARGET -->
    33     <target name="lirk3" depends="init">
     33    <target name="lirk3" depends="init,gs3-init">
    3434        <antcall target="compile"/>
    3535        <antcall target="create-distribution"/>
  • release-kits/lirk3/ant-scripts/compile.xml

    r17898 r19935  
    44    <target name="compile">
    55
    6         <!-- checkout -->
    76        <antcall target="checkout-greenstone3" />
     7        <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="compiled"/></antcall>
     8        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="compiled/gli" /></antcall>
     9        <ant dir="compiled" inheritAll="false">
     10            <target name="prepare"/>
     11            <target name="install"/>
     12            <target name="dist-tidy"/>
     13            <propertyset refid="forward.properties"/>
     14        </ant>
     15        <antcall target="insert-xml-parser"/>
     16        <antcall target="insert-ant"/>
     17        <antcall target="insert-documented-examples"/>
     18        <antcall target="insert-imagemagick-linux-binaries"/>
     19        <antcall target="compile-uninstaller" /> <!-- from rk3-targets -->
     20        <antcall target="prepare-documentation"/> <!-- from rk3-targets -->
    821
    9         <!-- preparation -->
    10         <antcall target="greenstone3-set-version-numbers">
    11             <param name="greenstone3basedir" value="${basedir}/compiled"/>
    12         </antcall>
    13         <ant dir="compiled" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="prepare-unix"  inheritAll="false"/>
     22        <!-- tweakers -->
     23        <!--<antcall target="tweak-configure-scripts" />
     24        <antcall target="regenerate-configure"/>
     25        <antcall target="tweak-makefiles" />
     26        <antcall target="linux-strip-execs" />
     27        -->
    1428
    15         <antcall target="tweak-configure-scripts" />
    16 
    17         <!-- update -->
    18         <ant dir="compiled" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="update-unix"  inheritAll="false"/>
    19 
    20         <!-- configure -->
    21         <antcall target="regenerate-configure"/>
    22         <ant dir="compiled" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="configure-unix" inheritAll="false"/>
    23         <antcall target="tweak-makefiles" />
    24 
    25         <!-- build -->
    26         <ant dir="compiled" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="build-unix" inheritAll="false"/>
    27         <antcall target="linux-strip-execs" />
    28 
    29         <!-- uninstaller -->
    30         <antcall target="compile-uninstaller" /> <!-- from rk3-targets -->
    31 
    32         <!-- documentation -->
    33         <antcall target="prepare-documentation" />
    3429
    3530    </target>
    3631
    37     <target name="checkout-greenstone3">
     32    <target name="insert-imagemagick-linux-binaries">
     33        <delete dir="compiled/bin/linux/imagemagick"/>
    3834        <svn>
    39             <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="compiled"/>
     35            <export srcurl="${svn.root}/other-projects/trunk/linux-binaries/imagemagick" destPath="compiled/gs2build/bin/linux/imagemagick"/>
    4036        </svn>
    4137    </target>
     38
     39
     40<!--
     41    <target name="ant-prepare">
     42        <ant target="prepare" dir="compiled" inheritAll="false">
     43            <propertyset refid="forward.properties"/>
     44        </ant>
     45    </target>
     46
     47    <target name="ant-install">
     48        <ant target="install" dir="compiled" inheritAll="false">
     49            <propertyset refid="forward.properties"/>
     50        </ant>
     51    </target>
     52
     53    <target name="ant-dist-tidy">
     54        <ant target="dist-tidy" dir="compiled" inheritAll="false">
     55            <propertyset refid="forward.properties"/>
     56        </ant>
     57    </target>
     58-->
    4259
    4360    <target name="tweak-configure-scripts">
     
    6885    </target>
    6986
    70     <target name="prepare-documentation">
    71         <mkdir dir="compiled/gsdl-manuals"/>
    72         <svn>
    73             <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="compiled/gsdl-manuals/manuals"/>
    74             <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="compiled/gsdl-manuals/shared"/>
    75         </svn>
    76         <javac srcdir="compiled/gsdl-manuals/shared"
    77               destdir="compiled/gsdl-manuals/shared"
    78               debug="on">
    79             <include name="*.java"/>
    80         </javac>
    81         <unzip src="compiled/gsdl-manuals/shared/fop.zip" dest="compiled/gsdl-manuals/shared"/>
    82 
    83         <path id="documentation.compile.classpath">
    84             <fileset dir="compiled/gsdl-manuals">
    85                 <include name="**/*.jar"/>
    86             </fileset>
    87             <pathelement path="compiled/gsdl-manuals/shared"/>
    88             <pathelement path="compiled/gsdl-manuals/manuals"/>
    89         </path>
    90 
    91         <java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output="compiled/gsdl-manuals/manuals/xml-source/en/help-en.xml">
    92             <arg value="compiled/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" />
    93             <arg value="compiled/gli/help/en/help.xml" />
    94             <arg value="compiled" />
    95         </java>
    96 
    97         <chmod perm="a+x" file="compiled/gsdl-manuals/shared/fop/fop.sh"/>
    98         <echo>Run generate-pdf.sh</echo>
    99         <exec dir="compiled/gsdl-manuals/manuals" executable="/bin/sh">
    100             <arg line="generate-pdf.sh u en" />
    101         </exec>
    102     </target>
    10387
    10488    <!--
     
    124108    <target name="gs2build-add-static">
    125109        <rsr file="compiled/gs2build/common-src/packages/configure" pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
    126         <rsr file="compiled/gs2build/build-src/packages/configure"  pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
     110        <rsr file="compiled/gs2build/build-src/packages/configure" pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
    127111        <rsr file="compiled/gs2build/configure.in" pattern="^LDFLAGS=.*" replacement="LDFLAGS=-static" />
    128112    </target>
  • release-kits/lirk3/ant-scripts/create-components.xml

    r17964 r19935  
    1616        <antcall target="prepare-tomcat-component" />
    1717        <antcall target="prepare-imagemagick-component" />
    18 
    19         <antcall target="prepare-sourcecode-component" />
    2018    </target>
    2119
     
    2523        <antcall target="compress-tomcat-component" />
    2624        <antcall target="compress-imagemagick-component" />
    27 
    28         <antcall target="compress-zipped-binary-release" /> <!-- from init -->
    29 
    3025    </target>
    3126
     
    6863    </target>
    6964
    70     <!-- sourcecode -->
    71     <target name="prepare-sourcecode-component">
    72 
    73         <delete dir="components/tmp/sourcecode"/>
    74         <mkdir dir="components/tmp/sourcecode"/>
    75 
    76         <copy todir="components/tmp/sourcecode" overwrite="true">
    77                 <fileset dir="distributions/web">
    78                     <include name="src/**/*"/>
    79                     <include name="gs2build/common-src/**/*"/>
    80                     <include name="gs2build/build-src/**/*"/>
    81                     <include name="gs2build/runtime-src/**/*"/>
    82                 </fileset>
    83         </copy>
    84 
    85         <mkdir dir="products"/>
    86         <tar destfile="products/Greenstone-${version}-${os.suffix}-sourcecode-component.tar.gz" basedir="components/tmp/sourcecode" compression="gzip" longfile="gnu"/>
    87 
    88     </target>
    89        
    90     <target name="compress-sourcecode-component">
    91         <sevenzip task="encode" input="components/sourcecode.comp" output="components/sourcecode.lzma" dictionnary="26"/>
    92     </target>
    93 
    9465    <!-- ant -->   
    9566    <target name="prepare-ant-component">
     
    9970
    10071        <copy todir="components/tmp/ant" overwrite="true">
    101             <fileset dir="distributions/web/packages">
    102                 <include name="ant/**/*"/>
    103             </fileset>
     72            <fileset dir="distributions/web" includes="packages/ant/**/*"/>
    10473        </copy>
    10574       
     
    11887
    11988        <copy todir="components/tmp/tomcat" overwrite="true">
    120             <fileset dir="distributions/web/packages">
    121                 <include name="tomcat/**/*"/>
    122             </fileset>
     89            <fileset dir="distributions/web" includes="packages/tomcat/**/*"/>
    12390        </copy>
    12491       
     
    137104
    138105        <copy todir="components/tmp/imagemagick" overwrite="true">
    139             <fileset dir="distributions/web/gs2build/bin/linux">
    140                 <include name="imagemagick/**/*"/>
    141             </fileset>
     106            <fileset dir="distributions/web" includes="gs2build/bin/linux/imagemagick/**/*"/>
    142107        </copy>
    143108               
  • release-kits/lirk3/ant-scripts/create-distribution.xml

    r19463 r19935  
    33
    44    <target name="create-distribution">
    5 
    65        <!-- 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"/>
     6        <antcall target="copy-compiled-to-dist"/> <!-- from init -->
    117        <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from init -->
    12         <antcall target="insert-uninstaller-jar"/> <!-- from rk3-targets -->
    13 
    14 
    15         <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" target="create-distribution-1" inheritAll="false">
    16             <property name="app.version" value="${version}"/>
    17             <property name="branch.path" value="${branch.path}"/>
    18         </ant>
    19         <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" target="create-distribution-2" inheritAll="false">
    20             <property name="app.version" value="${version}"/>
    21             <property name="branch.path" value="${branch.path}"/>
    22         </ant>
    23         <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" target="create-distribution-3" inheritAll="false">
    24             <property name="app.version" value="${version}"/>
    25             <property name="branch.path" value="${branch.path}"/>
    26         </ant>
    27         <antcall target="copy-over-build-xml" />
    28         <antcall target="insert-compiled-binaries"/>
    29         <antcall target="export-imagemagick-linux-binaries" />
    30    
     8        <antcall target="clean-user-manual"/>
     9        <antcall target="clean-uninstaller"/>
    3110        <antcall target="strip-svn-dirs"><param name="dir" value="distributions"/></antcall> <!-- from init -->
    32 
    3311    </target>
    3412
    35     <target name="export-greenstone3-gli">
    36         <mkdir dir="distributions"/>
    37         <delete dir="distributions/web"/>
    38         <svn>
    39             <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distributions/web"/>
    40             <export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli"/>
    41         </svn>
    42     </target>
    43    
    44     <target name="export-imagemagick-linux-binaries">
    45         <delete dir="distributions/web/gs2build/bin/linux/imagemagick"/>
    46         <svn>
    47             <export srcurl="${svn.root}/other-projects/trunk/linux-binaries/imagemagick" destPath="distributions/web/gs2build/bin/linux/imagemagick"/>
    48         </svn>
     13    <target name="clean-user-manual">
     14        <copy file="distributions/web/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distributions/web/docs/manual/gs2_user_en.pdf"/>
     15        <delete dir="distributions/web/gsdl-manuals"/>
    4916    </target>
    5017
    51     <target name="copy-over-build-xml">
    52         <move file="distributions/web/modified-build.xml" tofile="distributions/web/build.xml"/>
    53     </target>
    54 
    55     <target name="insert-user-manual">
    56         <copy file="compiled/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distributions/web/docs/manual/gs2_user_en.pdf"/>
    57     </target>
    58 
    59     <target name="insert-compiled-binaries">
    60         <delete dir="distributions/web/lib/jni"/>
    61         <exec executable="cp"><arg line="-r compiled/lib/jni distributions/web/lib"/></exec>
    62 
    63         <delete dir="distributions/web/gs2build/bin/linux"/>
    64         <exec executable="cp"><arg line="-r compiled/gs2build/bin/linux distributions/web/gs2build/bin"/></exec>
    65 
    66         <delete dir="distributions/web/gs2build/bin/java"/>
    67         <exec executable="cp"><arg line="-r compiled/gs2build/bin/java distributions/web/gs2build/bin"/></exec>
    68 
    69         <exec executable="cp"><arg line="compiled/bin/search4j distributions/web/bin"/></exec>
    70 
     18    <target name="clean-uninstaller">
     19        <delete dir="distributions/web/uninstaller"/>
    7120    </target>
    7221
  • release-kits/lirk3/ant-scripts/create-installer.xml

    r19006 r19935  
    66        <antcall target="make-installer-files-concrete"><param name="java.os" value="linux"/></antcall> <!-- from init -->
    77        <antcall target="compile-binary-installer"/> <!-- from init -->
    8         <antcall target="compile-minimal-installer"/> <!-- from init -->
    98    </target>
    109
    11     <target name="copy-installer-files" depends="copy-main-installer-files"> <!-- from init -->
     10    <target name="copy-installer-files" depends="copy-main-installer-files,copy-greenstone3-installer-files">
    1211
    1312        <copy todir="${basedir}/installer/classes" overwrite="true">
  • 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>
  • release-kits/shared/core/ant-scripts/init.xml

    r19901 r19935  
    152152    <target name="compile-binary-installer">
    153153
    154         <copy file="installer/antinstall-config.xml" tofile="installer/antinstall-config-binary.xml"/>
    155         <dcff file="installer/antinstall-config-binary.xml" startTag=".*&lt;!-- start source release --&gt;.*" endTag=".*&lt;!-- end source release --&gt;.*" />
     154        <copy file="installer/antinstall-config.xml" tofile="installer/antinstall-config-binary.xml" overwrite="true"/>
    156155        <dcff file="installer/antinstall-config-binary.xml" startTag=".*&lt;!-- start cdrom --&gt;.*" endTag=".*&lt;!-- end cdrom --&gt;.*" />
    157156
    158         <copy file="installer/build.xml" tofile="installer/build-binary.xml"/>
     157        <copy file="installer/build.xml" tofile="installer/build-binary.xml" overwrite="true"/>
    159158        <dcff file="installer/build-binary.xml" startTag=".*&lt;!-- start cdrom --&gt;.*" endTag=".*&lt;!-- end cdrom --&gt;.*" />
    160159
     
    170169
    171170            <zipfileset dir="installer/classes" includes="**/*" />
    172             <zipfileset dir="components" includes="*.lzma" excludes="source-release.lzma" />
     171            <zipfileset dir="components" includes="*.lzma"/>
    173172
    174173        </installer>
     
    179178
    180179        <copy file="installer/antinstall-config.xml" tofile="installer/antinstall-config-cdrom.xml"/>
    181         <dcff file="installer/antinstall-config-cdrom.xml" startTag=".*&lt;!-- start source release --&gt;.*" endTag=".*&lt;!-- end source release --&gt;.*" />
    182180        <dcff file="installer/antinstall-config-cdrom.xml" startTag=".*&lt;!-- start web --&gt;.*" endTag=".*&lt;!-- end web --&gt;.*" />
    183181
     
    199197    </target>
    200198
    201     <target name="compile-minimal-installer">
    202    
    203         <copy file="${basedir}/installer/antinstall-config.xml" tofile="${basedir}/installer/antinstall-config-minimal.xml"/>
    204         <dcff file="${basedir}/installer/antinstall-config-minimal.xml" startTag=".*&lt;!-- start source release --&gt;.*" endTag=".*&lt;!-- end source release --&gt;.*" />
    205         <dcff file="${basedir}/installer/antinstall-config-minimal.xml" startTag=".*&lt;!-- start bundled components --&gt;.*" endTag=".*&lt;!-- end bundled components --&gt;.*" />
    206         <installer file="${basedir}/installer/Greenstone-${version}-${os.suffix}-minimal.jar"
    207             compress="true"
    208             extractType="NonExtractor"
    209             installConfig="${basedir}/installer/antinstall-config-minimal.xml"
    210             buildFile="${basedir}/installer/build.xml"
    211             antInstallLib="${rk.home}/core/ant-installer/lib"
    212             antLib="${rk.home}/core/ant/lib"
    213             validateConfig="true"
    214             icons="bluecurve">
    215            
    216             <zipfileset dir="${basedir}/installer/classes" includes="**/*" />
    217             <zipfileset dir="${basedir}/components" includes="core.lzma" />
    218         </installer>
    219        
    220     </target>
    221 
    222     <target name="compile-source-installer">
    223 
    224         <copy file="${basedir}/installer/antinstall-config.xml" tofile="${basedir}/installer/antinstall-config-source.xml"/>
    225         <dcff file="${basedir}/installer/antinstall-config-source.xml" startTag=".*&lt;!-- start binary release --&gt;.*" endTag=".*&lt;!-- end binary release --&gt;.*" />
    226 
    227         <installer file="${basedir}/installer/Greenstone-${version}-${os.suffix}-source.jar"
    228             compress="true"
    229             extractType="NonExtractor"
    230             installConfig="${basedir}/installer/antinstall-config-source.xml"
    231             buildFile="${basedir}/installer/build.xml"
    232             antInstallLib="${rk.home}/core/ant-installer/lib"
    233             antLib="${rk.home}/core/ant/lib"
    234             validateConfig="true"
    235             icons="bluecurve">
    236            
    237             <zipfileset dir="${basedir}/installer/classes" includes="**/*" />
    238             <zipfileset dir="${basedir}/components" includes="source-release.lzma" />
    239         </installer>
    240 
    241     </target>
    242 
    243     <!-- fork the web distribution to preserve a source release -->
    244     <target name="copy-web-to-source">
    245         <copy todir="distributions/source"><fileset dir="distributions/web"/></copy>
    246     </target>
    247 
    248199    <target name="copy-main-installer-files">
    249200
    250201        <mkdir dir="${basedir}/installer/classes"/>
    251 
    252         <!-- the installer descriptors -->
    253         <copy todir="${basedir}/installer" file="${rk.home}/installer/antinstall-config.xml" overwrite="true" />
    254         <copy todir="${basedir}/installer" file="${rk.home}/installer/build.xml" overwrite="true" />
    255202
    256203        <!-- the language bundle -->
     
    288235        <property name="component.size.core" value="${component.megabytesize.core} MB"/>
    289236
    290         <!-- sourcecode core -->
    291         <length property="component.bytesize.sourcecode-core" mode="all"><fileset file="${basedir}/components/sourcecode-core.comp"/></length>
    292         <math result="component.megabytesize.sourcecode-core" operand1="${component.bytesize.sourcecode-core}" operation="/" operand2="1048576" datatype="int"/>
    293         <property name="component.size.sourcecode-core" value="${component.megabytesize.sourcecode-core} MB"/>
    294 
    295         <!-- sourcecode -->
    296         <length property="component.bytesize.sourcecode" mode="all"><fileset file="${basedir}/components/sourcecode.comp"/></length>
    297         <math result="component.megabytesize.sourcecode" operand1="${component.bytesize.sourcecode}" operation="/" operand2="1048576" datatype="int"/>
    298         <property name="component.size.sourcecode" value="${component.megabytesize.sourcecode} MB"/>
    299 
    300237        <!-- imagemagick -->
    301238        <length property="component.bytesize.imagemagick" mode="all"><fileset file="${basedir}/components/imagemagick.comp"/></length>
     
    317254        <math result="component.megabytesize.ant" operand1="${component.bytesize.ant}" operation="/" operand2="1048576" datatype="int"/>
    318255        <property name="component.size.ant" value="${component.megabytesize.ant} MB"/>
     256
     257        <!-- make the installer descriptors relevant to the current os -->
     258        <dcff file="installer/antinstall-config.xml" startTag=".*&lt;!--\s*if\s*(?!.*${rk.os}).*--&gt;.*" endTag=".*&lt;!--\s*/if\s*--&gt;.*" />
     259        <dcff file="installer/build.xml" startTag=".*&lt;!--\s*if\s*(?!.*${rk.os}).*--&gt;.*" endTag=".*&lt;!--\s*/if\s*--&gt;.*" />
    319260
    320261        <!-- put the concrete values of things in the config -->
     
    323264            <job pattern="@version@" replacement="${version}"/>
    324265            <job pattern="@component.size.core@" replacement="${component.size.core}"/>
    325             <job pattern="@component.size.sourcecode-core@" replacement="${component.size.sourcecode-core}"/>
    326             <job pattern="@component.size.sourcecode@" replacement="${component.size.sourcecode}"/>
    327266            <job pattern="@component.size.tomcat@" replacement="${component.size.tomcat}"/>
    328267            <job pattern="@component.size.ant@" replacement="${component.size.ant}"/>
     
    381320    </target>
    382321
    383     <!-- create the zipped up binary release from the web distribution -->
    384     <target name="compress-zipped-binary-release">
    385         <mkdir dir="products"/>
    386         <if>
    387             <bool><equals arg1="zip" arg2="${format}"/></bool>
    388             <zip destfile="products/Greenstone-${version}-${os.suffix}-binary.zip" basedir="distributions" includes="Greenstone-${version}-${os.suffix}-binary/**/*" compress="true"/>
    389             <else>
    390                 <exec dir="distributions" executable="tar">
    391                     <arg line="-czf ../products/Greenstone-${version}-${os.suffix}-binary.tar.gz Greenstone-${version}-${os.suffix}-binary"/>
    392                 </exec>
    393             </else>
    394         </if>
    395     </target>
    396 
    397322    <!-- unzip windows perl into bin/windows of the given gsdl or gs2build -->
    398323    <target name="insert-windows-perl">
     
    402327    </target>
    403328
    404     <!-- targets all or selected intermediate files of the release -->
    405     <target name="erase">
    406         <antcall target="erase-compiled"/>
    407         <antcall target="erase-distribution"/>
    408         <antcall target="erase-components"/>
    409         <antcall target="erase-installer"/>
    410         <antcall target="erase-wrapped-installer"/>
    411     </target>
    412 
    413     <target name="erase-compiled">
    414         <delete dir="compiled"/>
    415     </target>
    416 
    417     <target name="erase-distribution">
    418         <delete dir="distributions"/>
    419     </target>
    420 
    421     <target name="erase-components">
    422         <delete dir="components"/>
    423     </target>
    424 
    425     <target name="erase-installer">
    426         <delete dir="installer"/>
    427     </target>
    428 
    429     <target name="erase-wrapped-installer">
    430         <delete dir="wrapped-installer"/>
     329    <target name="copy-compiled-to-dist">
     330
     331        <!-- windows -->
     332        <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
     333            <delete dir="distributions/web"/>
     334            <mkdir dir="distributions"/>
     335            <copy todir="distributions/web">
     336                <fileset dir="compiled" includes="**/*"/>
     337            </copy>
     338
     339        <!-- linux, mac -->
     340        <else><if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
     341            <delete dir="distributions/web"/>
     342            <mkdir dir="distributions"/>
     343            <exec executable="cp"><arg line="-r compiled distributions/web"/></exec>
     344
     345        <!-- else fail -->
     346        <else>
     347            <fail>this target does not support the current os</fail>
     348
     349        </else></if></else></if>
     350
    431351    </target>
    432352
  • release-kits/shared/greenstone2/ant-scripts/rk2-targets.xml

    r19849 r19935  
    211211    </target>
    212212
     213    <target name="clean">
     214        <antcall target="clean-compiled"/>
     215        <antcall target="clean-distributions"/>
     216        <antcall target="clean-components"/>
     217        <antcall target="clean-installer"/>
     218        <antcall target="clean-wrapped-installer"/>
     219        <antcall target="clean-cdrom"/>
     220    </target>
     221
     222    <target name="clean-compiled">
     223        <delete dir="compiled"/>
     224    </target>
     225
     226    <target name="clean-distribution">
     227        <delete dir="distributions"/>
     228    </target>
     229
     230    <target name="clean-components">
     231        <delete dir="components"/>
     232    </target>
     233
     234    <target name="clean-installer">
     235        <delete dir="installer"/>
     236    </target>
     237
     238    <target name="clean-wrapped-installer">
     239        <delete dir="wrapped-installer"/>
     240    </target>
     241
     242    <target name="clean-cdrom">
     243        <delete dir="cdrom"/>
     244    </target>
    213245
    214246</project>
  • release-kits/shared/greenstone3/ant-scripts/rk3-targets.xml

    r19715 r19935  
    1212    <property name="version.major" value="3"/>
    1313
     14    <!-- create the property set to be forwarded to greenstone3 -->
     15    <propertyset id="forward.properties">
     16        <propertyref prefix="forward."/>
     17        <mapper type="glob" from="forward.*" to="*"/>
     18
     19        <propertyref name="app.version"/>
     20        <propertyref name="branch.path"/>
     21        <propertyref name="branch.revision"/>
     22
     23    </propertyset>
     24
    1425    <target name="greenstone3-set-version-numbers">
    1526        <rsr
     
    2132    <target name="gs3-init">
    2233
    23         <property name="install.flax" value="false"/>
    24         <echo level="info">Install Flax? (install.flax): ${install.flax}</echo>
     34        <!-- don't let greenstone3 block and wait for user input to accept
     35            the properties for the build -->
     36        <property name="forward.properties.accepted" value="true"/>
    2537
    26         <if><bool><isset property="server.default.servlet"/></bool>
    27             <echo level="info">default servlet: (server.default.servlet): ${server.default.servlet}</echo>
    28         </if>
     38        <!-- make sure all c++ compilation is done statically -->
     39        <property name="forward.compile.static" value="true"/>
     40
     41        <!-- show the property set to be forwarded to greenstone3 -->
     42        <echo>Properties to be forwarded to greenstone3 build</echo>
     43        <echoproperties><propertyset refid="forward.properties"/></echoproperties>
    2944
    3045    </target>
     
    3247    <target name="insert-uninstaller-jar">
    3348        <copy file="compiled/uninst.jar" tofile="distributions/web/uninst.jar"/>
     49    </target>
     50
     51    <!--
     52        inserts a copy of the release kit's own ant into the greenstone3
     53        installation. the ant from the release kit is minified so is a good choice.
     54    -->
     55    <target name="insert-ant">
     56
     57        <!-- remove any existing ant -->
     58        <delete dir="compiled/packages/ant"/>
     59
     60        <!-- windows copy -->
     61        <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
     62            <copy todir="compiled/packages">
     63                <fileset dir="${rk.home}/core" includes="ant/**/*"/>
     64            </copy>
     65
     66        <!-- linux, mac copy-->
     67        <else><if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
     68            <exec executable="cp">
     69                <arg    value="-r"/>
     70                <arg value="${rk.home}/core/ant"/>
     71                <arg value="compiled/packages"/>
     72            </exec>
     73
     74        <!-- otherwise fail -->
     75        <else>
     76            <fail>this target does not support the current os</fail>
     77
     78        </else></if></else></if>
     79
    3480    </target>
    3581   
     
    4490    </target>
    4591
     92    <target name="checkout-greenstone3">
     93        <svn>
     94            <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="compiled" revision="${branch.revision}"/>
     95            <checkout url="${svn.root}/gli/${branch.path}" destPath="compiled/gli" revision="${branch.revision}"/>
     96        </svn>
     97    </target>
     98
     99    <target name="insert-xml-parser">
     100        <copy todir="compiled/gs2build/perllib/cpan">
     101            <fileset dir="${rk.home}/greenstone3" includes="XML-Parser/**/*"/>
     102        </copy>
     103    </target>
     104
     105    <target name="insert-documented-examples">
     106        <echo>NOT IMPLEMENTED: Remember to put code in this target to grab and install the documented examples.</echo>
     107        <!-- copy the doc eg colls from /home/nzdl - note we don't include the formatting ones -->
     108    </target>
     109
     110    <target name="prepare-documentation">
     111
     112        <mkdir dir="compiled/gsdl-manuals"/>
     113        <svn>
     114            <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="compiled/gsdl-manuals/manuals"/>
     115            <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="compiled/gsdl-manuals/shared"/>
     116        </svn>
     117        <path id="documentation.compile.classpath">
     118            <fileset dir="compiled/gsdl-manuals">
     119                <include name="**/*.jar"/>
     120            </fileset>
     121            <pathelement path="compiled/gsdl-manuals/shared"/>
     122            <pathelement path="compiled/gsdl-manuals/manuals"/>
     123        </path>
     124        <javac srcdir="compiled/gsdl-manuals/shared"
     125            destdir="compiled/gsdl-manuals/shared"
     126            debug="on"
     127            classpathref="documentation.compile.classpath">
     128            <include name="*.java"/>
     129        </javac>
     130        <unzip src="compiled/gsdl-manuals/shared/fop.zip" dest="compiled/gsdl-manuals/shared"/>
     131
     132        <java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output="compiled/gsdl-manuals/manuals/xml-source/en/help-en.xml">
     133            <arg value="compiled/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" />
     134            <arg value="compiled/gli/help/en/help.xml" />
     135            <arg value="compiled" />
     136        </java>
     137
     138        <chmod perm="a+x" file="compiled/gsdl-manuals/shared/fop/fop.sh"/>
     139        <echo>Run generate-pdf script</echo>
     140        <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
     141            <exec dir="compiled/gsdl-manuals/manuals" executable="cmd">
     142                <arg value="/C" />
     143                <arg file="${basedir}/compiled/gsdl-manuals/manuals/generate-pdf.bat" />
     144                <arg value="u" />
     145                <arg value="en" />
     146            </exec>
     147        <else>
     148            <exec dir="compiled/gsdl-manuals/manuals" executable="/bin/bash">
     149                <arg line="generate-pdf.sh u en" />
     150            </exec>
     151        </else></if>
     152    </target>
     153
     154    <target name="clean">
     155        <antcall target="clean-compiled"/>
     156        <antcall target="clean-distributions"/>
     157        <antcall target="clean-components"/>
     158        <antcall target="clean-installer"/>
     159        <antcall target="clean-wrapped-installer"/>
     160    </target>
     161
     162    <target name="clean-compiled">
     163        <delete dir="compiled"/>
     164    </target>
     165
     166    <target name="clean-distribution">
     167        <delete dir="distributions"/>
     168    </target>
     169
     170    <target name="clean-components">
     171        <delete dir="components"/>
     172    </target>
     173
     174    <target name="clean-installer">
     175        <delete dir="installer"/>
     176    </target>
     177
     178    <target name="clean-wrapped-installer">
     179        <delete dir="wrapped-installer"/>
     180    </target>
     181
     182    <target name="copy-greenstone3-installer-files">
     183
     184        <!-- the installer descriptors -->
     185        <copy todir="installer" file="${rk.home}/greenstone3/installer/antinstall-config.xml" overwrite="true"/>
     186        <copy todir="installer" file="${rk.home}/greenstone3/installer/build.xml" overwrite="true"/>
     187
     188    </target>
    46189   
    47190</project>
  • release-kits/shared/greenstone3/installer/antinstall-config.xml

    r19790 r19935  
    2626    </page>
    2727
    28     <!-- start binary release -->
     28    <!-- welcome page -->
    2929    <page type="input" name="intro" displayText="">
    30         <comment name="welcome-message"/>
    31     </page>
    32     <!-- end binary release -->
    33 
    34     <!-- start source release -->
    35     <page type="input" name="intro" displayText="" target="Source Release">
    3630        <comment name="welcome-greenstone3"/>
    3731    </page>
    38     <!-- end source release -->
    3932
    4033    <!--  type="license" shows a license page to click through -->
     
    5447    </page>
    5548
     49    <!-- page to stop you going forward if an IS installation is detected -->
    5650    <page type="input" name="dontBudge" displayText="" ifProperty="(${ISInstallDetected}==true)" showNextButton="false">
    5751        <comment name="is-install-detected"/>
    5852    </page>
    5953
     54    <!-- page to choose components -->
    6055    <page type="input" name="selector" displayText="">
    6156        <comment name="choose-components"/>
    6257
    63         <!-- start binary release -->
    6458        <target
    6559            target="Initialising"
     
    7771            force="true"/>
    7872
    79         <!-- start bundled components -->
    8073        <target
    8174            target="Installing ImageMagick"
     
    8376            defaultValue="true"
    8477            displayText=""/>
     78
     79        <!-- if windows|mac -->
     80        <target
     81            target="Installing Ghostscript"
     82            diskRequirement="@component.size.ghostscript@"
     83            defaultValue="true"
     84            displayText=""/>
     85        <!-- /if -->
    8586
    8687        <target
     
    9596            defaultValue="true"
    9697            displayText=""/>
    97         <!-- end bundled components -->
     98
     99        <!-- if windows -->
     100        <target
     101            target="Installing Start Menu Shortcuts"
     102            diskRequirement="~10 KB"
     103            defaultValue="true"
     104            displayText=""/>
     105        <!-- /if -->
    98106
    99107    </page>
    100     <!-- end binary release -->
    101108
    102     <!-- start bundled components -->
     109    <!-- page to setup tomcat -->
    103110    <page type="input" name="tomcat-config" ifProperty="(${Installing Tomcat}==true)" displayText="">
    104 
    105111        <text property="tomcat.server" defaultValue="localhost" displayText=""/>
    106112        <text property="tomcat.port" defaultValue="8080" displayText=""/>
    107113        <text property="tomcat.shutdown.port" defaultValue="8005" displayText=""/>
     114    </page>
    108115
    109     </page>
    110     <!-- end bundled components -->
    111 
     116    <!-- the final progress page -->
    112117    <page type="progress" name="progress" showTargets="true" displayText=""/>
    113118
  • release-kits/shared/greenstone3/installer/build.xml

    r18980 r19935  
    33This is the build.xml run by AntInstaller for the installer
    44-->
    5 
    65<project name="Installation">
    76
     
    98    <property file="${basedir}/ant.install.properties"/>
    109
    11     <path id="project.classpath">
    12         <pathelement path="${antinstaller.jar}"/>
    13     </path>
    14 
    1510    <!-- custom tasks -->
     11    <path id="project.classpath"><pathelement path="${antinstaller.jar}"/></path>
     12
    1613    <typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/>
    1714    <taskdef name="sevenzip" classname="org.apache.tools.ant.SevenZip" classpathref="project.classpath"/>
    18 
    19     <condition property="bundled.java.exists">
    20         <available file="../@linux-java.extracted@/bin/java"/>
    21     </condition>
    22 
     15    <!-- if windows -->
     16    <taskdef name="shortcut" classname="com.orangevolt.tools.ant.Win32ShortcutTask" classpathref="project.classpath"/>
     17    <taskdef name="winprops" classname="com.orangevolt.tools.ant.Win32PropertiesTask" classpathref="project.classpath"/>
     18    <typedef name="getfreepath" classname="org.greenstone.anttasks.GetFreePath" classpathref="project.classpath"/>
     19    <!-- /if -->
     20
     21    <!-- create a local and strictly unix installDir String -->
     22    <path id="installDir.path"><pathelement location="${installDir}"/></path>
     23    <property name="installDir.local" refid="installDir.path"/>
     24    <pathconvert targetos="unix" property="installDir.unix" refid="installDir.path"/>
     25
     26    <!-- if windows -->
     27    <!-- load windows properties -->
     28    <winprops/>
     29    <!-- /if -->
     30
     31    <!-- work out whether a jre is bundled with this installer -->
     32    <available file="../jre/bin/java" property="bundled.java.exists"/>
     33
     34    <!-- determine if there is an existing installation in the installDir-->
     35    <available file="${installDir}\installation.properties" property="is.overinstall"/>
     36
     37    <!-- target to copy the bundled jre into place -->
    2338    <target name="Initialising" if="bundled.java.exists">
    2439        <mkdir dir="${installDir}"/>
    2540        <copy todir="${installDir}/packages/jre" failonerror="false">
    26             <fileset dir="../@linux-java.extracted@"/>
     41            <fileset dir="../jre"/>
    2742        </copy>
    2843        <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
    2944    </target>
    3045
     46    <!-- target to load in the messages left by the last installation -->
     47    <target name="Looking For Previous Installation" if="is.overinstall">
     48        <property file="${installDir}\installation.properties"/>
     49        <delete dir="${installed.startmenu.path}" failonerror="false"/>
     50    </target>
     51
    3152    <target name="Installing Core System">
    3253
    33         <!-- create the installation directory -->
    34         <mkdir dir="${installDir}"/>
    35 
    36         <!-- install files -->
    37         <echo>Installing Core Files</echo>
    38         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="core.lzma"/></patternset></unzip>
    39         <sevenzip task="decode" input="${basedir}/core.lzma" output="${basedir}/core.comp"/>
    40         <delete file="core.lzma"/>
    41         <unzip src="${basedir}/core.comp" dest="${installDir}"/>
    42         <delete file="core.comp"/>
    43 
    44         <echo>Setting Binaries to Executable</echo>
     54        <!-- rip out build.xml to the temp dir so we can fake and <antcall> with <ant> -->
     55        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="build.xml"/></patternset></unzip>
     56
     57
     58        <!-- if windows -->
     59        <echo>Figuring out the start menu path</echo>
     60        <getfreepath path="${win32.personal.programs_menu}\Greenstone-@version@" property="startmenu.path"/>
     61        <path id="startmenu.path.path" path="${startmenu.path}"/>
     62        <pathconvert targetos="unix" property="startmenu.path.unix" refid="startmenu.path.path"/>
     63
     64        <echo>Extracting 7za tool</echo>
     65        <unzip src="${antinstaller.jar}" dest="${basedir}">
     66            <patternset><include name="7za.exe"/></patternset>
     67        </unzip>
     68        <!-- /if -->
     69
     70        <echo>Extracting core component</echo>
     71        <ant target="extract-component"><property name="component.name" value="core"/></ant>
     72
     73        <echo>Setting binaries to executable</echo>
    4574        <chmod dir="${installDir}" includes="*.sh" perm="775"/>
    4675        <chmod dir="${installDir}/bin/script" includes="*" perm="775"/>
    4776        <chmod dir="${installDir}/bin" includes="*" perm="775"/>
     77        <!-- if linux -->
    4878        <chmod dir="${installDir}/gs2build/bin/linux" includes="*" perm="775"/>
     79        <!-- /if -->
     80        <!-- if mac -->
     81        <chmod dir="${installDir}/gs2build/bin/darwin" includes="*" perm="775"/>
     82        <!-- /if -->
    4983        <chmod dir="${installDir}/gs2build/bin/script" includes="**/*" perm="775"/>
    5084        <chmod dir="${installDir}/gli" includes="*.sh" perm="775"/>
    51         <echo/>
    52 
    53         <echo>Changing tomcat ports in build.properties</echo>
     85
     86        <echo>Setting tomcat ports</echo>
    5487        <rsr file="${installDir}/build.properties" pattern="(tomcat.port[=:]).*" replacement="$1${tomcat.port}" />
    5588        <rsr file="${installDir}/build.properties" pattern="(tomcat.shutdown.port[=:]).*" replacement="$1${tomcat.shutdown.port}" />
     
    5790        <echo>Setting up global properties</echo>
    5891        <copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
    59         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
    60         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.server@(.*)" replacement="$1localhost$2" />
    61         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.port@(.*)" replacement="$1${tomcat.port}$2" />
     92        <rsr file="${installDir}/web/WEB-INF/classes/global.properties">
     93            <job pattern="@gsdl3home@" replacement="${installDir.unix}/web" />
     94            <job pattern="@tomcat.server@" replacement="${tomcat.server}" />
     95            <job pattern="@tomcat.port@" replacement="${tomcat.port}" />
     96        </rsr>
     97
     98        <echo>Copying greenstone3.xml to tomcat directory</echo>
     99        <copy file="${installDir}/resources/tomcat/greenstone3.xml" tofile="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true"/>
     100        <rsr file="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" pattern="@gsdl3webhome@" replacement="${installDir.local}${path.separator}web" />
    62101
    63102        <echo>Setting up log4j properties</echo>
    64103        <copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
    65         <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
     104        <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="@gsdl3home@" replacement="${installDir}/web" />
     105
     106        <!-- if windows -->
     107        <echo message="Setting GSDLHOME in gs2build\setup.bat"/>
     108        <rsr file="${installDir}/gs2build/setup.bat" pattern="\*\*GSDLHOME\*\*" replacement="${installDir.local}\gs2build" />
     109        <!-- /if -->
    66110
    67111        <echo>Creating the english dictionary</echo>
    68112        <copy file="${installDir}/gli/classes/dictionary.properties" tofile="${installDir}/gli/classes/dictionary_en.properties"/>
    69         <echo/>
    70 
    71         <echo>Create usage.txt</echo>
     113
     114        <echo>Creating usage.txt</echo>
    72115        <echo file="${installDir}/gs2build/etc/usage.txt"></echo>
    73116
    74117        <echo>Creating installation properties file</echo>
    75         <echo file="${installDir}/installation.properties">#this file is just a placeholder for now</echo>
     118        <echo file="${installDir}\installation.properties">installed.startmenu.path:${startmenu.path.unix}</echo>
    76119
    77120        <echo>Finished</echo>
     
    79122    </target>
    80123
    81     <!-- imagemagick -->
    82124    <target name="Installing ImageMagick">
     125
    83126        <echo>Installing ImageMagick</echo>
    84         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>
    85         <sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/>
    86         <delete file="imagemagick.lzma"/>
    87         <unzip src="${basedir}/imagemagick.comp" dest="${installDir}/gs2build/bin/linux"/>
    88         <delete file="imagemagick.comp"/>
    89         <echo>Setting Binaries to Executable</echo>
     127        <ant target="extract-component"><property name="component.name" value="imagemagick"/></ant>
     128
     129        <echo>Setting binaries to executable</echo>
     130        <!-- if linux -->
    90131        <chmod dir="${installDir}/gs2build/bin/linux/imagemagick/bin" includes="*" perm="775"/>
    91     </target>
    92 
     132        <!-- /if -->
     133        <!-- if mac -->
     134        <chmod dir="${installDir}/gs2build/bin/darwin/imagemagick/bin" includes="*" perm="775"/>
     135        <!-- /if -->
     136
     137    </target>
     138
     139    <target name="Installing Ghostscript">
     140
     141        <echo>Installing Ghostscript</echo>
     142        <ant target="extract-component"><property name="component.name" value="ghostscript"/></ant>
     143
     144        <echo>Setting binaries to executable</echo>
     145        <!-- if linux -->
     146        <chmod dir="${installDir}/gs2build/bin/linux/ghostscript/bin" includes="*" perm="775"/>
     147        <!-- /if -->
     148        <!-- if mac -->
     149        <chmod dir="${installDir}/gs2build/bin/darwin/ghostscript/bin" includes="*" perm="775"/>
     150        <!-- /if -->
     151
     152    </target>
    93153
    94154    <target name="Installing Tomcat">
     155
    95156        <echo>Installing Tomcat (packages/tomcat)</echo>
    96157        <mkdir dir="packages"/>
    97         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="tomcat.lzma"/></patternset></unzip>
    98         <sevenzip task="decode" input="${basedir}/tomcat.lzma" output="${basedir}/tomcat.comp"/>
    99         <delete file="tomcat.lzma"/>
    100         <unzip src="${basedir}/tomcat.comp" dest="${installDir}/packages"/>
    101         <delete file="tomcat.comp"/>
     158        <ant target="extract-component"><property name="component.name" value="tomcat"/></ant>
    102159
    103160        <echo>Changing tomcat ports tomcat's server.xml</echo>
    104161        <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir}/packages/tomcat/conf/server.xml" overwrite="true"/>
    105         <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="(.*)@port@(.*)" replacement="$1${tomcat.port}$2" />
    106         <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="(.*)@shutdown-port@(.*)" replacement="$1${tomcat.shutdown.port}$2" />
    107        
     162        <rsr file="${installDir}/packages/tomcat/conf/server.xml">
     163            <job pattern="@port@" replacement="${tomcat.port}"/>
     164            <job pattern="@shutdown-port@" replacement="${tomcat.shutdown.port}"/>
     165        </rsr>
     166
    108167        <echo>Copying greenstone3.xml to tomcat directory</echo>
    109168        <copy file="${installDir}/resources/tomcat/greenstone3.xml" tofile="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true"/>
    110         <rsr file="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" pattern="(.*)@gsdl3webhome@(.*)" replacement="$1${installDir}/web$2" />
    111 
    112         <echo>Setting tomcat binaries to executable</echo>
     169        <rsr file="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" pattern="@gsdl3webhome@" replacement="${installDir}/web" />
     170
     171        <echo>Set binaries to executable</echo>
    113172        <chmod dir="${installDir}/packages/tomcat/bin" includes="*.sh" perm="775"/>
    114         <echo/>
     173
    115174    </target>
    116175
    117176    <target name="Installing Ant">
     177
    118178        <echo>Installing Ant (packages/ant)</echo>
    119179        <mkdir dir="packages"/>
    120         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="ant.lzma"/></patternset></unzip>
    121         <sevenzip task="decode" input="${basedir}/ant.lzma" output="${basedir}/ant.comp"/>
    122         <delete file="ant.lzma"/>
    123         <unzip src="${basedir}/ant.comp" dest="${installDir}/packages"/>
    124         <delete file="ant.comp"/>
    125 
    126         <echo>Setting ant binaries to executable</echo>
     180        <ant target="extract-component"><property name="component.name" value="ant"/></ant>
     181
     182        <echo>Set binaries to executable</echo>
    127183        <chmod dir="${installDir}/packages/ant/bin" includes="*" perm="775"/>
    128         <echo/>
    129     </target>
    130 
    131     <!-- source release -->
    132     <target name="Source Release">
    133 
    134         <echo>Installing Source Release</echo>
    135         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="source-release.lzma"/></patternset></unzip>
    136         <sevenzip task="decode" input="${basedir}/source-release.lzma" output="${basedir}/source-release.comp"/>
    137         <delete file="source-release.lzma"/>
    138         <unzip src="${basedir}/source-release.comp" dest="${installDir}"/>
    139         <delete file="source-release.comp"/>
    140 
    141         <echo>Setting Binaries to Executable</echo>
    142         <chmod dir="${installDir}" includes="*.sh,**/configure" perm="775"/>
    143         <chmod dir="${installDir}/bin/script" includes="*" perm="775"/>
    144         <chmod dir="${installDir}/bin" includes="*" perm="775"/>
    145         <chmod dir="${installDir}/gs2build/bin/linux" includes="*" perm="775"/>
    146         <chmod dir="${installDir}/gs2build/bin/script" includes="**/*" perm="775"/>
    147         <chmod dir="${installDir}/gli" includes="*.sh" perm="775"/>
    148         <echo/>
    149 
    150         <echo>Setting up global properties</echo>
    151         <copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
    152         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
    153         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.server@(.*)" replacement="$1localhost$2" />
    154         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.port@(.*)" replacement="$1${tomcat.port}$2" />
    155 
    156         <echo>Setting up log4j properties</echo>
    157         <copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
    158         <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
    159 
    160         <echo>Create usage.txt</echo>
    161         <echo file="${installDir}/gs2build/etc/usage.txt"></echo>
    162 
    163         <echo>Creating installation properties file</echo>
    164         <echo file="${installDir}/installation.properties">#this file is just a placeholder for now</echo>
    165 
    166     </target>
    167 
     184
     185    </target>
     186
     187
     188    <target name="Installing Start Menu Shortcuts">
     189
     190        <echo>Installing Start Menu Shortcuts</echo>
     191
     192        <mkdir dir="${startmenu.path}\Documentation"/>
     193       
     194        <shortcut
     195            file="${startmenu.path}\Greenstone3 Server.lnk"
     196            execute="${installDir}\gs3-server.bat"
     197            workingDirectory="${installDir}"
     198            iconFile="${installDir}\resources\images\gs3.ico"
     199            iconIndex="0" />
     200
     201        <shortcut
     202            file="${startmenu.path}\Greenstone Librarian Interface (GLI).lnk"
     203            execute="${installDir}\gli\gli.bat"
     204            workingDirectory="${installDir}\gli"
     205            iconFile="${installDir}\resources\images\gs3.ico"
     206            iconIndex="0" />
     207           
     208        <shortcut
     209            file="${startmenu.path}\Greenstone Editor for Metadata Sets (GEMS).lnk"
     210            execute="${installDir}\gli\gems.bat"
     211            workingDirectory="${installDir}\gli"
     212            iconFile="${installDir}\resources\images\gs3.ico"
     213            iconIndex="0" />
     214
     215        <shortcut
     216            file="${startmenu.path}\Uninstall.lnk"
     217            execute="${installDir}\Uninstall.bat"
     218            workingDirectory="${installDir}"
     219            iconFile="${installDir}\resources\images\gs3.ico"
     220            iconIndex="0" />
     221   
     222        <shortcut
     223            file="${startmenu.path}\Documentation\README.lnk"
     224            execute="${installDir}\README.txt" />
     225       
     226        <shortcut
     227            file="${startmenu.path}\Documentation\Greenstone3 Users' Guide.lnk"
     228            execute="${installDir}\documentation\manual\manual.pdf" />
     229       
     230        <shortcut
     231            file="${startmenu.path}\Documentation\Greenstone2 Users' Guide.lnk"
     232            execute="${installDir}\documentation\manual\gs2_user_en.pdf" />
     233       
     234    </target>
     235
     236    <!-- util target to extract the given component -->
     237    <!-- pass in ${component.name} as a param -->
     238    <target name="extract-component">
     239        <!-- extract the component into place -->
     240        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="${component.name}.lzma"/></patternset></unzip>
     241        <!-- if windows -->
     242        <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x ${component.name}.lzma"/></exec>
     243        <!-- /if -->
     244        <!-- if linux|mac -->
     245        <sevenzip task="decode" input="${basedir}/${component.name}.lzma" output="${basedir}/${component.name}.comp"/>
     246        <!-- /if -->
     247        <delete file="${component.name}.lzma"/>
     248        <unzip src="${basedir}/${component.name}.comp" dest="${installDir}"/>
     249        <delete file="${component.name}.comp"/>
     250    </target>
    168251
    169252</project>
  • release-kits/shared/linux/ant-scripts/linux-targets.xml

    r19153 r19935  
    22<project name="linux-targets">
    33
    4     <target name="copy-compiled-to-dist">
    5         <delete dir="distributions/web"/>
    6         <mkdir dir="distributions"/>
    7         <exec executable="cp"><arg line="-r compiled distributions/web"/></exec>
    8     </target>
    9 
    104</project>
  • release-kits/shared/windows/ant-scripts/windows-targets.xml

    r19848 r19935  
    11<?xml version="1.0" encoding="utf-8" ?>
    22<project name="windows-targets">
    3     <target name="copy-compiled-to-dist">
    4         <delete dir="distributions/web"/>
    5         <mkdir dir="distributions"/>
    6         <copy todir="distributions/web">
    7             <fileset dir="compiled" includes="**/*"/>
    8         </copy>
    9     </target>
     3
    104   
    115    <target name="get-copy-of-wrapper-source">
  • release-kits/wirk3/ant-scripts/compile.xml

    r19661 r19935  
    55        <antcall target="checkout-greenstone3" />
    66        <antcall target="generate-build-properties"><param name="greenstone3.basedir" value="compiled"/></antcall>
    7        
    87        <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/compiled" /></antcall>
    9         <ant target="prepare-windows" dir="compiled" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false">
     8
     9        <ant target="prepare" dir="compiled" inheritAll="false">
    1010            <property name="app.version" value="${version}"/>
    1111            <property name="branch.path" value="${branch.path}"/>
    1212            <property name="branch.revision" value="${branch.revision}"/>
    1313        </ant>
    14         <antcall target="insert-windows-perl"><param name="gsdl.basedir" value="compiled/gs2build"/></antcall>
    15         <ant target="build-windows" dir="compiled" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false">
     14
     15        <antcall target="insert-windows-perl"><param name="todir" value="compiled/gs2build/bin/windows"/></antcall>
     16
     17        <ant target="install" dir="compiled" inheritAll="false">
    1618            <property name="app.version" value="${version}"/>
    1719            <property name="branch.path" value="${branch.path}"/>
    1820            <property name="branch.revision" value="${branch.revision}"/>
    1921        </ant>
    20         <antcall target="compile-uninstaller" /> <!-- from rk3-targets -->
    21         <antcall target="prepare-documentation" />
    22     </target>
    2322
    24     <target name="checkout-greenstone3">
    25         <svn>
    26             <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="compiled" revision="${branch.revision}"/>
    27         </svn>
    28     </target>
    29 
    30     <target name="tweak-configure-scripts">
    31         <antcall target="mgpp-add-static" />
    32         <antcall target="mg-add-static" />
    33         <antcall target="gs2buildextra-add-static" />
    34     </target>
    35 
    36     <target name="prepare-documentation">
    37         <mkdir dir="compiled/gsdl-manuals"/>
    38         <svn>
    39             <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="compiled/gsdl-manuals/manuals" revision="${branch.revision}"/>
    40             <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="compiled/gsdl-manuals/shared" revision="${branch.revision}"/>
    41         </svn>
    42         <javac srcdir="compiled/gsdl-manuals/shared" destdir="compiled/gsdl-manuals/shared" debug="on"><include name="*.java"/></javac>
    43         <unzip src="compiled/gsdl-manuals/shared/fop.zip" dest="compiled/gsdl-manuals/shared"/>
    44 
    45         <echo>Define Classpath</echo>
    46         <path id="documentation.compile.classpath">
    47             <fileset dir="compiled/gsdl-manuals">
    48                 <include name="**/*.jar"/>
    49             </fileset>
    50             <pathelement path="compiled/gsdl-manuals/shared"/>
    51             <pathelement path="compiled/gsdl-manuals/manuals"/>
    52             <pathelement path="compiled/gli/classes"/>
    53         </path>
    54                    
    55         <echo>Apply XSLT</echo>
    56         <java classname="org.apache.xalan.xslt.Process" classpathref="documentation.compile.classpath" fork="true">
    57             <jvmarg value="-DGSDLHOME=${basedir}/greenstone" />
    58             <arg value="-IN"/><arg file="compiled/gli/help/en/help.xml" />
    59             <arg value="-XSL"/><arg file="compiled/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" />
    60             <arg value="-OUT"/><arg file="compiled/gsdl-manuals/manuals/xml-source/en/help-en.xml" />
    61         </java>
    62                    
    63         <echo>Run generate-pdf.bat</echo>
    64         <exec dir="${basedir}\compiled/gsdl-manuals/manuals" executable="cmd">
    65             <arg value="/C" />
    66             <arg file="${basedir}/compiled/gsdl-manuals/manuals/generate-pdf.bat" />
    67             <arg value="u" />
    68             <arg value="en" />
    69         </exec>
     23        <antcall target="compile-uninstaller"/> <!-- from rk3-targets -->
     24        <antcall target="prepare-documentation"/> <!-- from rk3-targets -->
    7025    </target>
    7126   
  • release-kits/wirk3/ant-scripts/create-distribution.xml

    r19661 r19935  
    1212        <antcall target="insert-uninstaller"><param name="script-format" value="bat"/></antcall> <!-- from rk3-targets -->
    1313
    14         <ant target="create-distribution-1" antfile="${wirk3.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}"/>
     
    2020        <antcall target="insert-icon"/>
    2121
    22         <ant target="create-distribution-2" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false">
     22        <ant target="create-distribution-2" dir="distributions/web" inheritAll="false">
    2323            <property name="app.version" value="${version}"/>
    2424            <property name="branch.path" value="${branch.path}"/>
    2525            <property name="branch.revision" value="${branch.revision}"/>
    2626        </ant>
    27         <ant target="create-distribution-3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false">
     27        <ant target="create-distribution-3" dir="distributions/web" inheritAll="false">
    2828            <property name="app.version" value="${version}"/>
    2929            <property name="branch.path" value="${branch.path}"/>
  • release-kits/wirk3/ant-scripts/create-installer.xml

    r19008 r19935  
    66        <antcall target="make-installer-files-concrete"><param name="java.os" value="windows"/></antcall> <!-- from init -->
    77        <antcall target="compile-binary-installer"/> <!-- from init -->
    8         <antcall target="compile-minimal-installer"/> <!-- from init -->
    98    </target>
    109
  • release-kits/wirk3/installer/antinstall-config.xml

    r19790 r19935  
    2626    </page>
    2727
    28     <!-- start binary release -->
    2928    <page type="input" name="intro" displayText="">
    30         <comment name="welcome-message"/>
    31     </page>
    32     <!-- end binary release -->
    33 
    34     <!-- start source release -->
    35     <page type="input" name="intro" displayText="" target="Source Release">
    3629        <comment name="welcome-greenstone3"/>
    3730    </page>
    38     <!-- end source release -->
    3931
    4032    <!--  type="license" shows a license page to click through -->
     
    5850    </page>
    5951
    60     <!-- start binary release -->
    6152    <page type="input" name="selector" displayText="">
    6253        <comment name="choose-components"/>
     
    8374            displayText=""/>       
    8475
    85         <!-- start bundled components -->
    8676        <target
    8777            target="Installing Tomcat"
     
    10797            defaultValue="true"
    10898            displayText=""/>
    109         <!-- end bundled components -->
    11099           
    111100    </page>
    112     <!-- end binary release -->
    113101
    114     <!-- start bundled components -->
    115102    <page type="input" name="tomcat-config" ifProperty="(${Installing Tomcat}==true)" displayText="">
    116 
    117103        <text property="tomcat.server" defaultValue="localhost" displayText=""/>
    118104        <text property="tomcat.port" defaultValue="8080" displayText=""/>
    119105        <text property="tomcat.shutdown.port" defaultValue="8005" displayText=""/>
    120 
    121106    </page>
    122     <!-- end bundled components -->
    123107
    124108    <page type="progress" name="progress" showTargets="true" displayText=""/>
  • release-kits/wirk3/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" default="" basedir="${basedir}">
    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     <taskdef name="shortcut" classname="com.orangevolt.tools.ant.Win32ShortcutTask" classpathref="project.classpath"/>
    17     <taskdef name="winprops" classname="com.orangevolt.tools.ant.Win32PropertiesTask" classpathref="project.classpath"/>
    18     <typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/>
    19     <typedef name="getfreepath" classname="org.greenstone.anttasks.GetFreePath" classpathref="project.classpath"/>
    20    
    21     <!-- create a local installDir String -->
    22     <path id="installDir.path">
    23         <pathelement location="${installDir}"/>
    24     </path>
    25     <property name="installDir.local" refid="installDir.path"/>
    26     <pathconvert targetos="unix" property="installDir.unix" refid="installDir.path"/>
    27        
    28     <!-- load windows properties -->
    29     <winprops/>
    30 
    31     <!-- determine if there is an existing installation in the installDir-->
    32     <available file="${installDir}\installation.properties" property="is.overinstall"/>
    33 
    34     <target name="Looking For Previous Installation" if="is.overinstall">
    35         <property file="${installDir}\installation.properties"/>
    36         <delete dir="${installed.startmenu.path}" failonerror="false"/>
    37     </target>
    38    
    39     <target name="Installing Core System">
    40 
    41         <!-- figure out the start menu path  -->
    42         <getfreepath path="${win32.personal.programs_menu}\Greenstone-@version@" property="startmenu.path"/>
    43         <path id="startmenu.path.path" path="${startmenu.path}"/>
    44         <pathconvert targetos="unix" property="startmenu.path.unix" refid="startmenu.path.path"/>
    45                
    46         <echo>basedir: ${basedir}</echo>
    47         <echo>installDir: ${installDir}</echo>
    48         <echo>antinstaller.jar: ${antinstaller.jar}</echo>
    49         <echo>startmenu.path: ${startmenu.path}</echo>
    50        
    51         <!-- create the installation directory -->
    52         <echo message="Creating Installation directory"/>
    53         <mkdir dir="${installDir}"/>
    54 
    55         <!-- extract 7za tool -->
    56         <unzip src="${antinstaller.jar}" dest="${basedir}">
    57             <patternset><include name="7za.exe"/></patternset>
    58         </unzip>
    59        
    60         <!-- install files -->
    61         <echo message="Installing Core Component"/>
    62         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="core.lzma"/></patternset></unzip>
    63         <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x core.lzma"/></exec>
    64         <delete file="core.lzma"/>
    65         <unzip src="${basedir}/core.comp" dest="${installDir}"/>
    66         <delete file="core.comp"/>
    67 
    68         <!-- jre -->
    69         <mkdir dir="${installDir}/packages"/>
    70         <copy todir="${installDir}/packages/jre" failonerror="false">
    71             <fileset dir="../@windows-java.extracted@"/>
    72         </copy>
    73 
    74         <!-- change the tomcat ports in build.properties -->
    75         <echo message="Changing tomcat ports in build.properties"/>
    76         <rsr file="${installDir}/build.properties" pattern="(tomcat.port[=:]).*" replacement="$1${tomcat.port}" />
    77         <rsr file="${installDir}/build.properties" pattern="(tomcat.shutdown.port[=:]).*" replacement="$1${tomcat.shutdown.port}" />
    78         <echo message="Changing tomcat ports in resources/tomcat/server.xml"/>
    79         <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir.local}/packages/tomcat/conf/server.xml" overwrite="true"/>
    80        
    81         <!-- set gsdlhome in gs2build setup.bat -->
    82         <echo message="Setting %GSDLHOME% in gs2build\setup.bat"/>
    83         <rsr file="${installDir}/gs2build/setup.bat" pattern="\*\*GSDLHOME\*\*" replacement="${installDir.local}\gs2build" />
    84         <!-- copy the greenstone3.xml file to tomcat -->
    85         <echo message="Copying greenstone3.xml to tomcat directory"/>
    86         <copy file="${installDir}/resources/tomcat/greenstone3.xml" tofile="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true"/>
    87         <rsr file="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" pattern="@gsdl3webhome@" replacement="${installDir.local}\web" />
    88 
    89         <!-- set up global properties -->
    90         <echo message="Setting up global properties"/>
    91         <copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
    92         <rsr file="${installDir}/web/WEB-INF/classes/global.properties">
    93             <job pattern="@gsdl3home@" replacement="${installDir.unix}/web" />
    94             <job pattern="@tomcat.server@" replacement="${tomcat.server}" />
    95             <job pattern="@tomcat.port@" replacement="${tomcat.port}" />
    96         </rsr>
    97 
    98         <!-- set up log4j properties-->
    99         <echo message="Setting up log4j properties"/>
    100         <copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
    101         <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="@gsdl3home@" replacement="${installDir.unix}/web"/>
    102 
    103         <echo>Creating the english dictionary</echo>
    104         <copy file="${installDir}/gli/classes/dictionary.properties" tofile="${installDir}/gli/classes/dictionary_en.properties"/>
    105         <echo/>
    106 
    107         <echo>Create usage.txt</echo>
    108         <echo file="${installDir}/gs2build/etc/usage.txt"></echo>
    109 
    110         <echo message="Creating installation properties file"/>
    111         <echo file="${installDir}\installation.properties">installed.startmenu.path:${startmenu.path.unix}</echo>
    112        
    113     </target>
    114 
    115 
    116     <target name="Installing Tomcat">
    117        
    118         <echo message="Installing Apache Tomcat"/>
    119         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="tomcat.lzma"/></patternset></unzip>
    120         <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x tomcat.lzma"/></exec>
    121         <delete file="tomcat.lzma"/>
    122         <unzip src="${basedir}/tomcat.comp" dest="${installDir}/packages"/>
    123         <delete file="tomcat.comp"/>
    124        
    125         <!-- change the tomcat ports in tomcats server.xml -->
    126         <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@server@" replacement="${tomcat.server}" />
    127         <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@port@" replacement="${tomcat.port}" />
    128         <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="@shutdown-port@" replacement="${tomcat.shutdown.port}" />
    129 
    130     </target>
    131 
    132     <target name="Installing Ant">
    133         <echo message="Installing Apache Ant"/>
    134         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="ant.lzma"/></patternset></unzip>
    135         <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x ant.lzma"/></exec>
    136         <delete file="ant.lzma"/>
    137         <unzip src="${basedir}/ant.comp" dest="${installDir}/packages"/>
    138         <delete file="ant.comp"/>
    139     </target>
    140 
    141     <target name="Installing ImageMagick">
    142         <echo message="Installing ImageMagick"/>
    143         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>
    144         <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x imagemagick.lzma"/></exec>
    145         <delete file="imagemagick.lzma"/>
    146         <unzip src="${basedir}/imagemagick.comp" dest="${installDir}/gs2build/bin/windows"/>
    147         <delete file="imagemagick.comp"/>
    148     </target>
    149 
    150     <target name="Installing Ghostscript">
    151         <echo message="Installing GhostScript"/>
    152         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="ghostscript.lzma"/></patternset></unzip>
    153         <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x ghostscript.lzma"/></exec>
    154         <delete file="ghostscript.lzma"/>
    155         <unzip src="${basedir}/ghostscript.comp" dest="${installDir}/gs2build/bin/windows"/>
    156         <delete file="ghostscript.comp"/>
    157     </target>
    158    
    159     <target name="Installing Start Menu Shortcuts">
    160 
    161         <mkdir dir="${startmenu.path}\Documentation"/>
    162        
    163         <shortcut
    164             file="${startmenu.path}\Greenstone3 Server.lnk"
    165             execute="${installDir}\gs3-server.bat"
    166             workingDirectory="${installDir}"
    167             iconFile="${installDir}\resources\images\gs3.ico"
    168             iconIndex="0" />
    169 
    170         <shortcut
    171             file="${startmenu.path}\Greenstone Librarian Interface (GLI).lnk"
    172             execute="${installDir}\gli\gli.bat"
    173             workingDirectory="${installDir}\gli"
    174             iconFile="${installDir}\resources\images\gs3.ico"
    175             iconIndex="0" />
    176            
    177         <shortcut
    178             file="${startmenu.path}\Greenstone Editor for Metadata Sets (GEMS).lnk"
    179             execute="${installDir}\gli\gems.bat"
    180             workingDirectory="${installDir}\gli"
    181             iconFile="${installDir}\resources\images\gs3.ico"
    182             iconIndex="0" />
    183 
    184         <shortcut
    185             file="${startmenu.path}\Uninstall.lnk"
    186             execute="${installDir}\Uninstall.bat"
    187             workingDirectory="${installDir}"
    188             iconFile="${installDir}\resources\images\gs3.ico"
    189             iconIndex="0" />
    190    
    191         <shortcut
    192             file="${startmenu.path}\Documentation\README.lnk"
    193             execute="${installDir}\README.txt" />
    194        
    195         <shortcut
    196             file="${startmenu.path}\Documentation\Greenstone3 Users' Guide.lnk"
    197             execute="${installDir}\documentation\manual\manual.pdf" />
    198        
    199         <shortcut
    200             file="${startmenu.path}\Documentation\Greenstone2 Users' Guide.lnk"
    201             execute="${installDir}\documentation\manual\gs2_user_en.pdf" />
    202        
    203     </target>
    204 
    205     <target name="Source Release" depends="">
    206 
    207         <!-- create the installation directory -->
    208         <echo message="Creating Installation directory"/>
    209         <mkdir dir="${installDir}"/>
    210 
    211         <!-- extract 7za tool -->
    212         <unzip src="${antinstaller.jar}" dest="${basedir}">
    213             <patternset><include name="7za.exe"/></patternset>
    214         </unzip>
    215 
    216         <echo>Installing Source Release</echo>
    217         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="source-release.lzma"/></patternset></unzip>
    218         <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x source-release.lzma"/></exec>
    219         <delete file="source-release.lzma"/>
    220         <unzip src="${basedir}/source-release.comp" dest="${installDir}"/>
    221         <delete file="source-release.comp"/>
    222 
    223         <!-- set gsdlhome in gs2build setup.bat -->
    224         <echo message="Setting %GSDLHOME% in gs2build\setup.bat"/>
    225         <rsr file="${installDir}/gs2build/setup.bat" pattern="\*\*GSDLHOME\*\*" replacement="${installDir.local}\gs2build" />
    226 
    227         <!-- set up global properties -->
    228         <echo message="Setting up global properties"/>
    229         <copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
    230         <rsr file="${installDir}/web/WEB-INF/classes/global.properties">
    231             <job pattern="@gsdl3home@" replacement="${installDir.unix}/web" />
    232             <job pattern="@tomcat.server@" replacement="${tomcat.server}" />
    233             <job pattern="@tomcat.port@" replacement="${tomcat.port}" />
    234         </rsr>
    235 
    236         <!-- set up log4j properties-->
    237         <echo message="Setting up log4j properties"/>
    238         <copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
    239         <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="@gsdl3home@" replacement="${installDir.unix}/web"/>
    240 
    241         <echo>Create usage.txt</echo>
    242         <echo file="${installDir}/gs2build/etc/usage.txt"></echo>
    243 
    244         <echo message="Creating installation properties file"/>
    245         <echo file="${installDir}\installation.properties">installed.startmenu.path:${startmenu.path.unix}</echo>
    246        
    247     </target>
    248 
    249 
    250    
    251 </project>
Note: See TracChangeset for help on using the changeset viewer.