Author: af
Date: Wed Jun 20 10:54:05 2012
New Revision: 1352042
URL: http://svn.apache.org/viewvc?rev=1352042&view=rev
Log:
#i120041# Added missing makefiles.
Added:
incubator/ooo/trunk/ext_libraries/serf/serf-1.1.0.mac.patch
incubator/ooo/trunk/ext_libraries/serf/win/
incubator/ooo/trunk/ext_libraries/serf/win/Library_serf.mk (with props)
incubator/ooo/trunk/ext_libraries/serf/win/Makefile (with props)
incubator/ooo/trunk/ext_libraries/serf/win/Module_serf.mk (with props)
incubator/ooo/trunk/ext_libraries/serf/win/Package_inc.mk (with props)
Removed:
incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.issue68.patch
incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.issue68b.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_libraries/serf/serf-1.0.0.nochunkedtransferencoding.patch
Added: incubator/ooo/trunk/ext_libraries/serf/serf-1.1.0.mac.patch
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/serf/serf-1.1.0.mac.patch?rev=1352042&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/serf-1.1.0.mac.patch (added)
+++ incubator/ooo/trunk/ext_libraries/serf/serf-1.1.0.mac.patch Wed Jun 20
10:54:05 2012
@@ -0,0 +1,11 @@
+--- misc/serf-1.1.0/configure.in 2011-07-13 03:10:50.000000000 +0200
++++ misc/build/serf-1.1.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/win/Library_serf.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/serf/win/Library_serf.mk?rev=1352042&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/win/Library_serf.mk (added)
+++ incubator/ooo/trunk/ext_libraries/serf/win/Library_serf.mk Wed Jun 20
10:54:05 2012
@@ -0,0 +1,89 @@
+#/**************************************************************
+# *
+# * 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 \
+))
+
+ORIGINAL_DEF_FILE=build/serf.def
+FIXED_DEF_FILE=build/fixed-serf.def
+
+$(call gb_LinkTarget_get_target,$(call gb_Library__get_linktargetname,serf)) :
$(FIXED_DEF_FILE)
+$(FIXED_DEF_FILE) : $(ORIGINAL_DEF_FILE)
+ cp $< $@
+ echo serf_bucket_request_set_CL >> $@
+
+$(eval $(call gb_Library_set_ldflags,serf,\
+ $$(LDFLAGS) \
+ -DEF:$(FIXED_DEF_FILE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,serf,\
+ apr \
+ apr-util \
+ libeay32 \
+ ssleay32 \
+ zlib \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_cobjects,serf,\
+ serf/$(INPATH)/misc/build/serf-1.1.0/buckets/aggregate_buckets \
+ serf/$(INPATH)/misc/build/serf-1.1.0/buckets/request_buckets \
+ serf/$(INPATH)/misc/build/serf-1.1.0/buckets/buckets \
+ serf/$(INPATH)/misc/build/serf-1.1.0/buckets/simple_buckets \
+ serf/$(INPATH)/misc/build/serf-1.1.0/buckets/file_buckets \
+ serf/$(INPATH)/misc/build/serf-1.1.0/buckets/mmap_buckets \
+ serf/$(INPATH)/misc/build/serf-1.1.0/buckets/socket_buckets \
+ serf/$(INPATH)/misc/build/serf-1.1.0/buckets/response_buckets \
+ serf/$(INPATH)/misc/build/serf-1.1.0/buckets/headers_buckets \
+ serf/$(INPATH)/misc/build/serf-1.1.0/buckets/allocator \
+ serf/$(INPATH)/misc/build/serf-1.1.0/buckets/dechunk_buckets \
+ serf/$(INPATH)/misc/build/serf-1.1.0/buckets/deflate_buckets \
+ serf/$(INPATH)/misc/build/serf-1.1.0/buckets/limit_buckets \
+ serf/$(INPATH)/misc/build/serf-1.1.0/buckets/ssl_buckets \
+ serf/$(INPATH)/misc/build/serf-1.1.0/buckets/barrier_buckets \
+ serf/$(INPATH)/misc/build/serf-1.1.0/buckets/chunk_buckets \
+ serf/$(INPATH)/misc/build/serf-1.1.0/buckets/bwtp_buckets \
+ serf/$(INPATH)/misc/build/serf-1.1.0/buckets/iovec_buckets \
+ serf/$(INPATH)/misc/build/serf-1.1.0/auth/auth \
+ serf/$(INPATH)/misc/build/serf-1.1.0/auth/auth_basic \
+ serf/$(INPATH)/misc/build/serf-1.1.0/auth/auth_digest \
+ serf/$(INPATH)/misc/build/serf-1.1.0/auth/auth_kerb \
+ serf/$(INPATH)/misc/build/serf-1.1.0/auth/auth_kerb_gss \
+ serf/$(INPATH)/misc/build/serf-1.1.0/context \
+ serf/$(INPATH)/misc/build/serf-1.1.0/incoming \
+ serf/$(INPATH)/misc/build/serf-1.1.0/outgoing \
+ serf/$(INPATH)/misc/build/serf-1.1.0/ssltunnel \
+))
Propchange: incubator/ooo/trunk/ext_libraries/serf/win/Library_serf.mk
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/ooo/trunk/ext_libraries/serf/win/Makefile
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/serf/win/Makefile?rev=1352042&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/win/Makefile (added)
+++ incubator/ooo/trunk/ext_libraries/serf/win/Makefile Wed Jun 20 10:54:05 2012
@@ -0,0 +1,30 @@
+#/**************************************************************
+# *
+# * 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)))
Propchange: incubator/ooo/trunk/ext_libraries/serf/win/Makefile
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/ooo/trunk/ext_libraries/serf/win/Module_serf.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/serf/win/Module_serf.mk?rev=1352042&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/win/Module_serf.mk (added)
+++ incubator/ooo/trunk/ext_libraries/serf/win/Module_serf.mk Wed Jun 20
10:54:05 2012
@@ -0,0 +1,27 @@
+#/**************************************************************
+# *
+# * 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 \
+))
Propchange: incubator/ooo/trunk/ext_libraries/serf/win/Module_serf.mk
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/ooo/trunk/ext_libraries/serf/win/Package_inc.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/serf/win/Package_inc.mk?rev=1352042&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/win/Package_inc.mk (added)
+++ incubator/ooo/trunk/ext_libraries/serf/win/Package_inc.mk Wed Jun 20
10:54:05 2012
@@ -0,0 +1,27 @@
+#/**************************************************************
+# *
+# * 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/$(INPATH)/misc/build/serf-1.1.0))
+$(eval $(call gb_Package_add_files, serf_inc, inc/serf, \
+ serf.h \
+ serf_bucket_types.h \
+ serf_bucket_util.h \
+ ))
Propchange: incubator/ooo/trunk/ext_libraries/serf/win/Package_inc.mk
------------------------------------------------------------------------------
svn:executable = *
