flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1402154 - in /incubator/flex/sdk/branches/develop: ./ modules/ modules/thirdparty/batik/ modules/thirdparty/batik/resources/org/apache/flex/forks/batik/apps/ modules/thirdparty/batik/resources/org/apache/flex/forks/batik/ext/swing/ modules...
Date Thu, 25 Oct 2012 13:58:13 GMT
Author: cframpton
Date: Thu Oct 25 13:58:12 2012
New Revision: 1402154

URL: http://svn.apache.org/viewvc?rev=1402154&view=rev
Log:
Remove unused stuff from batik-all-flex.jar and make fix up jars/LICENSE/NOTICE files on kit.

Added:
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/resources/org/apache/flex/forks/batik/util/gui/resources/blank.gif
  (with props)
Removed:
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/resources/org/apache/flex/forks/batik/apps/
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/resources/org/apache/flex/forks/batik/ext/swing/
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/resources/org/apache/flex/forks/batik/extensions/
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/resources/org/apache/flex/forks/batik/swing/
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/sources-1.3/org/apache/batik/swing/
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/sources-1.4/org/apache/batik/swing/
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/sources/batik-rasterizer-ext.mf
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/sources/batik-rasterizer-ext.pom.template
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/sources/batik-rasterizer.mf
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/sources/batik-rasterizer.pom.template
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/sources/batik-slideshow.mf
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/sources/batik-slideshow.pom.template
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/sources/batik-svgpp.pom.template
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/sources/batik-swing.pom.template
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/sources/batik-ttf2svg.mf
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/sources/batik-ttf2svg.pom.template
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/sources/org/apache/flex/forks/batik/apps/
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/sources/org/apache/flex/forks/batik/ext/
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/sources/org/apache/flex/forks/batik/extension/
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/sources/org/apache/flex/forks/batik/swing/
Modified:
    incubator/flex/sdk/branches/develop/build.properties
    incubator/flex/sdk/branches/develop/build.xml
    incubator/flex/sdk/branches/develop/modules/downloads.xml
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/   (props changed)
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/build.xml

Modified: incubator/flex/sdk/branches/develop/build.properties
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/build.properties?rev=1402154&r1=1402153&r2=1402154&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/build.properties (original)
+++ incubator/flex/sdk/branches/develop/build.properties Thu Oct 25 13:58:12 2012
@@ -47,5 +47,5 @@ mxmlc.jvm.args = ${jvm.args}
 manifest.sealed=false
 manifest.Implementation-Title=Apache Flex SDK
 manifest.Implementation-Version=${release.version}
