[67669] trunk/dports/devel/ice-java
blair at macports.org
blair at macports.org
Sat May 15 11:00:08 PDT 2010
Revision: 67669
http://trac.macports.org/changeset/67669
Author: blair at macports.org
Date: 2010-05-15 11:00:04 -0700 (Sat, 15 May 2010)
Log Message:
-----------
Add a patch from Robert Ray (Sony Pictures Imageworks) and modified by
ZeroC that fixes a bug using slice2java with --checksum.
Modified Paths:
--------------
trunk/dports/devel/ice-java/Portfile
Added Paths:
-----------
trunk/dports/devel/ice-java/files/
trunk/dports/devel/ice-java/files/patch-java.src.ant.Slice2JavaTask.java.diff
Modified: trunk/dports/devel/ice-java/Portfile
===================================================================
--- trunk/dports/devel/ice-java/Portfile 2010-05-15 17:47:51 UTC (rev 67668)
+++ trunk/dports/devel/ice-java/Portfile 2010-05-15 18:00:04 UTC (rev 67669)
@@ -4,6 +4,7 @@
name ice-java
version 3.4.0
+revision 1
categories devel java
maintainers blair
description Fast, object-oriented RPC for C++, Java, Python, Ruby, PHP
@@ -32,6 +33,7 @@
dist_subdir ice-cpp
distname Ice-${version}
distfiles ${distname}${extract.suffix}
+patchfiles patch-java.src.ant.Slice2JavaTask.java.diff
checksums Ice-${version}.tar.gz \
md5 998b10627ade020cb00f5beb73efc0e0 \
sha1 1c8fe296af8d65d16cddac39a8bc24b71e069f75 \
@@ -45,6 +47,12 @@
port:jgoodies-looks \
port:proguard
+patch {
+ set cmd "cd ${workpath}/Ice-${version} && patch -p1 < ${filespath}/patch-java.src.ant.Slice2JavaTask.java.diff"
+ ui_debug ${cmd}
+ system ${cmd}
+}
+
use_configure no
set classpath ${prefix}/lib/db46/db.jar:${prefix}/share/java/forms.jar:${prefix}/share/java/looks.jar:${prefix}/share/java/proguard.jar
Added: trunk/dports/devel/ice-java/files/patch-java.src.ant.Slice2JavaTask.java.diff
===================================================================
--- trunk/dports/devel/ice-java/files/patch-java.src.ant.Slice2JavaTask.java.diff (rev 0)
+++ trunk/dports/devel/ice-java/files/patch-java.src.ant.Slice2JavaTask.java.diff 2010-05-15 18:00:04 UTC (rev 67669)
@@ -0,0 +1,48 @@
+diff --git a/java/src/ant/Slice2JavaTask.java b/java/src/ant/Slice2JavaTask.java
+index 7cd79c6..ee8d323 100644
+--- a/java/src/ant/Slice2JavaTask.java
++++ b/java/src/ant/Slice2JavaTask.java
+@@ -117,8 +117,8 @@ public class Slice2JavaTask extends SliceTask
+ // anymore (the slice file changed since the dependency was
+ // last updated or a slice file it depends on changed).
+ //
+- java.util.ArrayList<File> buildList = new java.util.ArrayList<File>();
+- java.util.ArrayList<File> skipList = new java.util.ArrayList<File>();
++ java.util.HashSet<File> buildList = new java.util.HashSet<File>();
++ java.util.HashSet<File> skipList = new java.util.HashSet<File>();
+ for(FileSet fileset : _fileSets)
+ {
+ DirectoryScanner scanner = fileset.getDirectoryScanner(getProject());
+@@ -138,20 +138,20 @@ public class Slice2JavaTask extends SliceTask
+ skipList.add(slice);
+ }
+ }
++ }
+
+- if(_checksum != null && _checksum.length() > 0 && !buildList.isEmpty())
+- {
+- //
+- // Recompile all Slice files when checksums are used.
+- //
+- buildList.addAll(skipList);
+- }
+- else
++ if(_checksum != null && _checksum.length() > 0 && !buildList.isEmpty())
++ {
++ //
++ // Recompile all Slice files when checksums are used.
++ //
++ buildList.addAll(skipList);
++ }
++ else
++ {
++ for(File file : skipList)
+ {
+- for(File file : skipList)
+- {
+- log("skipping " + file.getName());
+- }
++ log("skipping " + file.getName());
+ }
+ }
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100515/561a1080/attachment.html>
More information about the macports-changes
mailing list