Return-Path: 
 <flex-commits-return-2929-apmail-incubator-flex-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-flex-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-flex-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B067DD562
	for <apmail-incubator-flex-commits-archive@minotaur.apache.org>;
 Tue, 18 Dec 2012 15:44:50 +0000 (UTC)
Received: (qmail 19460 invoked by uid 500); 18 Dec 2012 15:44:50 -0000
Delivered-To: apmail-incubator-flex-commits-archive@incubator.apache.org
Received: (qmail 19424 invoked by uid 500); 18 Dec 2012 15:44:50 -0000
Mailing-List: contact flex-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:flex-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:flex-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:flex-commits@incubator.apache.org>
List-Id: <flex-commits.incubator.apache.org>
Reply-To: flex-dev@incubator.apache.org
Delivered-To: mailing list flex-commits@incubator.apache.org
Received: (qmail 19395 invoked by uid 99); 18 Dec 2012 15:44:49 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Dec 2012 15:44:49 +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; Tue, 18 Dec 2012 15:44:46 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 883492388A64;
	Tue, 18 Dec 2012 15:44:25 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1423479 -
 /incubator/flex/sdk/branches/release4.9/modules/thirdparty/batik/build.xml
Date: Tue, 18 Dec 2012 15:44:25 -0000
To: flex-commits@incubator.apache.org
From: cframpton@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121218154425.883492388A64@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: cframpton
Date: Tue Dec 18 15:44:24 2012
New Revision: 1423479

URL: http://svn.apache.org/viewvc?rev=1423479&view=rev
Log:
For the build of batik-all-flex.jar, remove requirement to exec svn and fix up MANIFEST.MF for batik-all-flex.jar.

Modified:
    incubator/flex/sdk/branches/release4.9/modules/thirdparty/batik/build.xml

Modified: incubator/flex/sdk/branches/release4.9/modules/thirdparty/batik/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/release4.9/modules/thirdparty/batik/build.xml?rev=1423479&r1=1423478&r2=1423479&view=diff
==============================================================================
--- incubator/flex/sdk/branches/release4.9/modules/thirdparty/batik/build.xml (original)
+++ incubator/flex/sdk/branches/release4.9/modules/thirdparty/batik/build.xml Tue Dec 18 15:44:24 2012
@@ -1115,7 +1115,8 @@ JAVA=/usr/bin/java
 
   <property name="FLEX_HOME" value="${basedir}/../../.."/>
   <property name="FLEX_LIB" value="${basedir}/../../../lib"/>
-
+  <property name="build.number" value="0"/>
+  
   <!-- 
     Clone all-jar and add Flex info to manifest. 
     
@@ -1123,16 +1124,26 @@ JAVA=/usr/bin/java
     correctly.
   -->
 
-  <target name="batik-all-flex-jar" depends="init, compile, prepare-build"
+  <target name="batik-all-flex-jar" depends="init, compile, determine-svn-revision-from-file, determine-svn-revision-set"
           description="Creates a combined JAR file of the Batik libraries in ${build}/lib">
 
+    <mkdir dir="${build}"/>
+    <mkdir dir="${build}/docs"/>
+    <mkdir dir="${build}/lib"/>
+
+    <property name="flex.implementation.title" value="Apache Batik all-in-one JAR - Fork of Batik 1.7"/>
+    <property name="flex.implementation.version" value="${completeVersion}${svn-revision-suffix} Build ${build.number}"/>
+    
+    <echo>Implementation-Title: ${flex.implementation.title}</echo>
+    <echo>Implementation-Version: ${flex.implementation.version}</echo>
+    <echo>Build-Id: ${build.id}</echo>
+    
     <jar jarfile="${FLEX_LIB}/batik-all-flex.jar">
       <manifest>
-        <attribute name="Implementation-Title" value="Apache Batik all-in-one JAR - Fork of Batik 1.7"/>
-        <attribute name="Implementation-Version" value="${completeVersion}${svn-revision-suffix}"/>
+        <attribute name="Implementation-Title" value="${flex.implementation.title}"/>
+        <attribute name="Implementation-Version" value="${flex.implementation.version}"/>
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)"/>
         <attribute name="Build-Id" value="${build.id}"/>
-        <attribute name="Main-Class" value="${class-prefix}.apps.svgbrowser.Main"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}" excludes="**/.svn/">