You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ju...@apache.org on 2009/09/25 10:30:31 UTC
svn commit: r818767 - in /incubator/pdfbox/fontbox/trunk: Resources/
build.xml lib/ pom.xml
Author: jukka
Date: Fri Sep 25 08:30:31 2009
New Revision: 818767
URL: http://svn.apache.org/viewvc?rev=818767&view=rev
Log:
PDFBOX-499: Maven pom.xml & directory structure incorrect for the FontBox 0.8-incubating release
Drop build.xml entries that are now implemented in Maven build.
Removed:
incubator/pdfbox/fontbox/trunk/Resources/
incubator/pdfbox/fontbox/trunk/lib/
Modified:
incubator/pdfbox/fontbox/trunk/build.xml
incubator/pdfbox/fontbox/trunk/pom.xml
Modified: incubator/pdfbox/fontbox/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/pdfbox/fontbox/trunk/build.xml?rev=818767&r1=818766&r2=818767&view=diff
==============================================================================
--- incubator/pdfbox/fontbox/trunk/build.xml (original)
+++ incubator/pdfbox/fontbox/trunk/build.xml Fri Sep 25 08:30:31 2009
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project default="dist" name="FontBox" basedir=".">
+<project default="build.NET" name="FontBox" basedir=".">
<!-- Use the following file to alter any of the below properties -->
<property file="build.properties" />
@@ -99,99 +99,6 @@
</antcall>
</target>
- <target name="clean" description="Remove all generated files">
- <delete failonerror="false">
- <fileset dir="${dest.dir}"/>
- <fileset dir="${docs.dir}"/>
- <fileset dir="${bin.dir}"/>
- <fileset dir="${lib.dir}">
- <include name="${project.name}*.jar" />
- </fileset>
- <fileset dir="." file="checkstyle.cache" />
- </delete>
- </target>
-
- <target name="fontbox.init">
- <mkdir dir="${lib.dir}"/>
- <mkdir dir="${dest.dir}"/>
- <mkdir dir="${docs.dir}" />
- <mkdir dir="${bin.dir}" />
- </target>
-
- <target name="compile" depends="fontbox.init" description="Compile Java source files">
- <!-- required encoding flag to be able to build using ibm-jdk on redhat ES-->
- <javac srcdir="${src.dir}" destdir="${dest.dir}" target="1.4" source="1.4" debug="on" classpathref="build.classpath" deprecation="on" encoding="ISO-8859-1"/>
- </target>
-
- <target name="checkstyle" depends="compile,get.checkstyle">
- <!-- This doesn't work when run from netbeans for some reason -->
- <taskdef name="checkstyle"
- classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"
- classpathref="checkstyle.classpath" />
- <checkstyle config="${checkstyle.config}"
- classpathref="checkstyle.classpath"
- failOnViolation="false">
- <fileset dir="${src.dir}" />
- </checkstyle>
- </target>
-
- <target name="package" depends="compile" description="Package fontbox">
- <property name="release.name" value="${project.name}-${project.version}" />
- <mkdir dir="${resources.dir}"/>
- <propertyfile file="${resources.dir}/fontbox.version">
- <entry key="fontbox.version" value="${release.name}"/>
- </propertyfile>
-
- <jar jarfile="./lib/${release.name}.jar">
- <fileset dir="${dest.dir}">
- <include name="org/**/*.class"/>
- </fileset>
- <fileset dir=".">
- <include name="${resources.dir}/**/*" />
- </fileset>
- <metainf dir="." includes="*.txt"/>
- <manifest>
- <attribute name="Built-By" value="${user.name}"/>
- <attribute name="Implementation-Title" value="Apache FontBox (incubating)"/>
- <attribute name="Implementation-Version" value="${project.version}"/>
- <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
- <attribute name="Implementation-URL" value="http://incubator.apache.org/pdfbox/"/>
- </manifest>
- </jar>
- </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 zip distribution file">
- <zip zipfile="${target.dir}/${release.name}.zip">
- <zipfileset dir="." prefix="${release.name}">
- <include name="${src.dir}/**/*.java"/>
- <include name="${test.dir}/**/*.java"/>
- <include name="${src.dir}/**/*.html"/>
- <include name="${test.dir}/**/*.html"/>
- <include name="*.txt" />
- <include name="build.xml" />
- <include name="build.properties.example" />
- <include name="${checkstyle.config}" />
- </zipfileset>
- <zipfileset dir="." prefix="${release.name}">
- <include name="website/**/*" />
- <exclude name="website/build/**/*" />
- </zipfileset>
- <zipfileset dir="${ikvm.dir}/bin" prefix="${release.name}/bin" >
- <include name="*.dll" />
- </zipfileset>
- </zip>
- </target>
-
<target name="checkForIKVM">
<condition property="IKVMAvailable">
<and>
@@ -201,43 +108,15 @@
</condition>
</target>
- <target name="build.NET" depends="checkForIKVM,package" if="IKVMAvailable" description="Build FontBox .NET DLL files">
+ <target name="build.NET" depends="checkForIKVM" if="IKVMAvailable" description="Build FontBox .NET DLL files">
<property name="release.name" value="${project.name}-${project.version}" />
<exec executable="${ikvmc}">
<arg value="-reference:${ikvm.dir}/bin/IKVM.OpenJDK.ClassLibrary.dll" />
<arg value="-reference:${ikvm.dir}/bin/IKVM.AWT.WinForms.dll" />
<arg value="-target:library" />
- <arg value="-out:bin\${release.name}.dll" />
- <arg value="lib\${release.name}.jar" />
+ <arg value="-out:target\${release.name}.dll" />
+ <arg value="target\${release.name}.jar" />
</exec>
</target>
- <target name="javadoc" depends="compile" description="Create Javadocs">
- <property name="release.name" value="${project.name}-${project.version}" />
- <javadoc packagenames="org.*"
- sourcepath="${src.dir}"
- destdir="${docs.dir}"
- author="true"
- version="true"
- use="true"
- windowtitle="${release.name} API"
- doctitle="${project.name}"
- verbose="no"
- classpathref="build.classpath"
- encoding="ISO-8859-1"
- breakiterator="yes">
- <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
- <!--<link href="http://jakarta.apache.org/ant/manual/api/" />-->
- </javadoc>
- </target>
-
- <!-- FORREST_HOME must be set as an environment variable -->
- <property name="project.home" value="${basedir}/website" />
- <property name="forrest.jvmargs" value="-Djava.awt.headless=true" />
-
- <import file="${env.FORREST_HOME}/main/forrest.build.xml" optional="true"/>
- <target name="website" if="env.FORREST_HOME">
- <antcall target="site"/>
- </target>
-
</project>
\ No newline at end of file
Modified: incubator/pdfbox/fontbox/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/pdfbox/fontbox/trunk/pom.xml?rev=818767&r1=818766&r2=818767&view=diff
==============================================================================
--- incubator/pdfbox/fontbox/trunk/pom.xml (original)
+++ incubator/pdfbox/fontbox/trunk/pom.xml Fri Sep 25 08:30:31 2009
@@ -80,6 +80,9 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<source>${maven.compile.source}</source>
+ <links>
+ <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
+ </links>
</configuration>
</plugin>
<plugin>