move to own git serverHEADmaster

4 files changed, 238 insertions, 0 deletions

diff --git a/vcpkg/ports/serf/portfile.cmake b/vcpkg/ports/serf/portfile.cmake
new file mode 100644
index 0000000..b8bb244
--- /dev/null
+++ b/vcpkg/ports/serf/portfile.cmake
@@ -0,0 +1,139 @@
+vcpkg_download_distfile(ARCHIVE

+    URLS "https://dlcdn.apache.org/serf/serf-${VERSION}.tar.bz2"

+    FILENAME "serf-${VERSION}.tar.bz2"

+    SHA512 19165274d35c694935cda33f99ef92a7663a5d9c540fb7fd6792aa0efe39941b2fa87ff8b61afd060c6676baec634fd33dc2e9d34ecbee45ed99dfaed077802c

+)

+

+vcpkg_extract_source_archive(

+    SOURCE_PATH

+    ARCHIVE "${ARCHIVE}"

+    PATCHES

+      serf-fix-expat.patch

+      serf-use-debug-libs.patch

+)

+

+# Note: custom architecture is not supported on Unix.

+if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")

+  set(SCONS_ARCH "TARGET_ARCH=x86_64")

+elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")

+  set(SCONS_ARCH "TARGET_ARCH=x86")

+else()

+  set(SCONS_ARCH "")

+endif()

+

+if(EXISTS "${CURRENT_INSTALLED_DIR}/bin/libapr-1.dll")

+  set(APR_STATIC "no")

+else()

+  set(APR_STATIC "yes")

+endif()

+

+vcpkg_find_acquire_program(SCONS)

+

+message(STATUS "Building ${TARGET_TRIPLET}-rel")

+

+if(VCPKG_TARGET_IS_WINDOWS)

+  SET(apr_opts

+    "APR=${CURRENT_INSTALLED_DIR}"

+    "APU=${CURRENT_INSTALLED_DIR}"

+    "APR_STATIC=${APR_STATIC}"

+  )

+else()

+  SET(apr_opts

+    "APR=${CURRENT_INSTALLED_DIR}/tools/apr/bin/apr-1-config"

+    "APU=${CURRENT_INSTALLED_DIR}/tools/apr-util/bin/apu-1-config"

+  )

+endif()

+

+vcpkg_execute_build_process(

+  COMMAND ${SCONS}

+      "SOURCE_LAYOUT=no"

+      "PREFIX=${CURRENT_PACKAGES_DIR}"

+      "LIBDIR=${CURRENT_PACKAGES_DIR}/lib"

+      "OPENSSL=${CURRENT_INSTALLED_DIR}"

+      "ZLIB=${CURRENT_INSTALLED_DIR}"

+      ${apr_opts}

+      "${SCONS_ARCH}"

+      "DEBUG=no"

+      "install-lib" "install-inc" "install-pc"

+  WORKING_DIRECTORY "${SOURCE_PATH}"

+  LOGNAME "scons-rel"

+)

+

+# Fixup installed files.

+if(VCPKG_TARGET_IS_WINDOWS)

+  if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS)

+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin")

+    file(RENAME

+      "${CURRENT_PACKAGES_DIR}/lib/libserf-1.dll"

+      "${CURRENT_PACKAGES_DIR}/bin/libserf-1.dll"

+    )

+    file(RENAME

+      "${CURRENT_PACKAGES_DIR}/lib/libserf-1.pdb"

+      "${CURRENT_PACKAGES_DIR}/bin/libserf-1.pdb"

+    )

+  else()

+    file(REMOVE

+      "${CURRENT_PACKAGES_DIR}/lib/libserf-1.dll"

+      "${CURRENT_PACKAGES_DIR}/lib/libserf-1.pdb"

+      "${CURRENT_PACKAGES_DIR}/lib/libserf-1.lib"

+    )

+  endif()

+  file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libserf-1.exp")

+endif()

+

+if(NOT VCPKG_BUILD_TYPE)

