rpms/xml-stylebook/devel xml-stylebook-build-javadoc.patch, NONE, 1.1 xml-stylebook-image-printer.patch, NONE, 1.1 xml-stylebook.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
mbooth
mbooth at fedoraproject.org
Thu Jan 14 01:16:26 UTC 2010
Author: mbooth
Update of /cvs/pkgs/rpms/xml-stylebook/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25182
Modified Files:
.cvsignore sources
Added Files:
xml-stylebook-build-javadoc.patch
xml-stylebook-image-printer.patch xml-stylebook.spec
Log Message:
Initial commit of xml-stylebook
xml-stylebook-build-javadoc.patch:
build.xml | 29 ++++++++++++++++++++++++-----
1 file changed, 24 insertions(+), 5 deletions(-)
--- NEW FILE xml-stylebook-build-javadoc.patch ---
--- build.xml 2004-12-14 15:54:50.000000000 +0000
+++ build.xml 2010-01-11 21:02:34.783136703 +0000
@@ -54,17 +54,16 @@
<property name="build.dir" value="./build"/>
<property name="build.src" value="${build.dir}/src"/>
<property name="build.dest" value="${build.dir}/classes"/>
+ <property name="build.javadoc" value="${build.dir}/javadoc"/>
<property name="src.dir" value="./src"/>
<property name="bin.dir" value="./bin"/>
- <condition property="sun.codec.present" >
- <available classname="com.sun.image.codec.jpeg.JPEGCodec"/>
- </condition>
</target>
<target name="prepare" depends="init">
<mkdir dir="${build.dir}"/>
<mkdir dir="${build.src}"/>
<mkdir dir="${build.dest}"/>
+ <mkdir dir="${build.javadoc}"/>
<copy todir="${build.src}">
<fileset dir="${src.dir}"/>
</copy>
@@ -88,13 +87,12 @@
<target name="compile2" depends="prepare">
<javac srcdir="${src.dir}" excludes="org/apache/stylebook/processors/XalanProcessor.java" destdir="${build.dest}" debug="${debug}">
<exclude name="**/org/apache/stylebook/processors/XalanProcessor.java"/>
- <exclude name="**/org/apache/stylebook/printers/ImagePrinter.java" unless="sun.codec.present"/>
</javac>
<copy todir="${build.dest}/org/apache/stylebook/data">
<fileset dir="${build.src}/org/apache/stylebook/data"/>
</copy>
</target>
- <target name="package2" depends="compile2">
+ <target name="package2" depends="compile2,javadoc">
<replace file="${build.dest}/org/apache/stylebook/data/engine.xml" token="XalanProcessor" value="Xalan2Processor"/>
<jar jarfile="${bin.dir}/${name}-${version-xalan-2}.jar" basedir="${build.dest}" includes="org/**"/>
</target>
@@ -103,4 +101,25 @@
<deltree dir="${build.dir}"/>
</target>
+ <target name="javadoc" depends="prepare">
+ <javadoc destdir="${build.javadoc}"
+ packagenames="*"
+ noindex="false"
+ splitindex="true"
+ use="true"
+ version="true"
+ author="true"
+ windowtitle="${name} ${version-xalan-2}"
+ doctitle="${name} ${version-xalan-2} JavaDoc">
+ <fileset dir="${build.src}">
+ <exclude name="**/XalanProcessor.java"/>
+ <exclude name="**/stylebook/data**"/>
+ </fileset>
+ <classpath>
+ <pathelement path="${bin.dir}"/>
+ </classpath>
+ <link offline="true" packagelistLoc="/usr/share/javadoc/java"/>
+ </javadoc>
+ </target>
+
</project>
xml-stylebook-image-printer.patch:
ImagePrinter.java | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
--- NEW FILE xml-stylebook-image-printer.patch ---
--- src/org/apache/stylebook/printers/ImagePrinter.java 1999-11-30 07:28:54.000000000 -0500
+++ src/org/apache/stylebook/printers/ImagePrinter.java 2009-01-07 17:00:13.802150149 -0500
@@ -8,7 +8,10 @@
package org.apache.stylebook.printers;
import org.apache.stylebook.*;
-import com.sun.image.codec.jpeg.*;
+import javax.imageio.*;
+import javax.imageio.plugins.jpeg.*;
+import javax.imageio.metadata.*;
+import javax.imageio.stream.*;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
@@ -144,11 +147,15 @@
}
}
- // Write out image (highest quality for jpeg data)
- JPEGEncodeParam jpar=JPEGCodec.getDefaultJPEGEncodeParam(img);
- jpar.setQuality(1,true);
- JPEGImageEncoder jenc=JPEGCodec.createJPEGEncoder(out,jpar);
- jenc.encode(img);
+ ImageWriter encoder = (ImageWriter)ImageIO.getImageWritersByFormatName("JPEG").next();
+ JPEGImageWriteParam param = new JPEGImageWriteParam(null);
+
+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+ param.setCompressionQuality(1);
+
+ encoder.setOutput(ImageIO.createImageOutputStream(out));
+ encoder.write((IIOMetadata) null, new IIOImage(img,null,null), param);
+
out.flush();
}
--- NEW FILE xml-stylebook.spec ---
Name: xml-stylebook
Version: 1.0
Release: 0.3.b3_xalan2.svn313293%{?dist}
Summary: Apache XML Stylebook
Group: Development/Libraries
License: ASL 1.1
URL: http://xml.apache.org/
# How to generate this tarball:
# $ svn export http://svn.apache.org/repos/asf/xml/stylebook/trunk/@313293 xml-stylebook-1.0
# $ tar zcf xml-stylebook-1.0.tar.gz xml-stylebook-1.0
Source0: %{name}-%{version}.tar.gz
# Patch to fix an NPE in Xalan-J2's docs generation (from JPackage)
Patch0: %{name}-image-printer.patch
# Patch the build script to build javadocs
Patch1: %{name}-build-javadoc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: ant
BuildRequires: jaxp_parser_impl
BuildRequires: dejavu-sans-fonts
Requires: java >= 1:1.6.0
Requires: jpackage-utils
%description
Apache XML Stylebook is a HTML documentation generator.
%package javadoc
Summary: Javadocs for %{name}
Group: Documentation
Requires: %{name} = %{version}-%{release}
%description javadoc
API documentation for %{name}.
%package demo
Summary: Examples for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description demo
Examples demonstrating the use of %{name}.
%prep
%setup -q
%patch0 -p0
%patch1 -p0
# Remove bundled binaries
rm -r bin/*.jar
# Make sure upstream hasn't sneaked in any jars we don't know about
JARS=""
for j in `find -name "*.jar"`; do
if [ ! -L $j ]; then
JARS="$JARS $j"
fi
done
if [ ! -z "$JARS" ]; then
echo "These jars should be deleted and symlinked to system jars: $JARS"
exit 1
fi
%build
ant
# Build the examples (this serves as a good test suite)
pushd docs
rm run.bat
java -classpath "$(build-classpath jaxp_parser_impl):../bin/stylebook-%{version}-b3_xalan-2.jar" \
org.apache.stylebook.StyleBook "targetDirectory=../results" book.xml ../styles/apachexml
popd
%install
rm -rf %{buildroot}
# jars
install -pD -T bin/stylebook-%{version}-b3_xalan-2.jar \
%{buildroot}%{_javadir}/%{name}-%{version}.jar
(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do \
ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# javadoc
install -d %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr build/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
(cd %{buildroot}%{_javadocdir} && ln -sf %{name}-%{version} %{name})
# examples
install -d %{buildroot}%{_datadir}/%{name}
cp -pr docs %{buildroot}%{_datadir}/%{name}
cp -pr styles %{buildroot}%{_datadir}/%{name}
cp -pr results %{buildroot}%{_datadir}/%{name}
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc LICENSE.txt
%{_javadir}/*
%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%files demo
%defattr(-,root,root,-)
%{_datadir}/%{name}
%changelog
* Mon Jan 11 2010 Mat Booth <fedora at matbooth.co.uk> - 1.0-0.3.b3_xalan2.svn313293
- Build the examples (this serves as a good test suite.)
- Patch the build script to build javadocs.
- Add a build dep on a font package because the JDK is missing a dependency
to function correctly in headless mode. See RHBZ #478480 and #521523.
* Tue Jan 5 2010 Mat Booth <fedora at matbooth.co.uk> - 1.0-0.2.b3_xalan2.svn313293
- Add patch from JPackage to fix NPE in Xalan-J2 doc generation.
* Tue Jan 5 2010 Mat Booth <fedora at matbooth.co.uk> - 1.0-0.1.b3_xalan2.svn313293
- Initial stab at packaging trunk version of stylebook.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xml-stylebook/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 13 Jan 2010 03:15:16 -0000 1.1
+++ .cvsignore 14 Jan 2010 01:16:26 -0000 1.2
@@ -0,0 +1 @@
+xml-stylebook-1.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xml-stylebook/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 13 Jan 2010 03:15:16 -0000 1.1
+++ sources 14 Jan 2010 01:16:26 -0000 1.2
@@ -0,0 +1 @@
+11b3e4d6e4e2b45ceb161b99c91b2893 xml-stylebook-1.0.tar.gz
More information about the scm-commits
mailing list