Return-Path: 
 <derby-commits-return-15016-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
X-Original-To: apmail-db-derby-commits-archive@www.apache.org
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id E55FA7F0E
	for <apmail-db-derby-commits-archive@www.apache.org>;
 Wed, 26 Oct 2011 08:01:33 +0000 (UTC)
Received: (qmail 36242 invoked by uid 500); 26 Oct 2011 08:01:33 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 36171 invoked by uid 500); 26 Oct 2011 08:01:33 -0000
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:derby-commits-help@db.apache.org>
list-unsubscribe: <mailto:derby-commits-unsubscribe@db.apache.org>
List-Post: <mailto:derby-commits@db.apache.org>
Reply-To: "Derby Development" <derby-dev@db.apache.org>
List-Id: <derby-commits.db.apache.org>
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 36164 invoked by uid 99); 26 Oct 2011 08:01:32 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Oct 2011 08:01:32 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Oct 2011 08:01:30 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 6E88C23888FD;
	Wed, 26 Oct 2011 08:01:09 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1189065 - /db/derby/code/trunk/build.xml
Date: Wed, 26 Oct 2011 08:01:09 -0000
To: derby-commits@db.apache.org
From: kahatlen@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111026080109.6E88C23888FD@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: kahatlen
Date: Wed Oct 26 08:01:09 2011
New Revision: 1189065

URL: http://svn.apache.org/viewvc?rev=1189065&view=rev
Log:
DERBY-5478: Speed up creation of bin scripts

- Execute chmod once instead of six times

- Don't regenerate the scripts unless the templates have changed

Modified:
    db/derby/code/trunk/build.xml

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1189065&r1=1189064&r2=1189065&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Wed Oct 26 08:01:09 2011
@@ -879,7 +879,7 @@
 <!--                     Build the Unix shell scripts under bin          -->
 <!-- =================================================================== -->
 
-<target name="binscripts">
+<target name="binscripts" depends="check-binscripts" unless="binscripts.done">
   <antcall target="makebinscript">
     <param name="script" value="dblook"/>
   </antcall>
@@ -903,6 +903,10 @@
   <antcall target="makebinscript">
     <param name="script" value="stopNetworkServer"/>
   </antcall>
+
+  <!-- All the scripts should be executable. -->
+  <chmod perm="+x" dir="${generated.bin.dir}" includes="*"/>
+
 </target>
 
 <target name="makebinscript">
@@ -910,7 +914,17 @@
     <fileset file="bin/templates/derby_common.sh"/>
     <fileset file="bin/templates/${script}"/>
   </concat>
-  <chmod perm="+x" file="${generated.bin.dir}/${script}"/>
+</target>
+
+<target name="check-binscripts">
+  <dependset>
+    <srcfileset file="bin/templates/derby_common.sh"/>
+    <targetfileset dir="${generated.bin.dir}"/>
+  </dependset>
+  <uptodate property="binscripts.done">
+    <srcfiles dir="bin/templates" excludes="derby_common.sh"/>
+    <globmapper from="*" to="${generated.bin.dir}/*"/>
+  </uptodate>
 </target>
 
 <!-- =================================================================== -->