rpms/emma/F-9 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 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Andrew Overholt (overholt) fedora-extras-commits at redhat.com
Fri May 30 20:08:04 UTC 2008


Author: overholt

Update of /cvs/pkgs/rpms/emma/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29365

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 
Log Message:
Initial import into F-9.

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 &copy;  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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emma/F-9/.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:07:21 -0000	1.2
@@ -0,0 +1 @@
+emma-2.0.5312-src.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emma/F-9/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:07:21 -0000	1.2
@@ -0,0 +1 @@
+649464ab0a5941b8e47046762fc57020  emma-2.0.5312-src.zip




More information about the fedora-extras-commits mailing list