+  message(STATUS "Building ${TARGET_TRIPLET}-dbg")

+

+  if(VCPKG_TARGET_IS_WINDOWS)

+    SET(apr_opts

+      "APR=${CURRENT_INSTALLED_DIR}/debug"

+      "APU=${CURRENT_INSTALLED_DIR}/debug"

+      "APR_STATIC=${APR_STATIC}"

+    )

+  else()

+    SET(apr_opts

+      "APR=${CURRENT_INSTALLED_DIR}/tools/apr/debug/bin/apr-1-config"

+      "APU=${CURRENT_INSTALLED_DIR}/tools/apr-util/debug/bin/apu-1-config"

+    )

+  endif()

+

+  vcpkg_execute_build_process(

+      COMMAND ${SCONS}

+          "SOURCE_LAYOUT=no"

+          "PREFIX=${CURRENT_PACKAGES_DIR}/debug"

+          "LIBDIR=${CURRENT_PACKAGES_DIR}/debug/lib"

+          "OPENSSL=${CURRENT_INSTALLED_DIR}"

+          "ZLIB=${CURRENT_INSTALLED_DIR}"

+          ${apr_opts}

+          "${SCONS_ARCH}"

+          "DEBUG=yes"

+          "install-lib" "install-pc"

+      WORKING_DIRECTORY "${SOURCE_PATH}"

+      LOGNAME "scons-dbg"

+  )

+

+  # Fixup installed files.

+  if(VCPKG_TARGET_IS_WINDOWS)

+    if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "dynamic")

+      file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")

+      file(RENAME

+        "${CURRENT_PACKAGES_DIR}/debug/lib/libserf-1.dll"

+        "${CURRENT_PACKAGES_DIR}/debug/bin/libserf-1.dll"

+      )

+      file(RENAME

+        "${CURRENT_PACKAGES_DIR}/debug/lib/libserf-1.pdb"

+        "${CURRENT_PACKAGES_DIR}/debug/bin/libserf-1.pdb"

+      )

+    else()

+      file(REMOVE

+        "${CURRENT_PACKAGES_DIR}/debug/lib/libserf-1.dll"

+        "${CURRENT_PACKAGES_DIR}/debug/lib/libserf-1.pdb"

+        "${CURRENT_PACKAGES_DIR}/debug/lib/libserf-1.lib"

+      )

+    endif()

+    file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libserf-1.exp")

+  endif()

+endif()

+

+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

+vcpkg_fixup_pkgconfig()

diff --git a/vcpkg/ports/serf/serf-fix-expat.patch b/vcpkg/ports/serf/serf-fix-expat.patch
new file mode 100644
index 0000000..eb6a2a0
--- /dev/null
+++ b/vcpkg/ports/serf/serf-fix-expat.patch
@@ -0,0 +1,17 @@
+Index: SConstruct

+===================================================================

+--- SConstruct	(revision 1920717)

++++ SConstruct	(working copy)

+@@ -324,7 +324,11 @@

+   if aprstatic:
+     apr_libs='apr-1.lib'
+     apu_libs='aprutil-1.lib'
+-    env.Append(LIBS=['shell32.lib', 'xml.lib'])
++    env.Append(LIBS=['shell32.lib'])
++    if debug:
++      env.Append(LIBS=['libexpatdMD.lib'])
++    else:
++      env.Append(LIBS=['libexpatMD.lib'])
+   else:
+     apr_libs='libapr-1.lib'
+     apu_libs='libaprutil-1.lib'
diff --git a/vcpkg/ports/serf/serf-use-debug-libs.patch b/vcpkg/ports/serf/serf-use-debug-libs.patch
new file mode 100644
index 0000000..41d3d3c
--- /dev/null
+++ b/vcpkg/ports/serf/serf-use-debug-libs.patch
@@ -0,0 +1,68 @@
+Index: SConstruct

+===================================================================

+--- SConstruct	(revision 1920717)

++++ SConstruct	(working copy)

+@@ -331,8 +331,12 @@

