From 17a1b8a507212e51e2c2df9090bf2fea40215ac1 Mon Sep 17 00:00:00 2001
From: Kevin Sapper <mail@kevinsapper.de>
Date: Fri, 3 Feb 2017 16:57:16 +0100
Subject: [PATCH] Problem: [c_v1] codec API is generated outside zproject

Solution: Check the zproject switch and make sure the zproto codec
is mapped to a public class before generating the API xml.
---
 src/zproto_codec_c_v1.gsl | 8 +++++---
 src/zproto_example.xml    | 6 +++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/zproto_codec_c_v1.gsl b/src/zproto_codec_c_v1.gsl
index 9401e7d..6a6c2c8 100644
--- a/src/zproto_codec_c_v1.gsl
+++ b/src/zproto_codec_c_v1.gsl
@@ -309,8 +309,9 @@ $(CLASS.EXPORT_MACRO)void
 
 #endif
 
-.directory.create ("../api")
-.output "../api/$(class.name).api"
+.if switches.zproject ?= 1 & switches.private ?<> 1
+.   directory.create ("../api")
+.   output "../api/$(class.name).api"
 <class name="$(class.name)" state="draft" >
 <!--
     $(class.name) - $(class.title:)
@@ -558,7 +559,7 @@ $(CLASS.EXPORT_MACRO)void
         <argument name = "default_value" type = "string" />
         <return type = "string" />
     </method>
-    
+
     <method name = "$(name)_number">
         Get/set a value in the $(name) dictionary
         <argument name = "key" type = "string" />
@@ -598,6 +599,7 @@ $(CLASS.EXPORT_MACRO)void
         <argument name = "verbose" type = "boolean" />
     </method>
 </class>
+.endif
 
 .output "$(class.source_dir)/$(class.name).c"
 /*  =========================================================================
diff --git a/src/zproto_example.xml b/src/zproto_example.xml
index ecc6fa0..2ef4273 100644
--- a/src/zproto_example.xml
+++ b/src/zproto_example.xml
@@ -16,6 +16,10 @@ The signature is put into every protocol message and lets us filter bogus
 or unknown protocols. It is a 4-bit number from 0 to 15. Use a unique value
 for each protocol you write, at least.
 
+When using zproto with zproject you won't need to set package_dir and
+source_dir as those will be configured by zproject depending on the class's
+properties.
+
 <include filename = "license.xml" />
 
 You can define constants. These are put into the header file, prefixed by
@@ -147,7 +151,7 @@ zproto supports several kinds of binary data:
 * You can define frames, which are zframe_t objects in the API. Frames
   are sent as separate ZeroMQ frames on the wire. This is ideal for
   variable-size binary data such as images, or other blobs.
-  
+
 * You can define ZeroMQ messages, which are zmsg_t objects in the API.
   This is useful for protocols that want to wrap entire ZeroMQ messages
   in other data. If you use a "msg" type field, it must be the last