rpms/emma/devel emma-2.0.5312-build_xml.patch, NONE, 1.1 emma-2.0.5312-dependencies_xml.patch, NONE, 1.1 emma-2.0.5312-java15api.patch, NONE, 1.1 emma-2.0.5312.pom, NONE, 1.1 emma-eclemma.patch, NONE, 1.1 emma-timestamp.patch, NONE, 1.1 emma-timestamp.sh, NONE, 1.1 emma-timestamp2.sh, NONE, 1.1 emma.spec, NONE, 1.1 emma_ant-2.0.5312.pom, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Andrew Overholt (overholt)
fedora-extras-commits at redhat.com
Fri May 30 20:05:19 UTC 2008
Author: overholt
Update of /cvs/pkgs/rpms/emma/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28798/devel
Modified Files:
.cvsignore sources
Added Files:
emma-2.0.5312-build_xml.patch
emma-2.0.5312-dependencies_xml.patch
emma-2.0.5312-java15api.patch emma-2.0.5312.pom
emma-eclemma.patch emma-timestamp.patch emma-timestamp.sh
emma-timestamp2.sh emma.spec emma_ant-2.0.5312.pom
Log Message:
Initial import
emma-2.0.5312-build_xml.patch:
--- NEW FILE emma-2.0.5312-build_xml.patch ---
--- build.xml.orig 2005-06-12 19:20:56.000000000 +0200
+++ build.xml 2007-07-06 09:09:57.000000000 +0200
@@ -108,7 +108,7 @@
<property name="build.target.j2se.12.home" value="${build.target.j2se.14.home}" />
<property name="build.target.j2se.13.home" value="${build.target.j2se.14.home}" />
- <property name="build.target.ant.15.home" value="${env.ANT_HOME}" />
+ <property name="build.target.ant.15.home" value="/usr/share/java" />
<property name="build.target.ant.14.home" value="${build.target.ant.15.home}" />
@@ -509,6 +509,20 @@
command="-t rtag -r ${cvs.branch.label} -d -a ${cvs.ready.label} ${app.short.name}" />
</target>
+ <target name="javadoc" description="o Generate javadoc" >
+ <mkdir dir="${out.dir}/javadocs"></mkdir>
+ <tstamp>
+ <format pattern="2002-yyyy" property="year"></format>
+ </tstamp>
+ <property name="copyright" value="Copyright © The Codehaus. All Rights Reserved."></property>
+ <property name="title" value="Emma 2.0 API"></property>
+ <javadoc use="true" private="true" destdir="${out.dir}/javadocs" author="true" version="true" sourcepath="core/java12" packagenames="com.vladium.*">
+ <classpath>
+ <path refid="core.classpath"></path>
+ </classpath>
+ </javadoc>
+ </target>
+
</project>
<!-- ========= END OF FILE ========================================== -->
emma-2.0.5312-dependencies_xml.patch:
--- NEW FILE emma-2.0.5312-dependencies_xml.patch ---
--- dependencies.xml.orig 2006-01-24 18:43:37.000000000 +0100
+++ dependencies.xml 2006-01-24 18:43:53.000000000 +0100
@@ -5,12 +5,12 @@
<!-- ANT 1.4.x dependency: -->
<path id="boot.ant.14.classpath" >
- <pathelement location="${build.target.ant.14.home}/lib/ant.jar" />
+ <pathelement location="${build.target.ant.14.home}/ant.jar" />
</path>
<!-- ANT 1.5.x dependency: -->
<path id="boot.ant.15.classpath" >
- <pathelement location="${build.target.ant.15.home}/lib/ant.jar" />
+ <pathelement location="${build.target.ant.15.home}/ant.jar" />
</path>
emma-2.0.5312-java15api.patch:
--- NEW FILE emma-2.0.5312-java15api.patch ---
diff --git a/core/java12/com/vladium/emma/rt/InstrClassLoader.java b/core/java12/com/vladium/emma/rt/InstrClassLoader.java
index 4ea4f80..2c14287 100644
--- a/core/java12/com/vladium/emma/rt/InstrClassLoader.java
+++ b/core/java12/com/vladium/emma/rt/InstrClassLoader.java
@@ -343,7 +343,7 @@ final class InstrClassLoader extends URLClassLoader
// support ProtectionDomains with non-null class source URLs:
// [however, disable anything related to sealing or signing]
- final CodeSource csrc = new CodeSource (srcURL, null);
+ final CodeSource csrc = new CodeSource (srcURL, (java.security.cert.Certificate[]) null);
// allow getPackage() to return non-null on the class we are about to
// define (however, don't bother emulating the original manifest info since
--- NEW FILE emma-2.0.5312.pom ---
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>emma</groupId>
<artifactId>emma</artifactId>
<name>EMMA</name>
<version>2.0</version>
</project>
emma-eclemma.patch:
--- NEW FILE emma-eclemma.patch ---
diff -uNr core/java12/com/vladium/logging/Logger.java core/java12/com/vladium/logging/Logger.java
--- core/java12/com/vladium/logging/Logger.java 2008-04-25 14:43:29.000000000 -0400
+++ core/java12/com/vladium/logging/Logger.java 2008-04-25 14:43:47.000000000 -0400
@@ -70,7 +70,7 @@
if ((level < NONE) || (level > ALL))
throw new IllegalArgumentException ("invalid log level: " + level);
- if ((out == null) || out.checkError ())
+ if (out == null)
throw new IllegalArgumentException ("null or corrupt input: out");
return new Logger (level, out, prefix, classMask);
emma-timestamp.patch:
--- NEW FILE emma-timestamp.patch ---
--- build.xml 2008-04-25 16:29:49.000000000 -0400
+++ build.xml 2008-04-25 16:28:16.000000000 -0400
@@ -141,8 +141,16 @@
<delete dir="${release.dir}"/>
</target>
+ <target name="timestamp" depends="init, timestamp.rpmbuild, -timestamp.2, -timestamp.2, -timestamp.3, -timestamp.4, -timestamp.5">
+ </target>
- <target name="timestamp" depends="init, -timestamp.1, -timestamp.2, -timestamp.3, -timestamp.4, -timestamp.5">
+ <target name="timestamp.rpmbuild" depends="init">
+ <exec executable="/bin/sh">
+ <arg line="emma-timestamp.sh ${temp.dir}/timestamp.properties"/>
+ </exec>
+ <exec executable="/bin/sh">
+ <arg line="emma-timestamp2.sh ${temp.dir}/.ready.build.stamp"/>
+ </exec>
</target>
<target name="-timestamp.1" depends="init" unless="build.is.dirty" >
--- NEW FILE emma-timestamp.sh ---
#!/bin/sh
echo -n "app.build.id=" > $1
var=`echo "($(date +%Y) - 2001) * 12 + $(date +%m)" | bc`
var2=`echo "$var*100 + 25" | bc`
echo $var2 >> $1
echo "app.build.date=`date +\"%Y/%m/%d %T\"`" >> $1
--- NEW FILE emma-timestamp2.sh ---
#!/bin/sh
echo $(date +%s) > $1
--- NEW FILE emma.spec ---
# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the
# distribution.
# 3. Neither the name of the JPackage Project nor the names of its
# contributors may be used to endorse or promote products derived
# from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
Summary: Code Coverage Tool
Name: emma
Version: 2.0
Release: 0.5312.2jpp.2%{?dist}
Epoch: 0
Group: Development/Tools
License: CPL
URL: http://emma.sourceforge.net/
Source0: emma-2.0.5312-src.zip
Source1: emma-2.0.5312.pom
Source2: emma_ant-2.0.5312.pom
# These are hacks until we get the source for the timestamping class
# http://sourceforge.net/tracker/index.php?func=detail&aid=1953619&group_id=108932&atid=651900
Source3: emma-timestamp.sh
Source4: emma-timestamp2.sh
Patch0: emma-2.0.5312-dependencies_xml.patch
Patch1: emma-2.0.5312-build_xml.patch
# Taken from Gentoo package to allow us to build on a JDK > 1.4
Patch2: emma-2.0.5312-java15api.patch
# From eclemma's emmapatch directory
Patch3: %{name}-eclemma.patch
# This is a hack until we get the source for the timestamping class
# http://sourceforge.net/tracker/index.php?func=detail&aid=1953619&group_id=108932&atid=651900
Patch4: %{name}-timestamp.patch
Requires: java >= 0:1.4.2
Requires: jaxp_parser_impl
BuildRequires: ant >= 0:1.6.5
BuildRequires: java-devel >= 0:1.6
BuildRequires: jpackage-utils >= 0:1.7.2
# For the timestamp hack (see above)
BuildRequires: bc
Requires(post): jpackage-utils >= 0:1.7.2
Requires(postun): jpackage-utils >= 0:1.7.2
Requires: maven2
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
EMMA is an open-source toolkit for measuring and reporting Java
code coverage. EMMA distinguishes itself from other tools by going
after a unique feature combination: support for large-scale
enterprise software development while keeping individual developer's
work fast and iterative.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
%description javadoc
%{summary}.
%prep
%setup -q -n %{name}-%{version}.5312
cp -p %{SOURCE3} .
cp -p %{SOURCE4} .
# Make sure we don't use this no-source jar
rm lib/internal/stamptool.jar
%patch0 -b .orig
%patch1 -b .orig
%patch2 -p1 -b .orig
%patch3 -b .orig
%patch4 -b .orig
%build
[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
ant -Dbuild.compiler=modern build javadoc
%install
rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 dist/%{name}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
install -m 644 dist/%{name}_ant.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}_ant-%{version}.jar
%add_to_maven_depmap emma emma %{version} JPP %{name}
%add_to_maven_depmap emma emma_ant %{version} JPP %{name}_ant
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# poms
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -pm 644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}.pom
install -pm 644 %{SOURCE2} \
$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}_ant.pom
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr out/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
%post
%update_maven_depmap
%postun
%update_maven_depmap
%files
%defattr(-,root,root,-)
%doc cpl-v10.html
%{_javadir}/*
%{_datadir}/maven2/poms/JPP.%{name}*
%{_mavendepmapfragdir}/%{name}
%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}*
%changelog
* Wed May 28 2008 Andrew Overholt <overholt at redhat.com> 2.0-0.5312.2jpp.2
- Review (rhbz#444511) fixes: '-' in permissions, maven2 requirement,
file ownership of maven stuff, require OpenJDK.
* Fri Apr 25 2008 Andrew Overholt <overholt at redhat.com> 0:2.0-0.5312.2jpp.1
- Fedora-ify (remove Vendor, Distribution, javadoc %%post{,un}, license
-> "CPL", add 1.%%{?dist} to release, change groups to shut up rpmlint,
remove %%section free).
- Remove gnu-crypto requirement for GCJ.
- Copy patch from Gentoo build for 1.5 API changes.
- Add hacks to avoid having to use no-source class during build.
* Fri Jul 06 2007 Ralph Apel <r.apel at r-apel.de> 0:2.0-0.5312.2jpp
- Make Vendor, Distribution based on macro
- Add -javadoc subpackage
- Add gcj_support option
- Add poms and depmap frags
* Wed Feb 01 2006 Ralph Apel <r.apel at r-apel.de> 0:2.0-0.5312.1jpp
- First JPackage release.
--- NEW FILE emma_ant-2.0.5312.pom ---
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>emma</groupId>
<artifactId>emma_ant</artifactId>
<name>EMMA Ant</name>
<version>2.0</version>
<dependencies>
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
<version>1.6.5</version>
</dependency>
</dependencies>
</project>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emma/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 30 May 2008 19:38:13 -0000 1.1
+++ .cvsignore 30 May 2008 20:04:34 -0000 1.2
@@ -0,0 +1 @@
+emma-2.0.5312-src.zip
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emma/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 30 May 2008 19:38:13 -0000 1.1
+++ sources 30 May 2008 20:04:34 -0000 1.2
@@ -0,0 +1 @@
+649464ab0a5941b8e47046762fc57020 emma-2.0.5312-src.zip
More information about the fedora-extras-commits
mailing list