-manifest.Implementation-Vendor=The Apache Software Foundation
+manifest.Implementation-Vendor=The Apache Software Foundation (http://incubator.apache.org/flex/)
 manifest.Implementation-Vendor-Id=org.apache

Modified: incubator/flex/sdk/branches/develop/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/build.xml?rev=1402154&r1=1402153&r2=1402154&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/build.xml (original)
+++ incubator/flex/sdk/branches/develop/build.xml Thu Oct 25 13:58:12 2012
@@ -27,7 +27,7 @@
         <and>
             <equals arg1="${sun.arch.data.model}" arg2="64"/>
             <equals arg1="${os.arch}" arg2="x86_64"/>
-                <os family="mac"/>
+            <os family="mac"/>
         </and>
     </condition>
 
@@ -911,30 +911,21 @@
         -->
         <copy todir="${basedir}/temp/lib/external">
             <fileset dir="${basedir}/lib/external">
+                <!-- required license and notice files -->
+                <include name="*LICENSE*/**"/>
+                <include name="*NOTICE*/**"/>
+                <include name="*README*"/>
+                <!-- jar files -->
                 <include name="commons-collections.jar"/>
-                <include name="commons-collections-LICENSE*"/>
-                <include name="commons-collections-NOTICE*/**"/>
                 <include name="commons-discovery.jar"/>
-                <include name="commons-discovery-LICENSE*"/>
-                <include name="commons-discovery-NOTICE*/**"/>
                 <include name="commons-logging.jar"/>
-                <include name="commons-logging-LICENSE*"/>
-                <include name="commons-logging-NOTICE*/**"/>
                 <include name="javacc.jar"/>
-                <include name="javacc-LICENSE*"/>
                 <include name="saxon9.jar"/>
-                <include name="saxon9-LICENSE*"/>
-                <include name="saxon9-NOTICE*/**"/>
                 <include name="xalan.jar"/>
-                <include name="xalan-LICENSE*"/>
-                <include name="xalan-NOTICE*/**"/>
                 <include name="xercesImpl.jar"/>
                 <include name="xercesPatch.jar"/>
-                <include name="xerces-LICENSE*/**"/>
-                <include name="xerces-NOTICE*/**"/>
+                <include name="xml-apis-ext.jar"/>
                 <include name="xml-apis.jar"/>
-                <include name="xml-batik-LICENSE*"/>
-                <include name="xml-batik-NOTICE*/**"/>
                 <exclude name="optional/**"/>
             </fileset>
         </copy>

Modified: incubator/flex/sdk/branches/develop/modules/downloads.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/modules/downloads.xml?rev=1402154&r1=1402153&r2=1402154&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/modules/downloads.xml (original)
+++ incubator/flex/sdk/branches/develop/modules/downloads.xml Thu Oct 25 13:58:12 2012
@@ -275,7 +275,7 @@
 	    <delete dir="${basedir}/${batik.dir}/lib/**" failonerror="false"/>
         <delete includeEmptyDirs="true" failonerror="fasle">
             <fileset dir="${download.dir}">
-                <include name="${batik.zip.dir}*/**"/>
+                <include name="batik*/**"/>
             </fileset>            
         </delete>
     </target>

Propchange: incubator/flex/sdk/branches/develop/modules/thirdparty/batik/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Oct 25 13:58:12 2012
@@ -1,3 +1,3 @@
 classes
-batik-1.6
+batik-1.7
 lib

Modified: incubator/flex/sdk/branches/develop/modules/thirdparty/batik/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/modules/thirdparty/batik/build.xml?rev=1402154&r1=1402153&r2=1402154&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/modules/thirdparty/batik/build.xml (original)
+++ incubator/flex/sdk/branches/develop/modules/thirdparty/batik/build.xml Thu Oct 25 13:58:12
2012
@@ -1090,11 +1090,25 @@ JAVA=/usr/bin/java
 
   <!--====== START additions for Apache Flex =========-->
 
+    <!--
+    The following directories have been removed from the batik source tree since they
+    aren't being used by Flex:
+        resource and sources
+            apps
+            ext/swing
+            extension
+            
+        as well as the manifest files for the applications and all test files.
+        
+    There are several targets in this build file that will not build because of these
+    missing files.
+  -->
+
   <property name="FLEX_HOME" value="${basedir}/../../.."/>
   <property name="FLEX_LIB" value="${basedir}/../../../lib"/>
 
   <!-- 
-    Clone all-jar and add Flex manifest. 
+    Clone all-jar and add Flex info to manifest. 
     
     This must be built from the modules build file to get the manifest properties set
     correctly.
@@ -1115,9 +1129,9 @@ JAVA=/usr/bin/java
       <fileset dir="${dest}" excludes="**/.svn/">
         <include name="**"/>
       </fileset>
-      <!--fileset dir="${resources}" excludes="**/.svn/">
+      <fileset dir="${resources}" excludes="**/.svn/">
         <include name="**"/>
-      </fileset-->
+      </fileset>
     </jar>
   </target>
  
@@ -1129,10 +1143,8 @@ JAVA=/usr/bin/java
   <!--====== END additions for Apache Flex =========-->
 
   <!-- All batik in a single jar (dependencies: none) -->
-  <!-- Apache Flex:
-        modified Implementation-Title and added Class-Path.
-  -->
-  <target name="all-jar" depends="init, compile, prepare-build"
+
+    <target name="all-jar" depends="init, compile, prepare-build"
           description="Creates a combined JAR file of the Batik libraries in ${build}/lib">
     <jar jarfile="${build}/lib/${project}-all.jar">
       <manifest>

Added: incubator/flex/sdk/branches/develop/modules/thirdparty/batik/resources/org/apache/flex/forks/batik/util/gui/resources/blank.gif
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/modules/thirdparty/batik/resources/org/apache/flex/forks/batik/util/gui/resources/blank.gif?rev=1402154&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/flex/sdk/branches/develop/modules/thirdparty/batik/resources/org/apache/flex/forks/batik/util/gui/resources/blank.gif
------------------------------------------------------------------------------
    svn:mime-type = image/gif



Mime
View raw message