+ 
+   env.Append(LIBS=[apr_libs, apu_libs])
+   if not env.get('SOURCE_LAYOUT', None):
+-    env.Append(LIBPATH=['$APR/lib', '$APU/lib'],
+-               CPPPATH=['$APR/include/apr-1', '$APU/include/apr-1'])
++    if debug:
++      env.Append(LIBPATH=['$APR/debug/lib', '$APU/lib'],
++                 CPPPATH=['$APR/include/apr-1', '$APU/include/apr-1'])
++    else:
++      env.Append(LIBPATH=['$APR/lib', '$APU/debug/lib'],
++                 CPPPATH=['$APR/include/apr-1', '$APU/include/apr-1'])
+   elif aprstatic:
+     env.Append(LIBPATH=['$APR/LibR','$APU/LibR'],
+                CPPPATH=['$APR/include', '$APU/include'])
+@@ -341,10 +345,15 @@

+                CPPPATH=['$APR/include', '$APU/include'])
+ 
+   # zlib
+-  env.Append(LIBS=['zlib.lib'])
+   if not env.get('SOURCE_LAYOUT', None):
+-    env.Append(CPPPATH=['$ZLIB/include'],
+-               LIBPATH=['$ZLIB/lib'])
++    if debug:
++      env.Append(CPPPATH=['$ZLIB/include'],
++                 LIBPATH=['$ZLIB/debug/lib'])
++      env.Append(LIBS=['zlibd.lib'])
++    else:
++      env.Append(CPPPATH=['$ZLIB/include'],
++                 LIBPATH=['$ZLIB/lib'])
++      env.Append(LIBS=['zlib.lib'])
+   else:
+     env.Append(CPPPATH=['$ZLIB'],
+                LIBPATH=['$ZLIB'])
+@@ -351,8 +360,12 @@

+ 
+   # openssl
+   if not env.get('SOURCE_LAYOUT', None):
+-    env.Append(CPPPATH=['$OPENSSL/include/openssl'],
+-               LIBPATH=['$OPENSSL/lib'])
++    if debug:
++      env.Append(CPPPATH=['$OPENSSL/include/openssl'],
++                 LIBPATH=['$OPENSSL/debug/lib'])
++    else:
++      env.Append(CPPPATH=['$OPENSSL/include/openssl'],
++                 LIBPATH=['$OPENSSL/lib'])
+   elif 0: # opensslstatic:
+     env.Append(CPPPATH=['$OPENSSL/inc32'],
+                LIBPATH=['$OPENSSL/out32'])
+@@ -392,8 +405,12 @@

+     apr_libs = ''
+     apu_libs = ''
+ 
+-  env.Append(CPPPATH=['$OPENSSL/include'])
+-  env.Append(LIBPATH=['$OPENSSL/lib'])
++  if debug:
++    env.Append(CPPPATH=['$OPENSSL/include/openssl'],
++               LIBPATH=['$OPENSSL/debug/lib'])
++  else:
++    env.Append(CPPPATH=['$OPENSSL/include/openssl'],
++               LIBPATH=['$OPENSSL/debug'])
+ 
+ 
+ # If build with gssapi, get its information and define SERF_HAVE_GSSAPI
diff --git a/vcpkg/ports/serf/vcpkg.json b/vcpkg/ports/serf/vcpkg.json
new file mode 100644
index 0000000..7a50fec
--- /dev/null
+++ b/vcpkg/ports/serf/vcpkg.json
@@ -0,0 +1,14 @@
+{
+  "name": "serf",
+  "version": "1.3.10",
+  "description": "The serf library is a high performance C-based HTTP client library built upon the Apache Portable Runtime (APR) library. It is permissively licensed under the Apache License, v2.",
+  "homepage": "https://serf.apache.org/",
+  "license": "Apache-2.0",
+  "supports": "!uwp & !staticcrt & !arm",
+  "dependencies": [
+    "apr",
+    "apr-util",
+    "openssl",
+    "zlib"
+  ]
+}