incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arie...@apache.org
Subject svn commit: r1242210 - in /incubator/ooo/trunk/ext_libraries: apr-util/apr-util-1.4.1.makewin32.patch serf/serf-1.0.0.makewin32.patch
Date Thu, 09 Feb 2012 03:09:48 GMT
Author: arielch
Date: Thu Feb  9 03:09:48 2012
New Revision: 1242210

URL: http://svn.apache.org/viewvc?rev=1242210&view=rev
Log:
Replace $(OUTPATH) with $(INPATH)

Modified:
    incubator/ooo/trunk/ext_libraries/apr-util/apr-util-1.4.1.makewin32.patch
    incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.makewin32.patch

Modified: incubator/ooo/trunk/ext_libraries/apr-util/apr-util-1.4.1.makewin32.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr-util/apr-util-1.4.1.makewin32.patch?rev=1242210&r1=1242209&r2=1242210&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr-util/apr-util-1.4.1.makewin32.patch (original)
+++ incubator/ooo/trunk/ext_libraries/apr-util/apr-util-1.4.1.makewin32.patch Thu Feb  9 03:09:48
2012
@@ -47,48 +47,48 @@
 +))
 +
 +$(eval $(call gb_Library_add_cobjects,apr-util,\
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/buckets/apr_brigade \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets_alloc \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets_eos \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets_file \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets_flush \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets_heap \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets_mmap \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets_pipe \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets_pool \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets_refcount \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets_simple \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets_socket \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/crypto/apr_crypto \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/crypto/apr_md4 \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/crypto/apr_md5 \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/crypto/apr_sha1 \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/crypto/getuuid \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/crypto/uuid \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/dbd/apr_dbd \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/dbm/apr_dbm \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/dbm/apr_dbm_sdbm \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/dbm/sdbm/sdbm \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/dbm/sdbm/sdbm_hash \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/dbm/sdbm/sdbm_lock \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/dbm/sdbm/sdbm_pair \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/encoding/apr_base64 \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/hooks/apr_hooks \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/ldap/apr_ldap_stub \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/ldap/apr_ldap_url \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/memcache/apr_memcache \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/misc/apr_date \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/misc/apr_queue \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/misc/apr_reslist \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/misc/apr_rmm \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/misc/apr_thread_pool \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/misc/apu_dso \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/misc/apu_version \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/strmatch/apr_strmatch \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/uri/apr_uri \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/xlate/xlate \
-+	apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/xml/apr_xml \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/buckets/apr_brigade \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets_alloc \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets_eos \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets_file \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets_flush \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets_heap \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets_mmap \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets_pipe \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets_pool \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets_refcount \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets_simple \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/buckets/apr_buckets_socket \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/crypto/apr_crypto \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/crypto/apr_md4 \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/crypto/apr_md5 \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/crypto/apr_sha1 \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/crypto/getuuid \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/crypto/uuid \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/dbd/apr_dbd \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/dbm/apr_dbm \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/dbm/apr_dbm_sdbm \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/dbm/sdbm/sdbm \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/dbm/sdbm/sdbm_hash \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/dbm/sdbm/sdbm_lock \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/dbm/sdbm/sdbm_pair \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/encoding/apr_base64 \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/hooks/apr_hooks \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/ldap/apr_ldap_stub \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/ldap/apr_ldap_url \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/memcache/apr_memcache \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/misc/apr_date \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/misc/apr_queue \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/misc/apr_reslist \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/misc/apr_rmm \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/misc/apr_thread_pool \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/misc/apu_dso \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/misc/apu_version \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/strmatch/apr_strmatch \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/uri/apr_uri \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/xlate/xlate \
++	apr-util/$(INPATH)/misc/build/apr-util-1.4.1/xml/apr_xml \
 +))
 +
 +# vim: set noet sw=4 ts=4:
@@ -186,7 +186,7 @@
 +# * 
 +# *************************************************************/
 +
