aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2018-02-24 01:43:37 -0800
committerRobert Schumacher <roschuma@microsoft.com>2018-02-24 01:43:37 -0800
commit6d3fb52c7058d21a1bd9e0e070965f74edc553a7 (patch)
tree851ed1e8fef0fd024837cb1d19e020ec50403f50
parente391e7b5ddf3cb7369c18730a8f8403fe05472a5 (diff)
downloadvcpkg-6d3fb52c7058d21a1bd9e0e070965f74edc553a7.tar.gz
vcpkg-6d3fb52c7058d21a1bd9e0e070965f74edc553a7.zip
[chakracore] Use out of source builds
-rw-r--r--ports/chakracore/CONTROL2
-rw-r--r--ports/chakracore/portfile.cmake33
2 files changed, 20 insertions, 15 deletions
diff --git a/ports/chakracore/CONTROL b/ports/chakracore/CONTROL
index b86fa8963..b894f1d7f 100644
--- a/ports/chakracore/CONTROL
+++ b/ports/chakracore/CONTROL
@@ -1,3 +1,3 @@
Source: chakracore
-Version: 1.7.4
+Version: 1.7.4-1
Description: Core part of the Chakra Javascript engine
diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake
index 7bb628744..e87b0cb86 100644
--- a/ports/chakracore/portfile.cmake
+++ b/ports/chakracore/portfile.cmake
@@ -21,41 +21,46 @@ if(COR_H_PATH MATCHES "NOTFOUND")
endif()
get_filename_component(NETFXSDK_PATH "${COR_H_PATH}/../.." ABSOLUTE)
+set(BUILDTREE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
+file(REMOVE_RECURSE ${BUILDTREE_PATH})
+file(COPY ${SOURCE_PATH}/ DESTINATION ${BUILDTREE_PATH})
+
vcpkg_build_msbuild(
- PROJECT_PATH ${SOURCE_PATH}/Build/Chakra.Core.sln
+ PROJECT_PATH ${BUILDTREE_PATH}/Build/Chakra.Core.sln
OPTIONS "/p:DotNetSdkRoot=${NETFXSDK_PATH}/" "/p:CustomBeforeMicrosoftCommonTargets=${CMAKE_CURRENT_LIST_DIR}/no-warning-as-error.props"
)
file(INSTALL
- ${SOURCE_PATH}/lib/jsrt/ChakraCore.h
- ${SOURCE_PATH}/lib/jsrt/ChakraCommon.h
- ${SOURCE_PATH}/lib/jsrt/ChakraCommonWindows.h
- ${SOURCE_PATH}/lib/jsrt/ChakraDebug.h
+ ${BUILDTREE_PATH}/lib/jsrt/ChakraCore.h
+ ${BUILDTREE_PATH}/lib/jsrt/ChakraCommon.h
+ ${BUILDTREE_PATH}/lib/jsrt/ChakraCommonWindows.h
+ ${BUILDTREE_PATH}/lib/jsrt/ChakraDebug.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
+ ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/ChakraCore.dll
+ ${BUILDTREE_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
+ ${BUILDTREE_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
+ ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ChakraCore.dll
+ ${BUILDTREE_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
+ ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/Chakracore.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/lib
)
file(INSTALL
- ${SOURCE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ch.exe
- ${SOURCE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/GCStress.exe
- ${SOURCE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/rl.exe
+ ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ch.exe
+ ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/GCStress.exe
+ ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/rl.exe
DESTINATION ${CURRENT_PACKAGES_DIR}/tools/chakracore)
+
vcpkg_copy_pdbs()
file(INSTALL
${SOURCE_PATH}/LICENSE.txt