Changeset 13373

Show
Ignore:
Timestamp:
29.11.2006 15:00:13 (13 years ago)
Author:
kjdon
Message:

working on the create dist targets

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/gsdl3/dist-resources/dist-build.xml

    r13311 r13373  
    8383  <!-- creates the base distribution. Needs binaries copied in to it from other 
    8484    greenstones (prepare-for-dists) --> 
    85   <target name="create-distribution" depends="init"> 
     85  <target name="create-distribution-1" depends="init" description="do all the initial downloading and setting up"> 
    8686    <cvs command="export -D '1 second ago'" package="mgpp"  
    8787      dest="${src.packages.home}" 
     
    9393    <delete file="${gli.home}/gli.bat"/> 
    9494    <delete file="${gli.home}/gli.sh"/> 
    95     <antcall target="rename-gs2build-files-dist"/> 
     95    <antcall target="rename-gs2build-files-dist"/>     
    9696    <delete dir="${gs2build-extra.home}"/> 
    97     <antcall target="unzip-windows-packages"/> 
     97     
     98    <!--<antcall target="unzip-windows-packages"/> do we need this?--> 
    9899    <antcall target="get-macos-extra"/> 
    99     <antcall target="prepare-tomcat"/> 
     100    <antcall target="download-tomcat"/> 
    100101    <delete file="${packages.home}/apache-tomcat-5.5.12.zip"/> 
    101102    <delete file="${packages.home}/apache-tomcat-5.5.12-compat.zip"/> 
    102     <antcall target="configure-tomcat"/> 
    103103    <antcall target="prepare-axis"/> 
    104104    <delete file="${packages.home}/axis-bin-1_2_1.zip"/> 
    105105    <!-- delete old axis dir --> 
    106106    <delete dir="${packages.home}/axis"/> 
    107     <antcall target="prepare-web"/> 
     107    <mkdir dir="${web.home}/applet"/> 
     108    <mkdir dir="${web.home}/logs"/> 
     109 
    108110    <antcall target="prepare-collections"/> 
    109111    <antcall target="install-macos-extra"/> 
    110  
     112    <!-- documented collections --> 
     113    <antcall target="get-documented-collections"/> 
     114 
     115    <delete file="${basedir}/README-CVS.txt"/> 
     116    <delete file="${basedir}/TODO.txt"/> 
     117 
     118    <!-- make the extra directories needed for a release --> 
     119    <mkdir dir="${basedir}/Linux/bin"/> 
     120    <mkdir dir="${basedir}/Linux/lib/jni"/> 
     121    <mkdir dir="${basedir}/Darwin/bin"/> 
     122    <mkdir dir="${basedir}/Darwin/lib/jni"/> 
     123    <mkdir dir="${basedir}/Windows/lib/jni"/> 
     124    <mkdir dir="${basedir}/Windows/bin"/> 
     125    <mkdir dir="${gs2build.home}/Unix/bin/linux"/> 
     126    <mkdir dir="${gs2build.home}/Unix/bin/darwin"/> 
     127    <mkdir dir="${gs2build.home}/Windows/bin/windows"/> 
     128    <mkdir dir="${gs2build.home}/source/Windows"/> 
     129    <mkdir dir="${gs2build.home}/source/Unix"/> 
     130 
     131  </target> 
     132 
     133  <target name="create-distribution-2" description="do all the compilation"> 
    111134    <!-- compile the java stuff --> 
    112135    <antcall target="compile-web"/> 
     
    115138    <antcall target="distclean-packages"/> 
    116139    <antcall target="compile-core"/> 
    117   </target> 
    118   <target name="create-distribution-2" depends="init"> 
    119140    <antcall target="compile-gli"/> 
    120     <delete dir="${basedir}/build"/> 
    121  
    122     <mkdir dir="Linux/bin"/> 
    123     <mkdir dir="Linux/lib/jni"/> 
    124     <mkdir dir="Darwin/bin"/> 
    125     <mkdir dir="Darwin/lib/jni"/> 
    126     <mkdir dir="Windows/lib/jni"/> 
    127     <mkdir dir="Windows/bin"/> 
    128     <mkdir dir="${gs2build.home}/Unix/bin/linux"/> 
    129     <mkdir dir="${gs2build.home}/Unix/bin/darwin"/> 
    130     <mkdir dir="${gs2build.home}/Windows/bin/windows"/> 
    131     <mkdir dir="${gs2build.home}/source/Windows"/> 
    132     <mkdir dir="${gs2build.home}/source/Unix"/> 
     141  </target> 
     142 
     143  <target name="create-distribution-3" depends="init" description="Do the rearranging of source code etc"> 
    133144 
    134145    <!-- move top-level os dependent files --> 
     
    174185    </move> 
    175186 
    176     <!-- documented collections --> 
    177     <antcall target="get-documented-collections"/> 
    178187 
    179188    <!-- clean up --> 
    180     <xslt in="build.xml" out="dist-build.xml" style="dist-resources/convert-build-xml.xsl"/> 
     189    <xslt in="${basedir}/build.xml" out="${basedir}/dist-build.xml" style="${basedir}/dist-resources/convert-build-xml.xsl"/> 
    181190    <delete dir="${basedir}/build"/> 
    182191    <delete dir="${basedir}/lib/jni"/> 
    183     <delete dir="${basedir}/dist-resources"/> 
    184     <delete file="${basedir}/README-CVS.txt"/> 
    185     <delete file="${basedir}/TODO.txt"/> 
    186   </target> 
    187    
    188  
    189   <target name="prepare-for-source-dist" depends="init"> 
     192  </target> 
     193   
     194 
     195  <target name="create-source-distribution" depends="init"> 
    190196    <cvs command="export -D '1 second ago'" package="mgpp"  
    191197      dest="${src.packages.home}" 
     
    197203    <delete file="${gli.home}/gli.bat"/> 
    198204    <delete file="${gli.home}/gli.sh"/> 
    199     <antcall target="rename-gs2build-files-unix"/> 
     205    <antcall target="rename-gs2build-files-dist"/> 
     206    <delete dir="${gs2build-extra.home}"/> 
     207    <antcall target="download-tomcat"/> 
     208    <delete file="${packages.home}/apache-tomcat-5.5.12.zip"/> 
     209    <delete file="${packages.home}/apache-tomcat-5.5.12-compat.zip"/> 
     210 
    200211    <antcall target="prepare-collections"/> 
    201212    <antcall target="prepare-axis"/> 
     
    207218      dest="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz" 
    208219      usetimestamp="true"/> 
    209     <xslt in="build.xml" out="dist-build.xml" style="dist-resources/convert-build-xml-source.xsl"/> 
    210     <delete dir="${basedir}/dist-resources"/> 
     220    <xslt in="${basedir}/build.xml" out="${basedir}/dist-build.xml" style="${basedir}/dist-resources/convert-build-xml-source.xsl"/> 
     221    <!--<delete dir="${basedir}/dist-resources"/>--> 
    211222     
    212223  </target> 
     224 
     225  <!-- this target must be run once source dist unpacked --> 
     226  <target name="prepare-for-source-dist" depends="init"> 
     227    <antcall target="unzip-windows-packages"/> 
     228    <!-- install tomcat compat package if necessary --> 
     229    <condition property="need.tomcat.compat"> 
     230      <equals arg1="1.4" arg2="${ant.java.version}"/> 
     231    </condition> 
     232    <antcall target="install-tomcat-compat"/> 
     233    <condition property="need.xml.jars"> 
     234      <equals arg1="1.5" arg2="${ant.java.version}"/> 
     235    </condition> 
     236    <antcall target="rename-xml-jars"/> 
     237     
     238    <!-- set gsdlhome in setup.bat --> 
     239    <antcall target="gs2build-edit-setup-bat"/> 
     240    <antcall target="prepare-web"/> 
     241  </target> 
     242 
     243  <target name="rename-gs2build-files-dist" depends="init,rename-gs2build-files-unix"> 
     244    <copy file="${gs2build-extra.home}/lib.win32.mak" tofile="${gs2build.home}/lib/win32.mak"/> 
     245   <copy file="${gs2build-extra.home}/win32.mak" tofile="${gs2build.home}/win32.mak"/> 
     246   <copy file="${gs2build-extra.home}/setup.bat" tofile="${gs2build.home}/setup.bat"/> 
     247  </target>    
    213248 
    214249  <target name="delete-windows-files" depends="init" unless="current.os.iswindows"> 
     
    227262    <delete file="${gs2build.home}/bin/windows/perl-for-windows.zip"/> 
    228263  </target> 
    229  
    230   <target name="rename-gs2build-files-dist" depends="init,rename-gs2build-files-unix"> 
    231     <copy file="${gs2build-extra.home}/lib.win32.mak" tofile="${gs2build.home}/lib/win32.mak"/> 
    232    <copy file="${gs2build-extra.home}/win32.mak" tofile="${gs2build.home}/win32.mak"/> 
    233    <copy file="${gs2build-extra.home}/setup.bat" tofile="${gs2build.home}/setup.bat"/> 
    234   </target>    
    235264 
    236265  <target name="distclean-packages" depends="init,clean-packages-c++">