-+$(eval $(call gb_Package_Package,apr-util_inc,$(EXT_LIBRARIES)/apr-util/$(OUTPATH)/misc/build/apr-util-1.4.1/include))
++$(eval $(call gb_Package_Package,apr-util_inc,$(EXT_LIBRARIES)/apr-util/$(INPATH)/misc/build/apr-util-1.4.1/include))
 +$(eval $(call gb_Package_add_files, apr-util_inc, inc/apr-util,        \
 +       apu.h                                                           \
 +       apr_uri.h                                                       \

Modified: incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.makewin32.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.makewin32.patch?rev=1242210&r1=1242209&r2=1242210&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.makewin32.patch (original)
+++ incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.makewin32.patch Thu Feb  9 03:09:48
2012
@@ -55,33 +55,33 @@
 +))
 +
 +$(eval $(call gb_Library_add_cobjects,serf,\
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/buckets/aggregate_buckets \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/buckets/request_buckets \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/buckets/buckets \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/buckets/simple_buckets \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/buckets/file_buckets \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/buckets/mmap_buckets \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/buckets/socket_buckets \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/buckets/response_buckets \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/buckets/headers_buckets \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/buckets/allocator \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/buckets/dechunk_buckets \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/buckets/deflate_buckets \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/buckets/limit_buckets \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/buckets/ssl_buckets \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/buckets/barrier_buckets \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/buckets/chunk_buckets \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/buckets/bwtp_buckets \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/buckets/iovec_buckets \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/auth/auth \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/auth/auth_basic \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/auth/auth_digest \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/auth/auth_kerb \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/auth/auth_kerb_gss \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/context \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/incoming \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/outgoing \
-+	serf/$(OUTPATH)/misc/build/serf-1.0.0/ssltunnel \
++	serf/$(INPATH)/misc/build/serf-1.0.0/buckets/aggregate_buckets \
++	serf/$(INPATH)/misc/build/serf-1.0.0/buckets/request_buckets \
++	serf/$(INPATH)/misc/build/serf-1.0.0/buckets/buckets \
++	serf/$(INPATH)/misc/build/serf-1.0.0/buckets/simple_buckets \
++	serf/$(INPATH)/misc/build/serf-1.0.0/buckets/file_buckets \
++	serf/$(INPATH)/misc/build/serf-1.0.0/buckets/mmap_buckets \
++	serf/$(INPATH)/misc/build/serf-1.0.0/buckets/socket_buckets \
++	serf/$(INPATH)/misc/build/serf-1.0.0/buckets/response_buckets \
++	serf/$(INPATH)/misc/build/serf-1.0.0/buckets/headers_buckets \
++	serf/$(INPATH)/misc/build/serf-1.0.0/buckets/allocator \
++	serf/$(INPATH)/misc/build/serf-1.0.0/buckets/dechunk_buckets \
++	serf/$(INPATH)/misc/build/serf-1.0.0/buckets/deflate_buckets \
++	serf/$(INPATH)/misc/build/serf-1.0.0/buckets/limit_buckets \
++	serf/$(INPATH)/misc/build/serf-1.0.0/buckets/ssl_buckets \
++	serf/$(INPATH)/misc/build/serf-1.0.0/buckets/barrier_buckets \
++	serf/$(INPATH)/misc/build/serf-1.0.0/buckets/chunk_buckets \
++	serf/$(INPATH)/misc/build/serf-1.0.0/buckets/bwtp_buckets \
++	serf/$(INPATH)/misc/build/serf-1.0.0/buckets/iovec_buckets \
++	serf/$(INPATH)/misc/build/serf-1.0.0/auth/auth \
++	serf/$(INPATH)/misc/build/serf-1.0.0/auth/auth_basic \
++	serf/$(INPATH)/misc/build/serf-1.0.0/auth/auth_digest \
++	serf/$(INPATH)/misc/build/serf-1.0.0/auth/auth_kerb \
++	serf/$(INPATH)/misc/build/serf-1.0.0/auth/auth_kerb_gss \
++	serf/$(INPATH)/misc/build/serf-1.0.0/context \
++	serf/$(INPATH)/misc/build/serf-1.0.0/incoming \
++	serf/$(INPATH)/misc/build/serf-1.0.0/outgoing \
++	serf/$(INPATH)/misc/build/serf-1.0.0/ssltunnel \
 +))
 +
 +# vim: set noet sw=4 ts=4:
@@ -179,7 +179,7 @@
 +# * 
 +# *************************************************************/
 +
-+$(eval $(call gb_Package_Package,serf_inc,$(EXT_LIBRARIES)/serf/$(OUTPATH)/misc/build/serf-1.0.0))
++$(eval $(call gb_Package_Package,serf_inc,$(EXT_LIBRARIES)/serf/$(INPATH)/misc/build/serf-1.0.0))
 +$(eval $(call gb_Package_add_files, serf_inc, inc/serf,        \
 +       serf.h                                                  \
 +       serf_bucket_types.h                                     \



Mime
View raw message