pdfbox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r908961 - in /pdfbox/trunk: build.xml pom.xml src/assembly/bin.xml
Date Thu, 11 Feb 2010 13:28:48 GMT
Author: jukka
Date: Thu Feb 11 13:28:45 2010
New Revision: 908961

URL: http://svn.apache.org/viewvc?rev=908961&view=rev
Log:
PDFBOX-545: Switch PDFBox build to Maven

Add a binary release assembly. Remove the dist rules from the Ant build.

Added:
    pdfbox/trunk/src/assembly/bin.xml   (with props)
Modified:
    pdfbox/trunk/build.xml
    pdfbox/trunk/pom.xml

Modified: pdfbox/trunk/build.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/build.xml?rev=908961&r1=908960&r2=908961&view=diff
==============================================================================
--- pdfbox/trunk/build.xml (original)
+++ pdfbox/trunk/build.xml Thu Feb 11 13:28:45 2010
@@ -466,62 +466,9 @@
         </zip>
     </target>
 
-    <target name="nightly-dist">
-        <tstamp />
-        <property name="release.name" value="${project.name}-${project.version}-${DSTAMP}"
/>
-        <antcall target="dist" />
-    </target>
-
-    <target name="release-dist">
-        <antcall target="dist" />
-    </target>
-
-    <target name="dist" depends="clean,package,javadoc,build.NET,checkstyle" description="Create
jar distribution file">
-
-        <zip zipfile="${target.dir}/${release.name}-standalone.jar">
-            <zipfileset dir="./${target.dir}/" prefix="${release.name}">
-                <include name="${release.name}.jar"/>
-            </zipfileset>
-            <zipfileset dir="." prefix="${release.name}">
-                <include name="${ant.jar}" />
-                <include name="${lucene.jar}" />
-                <include name="${lucene-demos.jar}" />
-                <include name="${junit.jar}" />
-                <include name="${bcprov.jar}" />
-                <include name="${bcmail.jar}" />
-                <include name="${fontbox.jar}" />
-                <include name="${jempbox.jar}" />
-                <include name="${icu4j.jar}" />
-                <include name="${bin.dir}/**/*" />
-                <include name="README.txt" />
-                <include name="RELEASE-NOTES.txt" />
-                <include name="LICENSE.txt" />
-                <include name="NOTICE.txt" />
-            </zipfileset>
-        </zip>
-
-        <zip zipfile="${target.dir}/${release.name}-src.jar">
-            <zipfileset dir="." prefix="${release.name}">
-                <include name="${src.dir}/**/*.java"/>
-                <include name="${src.dir}/**/*.html"/>
-                <include name="${test.dir}/**/*.java"/>
-                <include name="${test.dir}/**/*.html"/>
-                <include name="${resources.dir}/**/*" />
-                <include name="*.txt" />
-                <include name="pom.xml" />
-                <include name="build.xml" />
-                <include name="build.properties.example" />
-                <include name="${checkstyle.config}" />
-            </zipfileset>
-            <zipfileset dir="${testfiles.dir}" prefix="${release.name}/${testfiles.dir}">
-                <include name="input/**/*" />
-                <include name="pdfreader/**/*" />
-            </zipfileset>
-            <zipfileset dir="${war.dir}" prefix="${release.name}/${war.dir}">
-                <include name="**/*" />
-            </zipfileset>
-        </zip>
-    </target>
+    <!-- We use Maven to create the release packages. Keep this target for -->
+    <!-- now for backwards compatibility with old build scripts and habits -->
+    <target name="dist" depends="clean,package,javadoc,build.NET,checkstyle"/>
 
     <target name="checkForIKVM">
         <condition property="IKVMAvailable">

Modified: pdfbox/trunk/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pom.xml?rev=908961&r1=908960&r2=908961&view=diff
==============================================================================
--- pdfbox/trunk/pom.xml (original)
+++ pdfbox/trunk/pom.xml Thu Feb 11 13:28:45 2010
@@ -212,6 +212,7 @@
                 <configuration>
                   <descriptors>
                     <descriptor>src/assembly/src.xml</descriptor>
+                    <descriptor>src/assembly/bin.xml</descriptor>
                   </descriptors>
                 </configuration>
               </execution>

Added: pdfbox/trunk/src/assembly/bin.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/src/assembly/bin.xml?rev=908961&view=auto
==============================================================================
--- pdfbox/trunk/src/assembly/bin.xml (added)
+++ pdfbox/trunk/src/assembly/bin.xml Thu Feb 11 13:28:45 2010
@@ -0,0 +1,45 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<assembly>
+  <id>bin</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>${project.basedir}</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>*.txt</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>org.apache.pdfbox:pdfbox</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>external</outputDirectory>
+      <excludes>
+        <exclude>org.apache.pdfbox:pdfbox</exclude>
+      </excludes>
+    </dependencySet>
+  </dependencySets>
+</assembly>

Propchange: pdfbox/trunk/src/assembly/bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message