You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by af...@apache.org on 2012/02/08 16:19:48 UTC
svn commit: r1241928 - in /incubator/ooo/trunk: ext_libraries/
ext_libraries/apr-util/ ext_libraries/apr-util/prj/ ext_libraries/apr/
ext_libraries/apr/prj/ ext_libraries/serf/ ext_libraries/serf/prj/
ext_sources/ main/ main/solenv/bin/ main/solenv/gbu...
Author: af
Date: Wed Feb 8 15:19:46 2012
New Revision: 1241928
URL: http://svn.apache.org/viewvc?rev=1241928&view=rev
Log:
118569: Added libraries for apr,apr-util,serf as preparation to replace neon by serf.
Added:
incubator/ooo/trunk/ext_libraries/Repository.mk
incubator/ooo/trunk/ext_libraries/RepositoryFixes.mk
incubator/ooo/trunk/ext_libraries/apr/
incubator/ooo/trunk/ext_libraries/apr-util/
incubator/ooo/trunk/ext_libraries/apr-util/apr-util-1.4.1.apu.hw.patch
incubator/ooo/trunk/ext_libraries/apr-util/apr-util-1.4.1.makewin32.patch
incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk
incubator/ooo/trunk/ext_libraries/apr-util/prj/
incubator/ooo/trunk/ext_libraries/apr-util/prj/build.lst
incubator/ooo/trunk/ext_libraries/apr-util/prj/d.lst
incubator/ooo/trunk/ext_libraries/apr/makefile.mk
incubator/ooo/trunk/ext_libraries/apr/prj/
incubator/ooo/trunk/ext_libraries/apr/prj/build.lst
incubator/ooo/trunk/ext_libraries/apr/prj/d.lst
incubator/ooo/trunk/ext_libraries/serf/
incubator/ooo/trunk/ext_libraries/serf/makefile.mk
incubator/ooo/trunk/ext_libraries/serf/prj/
incubator/ooo/trunk/ext_libraries/serf/prj/build.lst
incubator/ooo/trunk/ext_libraries/serf/prj/d.lst
incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.ldl.patch
incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.mac.patch
incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.makewin32.patch
incubator/ooo/trunk/ext_sources/3b179ed18f65c43141528aa6d2440db4-serf-1.0.0.tar.bz2 (with props)
incubator/ooo/trunk/ext_sources/666a5d56098a9debf998510e304c8095-apr-util-1.4.1.tar.gz (with props)
incubator/ooo/trunk/ext_sources/97262fe54dddaf583eaaee3497a426e1-apr-1.4.5.tar.gz (with props)
Modified:
incubator/ooo/trunk/main/configure.in
incubator/ooo/trunk/main/ooo.lst
incubator/ooo/trunk/main/set_soenv.in
incubator/ooo/trunk/main/solenv/bin/build.pl
incubator/ooo/trunk/main/solenv/gbuild/BuildDirs.mk
incubator/ooo/trunk/main/solenv/gbuild/Package.mk
incubator/ooo/trunk/main/ucb/prj/build.lst
Added: incubator/ooo/trunk/ext_libraries/Repository.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/Repository.mk?rev=1241928&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/Repository.mk (added)
+++ incubator/ooo/trunk/ext_libraries/Repository.mk Wed Feb 8 15:19:46 2012
@@ -0,0 +1,35 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Helper_register_repository,EXT_LIBRARIES))
+
+$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+ apr \
+ apr-util \
+ expat_xmlparse \
+ expat_xmltok \
+ serf \
+ libeay32 \
+ ssleay32 \
+ zlib \
+))
\ No newline at end of file
Added: incubator/ooo/trunk/ext_libraries/RepositoryFixes.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/RepositoryFixes.mk?rev=1241928&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/RepositoryFixes.mk (added)
+++ incubator/ooo/trunk/ext_libraries/RepositoryFixes.mk Wed Feb 8 15:19:46 2012
@@ -0,0 +1,34 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+ifeq ($(OS),WNT)
+gb_Library_FILENAMES := $(patsubst apr:iapr%,apr:libapr-1%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst expat_xmltok:iexpat_xmltok%,expat_xmltok:expat_xmltok%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst expat_xmlparse:iexpat_xmlparse%,expat_xmlparse:expat_xmlparse%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst libeay32:ilibeay32%,libeay32:libeay32%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ssleay32:issleay32%,ssleay32:ssleay32%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst zlib:izlib%,zlib:zlib%,$(gb_Library_FILENAMES))
+endif
+
+#gb_Library_FILENAMES := $(patsubst apr-util:iapr-util%,apr:libapr-util-1%,$(gb_Library_FILENAMES))
+
+# vim: set noet sw=4 ts=4:
Added: incubator/ooo/trunk/ext_libraries/apr-util/apr-util-1.4.1.apu.hw.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr-util/apr-util-1.4.1.apu.hw.patch?rev=1241928&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr-util/apr-util-1.4.1.apu.hw.patch (added)
+++ incubator/ooo/trunk/ext_libraries/apr-util/apr-util-1.4.1.apu.hw.patch Wed Feb 8 15:19:46 2012
@@ -0,0 +1,13 @@
+--- misc/apr-util-1.4.1/include/apu.hw 2008-11-21 07:18:37.000000000 +0100
++++ misc/build/apr-util-1.4.1/include/apu.hw 2012-01-03 13:37:20.042007300 +0100
+@@ -132,8 +132,8 @@
+ #define APU_HAVE_NSS 0
+ #endif
+
+-#define APU_HAVE_APR_ICONV 1
+-#define APU_HAVE_ICONV 0
++#undef APU_HAVE_APR_ICONV
++#undef APU_HAVE_ICONV
+ #define APR_HAS_XLATE (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
+
+ #endif /* APU_H */
Added: 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=1241928&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr-util/apr-util-1.4.1.makewin32.patch (added)
+++ incubator/ooo/trunk/ext_libraries/apr-util/apr-util-1.4.1.makewin32.patch Wed Feb 8 15:19:46 2012
@@ -0,0 +1,199 @@
+--- misc/apr-util-1.4.1/Library_apr-util.mk 2012-01-05 14:49:40.529219100 +0100
++++ misc/build/apr-util-1.4.1/Library_apr-util.mk 2012-01-05 14:47:18.621102400 +0100
+@@ -1 +1,90 @@
+-dummy
++#/**************************************************************
++# *
++# * Licensed to the Apache Software Foundation (ASF) under one
++# * or more contributor license agreements. See the NOTICE file
++# * distributed with this work for additional information
++# * regarding copyright ownership. The ASF licenses this file
++# * to you under the Apache License, Version 2.0 (the
++# * "License"); you may not use this file except in compliance
++# * with the License. You may obtain a copy of the License at
++# *
++# * http://www.apache.org/licenses/LICENSE-2.0
++# *
++# * Unless required by applicable law or agreed to in writing,
++# * software distributed under the License is distributed on an
++# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++# * KIND, either express or implied. See the License for the
++# * specific language governing permissions and limitations
++# * under the License.
++# *
++# *************************************************************/
++
++$(eval $(call gb_Library_Library,apr-util))
++
++$(eval $(call gb_Library_add_package_headers,apr-util,apr-util_inc))
++
++$(eval $(call gb_Library_set_include,apr-util,\
++ $$(INCLUDE) \
++ -I./include \
++ -I./include/private \
++ -I$(OUTDIR)/inc/apr \
++))
++
++$(eval $(call gb_Library_set_defs,apr-util,\
++ $$(DEFS) \
++ -DAPU_DECLARE_EXPORT -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS \
++))
++
++$(eval $(call gb_Library_add_linked_libs,apr-util,\
++ apr \
++ expat_xmltok \
++ expat_xmlparse \
++ $(gb_STDLIBS) \
++))
++
++$(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 \
++))
++
++# vim: set noet sw=4 ts=4:
+--- misc/apr-util-1.4.1/Makefile 2012-01-05 14:49:40.420212900 +0100
++++ misc/build/apr-util-1.4.1/Makefile 2012-01-05 14:47:07.827485100 +0100
+@@ -1 +1,32 @@
+-dummy
++#/**************************************************************
++# *
++# * Licensed to the Apache Software Foundation (ASF) under one
++# * or more contributor license agreements. See the NOTICE file
++# * distributed with this work for additional information
++# * regarding copyright ownership. The ASF licenses this file
++# * to you under the Apache License, Version 2.0 (the
++# * "License"); you may not use this file except in compliance
++# * with the License. You may obtain a copy of the License at
++# *
++# * http://www.apache.org/licenses/LICENSE-2.0
++# *
++# * Unless required by applicable law or agreed to in writing,
++# * software distributed under the License is distributed on an
++# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++# * KIND, either express or implied. See the License for the
++# * specific language governing permissions and limitations
++# * under the License.
++# *
++# *************************************************************/
++
++ifeq ($(strip $(SOLARENV)),)
++$(error No environment set!)
++endif
++
++gb_PARTIALBUILD := T
++GBUILDDIR := $(SOLARENV)/gbuild
++include $(GBUILDDIR)/gbuild.mk
++
++$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
++
++# vim: set noet sw=4 ts=4:
+--- misc/apr-util-1.4.1/Module_apr-util.mk 2012-01-05 14:49:40.476216100 +0100
++++ misc/build/apr-util-1.4.1/Module_apr-util.mk 2012-01-05 14:47:42.567472100 +0100
+@@ -1 +1,29 @@
+-dummy
++#/**************************************************************
++# *
++# * Licensed to the Apache Software Foundation (ASF) under one
++# * or more contributor license agreements. See the NOTICE file
++# * distributed with this work for additional information
++# * regarding copyright ownership. The ASF licenses this file
++# * to you under the Apache License, Version 2.0 (the
++# * "License"); you may not use this file except in compliance
++# * with the License. You may obtain a copy of the License at
++# *
++# * http://www.apache.org/licenses/LICENSE-2.0
++# *
++# * Unless required by applicable law or agreed to in writing,
++# * software distributed under the License is distributed on an
++# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++# * KIND, either express or implied. See the License for the
++# * specific language governing permissions and limitations
++# * under the License.
++# *
++# *************************************************************/
++
++$(eval $(call gb_Module_Module,apr-util))
++
++$(eval $(call gb_Module_add_targets,apr-util,\
++ Library_apr-util \
++ Package_inc \
++))
++
++# vim: set noet ts=4 sw=4:
+--- misc/apr-util-1.4.1/Package_inc.mk 2012-01-05 14:49:40.585222300 +0100
++++ misc/build/apr-util-1.4.1/Package_inc.mk 2012-01-05 14:47:51.616989700 +0100
+@@ -1 +1,32 @@
+-dummy
++#/**************************************************************
++# *
++# * Licensed to the Apache Software Foundation (ASF) under one
++# * or more contributor license agreements. See the NOTICE file
++# * distributed with this work for additional information
++# * regarding copyright ownership. The ASF licenses this file
++# * to you under the Apache License, Version 2.0 (the
++# * "License"); you may not use this file except in compliance
++# * with the License. You may obtain a copy of the License at
++# *
++# * http://www.apache.org/licenses/LICENSE-2.0
++# *
++# * Unless required by applicable law or agreed to in writing,
++# * software distributed under the License is distributed on an
++# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++# * KIND, either express or implied. See the License for the
++# * specific language governing permissions and limitations
++# * under the License.
++# *
++# *************************************************************/
++
++$(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_add_files, apr-util_inc, inc/apr-util, \
++ apu.h \
++ apr_uri.h \
++ apr_date.h \
++ apr_uuid.h \
++ apr_md5.h \
++ apr_xlate.h \
++ apr_base64.h \
++))
++
Added: incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk?rev=1241928&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk (added)
+++ incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk Wed Feb 8 15:19:46 2012
@@ -0,0 +1,96 @@
+#/**************************************************************
+# *
+# * Licensed to the Apache Software Foundation (ASF) under one
+# * or more contributor license agreements. See the NOTICE file
+# * distributed with this work for additional information
+# * regarding copyright ownership. The ASF licenses this file
+# * to you under the Apache License, Version 2.0 (the
+# * "License"); you may not use this file except in compliance
+# * with the License. You may obtain a copy of the License at
+# *
+# * http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing,
+# * software distributed under the License is distributed on an
+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# * KIND, either express or implied. See the License for the
+# * specific language governing permissions and limitations
+# * under the License.
+# *
+# *************************************************************/
+
+PRJ=.
+
+PRJNAME=apr-util
+TARGET=aprutil
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Files --------------------------------------------------------
+
+APRVERSION=1.4.1
+
+TARFILE_NAME=$(PRJNAME)-$(APRVERSION)
+TARFILE_MD5=666a5d56098a9debf998510e304c8095
+
+.IF "$(OS)"=="WNT"
+
+ADDITIONAL_FILES=Makefile Module_apr-util.mk Library_apr-util.mk Package_inc.mk
+
+PATCH_FILES= \
+ $(TARFILE_NAME).apu.hw.patch \
+ $(TARFILE_NAME).makewin32.patch
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=cp include/apu.hw include/apu.h; \
+ cp include/apr_ldap.hw include/apr_ldap.h; \
+ cp include/private/apu_config.hw include/private/apu_config.h; \
+ cp include/private/apu_select_dbm.hw include/private/apu_select_dbm.h
+CONFIGURE_FLAGS=
+
+BUILD_DIR=$(CONFIGURE_DIR)
+BUILD_ACTION=$(GNUMAKE)
+BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+
+.ELSE
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=.$/configure
+CONFIGURE_FLAGS= \
+ --with-apr=$(OUTDIR)/bin/apr-1-config \
+ --prefix=$(OUTDIR) \
+ --includedir=$(OUTDIR)$/inc$/apr-util \
+ --with-iconv="no"
+
+BUILD_DIR=$(CONFIGURE_DIR)
+BUILD_ACTION=$(GNUMAKE)
+BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+
+# Make apu-1-config believe that apr-util has been installed.
+INSTALL_ACTION=if [ -f apu-1-config.orig ]; then mv -f apu-1-config.orig apu-1-config; fi; \
+ cp apu-1-config apu-1-config.orig; \
+ sed -e "s/^location=source/location=installed/;s/^\(installbuilddir=.*\)\/.*/\\1\/lib\/apr-util\"/" apu-1-config > apu-1-config.installed; \
+ mv -f apu-1-config.installed apu-1-config; \
+ chmod +x apu-1-config
+
+OUT2INC+=include$/apr*.h
+OUT2INC+=include$/apu.h
+OUT2INC_SUBDIR=apr-util
+
+.IF "$(OS)"=="MACOSX"
+OUT2LIB+=.libs/libaprutil-1.*dylib
+.ELSE
+OUT2LIB=.libs/libaprutil-1.so*
+.ENDIF
+OUT2BIN=apu-1-config
+
+.ENDIF
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
+
Added: incubator/ooo/trunk/ext_libraries/apr-util/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr-util/prj/build.lst?rev=1241928&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr-util/prj/build.lst (added)
+++ incubator/ooo/trunk/ext_libraries/apr-util/prj/build.lst Wed Feb 8 15:19:46 2012
@@ -0,0 +1,3 @@
+apru apr-util : apr NULL
+apru apr-util usr1 - all apru_mkout NULL
+apru apr-util nmake - all apru_apr-util NULL
Added: incubator/ooo/trunk/ext_libraries/apr-util/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr-util/prj/d.lst?rev=1241928&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr-util/prj/d.lst (added)
+++ incubator/ooo/trunk/ext_libraries/apr-util/prj/d.lst Wed Feb 8 15:19:46 2012
@@ -0,0 +1,12 @@
+mkdir: %_DEST%\inc%_EXT%\apr-util
+..\%__SRC%\inc\apr-util\apr*.h %_DEST%\inc%_EXT%\apr-util
+..\%__SRC%\inc\apr-util\apu.h %_DEST%\inc%_EXT%\apr-util
+
+# Unixes
+..\%__SRC%\bin\apu-1-config %_DEST%\bin%_EXT%
+
+# Linux
+..\%__SRC%\lib\libaprutil-1.so* %_DEST%\lib%_EXT%
+
+# Mac
+..\%__SRC%\lib\libaprutil-1.*dylib %_DEST%\lib%_EXT%
Added: incubator/ooo/trunk/ext_libraries/apr/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr/makefile.mk?rev=1241928&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr/makefile.mk (added)
+++ incubator/ooo/trunk/ext_libraries/apr/makefile.mk Wed Feb 8 15:19:46 2012
@@ -0,0 +1,93 @@
+#/**************************************************************
+# *
+# * Licensed to the Apache Software Foundation (ASF) under one
+# * or more contributor license agreements. See the NOTICE file
+# * distributed with this work for additional information
+# * regarding copyright ownership. The ASF licenses this file
+# * to you under the Apache License, Version 2.0 (the
+# * "License"); you may not use this file except in compliance
+# * with the License. You may obtain a copy of the License at
+# *
+# * http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing,
+# * software distributed under the License is distributed on an
+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# * KIND, either express or implied. See the License for the
+# * specific language governing permissions and limitations
+# * under the License.
+# *
+# *************************************************************/
+
+PRJ=.
+
+PRJNAME=apr
+TARGET=apr
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Files --------------------------------------------------------
+
+APRVERSION=1.4.5
+
+TARFILE_NAME=$(PRJNAME)-$(APRVERSION)
+TARFILE_MD5=97262fe54dddaf583eaaee3497a426e1
+
+.IF "$(OS)"=="WNT"
+
+CONFIGURE_ACTION=cp include/apr.hw include/apr.h
+BUILD_DIR=
+BUILD_ACTION=INCLUDE="$(INCLUDE);./include" nmake -f Makefile.win buildall
+
+#INSTALL_ACTION=cp Release/libapr-1.lib $(OUTDIR)/lib/libapr-1.lib
+
+.ELSE
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=.$/configure --prefix=$(OUTDIR) --includedir=$(OUTDIR)$/inc$/apr
+CONFIGURE_FLAGS=
+
+BUILD_DIR=$(CONFIGURE_DIR)
+BUILD_ACTION=$(GNUMAKE)
+BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+
+# Make apr-1-config believe that apr has been installed.
+INSTALL_ACTION=if [ -f apr-1-config.orig ]; then mv -f apr-1-config.orig apr-1-config; fi; \
+ cp apr-1-config apr-1-config.orig; \
+ sed -e "s/^location=source/location=installed/;s/^\(installbuilddir=.*\)\/.*/\\1\/lib\/apr\"/" apr-1-config > apr-1-config.installed; \
+ mv -f apr-1-config.installed apr-1-config; \
+ chmod +x apr-1-config
+
+.ENDIF
+
+OUT2INC+=include$/apr*.h
+OUT2INC_SUBDIR=apr
+
+.IF "$(OS)"=="WNT"
+OUT2LIB+=LibR$/*.lib
+OUT2LIB+=LibR$/*.pdb
+OUT2LIB+=Release$/libaprapp-1.lib
+OUT2LIB+=Release$/libaprapp-1.pdb
+OUT2LIB+=Release$/libapr-1.lib
+OUT2LIB+=Release$/libapr-1.exp
+OUT2BIN+=Release$/libapr-1.dll
+OUT2BIN+=Release$/libapr-1.pdb
+.ELSE
+.IF "$(OS)"=="MACOSX"
+OUT2LIB+=.libs/libapr-1.*dylib
+.ELSE
+OUT2LIB+=.libs/libapr-1.so*
+.ENDIF
+OUT2BIN=build/apr_rules.mk
+OUT2BIN+=libtool
+OUT2BIN+=apr-1-config
+.ENDIF
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
Added: incubator/ooo/trunk/ext_libraries/apr/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr/prj/build.lst?rev=1241928&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr/prj/build.lst (added)
+++ incubator/ooo/trunk/ext_libraries/apr/prj/build.lst Wed Feb 8 15:19:46 2012
@@ -0,0 +1,3 @@
+apr apr : solenv NULL
+apr apr usr1 - all apr_mkout NULL
+apr apr nmake - all apr_apr NULL
Added: incubator/ooo/trunk/ext_libraries/apr/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr/prj/d.lst?rev=1241928&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr/prj/d.lst (added)
+++ incubator/ooo/trunk/ext_libraries/apr/prj/d.lst Wed Feb 8 15:19:46 2012
@@ -0,0 +1,20 @@
+mkdir: %_DEST%\inc%_EXT%\apr
+mkdir: %_DEST%\lib%_EXT%\apr
+
+# Includes
+..\%__SRC%\inc\apr\apr*.h %_DEST%\inc%_EXT%\apr
+
+# Windows
+..\%__SRC%\bin\libapr-1.dll %_DEST%\bin%_EXT%
+..\%__SRC%\lib\libapr-1.lib %_DEST%\lib%_EXT%
+
+# Unixes
+..\%__SRC%\bin\apr-1-config %_DEST%\bin%_EXT%
+..\%__SRC%\bin\libtool %_DEST%\lib%_EXT%\apr
+..\%__SRC%\bin\apr_rules.mk %_DEST%\lib%_EXT%\apr
+
+# Linux
+..\%__SRC%\lib\libapr-1.so* %_DEST%\lib%_EXT%
+
+# Mac
+..\%__SRC%\lib\libapr-1.*dylib %_DEST%\lib%_EXT%
Added: incubator/ooo/trunk/ext_libraries/serf/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/serf/makefile.mk?rev=1241928&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/makefile.mk (added)
+++ incubator/ooo/trunk/ext_libraries/serf/makefile.mk Wed Feb 8 15:19:46 2012
@@ -0,0 +1,92 @@
+#/**************************************************************
+# *
+# * Licensed to the Apache Software Foundation (ASF) under one
+# * or more contributor license agreements. See the NOTICE file
+# * distributed with this work for additional information
+# * regarding copyright ownership. The ASF licenses this file
+# * to you under the Apache License, Version 2.0 (the
+# * "License"); you may not use this file except in compliance
+# * with the License. You may obtain a copy of the License at
+# *
+# * http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing,
+# * software distributed under the License is distributed on an
+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# * KIND, either express or implied. See the License for the
+# * specific language governing permissions and limitations
+# * under the License.
+# *
+# *************************************************************/
+
+PRJ=.
+
+PRJNAME=serf
+TARGET=so_serf
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Files --------------------------------------------------------
+
+LIBSERFVERSION=1.0.0
+
+TARFILE_NAME=$(PRJNAME)-$(LIBSERFVERSION)
+TARFILE_MD5=3b179ed18f65c43141528aa6d2440db4
+
+.IF "$(OS)"=="WNT"
+
+ADDITIONAL_FILES=Makefile Module_serf.mk Library_serf.mk Package_inc.mk
+
+PATCH_FILES=$(TARFILE_NAME).makewin32.patch
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=
+CONFIGURE_FLAGS=
+
+BUILD_DIR=$(CONFIGURE_DIR)
+BUILD_ACTION=$(GNUMAKE)
+BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+
+.ELSE
+
+.IF "$(OS)"=="MACOSX"
+# Do not link against expat. It is not necessary (apr-util is already linked against it)
+# and does not work (we use a different expat library schema.)
+PATCH_FILES=$(TARFILE_NAME).mac.patch
+.ELSE
+# Add -ldl as last library so that the linker has no trouble resolving dependencies.
+PATCH_FILES=$(TARFILE_NAME).ldl.patch
+.ENDIF
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=autoconf && .$/configure
+.IF "$(OS)"=="MACOSX"
+# On Mac we need the content of CDEFS in CFLAGS so that the ssl headers are searched for
+# in a directory that corresponds to the directory that is searched for the ssl library.
+CONFIGURE_FLAGS='CFLAGS=$(CDEFS)'
+.ENDIF
+
+BUILD_DIR=$(CONFIGURE_DIR)
+BUILD_ACTION=$(GNUMAKE)
+BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+
+OUT2INC+=serf*.h
+OUT2INC_SUBDIR=serf
+
+.IF "$(OS)"=="MACOSX"
+OUT2LIB+=.libs/libserf-1.*dylib
+.ELSE
+OUT2LIB=.libs/libserf-1.so*
+.ENDIF
+
+.ENDIF
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
+
Added: incubator/ooo/trunk/ext_libraries/serf/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/serf/prj/build.lst?rev=1241928&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/prj/build.lst (added)
+++ incubator/ooo/trunk/ext_libraries/serf/prj/build.lst Wed Feb 8 15:19:46 2012
@@ -0,0 +1,3 @@
+serf serf : apr apr-util NULL
+serf serf usr1 - all serf_mkout NULL
+serf serf nmake - all serf_serf NULL
Added: incubator/ooo/trunk/ext_libraries/serf/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/serf/prj/d.lst?rev=1241928&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/prj/d.lst (added)
+++ incubator/ooo/trunk/ext_libraries/serf/prj/d.lst Wed Feb 8 15:19:46 2012
@@ -0,0 +1,9 @@
+mkdir: %_DEST%\inc%_EXT%\serf
+..\%__SRC%\inc\serf\serf*.h %_DEST%\inc%_EXT%\serf
+
+# Mac
+..\%__SRC%\lib\libserf-1.*dylib %_DEST%\lib%_EXT%
+
+# Linux, BSD, et al
+..\%__SRC%\lib\libserf-1.so* %_DEST%\lib%_EXT%
+
Added: incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.ldl.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.ldl.patch?rev=1241928&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.ldl.patch (added)
+++ incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.ldl.patch Wed Feb 8 15:19:46 2012
@@ -0,0 +1,11 @@
+--- misc/serf-1.0.0/Makefile.in 2011-07-13 04:30:42.000000000 +0200
++++ misc/build/serf-1.0.0/Makefile.in 2012-01-27 10:23:38.508100604 +0100
+@@ -54,7 +54,7 @@
+ INSTALL = @INSTALL@
+
+ LDFLAGS = @EXTRA_LDFLAGS@ @LDFLAGS@
+-LIBS = @EXTRA_LIBS@ @SERF_LIBS@ -lz -lssl -lcrypto
++LIBS = @EXTRA_LIBS@ @SERF_LIBS@ -lz -lssl -lcrypto -ldl
+
+ all: $(TARGET_LIB) $(PROGRAMS)
+
Added: incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.mac.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.mac.patch?rev=1241928&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.mac.patch (added)
+++ incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.mac.patch Wed Feb 8 15:19:46 2012
@@ -0,0 +1,11 @@
+--- misc/serf-1.0.0/configure.in 2011-07-13 03:10:50.000000000 +0200
++++ misc/build/serf-1.0.0/configure.in 2012-01-30 17:45:16.000000000 +0100
+@@ -199,7 +199,7 @@
+
+ libs=""
+ if test -n "$apu_config"; then
+- APR_ADDTO(libs, [`$apu_config --link-libtool --libs`])
++ APR_ADDTO(libs, [`$apu_config --link-libtool`])
+ fi
+ APR_ADDTO(libs, [`$apr_config --link-libtool --libs` $LIBS])
+
Added: 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=1241928&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.makewin32.patch (added)
+++ incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.makewin32.patch Wed Feb 8 15:19:46 2012
@@ -0,0 +1,188 @@
+--- misc/serf-1.0.0/Library_serf.mk 2012-01-05 14:15:46.843899000 +0100
++++ misc/build/serf-1.0.0/Library_serf.mk 2012-01-05 14:14:51.420729000 +0100
+@@ -1 +1,83 @@
+-dummy
++#/**************************************************************
++# *
++# * Licensed to the Apache Software Foundation (ASF) under one
++# * or more contributor license agreements. See the NOTICE file
++# * distributed with this work for additional information
++# * regarding copyright ownership. The ASF licenses this file
++# * to you under the Apache License, Version 2.0 (the
++# * "License"); you may not use this file except in compliance
++# * with the License. You may obtain a copy of the License at
++# *
++# * http://www.apache.org/licenses/LICENSE-2.0
++# *
++# * Unless required by applicable law or agreed to in writing,
++# * software distributed under the License is distributed on an
++# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++# * KIND, either express or implied. See the License for the
++# * specific language governing permissions and limitations
++# * under the License.
++# *
++# *************************************************************/
++
++$(eval $(call gb_Library_Library,serf))
++
++$(eval $(call gb_Library_add_package_headers,serf,serf_inc))
++
++$(eval $(call gb_Library_set_include,serf,\
++ $$(INCLUDE) \
++ -I. \
++ -I$(OUTDIR)/inc/apr \
++ -I$(OUTDIR)/inc/apr-util \
++ -I$(OUTDIR)/inc/external/zlib \
++))
++
++$(eval $(call gb_Library_set_defs,serf,\
++ $$(DEFS) \
++ -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS \
++))
++
++$(eval $(call gb_Library_set_ldflags,serf,\
++ $$(LDFLAGS) \
++ -DEF:build/serf.def \
++))
++
++$(eval $(call gb_Library_add_linked_libs,serf,\
++ apr \
++ apr-util \
++ libeay32 \
++ ssleay32 \
++ zlib \
++ $(gb_STDLIBS) \
++))
++
++$(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 \
++))
++
++# vim: set noet sw=4 ts=4:
+--- misc/serf-1.0.0/Makefile 2012-01-05 14:15:46.733892700 +0100
++++ misc/build/serf-1.0.0/Makefile 2012-01-05 14:15:05.049508500 +0100
+@@ -1 +1,32 @@
+-dummy
++#/**************************************************************
++# *
++# * Licensed to the Apache Software Foundation (ASF) under one
++# * or more contributor license agreements. See the NOTICE file
++# * distributed with this work for additional information
++# * regarding copyright ownership. The ASF licenses this file
++# * to you under the Apache License, Version 2.0 (the
++# * "License"); you may not use this file except in compliance
++# * with the License. You may obtain a copy of the License at
++# *
++# * http://www.apache.org/licenses/LICENSE-2.0
++# *
++# * Unless required by applicable law or agreed to in writing,
++# * software distributed under the License is distributed on an
++# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++# * KIND, either express or implied. See the License for the
++# * specific language governing permissions and limitations
++# * under the License.
++# *
++# *************************************************************/
++
++ifeq ($(strip $(SOLARENV)),)
++$(error No environment set!)
++endif
++
++gb_PARTIALBUILD := T
++GBUILDDIR := $(SOLARENV)/gbuild
++include $(GBUILDDIR)/gbuild.mk
++
++$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
++
++# vim: set noet sw=4 ts=4:
+--- misc/serf-1.0.0/Module_serf.mk 2012-01-05 14:15:46.787895800 +0100
++++ misc/build/serf-1.0.0/Module_serf.mk 2012-01-05 14:14:26.471301900 +0100
+@@ -1 +1,29 @@
+-dummy
++#/**************************************************************
++# *
++# * Licensed to the Apache Software Foundation (ASF) under one
++# * or more contributor license agreements. See the NOTICE file
++# * distributed with this work for additional information
++# * regarding copyright ownership. The ASF licenses this file
++# * to you under the Apache License, Version 2.0 (the
++# * "License"); you may not use this file except in compliance
++# * with the License. You may obtain a copy of the License at
++# *
++# * http://www.apache.org/licenses/LICENSE-2.0
++# *
++# * Unless required by applicable law or agreed to in writing,
++# * software distributed under the License is distributed on an
++# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++# * KIND, either express or implied. See the License for the
++# * specific language governing permissions and limitations
++# * under the License.
++# *
++# *************************************************************/
++
++$(eval $(call gb_Module_Module,serf))
++
++$(eval $(call gb_Module_add_targets,serf,\
++ Library_serf \
++ Package_inc \
++))
++
++# vim: set noet ts=4 sw=4:
+--- misc/serf-1.0.0/Package_inc.mk 2012-01-05 14:15:46.898902100 +0100
++++ misc/build/serf-1.0.0/Package_inc.mk 2012-01-05 14:14:41.118139700 +0100
+@@ -1 +1,28 @@
+-dummy
++#/**************************************************************
++# *
++# * Licensed to the Apache Software Foundation (ASF) under one
++# * or more contributor license agreements. See the NOTICE file
++# * distributed with this work for additional information
++# * regarding copyright ownership. The ASF licenses this file
++# * to you under the Apache License, Version 2.0 (the
++# * "License"); you may not use this file except in compliance
++# * with the License. You may obtain a copy of the License at
++# *
++# * http://www.apache.org/licenses/LICENSE-2.0
++# *
++# * Unless required by applicable law or agreed to in writing,
++# * software distributed under the License is distributed on an
++# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++# * KIND, either express or implied. See the License for the
++# * specific language governing permissions and limitations
++# * under the License.
++# *
++# *************************************************************/
++
++$(eval $(call gb_Package_Package,serf_inc,$(EXT_LIBRARIES)/serf/$(OUTPATH)/misc/build/serf-1.0.0))
++$(eval $(call gb_Package_add_files, serf_inc, inc/serf, \
++ serf.h \
++ serf_bucket_types.h \
++ serf_bucket_util.h \
++ ))
++
Added: incubator/ooo/trunk/ext_sources/3b179ed18f65c43141528aa6d2440db4-serf-1.0.0.tar.bz2
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_sources/3b179ed18f65c43141528aa6d2440db4-serf-1.0.0.tar.bz2?rev=1241928&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/ooo/trunk/ext_sources/3b179ed18f65c43141528aa6d2440db4-serf-1.0.0.tar.bz2
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/ooo/trunk/ext_sources/3b179ed18f65c43141528aa6d2440db4-serf-1.0.0.tar.bz2
------------------------------------------------------------------------------
svn:mime-type = application/x-bzip2
Added: incubator/ooo/trunk/ext_sources/666a5d56098a9debf998510e304c8095-apr-util-1.4.1.tar.gz
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_sources/666a5d56098a9debf998510e304c8095-apr-util-1.4.1.tar.gz?rev=1241928&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/ooo/trunk/ext_sources/666a5d56098a9debf998510e304c8095-apr-util-1.4.1.tar.gz
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/ooo/trunk/ext_sources/666a5d56098a9debf998510e304c8095-apr-util-1.4.1.tar.gz
------------------------------------------------------------------------------
svn:mime-type = application/x-gzip
Added: incubator/ooo/trunk/ext_sources/97262fe54dddaf583eaaee3497a426e1-apr-1.4.5.tar.gz
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_sources/97262fe54dddaf583eaaee3497a426e1-apr-1.4.5.tar.gz?rev=1241928&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/ooo/trunk/ext_sources/97262fe54dddaf583eaaee3497a426e1-apr-1.4.5.tar.gz
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/ooo/trunk/ext_sources/97262fe54dddaf583eaaee3497a426e1-apr-1.4.5.tar.gz
------------------------------------------------------------------------------
svn:mime-type = application/x-gzip
Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1241928&r1=1241927&r2=1241928&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Wed Feb 8 15:19:46 2012
@@ -7087,7 +7087,8 @@ if test -z "$WITH_LANG"; then
AC_MSG_RESULT([en-US])
else
AC_MSG_RESULT([$WITH_LANG])
- ADDITIONAL_REPOSITORIES="$ADDITIONAL_REPOSITORIES;../extras"
+ ADDITIONAL_REPOSITORIES="$ADDITIONAL_REPOSITORIES ../extras"
+ BUILD_TYPE="$BUILD_TYPE L10N"
fi
AC_SUBST(WITH_LANG)
Modified: incubator/ooo/trunk/main/ooo.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ooo.lst?rev=1241928&r1=1241927&r2=1241928&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ooo.lst (original)
+++ incubator/ooo/trunk/main/ooo.lst Wed Feb 8 15:19:46 2012
@@ -44,6 +44,10 @@ cf8a6967f7de535ae257fa411c98eb88-mdds_0.
a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+3b179ed18f65c43141528aa6d2440db4-serf-1.0.0.tar.bz2
+666a5d56098a9debf998510e304c8095-apr-util-1.4.1.tar.gz
+97262fe54dddaf583eaaee3497a426e1-apr-1.4.5.tar.gz
+
# Libraries with category B license
61f59e4110781cbe66b46449eadac231-croscorefonts-1.21.0.tar.gz
35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1241928&r1=1241927&r2=1241928&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Wed Feb 8 15:19:46 2012
@@ -1512,15 +1512,16 @@ else
#
print "done\n";
-$gb_REPOS = $SRC_ROOT;
-my $BUILD_TYPE = "@BUILD_TYPE@";
-if ('@WITH_LANG@' ne "")
+$gb_REPOS = $SRC_ROOT;
+for my $repo (split(/ /,"@ADDITIONAL_REPOSITORIES@"))
{
- $gb_REPOS .= " ".$SOURCE_ROOT_DIR."/extras";
- $BUILD_TYPE = "@BUILD_TYPE@ L10N";
+ my $abs_repo = `cd $SRC_ROOT/$repo;pwd`;
+ chomp($abs_repo);
+ $gb_REPOS .= " " . $abs_repo;
}
+
#
# F. Setting the different aliases.
#
@@ -1872,7 +1873,7 @@ ToFile( "WITH_FONTS", "@WITH_FONT
ToFile( "WITHOUT_AFMS", "@WITHOUT_AFMS@", "e" );
ToFile( "WITHOUT_PPDS", "@WITHOUT_PPDS@", "e" );
ToFile( "WITH_BINFILTER", "@WITH_BINFILTER@", "e" );
-ToFile( "BUILD_TYPE", "$BUILD_TYPE", "e" );
+ToFile( "BUILD_TYPE", "@BUILD_TYPE@", "e" );
ToFile( "ADDITIONAL_REPOSITORIES", "@ADDITIONAL_REPOSITORIES@", "e" );
ToFile( "VERBOSE", "@VERBOSE@", "e" );
ToFile( "ENABLE_EVOAB2", "@ENABLE_EVOAB2@", "e" );
Modified: incubator/ooo/trunk/main/solenv/bin/build.pl
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/build.pl?rev=1241928&r1=1241927&r2=1241928&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/build.pl (original)
+++ incubator/ooo/trunk/main/solenv/bin/build.pl Wed Feb 8 15:19:46 2012
@@ -228,7 +228,7 @@
# Collect additional repository directories from the ADDITIONAL_REPOSITORIES
# environment variable (typically set by configure).
- foreach my $additional_repository (split(";", $ENV{ADDITIONAL_REPOSITORIES}))
+ foreach my $additional_repository (split(" ", $ENV{ADDITIONAL_REPOSITORIES}))
{
next if $additional_repository eq "";
# The repository path is expected to be relative to the workspace_path.
Modified: incubator/ooo/trunk/main/solenv/gbuild/BuildDirs.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/gbuild/BuildDirs.mk?rev=1241928&r1=1241927&r2=1241928&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/gbuild/BuildDirs.mk (original)
+++ incubator/ooo/trunk/main/solenv/gbuild/BuildDirs.mk Wed Feb 8 15:19:46 2012
@@ -37,11 +37,11 @@ gb_REPOS := $(SOLARSRC)
endif
# HACK
-# unixify windoze paths
+# unixify windows paths
ifeq ($(OS),WNT)
override WORKDIR := $(shell cygpath -u $(WORKDIR))
override OUTDIR := $(shell cygpath -u $(OUTDIR))
-override gb_REPOS := $(shell cygpath -u $(gb_REPOS))
+override gb_REPOS := $(foreach repo,$(gb_REPOS),$(shell cygpath -u $(repo)))
endif
REPODIR := $(patsubst %/,%,$(dir $(firstword $(gb_REPOS))))
Modified: incubator/ooo/trunk/main/solenv/gbuild/Package.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/gbuild/Package.mk?rev=1241928&r1=1241927&r2=1241928&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/gbuild/Package.mk (original)
+++ incubator/ooo/trunk/main/solenv/gbuild/Package.mk Wed Feb 8 15:19:46 2012
@@ -66,6 +66,13 @@ $(call gb_PackagePart_PackagePart,$(2),$
endef
+#
+# Add multiple files $(3), which are located in directory $(2) to the package $(1).
+#
+define gb_Package_add_files
+$(foreach header,$(3), $(call gb_Package_add_file,$(strip $(1)),$(strip $(2))/$(header),$(header)))
+endef
+
define gb_Package_add_customtarget
$(call gb_Package_get_preparation_target,$(1)) : $(call gb_CustomTarget_get_target,$(2))
$(call gb_Package_get_clean_target,$(1)) : $(call gb_CustomTarget_get_clean_target,$(2))
Modified: incubator/ooo/trunk/main/ucb/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/prj/build.lst?rev=1241928&r1=1241927&r2=1241928&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/prj/build.lst (original)
+++ incubator/ooo/trunk/main/ucb/prj/build.lst Wed Feb 8 15:19:46 2012
@@ -1,4 +1,4 @@
-uc ucb : cppuhelper CURL:curl OPENSSL:openssl LIBXML2:libxml2 LIBXSLT:libxslt offapi sal salhelper ucbhelper udkapi comphelper tools NULL
+uc ucb : cppuhelper CURL:curl OPENSSL:openssl LIBXML2:libxml2 LIBXSLT:libxslt offapi sal salhelper ucbhelper udkapi comphelper serf tools NULL
uc ucb usr1 - all uc_mkout NULL
uc ucb\inc nmake - all uc_inc NULL
uc ucb\source\regexp nmake - all uc_regexp uc_inc NULL