svn commit: r1367323 - in /ant/sandbox/antdsl/trunk/doc: antdsl.jpeg antdsl.png index.html

[hi...@apache.org]

Author: hibou
Date: Mon Jul 30 21:37:22 2012
New Revision: 1367323

URL: http://svn.apache.org/viewvc?rev=1367323&view=rev
Log:
Update screenshot

Added:
    ant/sandbox/antdsl/trunk/doc/antdsl.png   (with props)
Removed:
    ant/sandbox/antdsl/trunk/doc/antdsl.jpeg
Modified:
    ant/sandbox/antdsl/trunk/doc/index.html

Added: ant/sandbox/antdsl/trunk/doc/antdsl.png
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/trunk/doc/antdsl.png?rev=1367323&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ant/sandbox/antdsl/trunk/doc/antdsl.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: ant/sandbox/antdsl/trunk/doc/index.html
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/trunk/doc/index.html?rev=1367323&r1=1367322&r2=1367323&view=diff
==============================================================================
--- ant/sandbox/antdsl/trunk/doc/index.html (original)
+++ ant/sandbox/antdsl/trunk/doc/index.html Mon Jul 30 21:37:22 2012
@@ -26,18 +26,18 @@ namespaces {
 
 {
     prop foo = "hello world!"
-    echo(message="${foo}")
+    echo(message = ${foo})
 }
 
-# Some documentation of the macro
-macrodef mymacro(arg t = "mymacro")
+# Some documentation of the function
+function myfunction(local t = "myfunction")
 {
-    echo(message = "@{t}")
+    echo(message = ${t})
 }
 
-macrodef mymacro2(arg dest, implicit element source)
+function myfunction2(local dest, implicit element source)
 {
-    copy(todir = "@{dest}" {
+    copy(todir = ${dest}, {
         source()
     })
 }
@@ -57,24 +57,24 @@ target notexecuted
 target build
     depends dep, notexecuted
 {
-    copy(file = "${basedir}/test/build.ant", tofile = "${basedir}/build/test/build.ant.copy")
+    copy(file = ${basedir} + "/test/build.ant", tofile = ${basedir} + "/build/test/build.ant.copy")
     // some comment
-    jar(file = "${basedir}/build/test/my.jar" {
-        fileset(dir="${basedir}/test", includes="*.ant")
+    jar(file = ${basedir} + "/build/test/my.jar" {
+        fileset(dir = ${basedir} + "/test", includes = "*.ant")
     })
-    mymacro()
-    mymacro(t = "simple macro")
+    myfunction()
+    myfunction(t = "simple function")
     /*
      * Some multiline comment 
      */
-    if (available(file = "${basedir}/test/build.ant")) {
-        mymacro2(dest = "${basedir}/build/test/dest", {
-            fileset(dir = "${basedir}", includes="build.*")
+    if (available(file = ${basedir} + "/test/build.ant")) {
+        myfunction2(dest = ${basedir} + "/build/test/dest", {
+            fileset(dir = ${basedir}, includes = "build.*")
         })
     } else {
         fail(message = "fail !")
     }
-    if (isset(property = "foo") && !isset(property = "notsetproperty")) {
+    if (isset(property = "foo") && !isset(property = "notsetproperty")) {
         echo(message = "test ok")
     } else {
         fail(message = "fail !")
@@ -84,16 +84,17 @@ target build
     echo(message = "test encoding\nline")
 
     local test = "hello" + ' ' + "world !"
-    echo(message = "${test}")
+    echo(message = ${test})
     local test2 = ((12345 + 6789) % 98765 == 12.4f)
-    echo(message = "${test2}")
+    echo(message = ${test2})
+    echo(message = eval("${test2}"))
 }
 </pre>
 </p>
 
 <p>
 Here are a screenshot of the Eclipse plugin:
-<center><img src="antdsl.jpeg" /></center>
+<center><img src="antdsl.png" /></center>
 </p>
 
 <h2>Build</h2>