[jbossnative-commits] JBoss Native SVN: r1172 - trunk/srclib/apr-iconv.

Author: mladen.turk(a)jboss.com Date: 2007-12-11 07:57:39 -0500 (Tue, 11 Dec 2007) New Revision: 1172 Modified: trunk/srclib/apr-iconv/AUTHORS trunk/srclib/apr-iconv/CHANGES trunk/srclib/apr-iconv/COPYING trunk/srclib/apr-iconv/LICENSE trunk/srclib/apr-iconv/NMAKEmakefile trunk/srclib/apr-iconv/NOTICE trunk/srclib/apr-iconv/STATUS trunk/srclib/apr-iconv/libapriconv.rc Log: Update native EOL style Modified: trunk/srclib/apr-iconv/AUTHORS =================================================================== --- trunk/srclib/apr-iconv/AUTHORS 2007-12-11 12:55:09 UTC (rev 1171) +++ trunk/srclib/apr-iconv/AUTHORS 2007-12-11 12:57:39 UTC (rev 1172) @@ -1 +1 @@ -Konstantin Chuguev <Konstantin.Chuguev(a)dante.org.uk&gt; +Konstantin Chuguev <Konstantin.Chuguev(a)dante.org.uk&gt; Property changes on: trunk/srclib/apr-iconv/AUTHORS ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/srclib/apr-iconv/CHANGES =================================================================== --- trunk/srclib/apr-iconv/CHANGES 2007-12-11 12:55:09 UTC (rev 1171) +++ trunk/srclib/apr-iconv/CHANGES 2007-12-11 12:57:39 UTC (rev 1172) @@ -1,85 +1,85 @@ - -*- coding: utf-8 -*- -Changes with APR-ICONV 1.2.2 - - - -Changes with APR-ICONV 1.2.1 - - *) Build schema fixes for win32 including VC8 precompiled header files, - NT and 9x specific builds, and x86_64 P64 model. [William Rowe] - - *) Build schema fixes for unix including default --prefix, vpath builds, - and decorated lib name. [Davi Arnaut, William Rowe, Henry Jen] - -Changes with APR-ICONV 1.2.0 - - *) Install 'iconv' utility as bin/apriconv to avoid colliding with - system provided iconv, install public headers to include/apr-1/ - per convention. [William Rowe] - - *) Fixes for Mingw builds and normalize to the APR conventions (e.g. - apriconv-1.so library name). [Kouhei Sutou <kou cozmixng.org>] - - *) Fix compiler emits for char <-> 2byte unicode pointer assignments. - [William Rowe] - - *) Correct from_ucs zero width joiner/byte order mark to be injected - only at the *start* of stream (when state is still 0). - PR 24387 [Kohn Emil Dan <emild cs.technion.ac.il>] - - *) Fix build on GCC 4.0 - [William Barker <william.barker wilshire.com>] - -Changes with APR-ICONV 1.1.0 - - *) Correctly resolve to APR-1.0, never APR-0.9 in ./buildconf - [William Rowe] - - *) APR_ICONV1_PATH distinguishes between our apr-iconv 0.9 and 1.x - flavors (the pool arguments to several internal functions changed - in 1.0, so the loadable charset modules are not binary compatible.) - To maintain APR-iconv 1.0 compatibility, first APR_ICONV1 is used, - if it is set then the older 0.9 flavor APR_ICONV_PATH won't be - searched. apr-iconv 0.9 and 1.0 will only coexist if both the - APR_ICONV1_PATH and APR_ICONV_PATH variables are both set to their - respective charset directories. [William Rowe] - -Changes with APR-ICONV 1.0.2 - - *) Fix libapriconv.rc for Win32 builds [William Rowe, Justin Erenkrantz] - -Changes with APR-ICONV 1.0.1 - -Changes with APR-ICONV 1.0.0 - - *) Add the possiblity of a DESTDIR prefix to Makefile.in to make it - consistent with the behaviour of apr and apr-util. [Graham Leggett] - -Changes with APR-ICONV 0.9.5 - -Changes with APR-ICONV 0.9.4 - - *) Add -v option to iconv program. [Justin Erenkrantz] - - *) Add api_version.h. [Justin Erenkrantz] - - *) A fourth pass at a build system. [Justin Erenkrantz] - - *) A third pass at a build system. [Justin Erenkrantz] - -Changes with APR-ICONV 0.9.3 - -Changes with APR-ICONV 0.9.2 - - *) A second pass at a working build system - now builds on linux, - some namespace protection added. - [jean-frederic clere <jfrederic.clere(a)fujitsu-siemens.com>] - - *) A first blush at a working build system. - [jean-frederic clere <jfrederic.clere(a)fujitsu-siemens.com>] - - *) First set of changes for APR compatibility (eliminated __inline). - [jean-frederic clere <jfrederic.clere(a)fujitsu-siemens.com>] - - *) Source moved from the apr library into it's own repository - due to size concerns. Still requires portability overhaul. + -*- coding: utf-8 -*- +Changes with APR-ICONV 1.2.2 + + + +Changes with APR-ICONV 1.2.1 + + *) Build schema fixes for win32 including VC8 precompiled header files, + NT and 9x specific builds, and x86_64 P64 model. [William Rowe] + + *) Build schema fixes for unix including default --prefix, vpath builds, + and decorated lib name. [Davi Arnaut, William Rowe, Henry Jen] + +Changes with APR-ICONV 1.2.0 + + *) Install 'iconv' utility as bin/apriconv to avoid colliding with + system provided iconv, install public headers to include/apr-1/ + per convention. [William Rowe] + + *) Fixes for Mingw builds and normalize to the APR conventions (e.g. + apriconv-1.so library name). [Kouhei Sutou <kou cozmixng.org>] + + *) Fix compiler emits for char <-> 2byte unicode pointer assignments. + [William Rowe] + + *) Correct from_ucs zero width joiner/byte order mark to be injected + only at the *start* of stream (when state is still 0). + PR 24387 [Kohn Emil Dan <emild cs.technion.ac.il>] + + *) Fix build on GCC 4.0 + [William Barker <william.barker wilshire.com>] + +Changes with APR-ICONV 1.1.0 + + *) Correctly resolve to APR-1.0, never APR-0.9 in ./buildconf + [William Rowe] + + *) APR_ICONV1_PATH distinguishes between our apr-iconv 0.9 and 1.x + flavors (the pool arguments to several internal functions changed + in 1.0, so the loadable charset modules are not binary compatible.) + To maintain APR-iconv 1.0 compatibility, first APR_ICONV1 is used, + if it is set then the older 0.9 flavor APR_ICONV_PATH won't be + searched. apr-iconv 0.9 and 1.0 will only coexist if both the + APR_ICONV1_PATH and APR_ICONV_PATH variables are both set to their + respective charset directories. [William Rowe] + +Changes with APR-ICONV 1.0.2 + + *) Fix libapriconv.rc for Win32 builds [William Rowe, Justin Erenkrantz] + +Changes with APR-ICONV 1.0.1 + +Changes with APR-ICONV 1.0.0 + + *) Add the possiblity of a DESTDIR prefix to Makefile.in to make it + consistent with the behaviour of apr and apr-util. [Graham Leggett] + +Changes with APR-ICONV 0.9.5 + +Changes with APR-ICONV 0.9.4 + + *) Add -v option to iconv program. [Justin Erenkrantz] + + *) Add api_version.h. [Justin Erenkrantz] + + *) A fourth pass at a build system. [Justin Erenkrantz] + + *) A third pass at a build system. [Justin Erenkrantz] + +Changes with APR-ICONV 0.9.3 + +Changes with APR-ICONV 0.9.2 + + *) A second pass at a working build system - now builds on linux, + some namespace protection added. + [jean-frederic clere <jfrederic.clere(a)fujitsu-siemens.com>] + + *) A first blush at a working build system. + [jean-frederic clere <jfrederic.clere(a)fujitsu-siemens.com>] + + *) First set of changes for APR compatibility (eliminated __inline). + [jean-frederic clere <jfrederic.clere(a)fujitsu-siemens.com>] + + *) Source moved from the apr library into it's own repository + due to size concerns. Still requires portability overhaul. Property changes on: trunk/srclib/apr-iconv/CHANGES ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/srclib/apr-iconv/COPYING =================================================================== --- trunk/srclib/apr-iconv/COPYING 2007-12-11 12:55:09 UTC (rev 1171) +++ trunk/srclib/apr-iconv/COPYING 2007-12-11 12:57:39 UTC (rev 1172) @@ -1,31 +1,31 @@ -/*- - * Copyright (c) 2000 - * Konstantin Chuguev. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Konstantin Chuguev - * and its contributors. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * iconv (Charset Conversion Library) v1.0 - */ +/*- + * Copyright (c) 2000 + * Konstantin Chuguev. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Konstantin Chuguev + * and its contributors. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * iconv (Charset Conversion Library) v1.0 + */ Property changes on: trunk/srclib/apr-iconv/COPYING ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/srclib/apr-iconv/LICENSE =================================================================== --- trunk/srclib/apr-iconv/LICENSE 2007-12-11 12:55:09 UTC (rev 1171) +++ trunk/srclib/apr-iconv/LICENSE 2007-12-11 12:57:39 UTC (rev 1172) @@ -1,204 +1,204 @@ - 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. - - - + 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. + + + Property changes on: trunk/srclib/apr-iconv/LICENSE ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/srclib/apr-iconv/NMAKEmakefile =================================================================== --- trunk/srclib/apr-iconv/NMAKEmakefile 2007-12-11 12:55:09 UTC (rev 1171) +++ trunk/srclib/apr-iconv/NMAKEmakefile 2007-12-11 12:57:39 UTC (rev 1172) @@ -1,334 +1,334 @@ -# Copyright 2001-2007 The Apache Software Foundation or its licensors, as -# applicable. -# -# 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. -# -# ==================================================================== -# -# NMAKEmakefile Master APR-ICONV makefile. -# Usage: -# DLL=1 Build DLL version -# DEBUG=1 Build DEBUG version of APR -# -# Originally contributed by Mladen Turk <mturk jboss.com> -# -# ==================================================================== -# - - -!IF !DEFINED(APR_DECLARE_STATIC) || "$(APR_DECLARE_STATIC)" == "" -TARGET=DLL -CFLAGS = -DAPR_DECLARE_EXPORT -DAPI_DECLARE_EXPORT -DAPI_MODULE_STATIC $(CFLAGS) -PROJECT = libapriconv-1 -APR_LIB = libapr-1.lib -!ELSE -CFLAGS = -DAPR_DECLARE_STATIC -DAPI_DECLARE_STATIC -DAPI_MODULE_STATIC $(CFLAGS) -PROJECT = apriconv-1 -APR_LIB = apr-1.lib -TARGET=LIB -!ENDIF - -!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" -SRCDIR = . -!ENDIF - -!include <..\..\NMAKEcommon.inc> - -!IFNDEF WITH_APR -!ERROR WITH_APR Not defined -!ENDIF - -LDIRS = /libpath:"$(WITH_APR)\lib" - -LFLAGS = $(LFLAGS) $(APR_LIB) -!IF "$(TARGET)" == "DLL" -LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib -!ENDIF - -INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\lib -I$(WITH_APR)\include\apr-1 -PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src -OBJECTS = \ - $(WORKDIR)\adobe-stdenc.obj \ - $(WORKDIR)\adobe-symbol.obj \ - $(WORKDIR)\adobe-zdingbats.obj \ - $(WORKDIR)\big5.obj \ - $(WORKDIR)\cns11643-plane1.obj \ - $(WORKDIR)\cns11643-plane14.obj \ - $(WORKDIR)\cns11643-plane2.obj \ - $(WORKDIR)\cp037.obj \ - $(WORKDIR)\cp038.obj \ - $(WORKDIR)\cp10000.obj \ - $(WORKDIR)\cp10006.obj \ - $(WORKDIR)\cp10007.obj \ - $(WORKDIR)\cp10029.obj \ - $(WORKDIR)\cp1006.obj \ - $(WORKDIR)\cp10079.obj \ - $(WORKDIR)\cp10081.obj \ - $(WORKDIR)\cp1026.obj \ - $(WORKDIR)\cp273.obj \ - $(WORKDIR)\cp274.obj \ - $(WORKDIR)\cp275.obj \ - $(WORKDIR)\cp277.obj \ - $(WORKDIR)\cp278.obj \ - $(WORKDIR)\cp280.obj \ - $(WORKDIR)\cp281.obj \ - $(WORKDIR)\cp284.obj \ - $(WORKDIR)\cp285.obj \ - $(WORKDIR)\cp290.obj \ - $(WORKDIR)\cp297.obj \ - $(WORKDIR)\cp420.obj \ - $(WORKDIR)\cp423.obj \ - $(WORKDIR)\cp424.obj \ - $(WORKDIR)\cp437.obj \ - $(WORKDIR)\cp500.obj \ - $(WORKDIR)\cp737.obj \ - $(WORKDIR)\cp775.obj \ - $(WORKDIR)\cp850.obj \ - $(WORKDIR)\cp851.obj \ - $(WORKDIR)\cp852.obj \ - $(WORKDIR)\cp855.obj \ - $(WORKDIR)\cp856.obj \ - $(WORKDIR)\cp857.obj \ - $(WORKDIR)\cp860.obj \ - $(WORKDIR)\cp861.obj \ - $(WORKDIR)\cp862.obj \ - $(WORKDIR)\cp863.obj \ - $(WORKDIR)\cp864.obj \ - $(WORKDIR)\cp865.obj \ - $(WORKDIR)\cp866.obj \ - $(WORKDIR)\cp868.obj \ - $(WORKDIR)\cp869.obj \ - $(WORKDIR)\cp870.obj \ - $(WORKDIR)\cp871.obj \ - $(WORKDIR)\cp874.obj \ - $(WORKDIR)\cp875.obj \ - $(WORKDIR)\cp880.obj \ - $(WORKDIR)\cp891.obj \ - $(WORKDIR)\cp903.obj \ - $(WORKDIR)\cp904.obj \ - $(WORKDIR)\cp905.obj \ - $(WORKDIR)\cp918.obj \ - $(WORKDIR)\cp932.obj \ - $(WORKDIR)\cp936.obj \ - $(WORKDIR)\cp949.obj \ - $(WORKDIR)\cp950.obj \ - $(WORKDIR)\dec-mcs.obj \ - $(WORKDIR)\ebcdic-at-de-a.obj \ - $(WORKDIR)\ebcdic-at-de.obj \ - $(WORKDIR)\ebcdic-ca-fr.obj \ - $(WORKDIR)\ebcdic-dk-no-a.obj \ - $(WORKDIR)\ebcdic-dk-no.obj \ - $(WORKDIR)\ebcdic-es-a.obj \ - $(WORKDIR)\ebcdic-es-s.obj \ - $(WORKDIR)\ebcdic-es.obj \ - $(WORKDIR)\ebcdic-fi-se-a.obj \ - $(WORKDIR)\ebcdic-fi-se.obj \ - $(WORKDIR)\ebcdic-fr.obj \ - $(WORKDIR)\ebcdic-it.obj \ - $(WORKDIR)\ebcdic-pt.obj \ - $(WORKDIR)\ebcdic-uk.obj \ - $(WORKDIR)\ebcdic-us.obj \ - $(WORKDIR)\gb12345.obj \ - $(WORKDIR)\gb_2312-80.obj \ - $(WORKDIR)\hp-roman8.obj \ - $(WORKDIR)\iso-8859-1.obj \ - $(WORKDIR)\iso-8859-10.obj \ - $(WORKDIR)\iso-8859-13.obj \ - $(WORKDIR)\iso-8859-14.obj \ - $(WORKDIR)\iso-8859-15.obj \ - $(WORKDIR)\iso-8859-2.obj \ - $(WORKDIR)\iso-8859-3.obj \ - $(WORKDIR)\iso-8859-4.obj \ - $(WORKDIR)\iso-8859-5.obj \ - $(WORKDIR)\iso-8859-6.obj \ - $(WORKDIR)\iso-8859-7.obj \ - $(WORKDIR)\iso-8859-8.obj \ - $(WORKDIR)\iso-8859-9.obj \ - $(WORKDIR)\iso-ir-10.obj \ - $(WORKDIR)\iso-ir-102.obj \ - $(WORKDIR)\iso-ir-103.obj \ - $(WORKDIR)\iso-ir-11.obj \ - $(WORKDIR)\iso-ir-111.obj \ - $(WORKDIR)\iso-ir-121.obj \ - $(WORKDIR)\iso-ir-122.obj \ - $(WORKDIR)\iso-ir-123.obj \ - $(WORKDIR)\iso-ir-128.obj \ - $(WORKDIR)\iso-ir-13.obj \ - $(WORKDIR)\iso-ir-139.obj \ - $(WORKDIR)\iso-ir-14.obj \ - $(WORKDIR)\iso-ir-141.obj \ - $(WORKDIR)\iso-ir-142.obj \ - $(WORKDIR)\iso-ir-143.obj \ - $(WORKDIR)\iso-ir-146.obj \ - $(WORKDIR)\iso-ir-147.obj \ - $(WORKDIR)\iso-ir-15.obj \ - $(WORKDIR)\iso-ir-150.obj \ - $(WORKDIR)\iso-ir-151.obj \ - $(WORKDIR)\iso-ir-152.obj \ - $(WORKDIR)\iso-ir-153.obj \ - $(WORKDIR)\iso-ir-154.obj \ - $(WORKDIR)\iso-ir-155.obj \ - $(WORKDIR)\iso-ir-158.obj \ - $(WORKDIR)\iso-ir-16.obj \ - $(WORKDIR)\iso-ir-17.obj \ - $(WORKDIR)\iso-ir-18.obj \ - $(WORKDIR)\iso-ir-19.obj \ - $(WORKDIR)\iso-ir-2.obj \ - $(WORKDIR)\iso-ir-21.obj \ - $(WORKDIR)\iso-ir-25.obj \ - $(WORKDIR)\iso-ir-27.obj \ - $(WORKDIR)\iso-ir-37.obj \ - $(WORKDIR)\iso-ir-4.obj \ - $(WORKDIR)\iso-ir-47.obj \ - $(WORKDIR)\iso-ir-49.obj \ - $(WORKDIR)\iso-ir-50.obj \ - $(WORKDIR)\iso-ir-51.obj \ - $(WORKDIR)\iso-ir-54.obj \ - $(WORKDIR)\iso-ir-55.obj \ - $(WORKDIR)\iso-ir-57.obj \ - $(WORKDIR)\iso-ir-60.obj \ - $(WORKDIR)\iso-ir-61.obj \ - $(WORKDIR)\iso-ir-69.obj \ - $(WORKDIR)\iso-ir-70.obj \ - $(WORKDIR)\iso-ir-8-1.obj \ - $(WORKDIR)\iso-ir-8-2.obj \ - $(WORKDIR)\iso-ir-84.obj \ - $(WORKDIR)\iso-ir-85.obj \ - $(WORKDIR)\iso-ir-86.obj \ - $(WORKDIR)\iso-ir-88.obj \ - $(WORKDIR)\iso-ir-89.obj \ - $(WORKDIR)\iso-ir-9-1.obj \ - $(WORKDIR)\iso-ir-9-2.obj \ - $(WORKDIR)\iso-ir-90.obj \ - $(WORKDIR)\iso-ir-91.obj \ - $(WORKDIR)\iso-ir-92.obj \ - $(WORKDIR)\iso-ir-93.obj \ - $(WORKDIR)\iso-ir-94.obj \ - $(WORKDIR)\iso-ir-95.obj \ - $(WORKDIR)\iso-ir-96.obj \ - $(WORKDIR)\iso-ir-98.obj \ - $(WORKDIR)\iso-ir-99.obj \ - $(WORKDIR)\iso646-dk.obj \ - $(WORKDIR)\iso646-kr.obj \ - $(WORKDIR)\jis_x0201.obj \ - $(WORKDIR)\jis_x0208-1983.obj \ - $(WORKDIR)\jis_x0212-1990.obj \ - $(WORKDIR)\johab.obj \ - $(WORKDIR)\koi8-r.obj \ - $(WORKDIR)\koi8-ru.obj \ - $(WORKDIR)\koi8-u.obj \ - $(WORKDIR)\ksx1001.obj \ - $(WORKDIR)\mac-ce.obj \ - $(WORKDIR)\mac-croatian.obj \ - $(WORKDIR)\mac-cyrillic.obj \ - $(WORKDIR)\mac-dingbats.obj \ - $(WORKDIR)\mac-greek.obj \ - $(WORKDIR)\mac-iceland.obj \ - $(WORKDIR)\mac-japan.obj \ - $(WORKDIR)\mac-roman.obj \ - $(WORKDIR)\mac-romania.obj \ - $(WORKDIR)\mac-thai.obj \ - $(WORKDIR)\mac-turkish.obj \ - $(WORKDIR)\mac-ukraine.obj \ - $(WORKDIR)\macintosh.obj \ - $(WORKDIR)\osd_ebcdic_df04_1.obj \ - $(WORKDIR)\osd_ebcdic_df04_15.obj \ - $(WORKDIR)\shift_jis.obj \ - $(WORKDIR)\us-ascii.obj \ - $(WORKDIR)\windows-1250.obj \ - $(WORKDIR)\windows-1251.obj \ - $(WORKDIR)\windows-1252.obj \ - $(WORKDIR)\windows-1253.obj \ - $(WORKDIR)\windows-1254.obj \ - $(WORKDIR)\windows-1255.obj \ - $(WORKDIR)\windows-1256.obj \ - $(WORKDIR)\windows-1257.obj \ - $(WORKDIR)\windows-1258.obj \ - $(WORKDIR)\_tbl_simple.obj \ - $(WORKDIR)\euc-jp.obj \ - $(WORKDIR)\euc-kr.obj \ - $(WORKDIR)\euc-tw.obj \ - $(WORKDIR)\gb2312.obj \ - $(WORKDIR)\iso-10646-ucs-2.obj \ - $(WORKDIR)\iso-10646-ucs-4.obj \ - $(WORKDIR)\iso-2022-cn.obj \ - $(WORKDIR)\iso-2022-jp-2.obj \ - $(WORKDIR)\iso-2022-jp.obj \ - $(WORKDIR)\iso-2022-kr.obj \ - $(WORKDIR)\ucs2-internal.obj \ - $(WORKDIR)\ucs4-internal.obj \ - $(WORKDIR)\unicode-1-1-utf-7.obj \ - $(WORKDIR)\utf-16.obj \ - $(WORKDIR)\utf-8.obj \ - $(WORKDIR)\api_version.obj \ - $(WORKDIR)\iconv.obj \ - $(WORKDIR)\iconv_ccs.obj \ - $(WORKDIR)\iconv_ces.obj \ - $(WORKDIR)\iconv_ces_euc.obj \ - $(WORKDIR)\iconv_ces_iso2022.obj \ - $(WORKDIR)\iconv_int.obj \ - $(WORKDIR)\iconv_module.obj \ - $(WORKDIR)\iconv_uc.obj - - -BUILDLIB = $(PREFIX)\lib -BUILDINC = $(PREFIX)\include\apr-1 - -!IF "$(TARGET)" == "DLL" -BUILDBIN = $(WORKDIR)\$(PROJECT).dll -BUILDPDB = $(WORKDIR)\$(PROJECT).pdb -BUILDRES = $(WORKDIR)\$(PROJECT).res -BUILDMAN = $(BUILDBIN).manifest -!ELSE -BUILDBIN = $(WORKDIR)\$(PROJECT).lib -!ENDIF - -all : $(WORKDIR) $(BUILDLIB) - -$(BUILDLIB) : - @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" - -$(WORKDIR) : - @$(MAKEWORKDIR) - -{$(SRCDIR)\ccs}.c{$(WORKDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)\ces}.c{$(WORKDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)\lib}.c{$(WORKDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - - -$(OBJECTS): $(SRCDIR)\include\*.h - -!IF "$(TARGET)" == "DLL" -$(BUILDRES): libapriconv.rc - $(RC) $(RCFLAGS) /i "$(WITH_APR)\include" /i "$(SRCDIR)\include" /d "API_VERSION_ONLY" /fo $(BUILDRES) $(SRCDIR)\libapriconv.rc -$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES) - $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) - IF EXIST $(BUILDMAN) \ - mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 -!ELSE -$(BUILDBIN): $(WORKDIR) $(OBJECTS) - $(LINK) $(LFLAGS) $(OBJECTS) $(LDIRS) /out:$(BUILDBIN) -!ENDIF - -clean: - @$(CLEANTARGET) - -install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN) - @xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q - @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q - @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# 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. +# +# ==================================================================== +# +# NMAKEmakefile Master APR-ICONV makefile. +# Usage: +# DLL=1 Build DLL version +# DEBUG=1 Build DEBUG version of APR +# +# Originally contributed by Mladen Turk <mturk jboss.com> +# +# ==================================================================== +# + + +!IF !DEFINED(APR_DECLARE_STATIC) || "$(APR_DECLARE_STATIC)" == "" +TARGET=DLL +CFLAGS = -DAPR_DECLARE_EXPORT -DAPI_DECLARE_EXPORT -DAPI_MODULE_STATIC $(CFLAGS) +PROJECT = libapriconv-1 +APR_LIB = libapr-1.lib +!ELSE +CFLAGS = -DAPR_DECLARE_STATIC -DAPI_DECLARE_STATIC -DAPI_MODULE_STATIC $(CFLAGS) +PROJECT = apriconv-1 +APR_LIB = apr-1.lib +TARGET=LIB +!ENDIF + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> + +!IFNDEF WITH_APR +!ERROR WITH_APR Not defined +!ENDIF + +LDIRS = /libpath:"$(WITH_APR)\lib" + +LFLAGS = $(LFLAGS) $(APR_LIB) +!IF "$(TARGET)" == "DLL" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib +!ENDIF + +INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\lib -I$(WITH_APR)\include\apr-1 +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src +OBJECTS = \ + $(WORKDIR)\adobe-stdenc.obj \ + $(WORKDIR)\adobe-symbol.obj \ + $(WORKDIR)\adobe-zdingbats.obj \ + $(WORKDIR)\big5.obj \ + $(WORKDIR)\cns11643-plane1.obj \ + $(WORKDIR)\cns11643-plane14.obj \ + $(WORKDIR)\cns11643-plane2.obj \ + $(WORKDIR)\cp037.obj \ + $(WORKDIR)\cp038.obj \ + $(WORKDIR)\cp10000.obj \ + $(WORKDIR)\cp10006.obj \ + $(WORKDIR)\cp10007.obj \ + $(WORKDIR)\cp10029.obj \ + $(WORKDIR)\cp1006.obj \ + $(WORKDIR)\cp10079.obj \ + $(WORKDIR)\cp10081.obj \ + $(WORKDIR)\cp1026.obj \ + $(WORKDIR)\cp273.obj \ + $(WORKDIR)\cp274.obj \ + $(WORKDIR)\cp275.obj \ + $(WORKDIR)\cp277.obj \ + $(WORKDIR)\cp278.obj \ + $(WORKDIR)\cp280.obj \ + $(WORKDIR)\cp281.obj \ + $(WORKDIR)\cp284.obj \ + $(WORKDIR)\cp285.obj \ + $(WORKDIR)\cp290.obj \ + $(WORKDIR)\cp297.obj \ + $(WORKDIR)\cp420.obj \ + $(WORKDIR)\cp423.obj \ + $(WORKDIR)\cp424.obj \ + $(WORKDIR)\cp437.obj \ + $(WORKDIR)\cp500.obj \ + $(WORKDIR)\cp737.obj \ + $(WORKDIR)\cp775.obj \ + $(WORKDIR)\cp850.obj \ + $(WORKDIR)\cp851.obj \ + $(WORKDIR)\cp852.obj \ + $(WORKDIR)\cp855.obj \ + $(WORKDIR)\cp856.obj \ + $(WORKDIR)\cp857.obj \ + $(WORKDIR)\cp860.obj \ + $(WORKDIR)\cp861.obj \ + $(WORKDIR)\cp862.obj \ + $(WORKDIR)\cp863.obj \ + $(WORKDIR)\cp864.obj \ + $(WORKDIR)\cp865.obj \ + $(WORKDIR)\cp866.obj \ + $(WORKDIR)\cp868.obj \ + $(WORKDIR)\cp869.obj \ + $(WORKDIR)\cp870.obj \ + $(WORKDIR)\cp871.obj \ + $(WORKDIR)\cp874.obj \ + $(WORKDIR)\cp875.obj \ + $(WORKDIR)\cp880.obj \ + $(WORKDIR)\cp891.obj \ + $(WORKDIR)\cp903.obj \ + $(WORKDIR)\cp904.obj \ + $(WORKDIR)\cp905.obj \ + $(WORKDIR)\cp918.obj \ + $(WORKDIR)\cp932.obj \ + $(WORKDIR)\cp936.obj \ + $(WORKDIR)\cp949.obj \ + $(WORKDIR)\cp950.obj \ + $(WORKDIR)\dec-mcs.obj \ + $(WORKDIR)\ebcdic-at-de-a.obj \ + $(WORKDIR)\ebcdic-at-de.obj \ + $(WORKDIR)\ebcdic-ca-fr.obj \ + $(WORKDIR)\ebcdic-dk-no-a.obj \ + $(WORKDIR)\ebcdic-dk-no.obj \ + $(WORKDIR)\ebcdic-es-a.obj \ + $(WORKDIR)\ebcdic-es-s.obj \ + $(WORKDIR)\ebcdic-es.obj \ + $(WORKDIR)\ebcdic-fi-se-a.obj \ + $(WORKDIR)\ebcdic-fi-se.obj \ + $(WORKDIR)\ebcdic-fr.obj \ + $(WORKDIR)\ebcdic-it.obj \ + $(WORKDIR)\ebcdic-pt.obj \ + $(WORKDIR)\ebcdic-uk.obj \ + $(WORKDIR)\ebcdic-us.obj \ + $(WORKDIR)\gb12345.obj \ + $(WORKDIR)\gb_2312-80.obj \ + $(WORKDIR)\hp-roman8.obj \ + $(WORKDIR)\iso-8859-1.obj \ + $(WORKDIR)\iso-8859-10.obj \ + $(WORKDIR)\iso-8859-13.obj \ + $(WORKDIR)\iso-8859-14.obj \ + $(WORKDIR)\iso-8859-15.obj \ + $(WORKDIR)\iso-8859-2.obj \ + $(WORKDIR)\iso-8859-3.obj \ + $(WORKDIR)\iso-8859-4.obj \ + $(WORKDIR)\iso-8859-5.obj \ + $(WORKDIR)\iso-8859-6.obj \ + $(WORKDIR)\iso-8859-7.obj \ + $(WORKDIR)\iso-8859-8.obj \ + $(WORKDIR)\iso-8859-9.obj \ + $(WORKDIR)\iso-ir-10.obj \ + $(WORKDIR)\iso-ir-102.obj \ + $(WORKDIR)\iso-ir-103.obj \ + $(WORKDIR)\iso-ir-11.obj \ + $(WORKDIR)\iso-ir-111.obj \ + $(WORKDIR)\iso-ir-121.obj \ + $(WORKDIR)\iso-ir-122.obj \ + $(WORKDIR)\iso-ir-123.obj \ + $(WORKDIR)\iso-ir-128.obj \ + $(WORKDIR)\iso-ir-13.obj \ + $(WORKDIR)\iso-ir-139.obj \ + $(WORKDIR)\iso-ir-14.obj \ + $(WORKDIR)\iso-ir-141.obj \ + $(WORKDIR)\iso-ir-142.obj \ + $(WORKDIR)\iso-ir-143.obj \ + $(WORKDIR)\iso-ir-146.obj \ + $(WORKDIR)\iso-ir-147.obj \ + $(WORKDIR)\iso-ir-15.obj \ + $(WORKDIR)\iso-ir-150.obj \ + $(WORKDIR)\iso-ir-151.obj \ + $(WORKDIR)\iso-ir-152.obj \ + $(WORKDIR)\iso-ir-153.obj \ + $(WORKDIR)\iso-ir-154.obj \ + $(WORKDIR)\iso-ir-155.obj \ + $(WORKDIR)\iso-ir-158.obj \ + $(WORKDIR)\iso-ir-16.obj \ + $(WORKDIR)\iso-ir-17.obj \ + $(WORKDIR)\iso-ir-18.obj \ + $(WORKDIR)\iso-ir-19.obj \ + $(WORKDIR)\iso-ir-2.obj \ + $(WORKDIR)\iso-ir-21.obj \ + $(WORKDIR)\iso-ir-25.obj \ + $(WORKDIR)\iso-ir-27.obj \ + $(WORKDIR)\iso-ir-37.obj \ + $(WORKDIR)\iso-ir-4.obj \ + $(WORKDIR)\iso-ir-47.obj \ + $(WORKDIR)\iso-ir-49.obj \ + $(WORKDIR)\iso-ir-50.obj \ + $(WORKDIR)\iso-ir-51.obj \ + $(WORKDIR)\iso-ir-54.obj \ + $(WORKDIR)\iso-ir-55.obj \ + $(WORKDIR)\iso-ir-57.obj \ + $(WORKDIR)\iso-ir-60.obj \ + $(WORKDIR)\iso-ir-61.obj \ + $(WORKDIR)\iso-ir-69.obj \ + $(WORKDIR)\iso-ir-70.obj \ + $(WORKDIR)\iso-ir-8-1.obj \ + $(WORKDIR)\iso-ir-8-2.obj \ + $(WORKDIR)\iso-ir-84.obj \ + $(WORKDIR)\iso-ir-85.obj \ + $(WORKDIR)\iso-ir-86.obj \ + $(WORKDIR)\iso-ir-88.obj \ + $(WORKDIR)\iso-ir-89.obj \ + $(WORKDIR)\iso-ir-9-1.obj \ + $(WORKDIR)\iso-ir-9-2.obj \ + $(WORKDIR)\iso-ir-90.obj \ + $(WORKDIR)\iso-ir-91.obj \ + $(WORKDIR)\iso-ir-92.obj \ + $(WORKDIR)\iso-ir-93.obj \ + $(WORKDIR)\iso-ir-94.obj \ + $(WORKDIR)\iso-ir-95.obj \ + $(WORKDIR)\iso-ir-96.obj \ + $(WORKDIR)\iso-ir-98.obj \ + $(WORKDIR)\iso-ir-99.obj \ + $(WORKDIR)\iso646-dk.obj \ + $(WORKDIR)\iso646-kr.obj \ + $(WORKDIR)\jis_x0201.obj \ + $(WORKDIR)\jis_x0208-1983.obj \ + $(WORKDIR)\jis_x0212-1990.obj \ + $(WORKDIR)\johab.obj \ + $(WORKDIR)\koi8-r.obj \ + $(WORKDIR)\koi8-ru.obj \ + $(WORKDIR)\koi8-u.obj \ + $(WORKDIR)\ksx1001.obj \ + $(WORKDIR)\mac-ce.obj \ + $(WORKDIR)\mac-croatian.obj \ + $(WORKDIR)\mac-cyrillic.obj \ + $(WORKDIR)\mac-dingbats.obj \ + $(WORKDIR)\mac-greek.obj \ + $(WORKDIR)\mac-iceland.obj \ + $(WORKDIR)\mac-japan.obj \ + $(WORKDIR)\mac-roman.obj \ + $(WORKDIR)\mac-romania.obj \ + $(WORKDIR)\mac-thai.obj \ + $(WORKDIR)\mac-turkish.obj \ + $(WORKDIR)\mac-ukraine.obj \ + $(WORKDIR)\macintosh.obj \ + $(WORKDIR)\osd_ebcdic_df04_1.obj \ + $(WORKDIR)\osd_ebcdic_df04_15.obj \ + $(WORKDIR)\shift_jis.obj \ + $(WORKDIR)\us-ascii.obj \ + $(WORKDIR)\windows-1250.obj \ + $(WORKDIR)\windows-1251.obj \ + $(WORKDIR)\windows-1252.obj \ + $(WORKDIR)\windows-1253.obj \ + $(WORKDIR)\windows-1254.obj \ + $(WORKDIR)\windows-1255.obj \ + $(WORKDIR)\windows-1256.obj \ + $(WORKDIR)\windows-1257.obj \ + $(WORKDIR)\windows-1258.obj \ + $(WORKDIR)\_tbl_simple.obj \ + $(WORKDIR)\euc-jp.obj \ + $(WORKDIR)\euc-kr.obj \ + $(WORKDIR)\euc-tw.obj \ + $(WORKDIR)\gb2312.obj \ + $(WORKDIR)\iso-10646-ucs-2.obj \ + $(WORKDIR)\iso-10646-ucs-4.obj \ + $(WORKDIR)\iso-2022-cn.obj \ + $(WORKDIR)\iso-2022-jp-2.obj \ + $(WORKDIR)\iso-2022-jp.obj \ + $(WORKDIR)\iso-2022-kr.obj \ + $(WORKDIR)\ucs2-internal.obj \ + $(WORKDIR)\ucs4-internal.obj \ + $(WORKDIR)\unicode-1-1-utf-7.obj \ + $(WORKDIR)\utf-16.obj \ + $(WORKDIR)\utf-8.obj \ + $(WORKDIR)\api_version.obj \ + $(WORKDIR)\iconv.obj \ + $(WORKDIR)\iconv_ccs.obj \ + $(WORKDIR)\iconv_ces.obj \ + $(WORKDIR)\iconv_ces_euc.obj \ + $(WORKDIR)\iconv_ces_iso2022.obj \ + $(WORKDIR)\iconv_int.obj \ + $(WORKDIR)\iconv_module.obj \ + $(WORKDIR)\iconv_uc.obj + + +BUILDLIB = $(PREFIX)\lib +BUILDINC = $(PREFIX)\include\apr-1 + +!IF "$(TARGET)" == "DLL" +BUILDBIN = $(WORKDIR)\$(PROJECT).dll +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMAN = $(BUILDBIN).manifest +!ELSE +BUILDBIN = $(WORKDIR)\$(PROJECT).lib +!ENDIF + +all : $(WORKDIR) $(BUILDLIB) + +$(BUILDLIB) : + @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" + +$(WORKDIR) : + @$(MAKEWORKDIR) + +{$(SRCDIR)\ccs}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\ces}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\lib}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + + +$(OBJECTS): $(SRCDIR)\include\*.h + +!IF "$(TARGET)" == "DLL" +$(BUILDRES): libapriconv.rc + $(RC) $(RCFLAGS) /i "$(WITH_APR)\include" /i "$(SRCDIR)\include" /d "API_VERSION_ONLY" /fo $(BUILDRES) $(SRCDIR)\libapriconv.rc +$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMAN) \ + mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 +!ELSE +$(BUILDBIN): $(WORKDIR) $(OBJECTS) + $(LINK) $(LFLAGS) $(OBJECTS) $(LDIRS) /out:$(BUILDBIN) +!ENDIF + +clean: + @$(CLEANTARGET) + +install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN) + @xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q + @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q + @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL Property changes on: trunk/srclib/apr-iconv/NMAKEmakefile ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/srclib/apr-iconv/NOTICE =================================================================== --- trunk/srclib/apr-iconv/NOTICE 2007-12-11 12:55:09 UTC (rev 1171) +++ trunk/srclib/apr-iconv/NOTICE 2007-12-11 12:57:39 UTC (rev 1172) @@ -1,2 +1,2 @@ -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). Property changes on: trunk/srclib/apr-iconv/NOTICE ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/srclib/apr-iconv/STATUS =================================================================== --- trunk/srclib/apr-iconv/STATUS 2007-12-11 12:55:09 UTC (rev 1171) +++ trunk/srclib/apr-iconv/STATUS 2007-12-11 12:57:39 UTC (rev 1172) @@ -1,47 +1,47 @@ -APACHE PORTABLE RUNTIME APR-ICONV LIBRARY STATUS: -*- coding: utf-8 -*- -Last modified at [$Date: 2007-11-26 22:52:06 +0100 (pon, 26 stu 2007) $] - -Releases: - 1.2.2 : in development - 1.2.1 : released November 26, 2007 - 1.2.0 : released June 7, 2007 - 1.1.1 : released November 23, 2005 - 1.1.0 : not released - 1.0.1 : released November 19, 2004 - 1.0.0 : released September 1, 2004 - 0.9.7 : released October 11, 2005 - 0.9.6 : not released - 0.9.5 : released November 16, 2004 - 0.9.4 : released September 26, 2003 - 0.9.3 : tagged March 30, 2002 - 0.9.2 : released March 22, 2002 (alpha) - -RELEASE SHOWSTOPPERS: - - -RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: - - * Drop modules.c code and replace much functionality with the - apr dso methods, etc. - -Other bugs that need fixing: - - * APR-util ./testall demonstrates that on finalization (when the - users calls with NULL inbuf and their target outbuf) that the - utf-7 converter doesn't exit the shift-state. Not certain that - this is in fact a bug in the code, an unimplemented feature or - a mistaken assumption in the apr-util/test/testxlate.c code. - -Other features that need writing: - - -Documentation that needs writing: - - * API documentation - Status: - - -Available Patches: - - -Open Issues: +APACHE PORTABLE RUNTIME APR-ICONV LIBRARY STATUS: -*- coding: utf-8 -*- +Last modified at [$Date: 2007-11-26 22:52:06 +0100 (pon, 26 stu 2007) $] + +Releases: + 1.2.2 : in development + 1.2.1 : released November 26, 2007 + 1.2.0 : released June 7, 2007 + 1.1.1 : released November 23, 2005 + 1.1.0 : not released + 1.0.1 : released November 19, 2004 + 1.0.0 : released September 1, 2004 + 0.9.7 : released October 11, 2005 + 0.9.6 : not released + 0.9.5 : released November 16, 2004 + 0.9.4 : released September 26, 2003 + 0.9.3 : tagged March 30, 2002 + 0.9.2 : released March 22, 2002 (alpha) + +RELEASE SHOWSTOPPERS: + + +RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: + + * Drop modules.c code and replace much functionality with the + apr dso methods, etc. + +Other bugs that need fixing: + + * APR-util ./testall demonstrates that on finalization (when the + users calls with NULL inbuf and their target outbuf) that the + utf-7 converter doesn't exit the shift-state. Not certain that + this is in fact a bug in the code, an unimplemented feature or + a mistaken assumption in the apr-util/test/testxlate.c code. + +Other features that need writing: + + +Documentation that needs writing: + + * API documentation + Status: + + +Available Patches: + + +Open Issues: Property changes on: trunk/srclib/apr-iconv/STATUS ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/srclib/apr-iconv/libapriconv.rc =================================================================== --- trunk/srclib/apr-iconv/libapriconv.rc 2007-12-11 12:55:09 UTC (rev 1171) +++ trunk/srclib/apr-iconv/libapriconv.rc 2007-12-11 12:57:39 UTC (rev 1172) @@ -1,66 +1,66 @@ -#include "api_version.h" - -#define API_COPYRIGHT "Copyright 2000-2005 The Apache Software " \ - "Foundation or its licensors, as applicable." - -#define API_LICENSE "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\r\n\r\n" \ - "http://www.apache.org/licenses/LICENSE-2.0\r\n\r\n" \ - "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." - -#define API_DLL_BASENAME "libapriconv-" API_STRINGIFY(API_MAJOR_VERSION) - - -1 VERSIONINFO - FILEVERSION API_VERSION_STRING_CSV,0 - PRODUCTVERSION API_VERSION_STRING_CSV,0 - FILEFLAGSMASK 0x3fL -#if defined(API_IS_DEV_VERSION) -#if defined(_DEBUG) - FILEFLAGS 0x03L -#else - FILEFLAGS 0x02L -#endif -#else -#if defined(_DEBUG) - FILEFLAGS 0x01L -#else - FILEFLAGS 0x00L -#endif -#endif -#if defined(WINNT) || defined(WIN64) - FILEOS 0x40004L -#else - FILEOS 0x4L -#endif - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", API_LICENSE "\0" - VALUE "CompanyName", "Apache Software Foundation\0" - VALUE "FileDescription", "Apache Portable Runtime Library\0" - VALUE "FileVersion", API_VERSION_STRING "\0" - VALUE "InternalName", API_DLL_BASENAME "\0" - VALUE "LegalCopyright", API_COPYRIGHT "\0" - VALUE "OriginalFilename", API_DLL_BASENAME ".dll\0" - VALUE "ProductName", "Apache Portable Runtime Project\0" - VALUE "ProductVersion", API_VERSION_STRING "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END +#include "api_version.h" + +#define API_COPYRIGHT "Copyright 2000-2005 The Apache Software " \ + "Foundation or its licensors, as applicable." + +#define API_LICENSE "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\r\n\r\n" \ + "http://www.apache.org/licenses/LICENSE-2.0\r\n\r\n" \ + "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." + +#define API_DLL_BASENAME "libapriconv-" API_STRINGIFY(API_MAJOR_VERSION) + + +1 VERSIONINFO + FILEVERSION API_VERSION_STRING_CSV,0 + PRODUCTVERSION API_VERSION_STRING_CSV,0 + FILEFLAGSMASK 0x3fL +#if defined(API_IS_DEV_VERSION) +#if defined(_DEBUG) + FILEFLAGS 0x03L +#else + FILEFLAGS 0x02L +#endif +#else +#if defined(_DEBUG) + FILEFLAGS 0x01L +#else + FILEFLAGS 0x00L +#endif +#endif +#if defined(WINNT) || defined(WIN64) + FILEOS 0x40004L +#else + FILEOS 0x4L +#endif + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", API_LICENSE "\0" + VALUE "CompanyName", "Apache Software Foundation\0" + VALUE "FileDescription", "Apache Portable Runtime Library\0" + VALUE "FileVersion", API_VERSION_STRING "\0" + VALUE "InternalName", API_DLL_BASENAME "\0" + VALUE "LegalCopyright", API_COPYRIGHT "\0" + VALUE "OriginalFilename", API_DLL_BASENAME ".dll\0" + VALUE "ProductName", "Apache Portable Runtime Project\0" + VALUE "ProductVersion", API_VERSION_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END Property changes on: trunk/srclib/apr-iconv/libapriconv.rc ___________________________________________________________________ Name: svn:eol-style + native