Ignore:
Timestamp:
2008-11-20T16:33:21+13:00 (14 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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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
Note: See TracChangeset for help on using the changeset viewer.