diff options
| author | carnold <[email protected]> | 2008-04-02 23:28:48 +0000 |
|---|---|---|
| committer | carnold <[email protected]> | 2008-04-02 23:28:48 +0000 |
| commit | b2c2b80334d413d87884b31a41956ab220a3f067 (patch) | |
| tree | 0bf26faa30a01cdad5023532abe060eb6961a46c | |
| parent | 5174f0f9c52fd2bb5e422ac580d437ff313ce1a0 (diff) | |
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
| -rw-r--r-- | src/changes/changes.xml | 37 | ||||
| -rw-r--r-- | src/changes/changes.xslt | 78 | ||||
| -rw-r--r-- | src/main/resources/META-INF/LICENSE | 202 | ||||
| -rw-r--r-- | src/main/resources/META-INF/NOTICE | 4 | ||||
| -rw-r--r-- | src/main/resources/cpptasks.mf | 7 | ||||
| -rw-r--r-- | src/site/apt/index.apt | 21 | ||||
| -rw-r--r-- | src/site/fml/faq.fml | 27 |
7 files changed, 248 insertions, 128 deletions
diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 86cd888..4782965 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -21,25 +21,40 @@ </properties> <body> - <release version="1.0-beta5" date="2007-12-31" description=""> - <!-- xsl:apply-templates select='/rss/channel/item'> - <xsl:sort select="substring-after(key, '-')" data-type="number"/> - </xsl:apply-templates --> + <release version="1.0-beta5" date="2008-04-03" description="Improved IDE project generation, updated docs and packaging"> + <action issue="980130">IDE project file generation.</action> + <action issue="1794857">history.xml not capturing mid and end arguments</action> + <action issue="1794867">LinkerDef not properly capturing references</action> + <action issue="1573193">Update documentation for antlib usage</action> + <action issue="1775873">Modify warning levels for sunpro</action> + <action issue="1715475">Modify CC, aCC and xlC to bid on .s files</action> + <action issue="1690945">Add msvc8 compiler to avoid deprecation warning on /GZ</action> + <action issue="1760649">Migrate to Maven 2 for build and documentation</action> + <action issue="1716271">Fix linked issues with shared libraries on VisualAge</action> + </release> + + <release version="1.0-beta4" date="2006-05-19" description="IDE project generation"> </release> - <release version="1.0-beta4" date="2006-05-19" description=""> + <release version="1.0-beta3" date="2004-04-28" description="rtti and optimization switches, prototypes for versioninfo, target, distributer"> + <action issue="937648">Sample build file for CPPUNIT</action> + <action issue="938336">Borland compilation repair</action> + <action issue="823577">Problem with linker extension</action> + <action issue="814132">Added type attribute to libset and syslibset so that dynamic or static could be chosen if both were available</action> + <action issue="940985">Added rtti and optimization attributes to cc and compiler</action> + <action issue="941119">Added versioninfo element (experimental)</action> + <action issue="749942">Add target element for cross-compilation (experimental)</action> + <action issue="941128">Add distributer element for distributed builds (experimental)</action> </release> - <release version="1.0-beta3" date="2004-04-28" description=""> + <release version="1.0-beta2" date="2004-02-27" description="Switch of license to Apache License 2"> </release> - <release version="1.0-beta2" date="2004-02-27" description=""> + <release version="1.0-beta1" date="2002-08-17" description="xdoc generated documentation and 17 compilers"> </release> - <release version="1.0-beta1" date="2002-08-17" description=""> - </release> - - <release version="1.0-alpha1" date="2002-01-08" description=""> + <release version="1.0-alpha1" date="2002-01-08" description="Initial sourceforge release."> </release> </body> </document> + diff --git a/src/changes/changes.xslt b/src/changes/changes.xslt deleted file mode 100644 index 7e5d629..0000000 --- a/src/changes/changes.xslt +++ /dev/null @@ -1,78 +0,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. - ---> -<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xsl:version="1.0"> - - <xsl:output method="xml" indent="yes"/> - - <xsl:apply-templates select="/"/> - - <xsl:template match="/"> - <xsl:comment> - - 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. - - - </xsl:comment> - <document> - <properties> - <title>cpptasks: Compile tasks for Apache Ant</title> - </properties> - <body> - - <release version="1.0-beta5" date="2007-12-31" description=""> - <!-- xsl:apply-templates select='/rss/channel/item'> - <xsl:sort select="substring-after(key, '-')" data-type="number"/> - </xsl:apply-templates --> - </release> - - <release version="1.0-beta4" date="2006-05-19" description=""> - </release> - - <release version="1.0-beta3" date="2004-04-28" description=""> - </release> - - <release version="1.0-beta2" date="2004-02-27" description=""> - </release> - - <release version="1.0-beta1" date="2002-08-17" description=""> - </release> - - <release version="1.0-alpha1" date="2002-01-08" description=""> - </release> - </body> -</document> -</xsl:template> - -<xsl:template match="item"> - <action issue="{key}"><xsl:value-of select="summary"/></action> -</xsl:template> - -</xsl:transform> diff --git a/src/main/resources/META-INF/LICENSE b/src/main/resources/META-INF/LICENSE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/src/main/resources/META-INF/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. diff --git a/src/main/resources/META-INF/NOTICE b/src/main/resources/META-INF/NOTICE new file mode 100644 index 0000000..81199e7 --- /dev/null +++ b/src/main/resources/META-INF/NOTICE @@ -0,0 +1,4 @@ +This product includes software developed by
+ The Ant-Contrib project (http://ant-contrib.sourceforge.net)
+This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
diff --git a/src/main/resources/cpptasks.mf b/src/main/resources/cpptasks.mf deleted file mode 100644 index 8f3b6d0..0000000 --- a/src/main/resources/cpptasks.mf +++ /dev/null @@ -1,7 +0,0 @@ -Manifest-Version: 2.0 -Main-Class: net.sf.antcontrib.cpptasks.AboutCCTask - -Name: CCTask -Implementation-Vendor: Ant-Contrib project -Implementation-Version: 1.0 -Implementation-Title: Compile and link tasks for Apache Ant 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"> @@ -56,5 +54,18 @@ cpptasks for Apache Ant </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> |