added remaining @native tags to method javadoc.

fixed createTagletProps.sh to recognize function names containing numbers.

3 files changed, 21 insertions, 8 deletions

diff --git a/resources/cl-if.cfg b/resources/cl-if.cfg
index 43898544..7a1fa360 100644
--- a/resources/cl-if.cfg
+++ b/resources/cl-if.cfg
@@ -18,17 +18,17 @@ Ignore CL_GL_.*|cl.*GL.*
 #custom implementations
 Ignore clCreateContext
 CustomJavaCode CL
-CustomJavaCode CL  /** Interface to C language function: <br> <code> cl_context clCreateContext(intptr_t * , uint32_t, cl_device_id * , void (*pfn_notify)(const char *, const void *, size_t, void *), void *, int32_t * ); </code>    */
+CustomJavaCode CL  /** Interface to C language function: <br> <code> cl_context {@native clCreateContext}(intptr_t * , uint32_t, cl_device_id * , void (*pfn_notify)(const char *, const void *, size_t, void *), void *, int32_t * ); </code>    */
 CustomJavaCode CL  public long clCreateContext(LongBuffer properties, long[] devices, CreateContextCallback pfn_notify, Object userData, IntBuffer errcode_ret);
 
 Ignore clCreateContextFromType
 CustomJavaCode CL
-CustomJavaCode CL  /** Interface to C language function: <br> <code> cl_context clCreateContextFromType(cl_context_properties *properties, cl_device_type device_type, void (*pfn_notify)(const char *errinfo,  const void *private_info, size_t cb, void *user_data), void *user_data, cl_int *errcode_ret) ; </code>    */
+CustomJavaCode CL  /** Interface to C language function: <br> <code> cl_context {@native clCreateContextFromType}(cl_context_properties *properties, cl_device_type device_type, void (*pfn_notify)(const char *errinfo,  const void *private_info, size_t cb, void *user_data), void *user_data, cl_int *errcode_ret) ; </code>    */
 CustomJavaCode CL  public long clCreateContextFromType(LongBuffer properties, long device_type, CreateContextCallback pfn_notify, Object userData, IntBuffer errcode_ret);
 
 Ignore clBuildProgram
 CustomJavaCode CL
-CustomJavaCode CL  /** Interface to C language function: <br> <code> int32_t clBuildProgram(cl_program, uint32_t, cl_device_id * , const char * , void (*pfn_notify)(cl_program, void *user_data), void * ); </code>    */
+CustomJavaCode CL  /** Interface to C language function: <br> <code> int32_t {@native clBuildProgram}(cl_program, uint32_t, cl_device_id * , const char * , void (*pfn_notify)(cl_program, void *user_data), void * ); </code>    */
 CustomJavaCode CL  public int clBuildProgram(long program, long[] devices, String options, BuildProgramCallback cb, Object userData);
 
 Ignore clEnqueueNativeKernel
diff --git a/resources/createTagletProps.sh b/resources/createTagletProps.sh
index 537f61fe..9708a822 100644
--- a/resources/createTagletProps.sh
+++ b/resources/createTagletProps.sh
@@ -1,9 +1,13 @@
 #download index
-wget http://www.khronos.org/opencl/sdk/1.0/docs/man/xhtml/Opencl_tofc.html;
+root=http://www.khronos.org/opencl/sdk/1.0/docs/man/xhtml
+wget ${root}/Opencl_tofc.html;
 #find links to cl* function doc
-grep -E .+\<a\ href=\"cl[A-Z][^\"]+\"[^\>]+\>cl[A-Z][a-Z]+\</a\>.+ ./Opencl_tofc.html > links;
+grep -E .+\<a\ href=\"cl[A-Z][^\"]+\"[^\>]+\>cl[A-Z][a-Z0-9]+\</a\>.+ ./Opencl_tofc.html > links;
 #add doc root to properties file
-echo nativetaglet.baseUrl=http://www.khronos.org/opencl/sdk/1.0/docs/man/xhtml/ > native-taglet.properties;
+echo "#Generated, do not edit, edit createTagletProps.sh instead.
+#This file is used in NativeTaglet and maps the generated method names
+#to the function specific OpenCL documentation man pages.
+nativetaglet.baseUrl=${root}" > native-taglet.properties;
 #add all links as properties to file and cleanup
-sed -r 's/\s+<li><a href="([a-Z.]+)"[^>]+>([a-Z]+)<\/a><\/li>/\2=\1/' links >> native-taglet.properties;
+sed -r 's/\s+<li><a href="([a-Z0-9.]+)"[^>]+>([a-Z0-9]+)<\/a><\/li>/\2=\1/' links >> native-taglet.properties;
 rm ./Opencl_tofc.html ./links
diff --git a/resources/native-taglet.properties b/resources/native-taglet.properties
index d5e64e9d..c6b27dc4 100644
--- a/resources/native-taglet.properties
+++ b/resources/native-taglet.properties
@@ -1,9 +1,14 @@
-nativetaglet.baseUrl=http://www.khronos.org/opencl/sdk/1.0/docs/man/xhtml/
+#Generated, do not edit, edit createTagletProps.sh instead.
+#This file is used in NativeTaglet and maps the generated method names
+#to the function specific OpenCL documentation man pages.
+nativetaglet.baseUrl=http://www.khronos.org/opencl/sdk/1.0/docs/man/xhtml
 clCreateCommandQueue=clCreateCommandQueue.html

 clCreateContext=clCreateContext.html

 clCreateContextFromType=clCreateContextFromType.html

 clCreateFromGLBuffer=clCreateFromGLBuffer.html

 clCreateFromGLRenderbuffer=clCreateFromGLRenderbuffer.html

+clCreateFromGLTexture2D=clCreateFromGLTexture2D.html

+clCreateFromGLTexture3D=clCreateFromGLTexture3D.html

 clCreateKernelsInProgram=clCreateKernelsInProgram.html

 clCreateProgramWithBinary=clCreateProgramWithBinary.html

 clCreateProgramWithSource=clCreateProgramWithSource.html

@@ -62,6 +67,8 @@ clEnqueueReadBuffer=clEnqueueReadBuffer.html
 clEnqueueWriteBuffer=clEnqueueWriteBuffer.html	

 clRetainMemObject=clRetainMemObject.html	

 clReleaseMemObject=clReleaseMemObject.html	

+clCreateImage2D=clCreateImage2D.html	

+clCreateImage3D=clCreateImage3D.html	

 clGetSupportedImageFormats=clGetSupportedImageFormats.html	

 clEnqueueReadImage=clEnqueueReadImage.html 	

 clEnqueueWriteImage=clEnqueueWriteImage.html 

@@ -108,6 +115,8 @@ clFinish=clFinish.html
 clGetExtensionFunctionAddress=clGetExtensionFunctionAddress.html

 clCreateFromGLBuffer=clCreateFromGLBuffer.html	

 clCreateFromGLRenderbuffer=clCreateFromGLRenderbuffer.html	

+clCreateFromGLTexture2D=clCreateFromGLTexture2D.html	

+clCreateFromGLTexture3D=clCreateFromGLTexture3D.html	

 clEnqueueAcquireGLObjects=clEnqueueAcquireGLObjects.html	

 clEnqueueReleaseGLObjects=clEnqueueReleaseGLObjects.html	

 clGetGLObjectInfo=clGetGLObjectInfo.html