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/mark3/ant-scripts
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r17597 r17898  
    1616
    1717    <!-- for the benefit of the shared scripts, set release-kit home -->
     18    <property name="rk.name" value="mark3"/>
    1819    <property name="rk.home" value="${mark3.home}" />
    1920    <property name="rk.os" value="linux" />
     21    <!-- os.suffix set dynamically below -->
    2022
    2123    <!-- IMPORT OTHER ANT SCRIPTS -->

  • release-kits/mark3/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>
    1313        <antcall target="set-gdbm-installed-path" />
    14         <ant target="prepare-unix" dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
     14        <ant target="prepare-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
    1515       
    1616        <!-- update -->
    17         <ant target="update-unix" dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
     17        <ant target="update-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
    1818
    1919        <!-- configure -->
    20         <ant target="configure-unix" dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
     20        <ant target="configure-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
    2121        <antcall target="tweak-makefiles" />
    2222
    2323        <!-- build -->
    24         <ant target="build-unix" dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
     24        <ant target="build-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
    2525        <antcall target="linux-strip-execs" />
    2626
    … …  
    3535    <target name="checkout-greenstone3">
    3636        <svn javahl="false">
    37             <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="greenstone3"/>
     37            <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="compiled"/>
    3838        </svn>
    3939    </target>
    4040
    4141    <target name="set-version-number-property">
    42         <rsr file="greenstone3/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />
     42        <rsr file="compiled/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />
    4343    </target>
    4444
    4545    <target name="set-gdbm-installed-path">
    46         <rsr file="greenstone3/build.properties" pattern="(gdbm.installed.path=).*" replacement="$1${mark3.home}/mac/${processor}/gdbm"/>
     46        <rsr file="compiled/build.properties" pattern="(gdbm.installed.path=).*" replacement="$1${mark3.home}/mac/${processor}/gdbm"/>
    4747    </target>
    4848
    4949    <target name="tweak-makefiles">
    5050        <rsr
    51             file="${basedir}/greenstone3/gs2build/common-src/src/gdbmedit/db2txt/Makefile"
     51            file="${basedir}/compiled/gs2build/common-src/src/gdbmedit/db2txt/Makefile"
    5252            pattern="^(LIBS ?=.*)-L${mark3.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$"
    5353            replacement="$1${mark3.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
    5454
    5555        <rsr
    56             file="${basedir}/greenstone3/gs2build/common-src/src/gdbmedit/txt2db/Makefile"
     56            file="${basedir}/compiled/gs2build/common-src/src/gdbmedit/txt2db/Makefile"
    5757            pattern="^(LIBS ?=.*)-L${mark3.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$"
    5858            replacement="$1${mark3.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
    5959
    6060        <rsr
    61             file="${basedir}/greenstone3/src/packages/javagdbm/jni/Makefile"
     61            file="${basedir}/compiled/src/packages/javagdbm/jni/Makefile"
    6262            pattern="^(GDBM_LIBS ?=.*)-L${mark3.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$"
    6363            replacement="$1${mark3.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
    … …  
    6565
    6666    <target name="linux-strip-execs">
    67         <exec dir="greenstone3/gs2build/bin/darwin" executable="find">
     67        <exec dir="compiled/gs2build/bin/darwin" executable="find">
    6868            <arg line=". ! -name . -exec strip {} &#59;"/>
    6969        </exec>
    … …  
    7171
    7272    <target name="prepare-documentation">
    73         <mkdir dir="greenstone3/gsdl-manuals"/>
     73        <mkdir dir="compiled/gsdl-manuals"/>
    7474        <svn javahl="false">
    75             <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="greenstone3/gsdl-manuals/manuals"/>
    76             <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="greenstone3/gsdl-manuals/shared"/>
     75            <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="compiled/gsdl-manuals/manuals"/>
     76            <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="compiled/gsdl-manuals/shared"/>
    7777        </svn>
    78         <javac srcdir="greenstone3/gsdl-manuals/shared"
    79               destdir="greenstone3/gsdl-manuals/shared"
     78        <javac srcdir="compiled/gsdl-manuals/shared"
     79              destdir="compiled/gsdl-manuals/shared"
    8080              debug="on">
    8181            <include name="*.java"/>
    8282        </javac>
    83         <unzip src="greenstone3/gsdl-manuals/shared/fop.zip" dest="greenstone3/gsdl-manuals/shared"/>
     83        <unzip src="compiled/gsdl-manuals/shared/fop.zip" dest="compiled/gsdl-manuals/shared"/>
    8484
    8585        <path id="documentation.compile.classpath">
    86             <fileset dir="greenstone3/gsdl-manuals">
     86            <fileset dir="compiled/gsdl-manuals">
    8787                <include name="**/*.jar"/>
    8888            </fileset>
    89             <pathelement path="greenstone3/gsdl-manuals/shared"/>
    90             <pathelement path="greenstone3/gsdl-manuals/manuals"/>
     89            <pathelement path="compiled/gsdl-manuals/shared"/>
     90            <pathelement path="compiled/gsdl-manuals/manuals"/>
    9191        </path>
    9292
    93         <java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output="greenstone3/gsdl-manuals/manuals/xml-source/en/help-en.xml">
    94             <arg value="greenstone3/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" />
    95             <arg value="greenstone3/gli/help/en/help.xml" />
    96             <arg value="greenstone3" />
     93        <java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output="compiled/gsdl-manuals/manuals/xml-source/en/help-en.xml">
     94            <arg value="compiled/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" />
     95            <arg value="compiled/gli/help/en/help.xml" />
     96            <arg value="compiled" />
    9797        </java>
    9898
    99         <chmod perm="a+x" file="greenstone3/gsdl-manuals/shared/fop/fop.sh"/>
     99        <chmod perm="a+x" file="compiled/gsdl-manuals/shared/fop/fop.sh"/>
    100100        <echo>Run generate-pdf.sh</echo>
    101         <exec dir="greenstone3/gsdl-manuals/manuals" executable="/bin/sh">
     101        <exec dir="compiled/gsdl-manuals/manuals" executable="/bin/sh">
    102102            <arg line="generate-pdf.sh u en" />
    103103        </exec>

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

    r17814 r17898  
    22<project name="mark3-create-components" default="create-components">
    33
    4     <!-- create components from the distribution folder -->
     4    <!-- create components from the distributions folder -->
    55
    66    <!-- 1st level -->
    … …  
    4343               
    4444        <copy todir="components/tmp/core" overwrite="true">
    45             <fileset dir="distribution/greenstone3">
     45            <fileset dir="distributions/web">
    4646                <include name="**/*"/>
    4747
    … …  
    8585
    8686        <copy todir="components/tmp/sourcecode" overwrite="true">
    87                 <fileset dir="distribution/greenstone3">
     87                <fileset dir="distributions/web">
    8888                    <include name="src/**/*"/>
    8989                    <include name="gs2build/common-src/**/*"/>
    … …  
    108108
    109109        <copy todir="components/tmp/ant" overwrite="true">
    110             <fileset dir="distribution/greenstone3/packages">
     110            <fileset dir="distributions/web/packages">
    111111                <include name="ant/**/*"/>
    112112            </fileset>
    … …  
    127127
    128128        <copy todir="components/tmp/tomcat" overwrite="true">
    129             <fileset dir="distribution/greenstone3/packages">
     129            <fileset dir="distributions/web/packages">
    130130                <include name="tomcat/**/*"/>
    131131            </fileset>
    … …  
    146146
    147147        <copy todir="components/tmp/imagemagick" overwrite="true">
    148             <fileset dir="distribution/greenstone3/gs2build/bin/darwin">
     148            <fileset dir="distributions/web/gs2build/bin/darwin">
    149149                <include name="imagemagick/**/*"/>
    150150            </fileset>
    … …  
    165165
    166166        <copy todir="components/tmp/ghostscript" overwrite="true">
    167             <fileset dir="distribution/greenstone3/gs2build/bin/darwin">
     167            <fileset dir="distributions/web/gs2build/bin/darwin">
    168168                <include name="ghostscript/**/*"/>
    169169            </fileset>

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

    r17833 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 target="create-distribution-1" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
     15        <ant target="create-distribution-1" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false">
    1616            <property name="app.version" value="${version}"/>
    1717            <property name="branch.path" value="${branch.path}"/>
    1818        </ant>
    1919
    20         <ant target="create-distribution-2" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
     20        <ant target="create-distribution-2" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false">
    2121            <property name="app.version" value="${version}"/>
    2222            <property name="branch.path" value="${branch.path}"/>
    2323        </ant>
    2424
    25         <ant target="create-distribution-3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
     25        <ant target="create-distribution-3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false">
    2626            <property name="app.version" value="${version}"/>
    2727            <property name="branch.path" value="${branch.path}"/>
    … …  
    3232        <antcall target="export-imagemagick-darwin-binaries" />
    3333        <antcall target="export-ghostscript-darwin-binaries" />
    34         <antcall target="strip-svn-dirs"><param name="dir" value="distribution"/></antcall> <!-- from init -->
     34        <antcall target="strip-svn-dirs"><param name="dir" value="distributions"/></antcall> <!-- from init -->
    3535    </target>
    3636
    3737    <target name="export-greenstone3-gli">
    38         <mkdir dir="distribution"/>
    39         <delete dir="distribution/greenstone3"/>
     38        <mkdir dir="distributions"/>
     39        <delete dir="distributions/web"/>
    4040        <svn javahl="false">
    41             <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3"/>
    42             <export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution/greenstone3/gli"/>
     41            <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distributions/web"/>
     42            <export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli"/>
    4343        </svn>
    4444    </target>
    4545   
    4646    <target name="export-imagemagick-darwin-binaries">
    47         <delete dir="distribution/greenstone3/gs2build/bin/darwin/imagemagick"/>
     47        <delete dir="distributions/web/gs2build/bin/darwin/imagemagick"/>
    4848        <svn>
    49             <export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/imagemagick" destPath="distribution/greenstone3/gs2build/bin/darwin/imagemagick"/>
     49            <export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/imagemagick" destPath="distributions/web/gs2build/bin/darwin/imagemagick"/>
    5050        </svn>
    5151    </target>
    5252   
    5353    <target name="export-ghostscript-darwin-binaries">
    54         <delete dir="distribution/greenstone3/gs2build/bin/darwin/ghostscript"/>
     54        <delete dir="distributions/web/gs2build/bin/darwin/ghostscript"/>
    5555        <svn>
    56             <export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/ghostscript" destPath="distribution/greenstone3/gs2build/bin/darwin/ghostscript"/>
     56            <export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/ghostscript" destPath="distributions/web/gs2build/bin/darwin/ghostscript"/>
    5757        </svn>
    5858    </target>
    5959
    60     <target name="dist-set-version-number-property">
    61         <rsr
    62             file="distribution/greenstone3/resources/java/global.properties.in"
    63             pattern="(.*)@gsdl3version@(.*)"
    64             replacement="$1${version}$2" />
    65     </target>
    66 
    6760    <target name="copy-over-build-xml">
    68         <move file="distribution/greenstone3/modified-build.xml" tofile="distribution/greenstone3/build.xml"/>
     61        <move file="distributions/web/modified-build.xml" tofile="distributions/web/build.xml"/>
    6962    </target>
    7063
    7164    <target name="insert-user-manual">
    72         <copy file="greenstone3/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distribution/greenstone3/docs/manual/gs2_user_en.pdf"/>
     65        <copy file="compiled/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distributions/web/docs/manual/gs2_user_en.pdf"/>
    7366    </target>
    7467
    7568    <target name="insert-compiled-binaries">
    76         <delete dir="distribution/greenstone3/lib/jni"/>
    77         <exec executable="cp"><arg line="-r greenstone3/lib/jni distribution/greenstone3/lib"/></exec>
     69        <delete dir="distributions/web/lib/jni"/>
     70        <exec executable="cp"><arg line="-r compiled/lib/jni distributions/web/lib"/></exec>
    7871
    79         <delete dir="distribution/greenstone3/gs2build/bin/darwin"/>
    80         <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/darwin distribution/greenstone3/gs2build/bin"/></exec>
     72        <delete dir="distributions/web/gs2build/bin/darwin"/>
     73        <exec executable="cp"><arg line="-r compiled/gs2build/bin/darwin distributions/web/gs2build/bin"/></exec>
    8174
    82         <delete dir="distribution/greenstone3/gs2build/bin/java"/>
    83         <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/java distribution/greenstone3/gs2build/bin"/></exec>
    84         <exec executable="cp"><arg line="greenstone3/bin/search4j distribution/greenstone3/bin"/></exec>
     75        <delete dir="distributions/web/gs2build/bin/java"/>
     76        <exec executable="cp"><arg line="-r compiled/gs2build/bin/java distributions/web/gs2build/bin"/></exec>
     77        <exec executable="cp"><arg line="compiled/bin/search4j distributions/web/bin"/></exec>
    8578    </target>
    8679
    87     <target name="rename-build-xml-for-transit">
    88         <move file="distribution/greenstone3/build.xml" tofile="distribution/greenstone3/greenstone3-build.xml"/>
    89     </target>
    90 
    91 
    9280</project>

  • release-kits/mark3/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.