greenstone.org greenstone wiki greenstone trac planet greenstone
Show
Ignore:
Timestamp:
2008-11-20 16:33:21 (2 months 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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • release-kits/shared/ant-scripts/init.xml

    r17881 r17898  
    33 
    44        <!-- load in static properties from build.properties --> 
    5         <property file="build.properties" /> 
     5        <property file="${rk.name}-build.properties" /> 
    66 
    77        <!-- CONSTANTS (overridable in build.properties) --> 
    …… 
    5252 
    5353                <!-- our classes --> 
    54                 <fileset dir="${rk.home}/ant-scripts/tasks"> 
    55                         <include name="**/*.jar"/> 
    56                 </fileset> 
    57  
    58                 <!-- jars in lib directory --> 
    59                 <fileset dir="${rk.home}/lib"> 
    60                         <include name="*.jar"/> 
    61                 </fileset> 
    62  
    63                 <!-- a few ant-installer jars --> 
    64                 <fileset dir="${rk.home}/packages/ant-installer/lib"> 
    65                         <include name="ant-installer-ext.jar"/> 
    66                         <include name="ant-installer.jar"/> 
     54                <fileset dir="${rk.home}"> 
     55                        <include name="ant-scripts/tasks/antelope/AntelopeTasks_3.4.2.jar"/> 
     56                        <include name="ant-scripts/tasks/orangevolt/roxes-win32forjava-1.1.1.jar"/> 
     57                        <include name="ant-scripts/tasks/orangevolt/orangevolt-ant-tasks-1.3.8.jar"/> 
     58                        <include name="ant-scripts/tasks/svnant/lib/ganymed.jar"/> 
     59                        <include name="ant-scripts/tasks/svnant/lib/svnClientAdapter.jar"/> 
     60                        <include name="ant-scripts/tasks/svnant/lib/svnant.jar"/> 
     61                        <include name="ant-scripts/tasks/svnant/lib/svnjavahl.jar"/> 
     62                        <include name="ant-scripts/tasks/svnant/lib/svnkit.jar"/> 
     63                        <include name="ant-scripts/tasks/greenstone/anttasks.jar"/> 
     64                        <include name="ant-scripts/tasks/7z-ant/7z.jar"/> 
     65                        <include name="lib/crypt.jar"/> 
     66                        <include name="lib/serializer.jar"/> 
     67                        <include name="lib/xalan.jar"/> 
     68                        <include name="lib/xercesImpl.jar"/> 
     69                        <include name="lib/xml-apis.jar"/> 
     70                        <include name="packages/ant-installer/lib/ant-installer-ext.jar"/> 
     71                        <include name="packages/ant-installer/lib/ant-installer.jar"/> 
    6772                </fileset> 
    6873 
    …… 
    118123                                <not><isset property="version"/></not> 
    119124                        </bool> 
    120                         <fail>Version number not set</fail> 
     125                        <fail>Version number not set. 
     126Check that the file '${rk.name}-build.properties' exists and defines property 'version'.</fail> 
    121127                </if> 
    122128                <property name="app.version" value="${version}"/> 
    …… 
    224230        </target> 
    225231 
     232        <!-- fork the web distribution to preserve a source release --> 
    226233        <target name="copy-web-to-source"> 
    227234                <copy todir="distributions/source"><fileset dir="distributions/web"/></copy> 
    …… 
    415422        </target> 
    416423 
     424        <!-- shared target to compile the uninstaller --> 
     425        <target name="compile-uninstaller"> 
     426                <echo>Compiling Uninstaller</echo> 
     427 
     428                <!-- create working build directory --> 
     429                <mkdir dir="${basedir}/compiled/uninstaller/build/resources" /> 
     430 
     431                <!-- copile to build --> 
     432                <javac 
     433                        srcdir="${rk.home}/uninstaller" 
     434                        destdir="${basedir}/compiled/uninstaller/build" /> 
     435 
     436                <!-- copy language bundle into place --> 
     437                <native2ascii 
     438                        implementation="sun" 
     439                        src="${rk.home}/language-strings" 
     440                        dest="${basedir}/compiled/uninstaller/build/resources"/> 
     441 
     442                <!-- jar it all up --> 
     443                <jar 
     444                        destfile="${basedir}/compiled/uninstaller/uninst.jar" 
     445                        manifest="${rk.home}/uninstaller/manifest.mf" 
     446                        basedir="${basedir}/compiled/uninstaller/build" /> 
     447 
     448        </target> 
     449 
     450        <!-- copy the uninstaller from the compiled directory to web distribution --> 
     451        <target name="insert-uninstaller"> 
     452                <copy file="compiled/uninstaller/uninst.jar" todir="distributions/web" /> 
     453                <copy file="${rk.home}/uninstaller/Uninstall.${script-format}" todir="distributions/web" /> 
     454        </target> 
     455 
     456        <!-- creates the comp for the source release, works for all release kits --> 
     457        <target name="prepare-source-release"> 
     458                <delete dir="components/tmp/source-release"/> 
     459                <mkdir dir="components/tmp/source-release"/> 
     460 
     461                <copy todir="components/tmp/source-release" overwrite="true"> 
     462                        <fileset dir="distributions/source"/> 
     463                </copy> 
     464                <zip destfile="components/source-release.comp" basedir="components/tmp/source-release" compress="false"/> 
     465        </target> 
     466 
    417467</project> 

  • release-kits/shared/greenstone2/ant-scripts/rk2-targets.xml

    r17810 r17898  
    1212        <property name="version.major" value="2"/> 
    1313 
    14         <target name="compile-uninstaller"> 
    15                 <echo>Compiling Uninstaller</echo> 
     14        <target name="gsdl-set-version-numbers"> 
     15                <echo level="info">Setting version in src/lib/gsdlconf.h</echo> 
     16                <rsr file="${gsdl.basedir}/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" /> 
    1617 
    17                 <!-- create working build directory --> 
    18                 <mkdir dir="${basedir}/gsdl/uninstaller/build/resources" /> 
     18                <echo level="info">Setting version in Install.sh</echo> 
     19                <rsr file="${gsdl.basedir}/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" /> 
    1920 
    20                 <!-- copile to build --> 
    21                 <javac 
    22                         srcdir="${rk.home}/uninstaller" 
    23                         destdir="${basedir}/gsdl/uninstaller/build" /> 
    24  
    25                 <!-- copy language bundle into place --> 
    26                 <native2ascii 
    27                         implementation="sun" 
    28                         src="${rk.home}/language-strings" 
    29                         dest="${basedir}/gsdl/uninstaller/build/resources"/> 
    30  
    31                 <!-- jar it all up --> 
    32                 <jar 
    33                         destfile="${basedir}/gsdl/uninstaller/uninst.jar" 
    34                         manifest="${rk.home}/uninstaller/manifest.mf" 
    35                         basedir="${basedir}/gsdl/uninstaller/build" /> 
    36  
    37         </target> 
    38  
    39         <target name="insert-uninstaller"> 
    40                 <copy file="gsdl/uninstaller/uninst.jar" todir="distributions/web" /> 
    41                 <copy file="${rk.home}/uninstaller/Uninstall.${script-format}" todir="distributions/web" /> 
     21                <echo level="info">Setting version in etc/VERSION</echo> 
     22                <rsr file="${gsdl.basedir}/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" /> 
    4223        </target> 
    4324 
    …… 
    4930        </target> 
    5031 
    51         <!-- source-release --> 
    52         <target name="prepare-source-release"> 
    53                 <delete dir="components/tmp/source-release"/> 
    54                 <mkdir dir="components/tmp/source-release"/> 
    55  
    56                 <copy todir="components/tmp/source-release" overwrite="true"> 
    57                         <fileset dir="distributions/source"/> 
    58                 </copy> 
    59                 <zip destfile="components/source-release.comp" basedir="components/tmp/source-release" compress="false" includes="**/*"/> 
    60         </target> 
    61  
    62  
    6332</project> 

  • release-kits/shared/greenstone3/ant-scripts/rk3-targets.xml

    r17813 r17898  
    1212        <property name="version.major" value="3"/> 
    1313 
    14         <target name="compile-uninstaller"> 
    15                 <echo>Compiling Uninstaller</echo> 
    16  
    17                 <!-- create working build directory --> 
    18                 <mkdir dir="${basedir}/greenstone3/uninstaller/build/resources" /> 
    19  
    20                 <!-- copile to build --> 
    21                 <javac 
    22                         srcdir="${rk.home}/uninstaller" 
    23                         destdir="${basedir}/greenstone3/uninstaller/build" /> 
    24  
    25                 <!-- copy language bundle into place --> 
    26                 <native2ascii 
    27                         implementation="sun" 
    28                         src="${rk.home}/language-strings" 
    29                         dest="${basedir}/greenstone3/uninstaller/build/resources"/> 
    30  
    31                 <!-- jar it all up --> 
    32                 <jar 
    33                         destfile="${basedir}/greenstone3/uninstaller/uninst.jar" 
    34                         manifest="${rk.home}/uninstaller/manifest.mf" 
    35                         basedir="${basedir}/greenstone3/uninstaller/build" /> 
    36  
    37         </target> 
    38  
    39         <target name="insert-uninstaller"> 
    40                 <copy file="greenstone3/uninstaller/uninst.jar" todir="distribution/greenstone3" /> 
    41                 <copy file="${rk.home}/uninstaller/Uninstall.${script-format}" todir="distribution/greenstone3" /> 
    42         </target> 
    43  
    4414        <target name="greenstone3-set-version-numbers"> 
    4515                <rsr 
    …… 
    4919        </target> 
    5020 
    51         <target name="copy-web-to-source-greenstone3"> 
    52                 <copy todir="distribution/source"><fileset dir="distribution/greenstone3"/></copy> 
    53         </target> 
    54  
    55  
    56         <!-- sourcecode-release --> 
    57         <target name="prepare-source-release"> 
    58                 <delete dir="components/tmp/source-release"/> 
    59                 <mkdir dir="components/tmp/source-release"/> 
    60  
    61                 <copy todir="components/tmp/source-release" overwrite="true"> 
    62                         <fileset dir="distribution/source"/> 
    63                 </copy> 
    64                 <zip destfile="components/source-release.comp" basedir="components/tmp/source-release" compress="false"/> 
    65         </target> 
    66  
    67  
    6821</project>