Changeset 18907


Ignore:
Timestamp:
2009-04-08T11:49:53+12:00 (15 years ago)
Author:
oranfry
Message:

partially tested, partially complete changes for release kits to create dist based on the compiled copy of greenstone

Location:
branches/rk-oran
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/rk-oran/lirk2/ant-scripts/compile.xml

    r18870 r18907  
    66        <!-- checkout -->
    77        <antcall target="checkout-gsdl-gli" />
     8        <antcall target="drop-in-docs"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall>
    89        <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall>
    9        
     10        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/compiled/gli"/></antcall>
     11
    1012        <!-- configure -->
    1113        <antcall target="add-static-to-configure-in"/>
    … …  
    1315        <antcall target="run-configure"/>
    1416        <antcall target="makefiles-add-static"/>
     17
     18        <!-- make common-src and reconfigure -->
     19        <!-- this is a workaround to a problem with the gsdl build code -->
     20        <!-- expat needs to be compiled before the perl XML Parser is configured -->
     21        <antcall target="make-common-src"/>
     22        <antcall target="run-configure"/>
    1523
    1624        <!-- make -->
    … …  
    2028        <antcall target="strip-execs"/>
    2129
     30        <!-- gli -->
     31        <antcall target="compile-gli">
     32            <param name="glibasedir"  value="${basedir}/compiled/gli"/>
     33            <param name="gsdlbasedir" value="${basedir}/compiled"/>
     34        </antcall>
     35
    2236        <!-- uninstaller -->
    23         <antcall target="compile-uninstaller" /> <!-- from rk2-targets -->
     37        <antcall target="compile-uninstaller" /> <!-- from init -->
    2438
    2539        <!-- build collections -->
    2640        <antcall target="build-demo-collection" />
    2741
    28     </target>
    29 
    30     <target name="checkout-gsdl-gli">
    31         <svn>
    32             <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/compiled"/>
    33             <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/compiled/gli"/>
    34         </svn>
    3542    </target>
    3643
    … …  
    104111
    105112
    106 
    107113</project>

  • branches/rk-oran/lirk2/ant-scripts/create-distribution.xml

    r18874 r18907  
    44    <target name="create-distribution">
    55
    6         <antcall target="export-gsdl-gli"><param name="dest" value="distributions/web"/></antcall>
    7         <antcall target="drop-in-docs"><param name="gsdl.basedir" value="distributions/web"/></antcall>
    8         <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/distributions/web"/></antcall>
    9         <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall>
     6        <antcall target="copy-compiled-to-dist"/> <!-- from init -->
     7        <antcall target="dist-clean-sourcecode"/> <!-- from rk2-targets -->
     8        <antcall target="dist-unzip-packages"/> <!-- from rk2-targets -->
     9        <antcall target="insert-export-to-cd-package"><param name="gsdl.basedir" value="distributions/web"/></antcall> <!-- from rk2-targets -->
    1010        <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk2-targets -->
    11         <antcall target="dist-unzip-packages"/>
    12         <antcall target="drop-in-demo-collection" />
    13         <antcall target="insert-export-to-cd-package"><param name="gsdl.basedir" value="distributions/web"/></antcall> <!-- from rk2-targets -->
    14         <antcall target="drop-in-binaries" />
    15         <antcall target="export-imagemagick-linux-binaries" />
    16         <antcall target="export-wvware-linux-binaries" />
    17         <antcall target="compile-gli" />
     11
     12        <antcall target="export-imagemagick-linux-binaries"/>
     13        <antcall target="export-wvware-linux-binaries"/>
     14       
    1815        <antcall target="remove-unneeded-files" />
     16        <antcall target="strip-svn-dirs"><param name="dir" value="${basedir}/distributions/web"/></antcall>
    1917        <antcall target="create-needed-empty-files"><param name="gsdl.basedir" value="distributions/web"/></antcall>
    2018
    … …  
    5856    </target>
    5957
    60     <target name="compile-gli">
    61         <echo>Compiling gli...</echo>
    62         <exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makegli.sh"/>
    63 
    64         <echo>Creating jar...</echo>
    65         <exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makejar.sh"/>
    66 
    67         <echo>Cleaning up intermediate files...</echo>
    68         <delete dir="${basedir}/distributions/web/gli/jar"/>
    69         <delete dir="${basedir}/distributions/web/gli/classes/org"/>
    70 
    71         <echo>Putting gli server jar in a better place</echo>
    72         <exec dir="${basedir}/distributions/web" executable="mv" failonerror="true">
    73             <arg line="gli/GLIServer.jar bin/java" />
    74         </exec>
    75     </target>
    76 
    77     <target name="dist-unzip-packages">
    78         <untar src="${basedir}/distributions/web/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz" dest="${basedir}/distributions/web/common-src/packages/sqlite" compression="gzip"/>
    79         <delete file="${basedir}/distributions/web/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz"/>
    80     </target>
    81 
    82 
    8358    <target name="remove-unneeded-files">
     59        <delete dir="${basedir}/distributions/web/uninstaller" />
     60        <delete dir="${basedir}/distributions/web/autom4te.cache" />
    8461        <delete file="${basedir}/distributions/web/gli/.greenstonestore" />
    85         <delete><fileset dir="${basedir}/distributions/web" includes="win32.mak,win32cfg.h,Install.sh,Support.htm"/></delete>
     62        <delete><fileset dir="${basedir}/distributions/web" includes="win32.mak,win32cfg.h,Install.sh,Support.htm,micotest.cpp"/></delete>
    8663        <delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" />
    8764        <delete><fileset dir="${basedir}/distributions/web/gli" includes="*.bat"/></delete>
    8865        <delete><fileset dir="${basedir}/distributions/web" includes="*.bat"/></delete>
    8966        <delete dir="${basedir}/distributions/web/common-src/packages/windows"/>
     67        <delete dir="${basedir}/distributions/web/common-src/indexers/packages/windows"/>
    9068    </target>
    9169

  • branches/rk-oran/lirk2/resources/build-demo.sh

    r16167 r18907  
    1 . setup.bash
    2 import.pl --removeold demo
    3 buildcol.pl --removeold demo
    4 rm -rf collect/demo/index
     1#!/bin/bash
     2source setup.bash
     3import.pl --removeold demo && \
     4buildcol.pl --removeold demo && \
     5rm -rf collect/demo/index collect/demo/archives && \
    56mv collect/demo/building collect/demo/index
     7

  • branches/rk-oran/mark2/ant-scripts/compile.xml

    r18870 r18907  
    66        <!-- checkout -->
    77        <antcall target="checkout-gsdl-gli" />
     8        <antcall target="drop-in-docs"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall>
    89        <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall>
     10        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/compiled/gli"/></antcall>
    911       
    1012        <!-- configure -->
    1113        <antcall target="run-configure"/>
    1214        <antcall target="tweak-makefiles"/>
     15
     16        <!-- make common-src and reconfigure -->
     17        <!-- this is a workaround to a problem with the gsdl build code -->
     18        <!-- expat needs to be compiled before the perl XML Parser is configured -->
     19        <antcall target="make-common-src"/>
     20        <antcall target="run-configure"/>
    1321
    1422        <!-- make -->
    … …  
    1826        <antcall target="strip-execs"/>
    1927
     28        <!-- gli -->
     29        <antcall target="compile-gli">
     30            <param name="glibasedir"  value="${basedir}/compiled/gli"/>
     31            <param name="gsdlbasedir" value="${basedir}/compiled"/>
     32        </antcall>
     33
    2034        <!-- uninstaller -->
    2135        <antcall target="compile-uninstaller" /> <!-- from rk2-targets -->
    … …  
    2438        <antcall target="build-demo-collection" />
    2539
    26     </target>
    27 
    28     <target name="checkout-gsdl-gli">
    29         <svn javahl="false">
    30             <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/compiled"/>
    31             <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/compiled/gli"/>
    32         </svn>
    3340    </target>
    3441

  • branches/rk-oran/mark2/ant-scripts/create-distribution.xml

    r18874 r18907  
    44    <target name="create-distribution">
    55
    6         <antcall target="export-gsdl-gli"><param name="dest" value="distributions/web"/></antcall>
    7         <antcall target="drop-in-docs"><param name="gsdl.basedir" value="distributions/web"/></antcall>
    8         <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/distributions/web"/></antcall>
    9         <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall>
     6        <antcall target="copy-compiled-to-dist"/> <!-- from init -->
     7        <antcall target="dist-clean-sourcecode"/> <!-- from rk2-targets -->
     8        <antcall target="dist-unzip-packages"/> <!-- from rk2-targets -->
     9        <antcall target="insert-export-to-cd-package"><param name="gsdl.basedir" value="distributions/web"/></antcall> <!-- from rk2-targets -->
    1010        <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk2-targets -->
    11         <antcall target="dist-unzip-packages"/>
    12         <antcall target="drop-in-binaries" />
    13         <antcall target="drop-in-demo-collection" />
    14         <antcall target="insert-export-to-cd-package"><param name="gsdl.basedir" value="distributions/web"/></antcall> <!-- from rk2-targets -->
     11
    1512        <antcall target="export-imagemagick-darwin-binaries" />
    1613        <antcall target="export-ghostscript-darwin-binaries" />
    17         <antcall target="compile-gli" />
    18         <antcall target="remove-unneeded-files" />
     14
     15        <antcall target="remove-unneeded-files"/>
     16        <antcall target="strip-svn-dirs"><param name="dir" value="${basedir}/distributions/web"/></antcall>
    1917        <antcall target="create-needed-empty-files"><param name="gsdl.basedir" value="distributions/web"/></antcall>
    2018
    … …  
    7573    </target>
    7674
    77     <target name="dist-unzip-packages">
    78         <untar src="${basedir}/distributions/web/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz" dest="${basedir}/distributions/web/common-src/packages/sqlite" compression="gzip"/>
    79         <delete file="${basedir}/distributions/web/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz"/>
    80     </target>
    81 
    82 
    8375    <target name="remove-unneeded-files">
     76        <delete dir="${basedir}/distributions/web/uninstaller" />
    8477        <delete file="${basedir}/distributions/web/gli/.greenstonestore" />
    8578        <delete><fileset dir="${basedir}/distributions/web" includes="win32.mak,win32cfg.h,Install.sh,Support.htm"/></delete>

  • branches/rk-oran/mark2/resources/build-demo.sh

    r16167 r18907  
    1 . setup.bash
    2 import.pl --removeold demo
    3 buildcol.pl --removeold demo
    4 rm -rf collect/demo/index
     1#!/bin/bash
     2source setup.bash
     3import.pl --removeold demo && \
     4buildcol.pl --removeold demo && \
     5rm -rf collect/demo/index collect/demo/archives && \
    56mv collect/demo/building collect/demo/index
     7

  • branches/rk-oran/shared/ant-scripts/init.xml

    r18072 r18907  
    359359        <!-- jar it all up -->
    360360        <jar
    361             destfile="${basedir}/compiled/uninstaller/uninst.jar"
     361            destfile="${basedir}/compiled/uninst.jar"
    362362            manifest="${rk.home}/uninstaller/manifest.mf"
    363363            basedir="${basedir}/compiled/uninstaller/build" />
    … …  
    367367    <!-- copy the uninstaller from the compiled directory to web distribution -->
    368368    <target name="insert-uninstaller">
    369         <copy file="compiled/uninstaller/uninst.jar" todir="distributions/web" />
     369        <!--<copy file="compiled/uninstaller/uninst.jar" todir="distributions/web" />-->
    370370        <copy file="${rk.home}/uninstaller/Uninstall.${script-format}" todir="distributions/web" />
    371371    </target>
    … …  
    392392    </target>
    393393
     394    <target name="compile-gli">
     395
     396        <echo>Compiling gli...</echo>
     397        <exec dir="${glibasedir}" executable="${glibasedir}/makegli.sh"/>
     398
     399        <echo>Creating jar...</echo>
     400        <exec dir="${glibasedir}" executable="${glibasedir}/makejar.sh"/>
     401
     402        <echo>Cleaning up intermediate files...</echo>
     403        <delete dir="${glibasedir}/jar"/>
     404        <delete dir="${glibasedir}/classes/org"/>
     405
     406        <if><bool><isset property="gsdlbasedir"/></bool>
     407            <echo>Putting gli server jar in a better place</echo>
     408            <exec executable="mv" failonerror="true">
     409                <arg line="${glibasedir}/GLIServer.jar ${gsdlbasedir}/bin/java" />
     410            </exec>
     411        </if>
     412
     413    </target>
     414
     415    <target name="copy-compiled-to-dist">
     416        <delete dir="distributions/web"/>
     417        <mkdir dir="distributions"/>
     418        <exec executable="cp"><arg line="-r compiled distributions/web"/></exec>
     419    </target>
    394420
    395421</project>

  • branches/rk-oran/shared/greenstone2/ant-scripts/rk2-targets.xml

    r18869 r18907  
    9797    <target name="create-binary-zip-linux">
    9898        <property name="binzip.dir" value="distributions/Greenstone-${version}-${os.suffix}-binary"/>
     99
     100        <delete dir="${binzip.dir}"/>
    99101        <exec dir="${basedir}" executable="cp"><arg line="-r distributions/web ${binzip.dir}"/></exec>
    100102
    … …  
    137139    </target>
    138140
     141    <target name="dist-clean-sourcecode">
     142        <exec dir="distributions/web" executable="make"><arg value="distclean"/></exec>
     143        <delete dir="distributions/web/common-src"/>
     144        <delete dir="distributions/web/build-src"/>
     145        <delete dir="distributions/web/runtime-src"/>
     146        <svn>
     147            <export srcurl="${svn.root}/gsdl/${branch.path}/common-src" destPath="distributions/web/common-src"/>
     148            <export srcurl="${svn.root}/gsdl/${branch.path}/build-src" destPath="distributions/web/build-src"/>
     149            <export srcurl="${svn.root}/gsdl/${branch.path}/runtime-src" destPath="distributions/web/runtime-src"/>
     150        </svn>
     151    </target>
     152
     153    <target name="dist-unzip-packages">
     154        <untar src="${basedir}/distributions/web/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz" dest="${basedir}/distributions/web/common-src/packages/sqlite" compression="gzip"/>
     155        <delete file="${basedir}/distributions/web/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz"/>
     156    </target>
     157
     158    <target name="make-common-src">
     159        <exec dir="${basedir}/compiled/common-src" executable="make" failonerror="true"/>
     160        <exec dir="${basedir}/compiled/common-src" executable="make" failonerror="true"><arg value="install"/></exec>
     161    </target>
     162
     163    <target name="checkout-gsdl-gli">
     164        <svn>
     165            <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/compiled"/>
     166            <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/compiled/gli"/>
     167        </svn>
     168    </target>
     169
     170
     171
    139172</project>
    140173   
Note: See TracChangeset for help on using the changeset viewer.