Changeset 28259

Show
Ignore:
Timestamp:
11.09.2013 19:37:44 (6 years ago)
Author:
ak19
Message:

The PDFBox ext is now checked out into the gs2build/ext folder for GS3, which is consistent with its checkout location in GS2. Build.xml now has a target to get and extract the pdfbox ext tar.gz file if the checkout.pdfbox.ext property in build.properties, which is currently being introduced with this commit, is true, which it is by default in build.properties.in

Location:
main/trunk/greenstone3
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.properties.in

    r27828 r28259  
    9393#checkout.imagemagick.ext=true 
    9494 
     95# By default, GS3 will check out the pdfbox extension from SVN 
     96checkout.pdfbox.ext=true 
     97 
    9598# The following two properties are automatically overridden by gs3-server 
    9699# when running off a read-only medium such as a DVD ... 
  • main/trunk/greenstone3/build.xml

    r28178 r28259  
    24662466  <target name="prepare-gs2build" depends="init" if="collection.building.enabled" unless="gs2build.present"> 
    24672467    <antcall target="checkout-gs2build"/> 
     2468    <antcall target="prepare-pdfbox"/> 
    24682469    <antcall target="prepare-imagemagick"/> <!-- has to be done before calling prepare-gnome-lib --> 
    24692470    <antcall target="prepare-gnome-lib"/> 
     
    24832484  </target> 
    24842485 
     2486  <!-- Gets the PDFBox extension into gs2build/ext if checkout.pdfbox.ext is set to true in build.properties  
     2487       (which it is by default) --> 
     2488  <target name="prepare-pdfbox" depends="init" if="collection.building.enabled"> 
     2489    <if> 
     2490      <bool> 
     2491    <istrue value="${checkout.pdfbox.ext}"/> 
     2492      </bool> 
     2493       
     2494      <property name="pdfbox.ext.dir" value="${gs2build.home}/ext/pdf-box"/> 
     2495      <condition property="pdfbox.ext.present"> 
     2496    <available file="${pdfbox.ext.dir}" type="dir" /> 
     2497      </condition> 
     2498       
     2499      <!-- get the pdfbox tar.gz file if we don't already have it and extract it if there's no pdf-box directory in gs2build/ext--> 
     2500      <if> 
     2501    <bool> 
     2502      <not><istrue value="${pdfbox.ext.present}"/></not> 
     2503    </bool> 
     2504 
     2505    <if> 
     2506      <bool> 
     2507        <not><istrue value="${gs2build.home}/ext/pdf-box-java.tar.gz"/></not> 
     2508      </bool> 
     2509 
     2510      <echo>Checking out the PDFBox extension into the GSDLHOME extension area</echo> 
     2511      <exec executable="svn"> 
     2512        <arg value="export"/> 
     2513        <arg value="${svn.root}/gs2-extensions/pdf-box/trunk/pdf-box-java.tar.gz"/> 
     2514        <arg value="${gs2build.home}/ext/pdf-box-java.tar.gz"/> 
     2515      </exec> 
     2516    </if>    
     2517 
     2518    <echo>Extacting the PDFBox extension into the GSDLHOME extension area</echo> 
     2519    <untar compression="gzip"  
     2520           src="${gs2build.home}/ext/pdf-box-java.tar.gz" 
     2521           dest="${pdfbox.ext.dir}"/> 
     2522 
     2523    <delete file="${gs2build.home}/ext/pdf-box-java.tar.gz"/> 
     2524 
     2525    <else> 
     2526      <echo>The PDFBox extension already exists at ${pdfbox.ext.dir}</echo> 
     2527    </else>  
     2528      </if> 
     2529 
     2530      <else> 
     2531    <echo>**** Not preparing the PDFBox extension:</echo> 
     2532    <echo>The property checkout.pdfbox.ext in build.properties was not set or was set to false</echo> 
     2533      </else> 
     2534    </if> 
     2535  </target> 
    24852536 
    24862537  <target name="prepare-imagemagick" depends="init" if="collection.building.enabled">