Changeset 17898 for release-kits/lirk3


Ignore:
Timestamp:
2008-11-20T16:33:21+13:00 (15 years ago)
Author:
oranfry
Message:

Standardised names of directories used in release kits

  • gsdl and greenstone3 -> compiled
  • distribution and distributions -> distributions
  • greenstone3 and web -> web

And, expect more specifically named properties files, e.g., lirk3-build.properties, wirk2-build.properties

Location:
release-kits/lirk3/ant-scripts
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • release-kits/lirk3/ant-scripts/build.xml

    r17596 r17898  
    1313
    1414    <!-- for the benefit of the shared scripts, set release-kit home -->
     15    <property name="rk.name" value="lirk3"/>
    1516    <property name="rk.home" value="${lirk3.home}" />
    1617    <property name="rk.os" value="linux" />

  • release-kits/lirk3/ant-scripts/compile.xml

    r17523 r17898  
    99        <!-- preparation -->
    1010        <antcall target="greenstone3-set-version-numbers">
    11             <param name="greenstone3basedir" value="${basedir}/greenstone3"/>
     11            <param name="greenstone3basedir" value="${basedir}/compiled"/>
    1212        </antcall>
    13         <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="prepare-unix"  inheritAll="false"/>
     13        <ant dir="compiled" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="prepare-unix"  inheritAll="false"/>
    1414
    1515        <antcall target="tweak-configure-scripts" />
    1616
    1717        <!-- update -->
    18         <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="update-unix"  inheritAll="false"/>
     18        <ant dir="compiled" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="update-unix"  inheritAll="false"/>
    1919
    2020        <!-- configure -->
    2121        <antcall target="regenerate-configure"/>
    22         <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="configure-unix" inheritAll="false"/>
     22        <ant dir="compiled" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="configure-unix" inheritAll="false"/>
    2323        <antcall target="tweak-makefiles" />
    2424
    2525        <!-- build -->
    26         <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="build-unix" inheritAll="false"/>
     26        <ant dir="compiled" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="build-unix" inheritAll="false"/>
    2727        <antcall target="linux-strip-execs" />
    2828
    … …  
    3737    <target name="checkout-greenstone3">
    3838        <svn>
    39             <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="greenstone3"/>
     39            <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="compiled"/>
    4040        </svn>
    4141    </target>
    … …  
    4848
    4949    <target name="regenerate-configure">
    50         <exec dir="greenstone3/gs2build" executable="autoconf" output="greenstone3/gs2build/configure">
     50        <exec dir="compiled/gs2build" executable="autoconf" output="compiled/gs2build/configure">
    5151            <arg line="configure.in"/>
    5252        </exec>
    53         <chmod file="greenstone3/gs2build/configure" perm="+x"/>
     53        <chmod file="compiled/gs2build/configure" perm="+x"/>
    5454    </target>
    5555
    … …  
    6363
    6464    <target name="linux-strip-execs">
    65         <exec dir="greenstone3/gs2build/bin/linux" executable="find">
     65        <exec dir="compiled/gs2build/bin/linux" executable="find">
    6666            <arg line="! -name . -exec strip {} &#59;"/>
    6767        </exec>
    … …  
    6969
    7070    <target name="prepare-documentation">
    71         <mkdir dir="greenstone3/gsdl-manuals"/>
     71        <mkdir dir="compiled/gsdl-manuals"/>
    7272        <svn>
    73             <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="greenstone3/gsdl-manuals/manuals"/>
    74             <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="greenstone3/gsdl-manuals/shared"/>
     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"/>
    7575        </svn>
    76         <javac srcdir="greenstone3/gsdl-manuals/shared"
    77               destdir="greenstone3/gsdl-manuals/shared"
     76        <javac srcdir="compiled/gsdl-manuals/shared"
     77              destdir="compiled/gsdl-manuals/shared"
    7878              debug="on">
    7979            <include name="*.java"/>
    8080        </javac>
    81         <unzip src="greenstone3/gsdl-manuals/shared/fop.zip" dest="greenstone3/gsdl-manuals/shared"/>
     81        <unzip src="compiled/gsdl-manuals/shared/fop.zip" dest="compiled/gsdl-manuals/shared"/>
    8282
    8383        <path id="documentation.compile.classpath">
    84             <fileset dir="greenstone3/gsdl-manuals">
     84            <fileset dir="compiled/gsdl-manuals">
    8585                <include name="**/*.jar"/>
    8686            </fileset>
    87             <pathelement path="greenstone3/gsdl-manuals/shared"/>
    88             <pathelement path="greenstone3/gsdl-manuals/manuals"/>
     87            <pathelement path="compiled/gsdl-manuals/shared"/>
     88            <pathelement path="compiled/gsdl-manuals/manuals"/>
    8989        </path>
    9090
    91         <java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output="greenstone3/gsdl-manuals/manuals/xml-source/en/help-en.xml">
    92             <arg value="greenstone3/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" />
    93             <arg value="greenstone3/gli/help/en/help.xml" />
    94             <arg value="greenstone3" />
     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" />
    9595        </java>
    9696
    97         <chmod perm="a+x" file="greenstone3/gsdl-manuals/shared/fop/fop.sh"/>
     97        <chmod perm="a+x" file="compiled/gsdl-manuals/shared/fop/fop.sh"/>
    9898        <echo>Run generate-pdf.sh</echo>
    99         <exec dir="greenstone3/gsdl-manuals/manuals" executable="/bin/sh">
     99        <exec dir="compiled/gsdl-manuals/manuals" executable="/bin/sh">
    100100            <arg line="generate-pdf.sh u en" />
    101101        </exec>
    … …  
    109109
    110110    <target name="mgpp-add-static">
    111         <rsr file="greenstone3/gs2build/common-src/indexers/mgpp/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
    112         <exec dir="greenstone3/gs2build/common-src/indexers/mgpp" executable="autoconf" output="greenstone3/gs2build/common-src/indexers/mgpp/configure">
     111        <rsr file="compiled/gs2build/common-src/indexers/mgpp/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
     112        <exec dir="compiled/gs2build/common-src/indexers/mgpp" executable="autoconf" output="compiled/gs2build/common-src/indexers/mgpp/configure">
    113113            <arg line="configure.in"/>
    114114        </exec>
    … …  
    116116
    117117    <target name="mg-add-static">
    118         <rsr file="greenstone3/gs2build/common-src/indexers/mg/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
    119         <exec dir="greenstone3/gs2build/common-src/indexers/mg" executable="autoconf" output="greenstone3/gs2build/common-src/indexers/mg/configure">
     118        <rsr file="compiled/gs2build/common-src/indexers/mg/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
     119        <exec dir="compiled/gs2build/common-src/indexers/mg" executable="autoconf" output="compiled/gs2build/common-src/indexers/mg/configure">
    120120            <arg line="configure.in"/>
    121121        </exec>
    … …  
    123123
    124124    <target name="gs2build-add-static">
    125         <rsr file="greenstone3/gs2build/common-src/packages/configure" pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
    126         <rsr file="greenstone3/gs2build/build-src/packages/configure"  pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
    127         <rsr file="greenstone3/gs2build/configure.in" pattern="^LDFLAGS=.*" replacement="LDFLAGS=-static" />
     125        <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;" />
     127        <rsr file="compiled/gs2build/configure.in" pattern="^LDFLAGS=.*" replacement="LDFLAGS=-static" />
    128128    </target>
    129129
    130130    <target name="wv-add-static">
    131         <rsr file="greenstone3/gs2build/build-src/packages/wv/wv-gs/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
     131        <rsr file="compiled/gs2build/build-src/packages/wv/wv-gs/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
    132132    </target>
    133133
    134134    <target name="xlhtml-add-static">
    135         <rsr file="greenstone3/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
     135        <rsr file="compiled/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
    136136    </target>
    137137
    138138    <target name="ppthtml-add-static">
    139         <rsr file="greenstone3/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
     139        <rsr file="compiled/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
    140140    </target>
    141141
    142142    <target name="rtftohtml-add-static">
    143         <rsr file="greenstone3/gs2build/build-src/packages/rtftohtml/rtftohtml_src/Makefile" pattern="-o rtftohtml(.{2})EXEEXT(.{1})" replacement="-o rtftohtml$1EXEEXT$2 -static" />
     143        <rsr file="compiled/gs2build/build-src/packages/rtftohtml/rtftohtml_src/Makefile" pattern="-o rtftohtml(.{2})EXEEXT(.{1})" replacement="-o rtftohtml$1EXEEXT$2 -static" />
    144144    </target>
    145145
    146146    <target name="gdbm-add-static">
    147         <rsr file="greenstone3/src/packages/javagdbm/jni/Makefile" pattern="^(GDBM_LIBS)\s*=\s*(.*)-lgdbm(.*)$" replacement="$1=$2/usr/lib/libgdbm.a$3" />
     147        <rsr file="compiled/src/packages/javagdbm/jni/Makefile" pattern="^(GDBM_LIBS)\s*=\s*(.*)-lgdbm(.*)$" replacement="$1=$2/usr/lib/libgdbm.a$3" />
    148148    </target>
    149149

  • release-kits/lirk3/ant-scripts/create-components.xml

    r17814 r17898  
    22<project name="lirk3-create-components" default="create-components">
    33
    4     <!-- create components from the distribution folder -->
     4    <!-- create components from the distributions folder -->
    55
    66    <!-- 1st level -->
    … …  
    4242               
    4343        <copy todir="components/tmp/core" overwrite="true">
    44             <fileset dir="distribution/greenstone3">
     44            <fileset dir="distributions/web">
    4545                <include name="**/*"/>
    4646
    … …  
    5858                <exclude name="packages/tomcat"/>
    5959                <exclude name="packages/tomcat/**/*"/>
    60                 <exclude name="distributions/greenstone3/gs2build/bin/linux/imagemagick"/>
    61                 <exclude name="distributions/greenstone3/gs2build/bin/linux/imagemagick/**/*"/>
     60                <exclude name="distributions/web/gs2build/bin/linux/imagemagick"/>
     61                <exclude name="distributions/web/gs2build/bin/linux/imagemagick/**/*"/>
    6262
    6363            </fileset>
    … …  
    7878
    7979        <copy todir="components/tmp/sourcecode" overwrite="true">
    80                 <fileset dir="distribution/greenstone3">
     80                <fileset dir="distributions/web">
    8181                    <include name="src/**/*"/>
    8282                    <include name="gs2build/common-src/**/*"/>
    … …  
    100100
    101101        <copy todir="components/tmp/ant" overwrite="true">
    102             <fileset dir="distribution/greenstone3/packages">
     102            <fileset dir="distributions/web/packages">
    103103                <include name="ant/**/*"/>
    104104            </fileset>
    … …  
    119119
    120120        <copy todir="components/tmp/tomcat" overwrite="true">
    121             <fileset dir="distribution/greenstone3/packages">
     121            <fileset dir="distributions/web/packages">
    122122                <include name="tomcat/**/*"/>
    123123            </fileset>
    … …  
    138138
    139139        <copy todir="components/tmp/imagemagick" overwrite="true">
    140             <fileset dir="distribution/greenstone3/gs2build/bin/linux">
     140            <fileset dir="distributions/web/gs2build/bin/linux">
    141141                <include name="imagemagick/**/*"/>
    142142            </fileset>

  • release-kits/lirk3/ant-scripts/create-distribution.xml

    r17816 r17898  
    66        <!-- create distribution -->
    77        <antcall target="export-greenstone3-gli" />
    8         <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distribution/greenstone3"/></antcall>
    9         <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/></antcall>
     8        <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distributions/web"/></antcall>
     9        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall>
    1010        <antcall target="insert-user-manual"/>
    1111        <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk3-targets -->
    1212
    13         <antcall target="copy-web-to-source-greenstone3" /> <!-- from gs3-targets -->
     13        <antcall target="copy-web-to-source" /> <!-- from init -->
    1414
    15         <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-1" inheritAll="false">
     15        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" target="create-distribution-1" inheritAll="false">
    1616            <property name="app.version" value="${version}"/>
    1717            <property name="branch.path" value="${branch.path}"/>
    1818        </ant>
    19         <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-2" inheritAll="false">
     19        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" target="create-distribution-2" inheritAll="false">
    2020            <property name="app.version" value="${version}"/>
    2121            <property name="branch.path" value="${branch.path}"/>
    2222        </ant>
    23         <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-3" inheritAll="false">
     23        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" target="create-distribution-3" inheritAll="false">
    2424            <property name="app.version" value="${version}"/>
    2525            <property name="branch.path" value="${branch.path}"/>
    … …  
    2929        <antcall target="export-imagemagick-linux-binaries" />
    3030   
    31         <antcall target="strip-svn-dirs"><param name="dir" value="distribution"/></antcall> <!-- from init -->
     31        <antcall target="strip-svn-dirs"><param name="dir" value="distributions"/></antcall> <!-- from init -->
    3232
    3333    </target>
    3434
    3535    <target name="export-greenstone3-gli">
    36         <mkdir dir="distribution"/>
    37         <delete dir="distribution/greenstone3"/>
     36        <mkdir dir="distributions"/>
     37        <delete dir="distributions/web"/>
    3838        <svn>
    39             <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3"/>
    40             <export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution/greenstone3/gli"/>
     39            <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distributions/web"/>
     40            <export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli"/>
    4141        </svn>
    4242    </target>
    4343   
    4444    <target name="export-imagemagick-linux-binaries">
    45         <delete dir="distribution/greenstone3/gs2build/bin/linux/imagemagick"/>
     45        <delete dir="distributions/web/gs2build/bin/linux/imagemagick"/>
    4646        <svn>
    47             <export srcurl="${svn.root}/other-projects/trunk/linux-binaries/imagemagick" destPath="distribution/greenstone3/gs2build/bin/linux/imagemagick"/>
     47            <export srcurl="${svn.root}/other-projects/trunk/linux-binaries/imagemagick" destPath="distributions/web/gs2build/bin/linux/imagemagick"/>
    4848        </svn>
    4949    </target>
    5050
    5151    <target name="copy-over-build-xml">
    52         <move file="distribution/greenstone3/modified-build.xml" tofile="distribution/greenstone3/build.xml"/>
     52        <move file="distributions/web/modified-build.xml" tofile="distributions/web/build.xml"/>
    5353    </target>
    5454
    5555    <target name="insert-user-manual">
    56         <copy file="greenstone3/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distribution/greenstone3/docs/manual/gs2_user_en.pdf"/>
     56        <copy file="compiled/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distributions/web/docs/manual/gs2_user_en.pdf"/>
    5757    </target>
    5858
    5959    <target name="insert-compiled-binaries">
    60         <delete dir="distribution/greenstone3/lib/jni"/>
    61         <exec executable="cp"><arg line="-r greenstone3/lib/jni distribution/greenstone3/lib"/></exec>
     60        <delete dir="distributions/web/lib/jni"/>
     61        <exec executable="cp"><arg line="-r compiled/lib/jni distributions/web/lib"/></exec>
    6262
    63         <delete dir="distribution/greenstone3/gs2build/bin/linux"/>
    64         <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/linux distribution/greenstone3/gs2build/bin"/></exec>
     63        <delete dir="distributions/web/gs2build/bin/linux"/>
     64        <exec executable="cp"><arg line="-r compiled/gs2build/bin/linux distributions/web/gs2build/bin"/></exec>
    6565
    66         <delete dir="distribution/greenstone3/gs2build/bin/java"/>
    67         <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/java distribution/greenstone3/gs2build/bin"/></exec>
     66        <delete dir="distributions/web/gs2build/bin/java"/>
     67        <exec executable="cp"><arg line="-r compiled/gs2build/bin/java distributions/web/gs2build/bin"/></exec>
    6868
    69         <exec executable="cp"><arg line="greenstone3/bin/search4j distribution/greenstone3/bin"/></exec>
     69        <exec executable="cp"><arg line="compiled/bin/search4j distributions/web/bin"/></exec>
    7070
    7171    </target>

  • release-kits/lirk3/ant-scripts/create-installer.xml

    r17697 r17898  
    1313
    1414        <copy todir="${basedir}/installer/classes" overwrite="true">
    15             <fileset file="${basedir}/distribution/greenstone3/LICENSE.txt"/>
     15            <fileset file="${basedir}/distributions/web/LICENSE.txt"/>
    1616        </copy>
    1717
Note: See TracChangeset for help on using the changeset viewer.