JBoss Native SVN: r1188 - trunk/build/unix/util.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-13 01:41:24 -0500 (Thu, 13 Dec 2007)
New Revision: 1188
Modified:
trunk/build/unix/util/builddep.sh
Log:
Add missing esac
Modified: trunk/build/unix/util/builddep.sh
===================================================================
--- trunk/build/unix/util/builddep.sh 2007-12-12 17:26:21 UTC (rev 1187)
+++ trunk/build/unix/util/builddep.sh 2007-12-13 06:41:24 UTC (rev 1188)
@@ -45,5 +45,6 @@
solaris)
pkgchk -l -p $file | grep "^ " >> $2.tmp
;;
+ esac
done
sort -u $2.tmp > $2.pkg
16 years, 5 months
JBoss Native SVN: r1187 - trunk/build/unix/util.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-12 12:26:21 -0500 (Wed, 12 Dec 2007)
New Revision: 1187
Modified:
trunk/build/unix/util/builddep.sh
Log:
Add Solaris logic.
Modified: trunk/build/unix/util/builddep.sh
===================================================================
--- trunk/build/unix/util/builddep.sh 2007-12-12 16:53:28 UTC (rev 1186)
+++ trunk/build/unix/util/builddep.sh 2007-12-12 17:26:21 UTC (rev 1187)
@@ -38,6 +38,12 @@
> $2.tmp
for file in `cat $2`
do
- rpm -qf $file >> $2.tmp
+ case ${BUILD_SYS} in
+ linux2)
+ rpm -qf $file >> $2.tmp
+ ;;
+ solaris)
+ pkgchk -l -p $file | grep "^ " >> $2.tmp
+ ;;
done
sort -u $2.tmp > $2.pkg
16 years, 5 months
JBoss Native SVN: r1186 - in trunk/build/unix: util and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-12 11:53:28 -0500 (Wed, 12 Dec 2007)
New Revision: 1186
Added:
trunk/build/unix/util/builddep.sh
Modified:
trunk/build/unix/build.sh
Log:
Add a list of depencies. (Of the libraries of the built package)
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2007-12-12 09:40:21 UTC (rev 1185)
+++ trunk/build/unix/build.sh 2007-12-12 16:53:28 UTC (rev 1186)
@@ -143,7 +143,7 @@
export patch
# Read apr and openssl version.
-parg=`grep -v '^#' ${package_list} | grep "^$PACKAGE|" | grep $build_version`
+parg=`grep -v '^#' ${package_list} | grep "^$PACKAGE|" | grep "|$build_version|"`
apr_version=`echo "${parg}" | ${awk} -F'|' '{print $3}'`
apu_version=`echo "${parg}" | ${awk} -F'|' '{print $4}'`
api_version=`echo "${parg}" | ${awk} -F'|' '{print $5}'`
@@ -277,16 +277,18 @@
# # $1=script $2..n
override()
{
+ basedir=`dirname $1`
cmd=`basename $1 .sh`
- if [ -x ${cmd}.${BUILD_SYS}.${BUILD_CPU}.sh ]; then
+ if [ -x ${basedir}/${cmd}.${BUILD_SYS}.${BUILD_CPU}.sh ]; then
run=${cmd}.${BUILD_SYS}.${BUILD_CPU}.sh
- elif [ -x ${cmd}.${BUILD_SYS}.sh ]; then
+ elif [ -x ${basedir}/${cmd}.${BUILD_SYS}.sh ]; then
run=${cmd}.${BUILD_SYS}.sh
else
run=${cmd}.sh
fi
shift
- ./$run $@
+ echo "Running ${basedir}/$run $@"
+ ${basedir}/$run $@
if [ $? -eq 2 ]; then
echo "$run not supported on this platform"
exit 0
@@ -757,3 +759,6 @@
(cd ${package_src_dir}
buildbin $build_output_dir
)
+
+# generate a list of dependencies
+override ${build_top}/util/builddep $build_output_dir ${PACKAGE}.${build_version}.${BUILD_SYS}.${BUILD_CPU}.depends
Added: trunk/build/unix/util/builddep.sh
===================================================================
--- trunk/build/unix/util/builddep.sh (rev 0)
+++ trunk/build/unix/util/builddep.sh 2007-12-12 16:53:28 UTC (rev 1186)
@@ -0,0 +1,43 @@
+#!/bin/sh
+# Copyright(c) 2007 Red Hat Middleware, LLC,
+# and individual contributors as indicated by the @authors tag.
+# See the copyright.txt in the distribution for a
+# full listing of individual contributors.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library in the file COPYING.LIB;
+# if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+#
+# @author Jean-Frederic Clere
+#
+
+# Download the sources. It guess how to do it.
+# $1: binary build directory.
+# $2: ouput file.
+LD_LIBRARY_PATH=$1
+for dir in `find $1 -name "*.${so_extension}" -exec dirname {} \;`
+do
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$dir
+done
+echo "LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH
+
+find $1 -name "*.${so_extension}" -exec ldd {} \; > $2.all
+cat $2.all | awk 'NF==4 { print $3 } ' | sort -u | grep -v "$1" > $2
+> $2.tmp
+for file in `cat $2`
+do
+ rpm -qf $file >> $2.tmp
+done
+sort -u $2.tmp > $2.pkg
Property changes on: trunk/build/unix/util/builddep.sh
___________________________________________________________________
Name: svn:executable
+ *
16 years, 5 months
JBoss Native SVN: r1185 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-12 04:40:21 -0500 (Wed, 12 Dec 2007)
New Revision: 1185
Modified:
trunk/build/unix/build.sh
Log:
apr-util has a --with-openssl=DIR so we must be build openssl before apr-util.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2007-12-12 09:26:06 UTC (rev 1184)
+++ trunk/build/unix/build.sh 2007-12-12 09:40:21 UTC (rev 1185)
@@ -608,6 +608,15 @@
echo "Building binaries at `pwd`"
dst_dir=$1
+ # apr-util has a --with-openssl=DIR so we must be build openssl before apu.
+ ls srclib | grep openssl >/dev/null
+ if [ $? -eq 0 ]; then
+ buildopenssl srclib/openssl-${ssl_version} false
+ if $has_static ; then
+ buildopenssl srclib/openssl-${ssl_version} false
+ fi
+ fi
+
if $has_apr; then
buildapr srclib/apr-${apr_version} false
if $has_static ; then
@@ -627,13 +636,6 @@
fi
fi
- ls srclib | grep openssl >/dev/null
- if [ $? -eq 0 ]; then
- buildopenssl srclib/openssl-${ssl_version} false
- if $has_static ; then
- buildopenssl srclib/openssl-${ssl_version} false
- fi
- fi
# Do our specific part.
override ${package_src_dir}/buildbin.${PACKAGE}.sh ${build_common_dir} ${package_dist_dir} ${package_output_dir} $has_openssl $has_static
16 years, 5 months
JBoss Native SVN: r1184 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-12 04:26:06 -0500 (Wed, 12 Dec 2007)
New Revision: 1184
Modified:
trunk/build/unix/build.sh
Log:
Add a build_api so that the decision of building apr-iconv depends on the platfrom dectection.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2007-12-12 08:46:35 UTC (rev 1183)
+++ trunk/build/unix/build.sh 2007-12-12 09:26:06 UTC (rev 1184)
@@ -46,6 +46,7 @@
has_apr=true
has_apu=true
has_api=true
+build_api=false
has_cache=false
has_version=false
has_package=false
@@ -216,6 +217,9 @@
so_extension=dll
BUILD_WIN=true
NATIVEEOL="CRLF"
+ if $has_api; then
+ build_api=true
+ fi
;;
CYGWIN*)
so_extension=dll
@@ -604,21 +608,12 @@
echo "Building binaries at `pwd`"
dst_dir=$1
- case ${BUILD_TAG} in
- windows-*)
- $has_api=$has_api
- ;;
- *)
- $has_api=false
- ;;
- esac
-
if $has_apr; then
buildapr srclib/apr-${apr_version} false
if $has_static ; then
buildapr srclib/apr-${apr_version} true
fi
- if $has_api; then
+ if $build_api; then
buildapi srclib/apr-iconv-${api_version} false
if $has_static ; then
buildapi srclib/apr-iconv-${api_version} true
16 years, 5 months
JBoss Native SVN: r1183 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-12 03:46:35 -0500 (Wed, 12 Dec 2007)
New Revision: 1183
Modified:
trunk/build/unix/build.sh
Log:
Build apr-iconv only for Windows targets
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2007-12-12 08:28:42 UTC (rev 1182)
+++ trunk/build/unix/build.sh 2007-12-12 08:46:35 UTC (rev 1183)
@@ -604,6 +604,15 @@
echo "Building binaries at `pwd`"
dst_dir=$1
+ case ${BUILD_TAG} in
+ windows-*)
+ $has_api=$has_api
+ ;;
+ *)
+ $has_api=false
+ ;;
+ esac
+
if $has_apr; then
buildapr srclib/apr-${apr_version} false
if $has_static ; then
16 years, 5 months
JBoss Native SVN: r1182 - trunk/srclib/apr-iconv.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-12 03:28:42 -0500 (Wed, 12 Dec 2007)
New Revision: 1182
Modified:
trunk/srclib/apr-iconv/README
Log:
Update README
Modified: trunk/srclib/apr-iconv/README
===================================================================
--- trunk/srclib/apr-iconv/README 2007-12-12 08:26:14 UTC (rev 1181)
+++ trunk/srclib/apr-iconv/README 2007-12-12 08:28:42 UTC (rev 1182)
@@ -1,38 +1,6 @@
- ICONV - Charset Conversion Library. Version 1.0
- -----------------------------------------------
+ Apache Portable Runtime Iconv Library
+ -------------------------------------
-This distribution contains the library (libiconv.a and .so) for
-conversion between various charsets (character encoding schemes)
-and the command line utility (iconv).
-
-Syntax of the library functions (iconv_open, iconv, iconv_close)
-and the utility is described in the man pages.
-
-Features of the library:
- - small size: the actual conversion methods are located
- in dynamically loaded shared modules, representing
- either a character encoding scheme (CES), or a coded
- character set (CCS);
- - open module API: adding new modules (both CESs and
- CCSs) is easy. Although the API has not been documented,
- it is rather simple to be figured out from the sources;
- - BSD-style copyright;
- - POSIX compliance of iconv_open, iconv and iconv_close
- functions;
- - support for aliases for charset names via UNIX symbolic
- links;
- - ISO/IEC 10646 conformance of the internal representation
- of characters; conversion is always done in two steps:
- (1) a sequence of zero or more bytes from input buffer
- coded in the source charset is converted to exactly one
- valid UCS-4 character and (2) the UCS-4 character is
- converted to a sequence of zero or more bytes in
- the target charset to the output buffer;
- - standard sources of CCS tables: all C source files of
- the tables have been generated by a Perl script from
- the Unicode and RFC1345 charset mapping tables before
- being included to the package.
-
- Konstantin Chuguev
- <Konstantin.Chuguev(a)dante.org.uk>
- September 2000.
+This version uses all provided modules as builtin
+In general it is used only on windows platform where
+there is no provided system iconv library
16 years, 5 months
JBoss Native SVN: r1181 - trunk/srclib/apr-iconv.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-12 03:26:14 -0500 (Wed, 12 Dec 2007)
New Revision: 1181
Removed:
trunk/srclib/apr-iconv/AUTHORS
trunk/srclib/apr-iconv/CHANGES
trunk/srclib/apr-iconv/COPYING
trunk/srclib/apr-iconv/LICENSE
trunk/srclib/apr-iconv/NOTICE
trunk/srclib/apr-iconv/STATUS
trunk/srclib/apr-iconv/ccs/
trunk/srclib/apr-iconv/ces/
trunk/srclib/apr-iconv/include/
trunk/srclib/apr-iconv/lib/
trunk/srclib/apr-iconv/libapriconv.rc
Log:
Remove apr-iconv sources. They are recreated at build time using provided patch
Deleted: trunk/srclib/apr-iconv/AUTHORS
===================================================================
--- trunk/srclib/apr-iconv/AUTHORS 2007-12-12 08:20:58 UTC (rev 1180)
+++ trunk/srclib/apr-iconv/AUTHORS 2007-12-12 08:26:14 UTC (rev 1181)
@@ -1 +0,0 @@
-Konstantin Chuguev <Konstantin.Chuguev(a)dante.org.uk>
Deleted: trunk/srclib/apr-iconv/CHANGES
===================================================================
--- trunk/srclib/apr-iconv/CHANGES 2007-12-12 08:20:58 UTC (rev 1180)
+++ trunk/srclib/apr-iconv/CHANGES 2007-12-12 08:26:14 UTC (rev 1181)
@@ -1,85 +0,0 @@
- -*- 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.
Deleted: trunk/srclib/apr-iconv/COPYING
===================================================================
--- trunk/srclib/apr-iconv/COPYING 2007-12-12 08:20:58 UTC (rev 1180)
+++ trunk/srclib/apr-iconv/COPYING 2007-12-12 08:26:14 UTC (rev 1181)
@@ -1,31 +0,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
- */
Deleted: trunk/srclib/apr-iconv/LICENSE
===================================================================
--- trunk/srclib/apr-iconv/LICENSE 2007-12-12 08:20:58 UTC (rev 1180)
+++ trunk/srclib/apr-iconv/LICENSE 2007-12-12 08:26:14 UTC (rev 1181)
@@ -1,204 +0,0 @@
- 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.
-
-
-
Deleted: trunk/srclib/apr-iconv/NOTICE
===================================================================
--- trunk/srclib/apr-iconv/NOTICE 2007-12-12 08:20:58 UTC (rev 1180)
+++ trunk/srclib/apr-iconv/NOTICE 2007-12-12 08:26:14 UTC (rev 1181)
@@ -1,2 +0,0 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
Deleted: trunk/srclib/apr-iconv/STATUS
===================================================================
--- trunk/srclib/apr-iconv/STATUS 2007-12-12 08:20:58 UTC (rev 1180)
+++ trunk/srclib/apr-iconv/STATUS 2007-12-12 08:26:14 UTC (rev 1181)
@@ -1,47 +0,0 @@
-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:
Deleted: trunk/srclib/apr-iconv/libapriconv.rc
===================================================================
--- trunk/srclib/apr-iconv/libapriconv.rc 2007-12-12 08:20:58 UTC (rev 1180)
+++ trunk/srclib/apr-iconv/libapriconv.rc 2007-12-12 08:26:14 UTC (rev 1181)
@@ -1,66 +0,0 @@
-#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
16 years, 5 months
JBoss Native SVN: r1180 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-12 03:20:58 -0500 (Wed, 12 Dec 2007)
New Revision: 1180
Modified:
trunk/build/unix/build.sh
Log:
Fix typo
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2007-12-12 08:10:27 UTC (rev 1179)
+++ trunk/build/unix/build.sh 2007-12-12 08:20:58 UTC (rev 1180)
@@ -564,7 +564,7 @@
api_srcdir=$1
api_static=$2
- if $apu_static ; then
+ if $api_static ; then
api_common_dir=${build_common_dir}-static
else
api_common_dir=${build_common_dir}
16 years, 5 months
JBoss Native SVN: r1179 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-12 03:10:27 -0500 (Wed, 12 Dec 2007)
New Revision: 1179
Modified:
trunk/build/unix/build.sh
Log:
Fix apr-iconv to the core components builds
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2007-12-12 07:53:08 UTC (rev 1178)
+++ trunk/build/unix/build.sh 2007-12-12 08:10:27 UTC (rev 1179)
@@ -45,7 +45,7 @@
has_openssl=false
has_apr=true
has_apu=true
-has_api=false
+has_api=true
has_cache=false
has_version=false
has_package=false
@@ -158,6 +158,9 @@
if [ "x" = "x${apu_version}" ]; then
has_apu=false
fi
+if [ "x" = "x${api_version}" ]; then
+ has_api=false
+fi
# Get plaform information
so_extension=so
@@ -606,6 +609,12 @@
if $has_static ; then
buildapr srclib/apr-${apr_version} true
fi
+ if $has_api; then
+ buildapi srclib/apr-iconv-${api_version} false
+ if $has_static ; then
+ buildapi srclib/apr-iconv-${api_version} true
+ fi
+ fi
if $has_apu; then
buildapu srclib/apr-util-${apu_version} false
if $has_static ; then
16 years, 5 months