Merge branch 'master' of https://github.com/Microsoft/vcpkg

7 files changed, 80 insertions, 2 deletions

diff --git a/docs/FAQ.md b/docs/FAQ.md
index 15608ae74..7bc57f605 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -3,7 +3,7 @@
 Vcpkg is a tool to acquire C++ open source library and rebuild them on Windows. 
 
 ## Can I contribute a new library?
-Yes! Start out by reading our [contribution guidelines](CONTRIBUTING.md).
+Yes! Start out by reading our [contribution guidelines](../CONTRIBUTING.md).
 
 ## Can Vcpkg create pre-built binary packages? What is the binary format used by Vcpkg?
 In the preview release, we do not have a supported way to distribute individual binary packages. This avoids the issue of trying to use a specific pre-built package against differently built dependencies. As such, we have also not specified a stable format for the built library packages.
diff --git a/ports/chakracore/CONTROL b/ports/chakracore/CONTROL
new file mode 100644
index 000000000..c0ea61800
--- /dev/null
+++ b/ports/chakracore/CONTROL
@@ -0,0 +1,3 @@
+Source: chakracore
+Version: 1.2.0.0
+Description: Core part of the Chakra Javascript engine
\ No newline at end of file
diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake
new file mode 100644
index 000000000..6780b6b55
--- /dev/null
+++ b/ports/chakracore/portfile.cmake
@@ -0,0 +1,48 @@
+include(vcpkg_common_functions)
+find_program(POWERSHELL powershell)
+
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ChakraCore-1.2.0.0)
+vcpkg_download_distfile(ARCHIVE_FILE
+    URLS "https://github.com/Microsoft/ChakraCore/archive/v1.2.0.0.tar.gz"
+    FILENAME "ChakraCore-1.2.0.0.tar.gz"
+    SHA512 53e487028a30605a4e2589c40b65da060ca4884617fdba8877557e4db75f911be4433d260132cce3526647622bdc742a0aacda1443a16dfed3d3fdd442539528
+)
+vcpkg_extract_source_archive(${ARCHIVE_FILE})
+
+message(STATUS "Patching JavascriptPromise.cpp for https://github.com/Microsoft/ChakraCore/issues/1429")
+vcpkg_execute_required_process(
+	COMMAND ${POWERSHELL} -command (gc lib/runtime/library/JavascriptPromise.cpp -encoding utf7) -replace('«', '^<^<') -replace('»', '^>^>') | Set-Content lib/runtime/library/JavascriptPromise.cpp
+	WORKING_DIRECTORY ${SOURCE_PATH}
+)
+message(STATUS "Patching done.")
+
+vcpkg_build_msbuild(
+    PROJECT_PATH ${SOURCE_PATH}/Build/Chakra.Core.sln
+)
+
+file(INSTALL
+	${SOURCE_PATH}/lib/jsrt/ChakraCore.h
+	${SOURCE_PATH}/lib/jsrt/ChakraCommon.h
+    DESTINATION ${CURRENT_PACKAGES_DIR}/include
+)
+file(INSTALL
+	${SOURCE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/ChakraCore.dll
+	${SOURCE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/ChakraCore.pdb
+    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
+)
+file(INSTALL
+	${SOURCE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/Chakracore.lib
+    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
+)
+file(INSTALL
+	${SOURCE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ChakraCore.dll
+	${SOURCE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ChakraCore.pdb
+    DESTINATION ${CURRENT_PACKAGES_DIR}/bin
+)
+file(INSTALL
+	${SOURCE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/Chakracore.lib
+    DESTINATION ${CURRENT_PACKAGES_DIR}/lib
+)
+file(INSTALL
+	${SOURCE_PATH}/LICENSE.txt
+	DESTINATION ${CURRENT_PACKAGES_DIR}/share/ChakraCore RENAME copyright)
diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL
index 4922a6fff..3419731e8 100644
--- a/ports/harfbuzz/CONTROL
+++ b/ports/harfbuzz/CONTROL
@@ -1,4 +1,3 @@
 Source: harfbuzz
 Version: 1.3.2
 Description: HarfBuzz OpenType text shaping engine
-Build-depends: ragel
diff --git a/ports/rxcpp/CONTROL b/ports/rxcpp/CONTROL
new file mode 100644
index 000000000..b4440da35
--- /dev/null
+++ b/ports/rxcpp/CONTROL
@@ -0,0 +1,3 @@
+Source: rxcpp
+Version: 2.3.0
+Description: Reactive Extensions for C++
\ No newline at end of file
diff --git a/ports/rxcpp/portfile.cmake b/ports/rxcpp/portfile.cmake
new file mode 100644
index 000000000..15d0dc15c
--- /dev/null
+++ b/ports/rxcpp/portfile.cmake
@@ -0,0 +1,23 @@
+include(${CMAKE_TRIPLET_FILE})
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/RxCpp-2.3.0)
+vcpkg_download_distfile(ARCHIVE_FILE
+    URLS "https://github.com/Reactive-Extensions/RxCpp/archive/v2.3.0.tar.gz"
+    FILENAME "RxCpp-2.3.0.tar.gz"
+    SHA512 180cf36777b0c14e989b4b79f01fcda7ecabfe4b3cee3ad7343138497578af02745de63f74941ec228eac3fccca4a7dfdfdd1c4d16a89438022dca6f9968953f
+)
+vcpkg_extract_source_archive(${ARCHIVE_FILE})
+
+file(INSTALL
+	${SOURCE_PATH}/Rx/v2/src/rxcpp
+    DESTINATION ${CURRENT_PACKAGES_DIR}/include
+)
+
+file(INSTALL
+	${SOURCE_PATH}/Ix/CPP/src/cpplinq
+    DESTINATION ${CURRENT_PACKAGES_DIR}/include
+)
+
+file(INSTALL
+	${SOURCE_PATH}/license.md
+	DESTINATION ${CURRENT_PACKAGES_DIR}/share/rxcpp RENAME copyright)
\ No newline at end of file
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index ca0900b89..cd4de3f21 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -36,6 +36,8 @@ if(NOT VCPKG_TOOLCHAIN)
 
     include_directories(${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include)
 
+    set(CMAKE_PROGRAM_PATH ${CMAKE_PROGRAM_PATH} ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools)
+
     option(OVERRIDE_ADD_EXECUTABLE "Automatically copy dependencies into the output directory for executables." ON)
     if(OVERRIDE_ADD_EXECUTABLE)
         function(add_executable name)