You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2012/10/29 11:59:41 UTC
svn commit: r1403251 - in /manifoldcf/trunk: CHANGES.txt site/build.xml
Author: kwright
Date: Mon Oct 29 10:59:40 2012
New Revision: 1403251
URL: http://svn.apache.org/viewvc?rev=1403251&view=rev
Log:
Fix for CONNECTORS-561. Only download font packages if they aren't already there. Committed on behalf of Alex Ott.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/site/build.xml
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1403251&r1=1403250&r2=1403251&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Oct 29 10:59:40 2012
@@ -3,6 +3,10 @@ $Id$
======================= 1.1-dev =====================
+CONNECTORS-561: Only download font packages if they aren't already
+present.
+(Alex Ott)
+
CONNECTORS-559: Help link of navigation.jsp is incorrect by locale.
(Shinichiro Abe)
Modified: manifoldcf/trunk/site/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/build.xml?rev=1403251&r1=1403250&r2=1403251&view=diff
==============================================================================
--- manifoldcf/trunk/site/build.xml (original)
+++ manifoldcf/trunk/site/build.xml Mon Oct 29 10:59:40 2012
@@ -40,7 +40,7 @@
<available file="fonts/dejavu-fonts-ttf-2.33.zip" property="dejavuAvailable"/>
</target>
- <target name="dejavu-check" depends="calculate-dejavu-condition" unless="dejavuAvailable">
+ <target name="dejavu-check" depends="download-dejavu-fonts,calculate-dejavu-condition" unless="dejavuAvailable">
<echo message="Dejavu fonts cannot be built without dejavu-fonts-ttf-2.33.zip"/>
</target>
@@ -48,7 +48,7 @@
<available file="fonts/IPAGTTC00303.zip" property="ipaAvailable"/>
</target>
- <target name="ipa-check" depends="calculate-ipa-condition" unless="ipaAvailable">
+ <target name="ipa-check" depends="download-ipa-fonts,calculate-ipa-condition" unless="ipaAvailable">
<echo message="IPA fonts cannot be built without IPAGTTC00303.zip"/>
</target>
@@ -251,12 +251,20 @@
</exec>
</target>
- <target name="download-dejavu-fonts">
+ <target name="calculate-dejavu-condition-before">
+ <available file="fonts/dejavu-fonts-ttf-2.33.zip" property="dejavuAvailableBefore"/>
+ </target>
+
+ <target name="download-dejavu-fonts" depends="calculate-dejavu-condition-before" unless="dejavuAvailableBefore">
<mkdir dir="fonts"/>
<get src="http://downloads.sourceforge.net/project/dejavu/dejavu/2.33/dejavu-fonts-ttf-2.33.zip?r=&ts=1327734867&use_mirror=cdnetworks-us-2" dest="fonts"/>
</target>
- <target name="download-ipa-fonts">
+ <target name="calculate-ipa-condition-before">
+ <available file="fonts/IPAGTTC00303.zip" property="ipaAvailableBefore"/>
+ </target>
+
+ <target name="download-ipa-fonts" depends="calculate-ipa-condition-before" unless="ipaAvailableBefore">
<mkdir dir="fonts"/>
<!-- http://ossipedia.ipa.go.jp/ipafont/download.html?ruleagreement=%E5%90%8C%E6%84%8F%E3%81%99%E3%82%8B%2FAccept -->
<!-- get src="http://ossipedia.ipa.go.jp/ipafont/IPAGTTC00303.php" dest="fonts/IPAGTTC00303.zip"/ -->