From 20b775a41b3f4c16681f47b601b38fdb00e42870 Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Wed, 10 Dec 2008 04:44:40 +0000 Subject: [PATCH] Teach 'ant genservice' to respect files with ActionScript(omit=true). git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5590 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/presents/tools/GenServiceTask.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/java/com/threerings/presents/tools/GenServiceTask.java b/src/java/com/threerings/presents/tools/GenServiceTask.java index 2fb6ac505..162decd91 100644 --- a/src/java/com/threerings/presents/tools/GenServiceTask.java +++ b/src/java/com/threerings/presents/tools/GenServiceTask.java @@ -37,6 +37,8 @@ import com.google.common.collect.Iterables; import com.samskivert.util.ComparableArrayList; import com.samskivert.util.StringUtil; +import com.threerings.util.ActionScript; + import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; @@ -168,15 +170,18 @@ public class GenServiceTask extends InvocationTask return; } + ActionScript asa = service.getAnnotation(ActionScript.class); + boolean skipAS = (asa != null) && asa.omit(); + ServiceDescription desc = new ServiceDescription(service); - generateMarshaller(source, desc); + generateMarshaller(source, desc, skipAS); generateDispatcher(source, desc); if (!_providerless.contains(service.getSimpleName())) { generateProvider(source, desc); } } - protected void generateMarshaller (File source, ServiceDescription sdesc) + protected void generateMarshaller (File source, ServiceDescription sdesc, boolean skipAS) { if (_verbose) { System.out.println("Generating marshaller"); @@ -247,7 +252,7 @@ public class GenServiceTask extends InvocationTask // if we're not configured with an ActionScript source root, don't generate the // ActionScript versions - if (_asroot == null) { + if (_asroot == null || skipAS) { return; }