From b2c2b80334d413d87884b31a41956ab220a3f067 Mon Sep 17 00:00:00 2001
From: carnold <carnold@dev.java.net>
Date: Wed, 2 Apr 2008 23:28:48 +0000
Subject: Clean up stray/incomplete site files

git-svn-id: file:///home/sven/projects/JOGL/temp/ant-contrib/svn/ant-contrib-code/cpptasks/trunk@163 32d7a393-a5a9-423c-abd3-5d954feb1f2f
---
 src/site/apt/index.apt | 21 ++++++++++++++++-----
 src/site/fml/faq.fml   | 27 ---------------------------
 2 files changed, 16 insertions(+), 32 deletions(-)
 delete mode 100644 src/site/fml/faq.fml

(limited to 'src/site')

diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index 2218ba5..ac4696a 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -22,7 +22,7 @@ cpptasks for Apache Ant
 
   The cc task can compile various source languages and produce executables,
   shared libraries (aka DLL's) and static libraries. Compiler adaptors are currently available
-  for several C/C++ compilers, FORTRAN, MIDL and Windows Resource files.
+  for C/C++, FORTRAN, MIDL and Windows Resource compilers.
 
   The task can be used with Apache Ant 1.5 and later.  This software is not a product
   of the Apache Software Foundation (ASF) and no endorsement by the ASF is implied.
@@ -32,9 +32,7 @@ cpptasks for Apache Ant
      * Place cpptasks.jar into Ant's classpath by placing in Ant's lib directory,
           adding to CLASSPATH environment variable or using the -lib command line option.
 
-     * Add type and task definitions in build file:
-       Ant 1.6 or later: add xmlns:cpptasks="antlib:sf.net.antcontrib.cpptasks" to <project> element.
-       Ant 1.5 or later: Add <taskdef resource="cpptasks.tasks"/> and <typedef resource="cpptasks.types"/> to body of <project> element.
+     * Add type and task definitions in build file using either taskdef or antlib.
 
      * Add {{{antdocs/CCTask.html}cc}} element to some target in your build file.
 
@@ -42,7 +40,7 @@ cpptasks for Apache Ant
 
      * Build project.
 
-   Trivial Sample:
+   Trivial Sample using taskdef (compatible with Ant 1.5 or later):
    
 +--
 <project name="hello" default="compile">
@@ -54,6 +52,19 @@ cpptasks for Apache Ant
         </cc>
     </target>
 </project>
++--
+
+   Trivial Sample using antlib (compatible with Ant 1.6 or later):
+   
++--
+<project name="hello" default="compile" xmlns:cpptasks="antlib:net.sf.antcontrib.cpptasks">
+    <target name="compile">
+        <mkdir dir="target/main/obj"/>
+        <cpptasks:cc outtype="executable" subsystem="console" outfile="target/hello" objdir="target/main/obj">
+           <fileset dir="src/main/c" includes="*.c"/>
+        </cpptasks:cc>
+    </target>
+</project>
 +--
 
    More complex samples appear in src/samples.
diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml
deleted file mode 100644
index 04bfb65..0000000
--- a/src/site/fml/faq.fml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Ant-Contrib Project under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The Ant-Contrib Project licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<faqs title="Frequently Asked Questions">
-  <part id="faq">
-
-      <faq id="hello">
-         <question>A Question?</question>
-         <answer>An Answer.</answer>
-      </faq>
-  </part>
-</faqs>
-- 
cgit v1.2.3