Merge linux branch into master

CMakeLists.txt

@@ -10,7 +10,26 @@ function(clr_unknown_arch)
     endif()
 endfunction()
 
+if(ICU_INCLUDE_PATH)
+  set(ICU_CC_PATH "${ICU_INCLUDE_PATH}/../lib/")
+  find_library(ICUUC icuuc PATHS ${ICU_CC_PATH} NO_DEFAULT_PATH)
+  find_library(ICU18 icui18n PATHS ${ICU_CC_PATH} NO_DEFAULT_PATH)
+  find_library(ICUDATA icudata PATHS ${ICU_CC_PATH} NO_DEFAULT_PATH)
+  if(ICUUC)
+    message("found libraries on ${ICU_CC_PATH}")
+    set(ICULIB
+      ${ICUUC}
+      ${ICU18}
+      ${ICUDATA}
+      )
+  endif()
+endif()
+
 if(CMAKE_SYSTEM_NAME STREQUAL Linux)
+    if(NOT ICULIB)
+      set(ICULIB "icuuc")
+    endif()
+
     set(CLR_CMAKE_PLATFORM_UNIX 1)
     if(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
         set(CLR_CMAKE_PLATFORM_UNIX_TARGET_AMD64 1)
@@ -21,9 +40,16 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux)
 elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin)
     add_definitions(
         -DPLATFORM_UNIX
-        -DU_DISABLE_RENAMING=1 #in case we link against to an older binary of icu
     )
 
+    if(NOT ICULIB)
+      set(ICULIB "icucore")
+      add_definitions(
+        -DU_DISABLE_RENAMING=1 #in case we link against to an older binary of icu
+        )
+      message("using ICU from system default: ${ICULIB}")
+    endif()
+
     set(CLR_CMAKE_PLATFORM_UNIX 1)
     if(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
         set(CLR_CMAKE_PLATFORM_UNIX_TARGET_AMD64 1)
@@ -193,6 +219,12 @@ include_directories(
     ${ICU_INCLUDE_PATH}
     )
 
+if(ICU_INCLUDE_PATH)
+    if(NOT HAVE_LIBICU_UCHAR_H)
+        set(HAVE_LIBICU_UCHAR_H "1")
+    endif()
+endif()
+
 add_subdirectory (pal)
 
 # build the rest with NO_PAL_MINMAX and PAL_STDCPP_COMPAT

bin/ChakraCore/CMakeLists.txt

@@ -3,7 +3,7 @@ add_library (ChakraCore SHARED
   ConfigParserExternals.cpp
   TestHooks.cpp
 )
-  
+
 target_include_directories (
   ChakraCore PUBLIC
   ${CMAKE_CURRENT_SOURCE_DIR}
@@ -45,18 +45,9 @@ set(lib_target "${lib_target}"
   pthread
   stdc++
   dl
+  ${ICULIB}
   )
 
-if(CMAKE_SYSTEM_NAME STREQUAL Linux)
-  set(lib_target "${lib_target}"
-    icuuc
-    )
-elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin)
-  set(lib_target "${lib_target}"
-    icucore
-    )
-endif() # Linux ?
-
 if(CMAKE_SYSTEM_NAME STREQUAL Linux)
   set(lib_target "${lib_target}"
     -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libChakraCoreLib.version
@@ -72,7 +63,7 @@ if(NOT CC_XCODE_PROJECT)
   if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
     set(CC_LIB_EXT "dylib")
   endif()
-  
+
   add_custom_command(TARGET ChakraCore POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
     "${CHAKRACORE_BINARY_DIR}/bin/ChakraCore/libChakraCore.${CC_LIB_EXT}"

bin/NativeTests/NativeTests.vcxproj

@@ -27,7 +27,6 @@
           $(ChakraCoreRootDirectory)bin\External;
           %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
-      <RuntimeLibrary Condition="'$(Configuration)'=='Debug'">MultiThreadedDebugDLL</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <SmallerTypeCheck>false</SmallerTypeCheck>
       <MinimalRebuild>false</MinimalRebuild>

bin/ch/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(ch_source_files 
+set(ch_source_files
   ch.cpp
   ChakraRtInterface.cpp
   CodexAssert.cpp
@@ -59,12 +59,12 @@ if(STATIC_LIBRARY)
 
   if(CMAKE_SYSTEM_NAME STREQUAL Linux)
     set(lib_target "${lib_target}"
-      icuuc
+      ${ICULIB}
       unwind-x86_64
       )
   elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin)
     set(lib_target "${lib_target}"
-      icucore
+      ${ICULIB}
       "-framework CoreFoundation"
       "-framework Security"
       )
@@ -78,7 +78,7 @@ else() # // !from shared library
 endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL Linux)
-  set(lib_target "${lib_target}" 
+  set(lib_target "${lib_target}"
     -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/ch.version
     )
 endif()

bin/ch/ch.cpp

@@ -310,6 +310,12 @@ HRESULT RunScript(const char* fileName, LPCSTR fileContents, BYTE *bcBuffer, cha
             }
 
             runScript = ChakraRTInterface::JsTTDRunScript(-1, fileContents, WScriptJsrt::GetNextSourceContext(), fullPath, nullptr /*result*/);
+
+            if (runScript == JsErrorCategoryUsage)
+            {
+                wprintf(_u("FATAL ERROR: Core was compiled without ENABLE_TTD is defined. CH is trying to use TTD interface\n"));
+                abort();
+            }
 #else
             runScript = ChakraRTInterface::JsRunScriptUtf8(fileContents, WScriptJsrt::GetNextSourceContext(), fullPath, nullptr /*result*/);
 #endif

bin/ch/stdafx.h

@@ -23,7 +23,6 @@
 
 #define WIN32_LEAN_AND_MEAN 1
 
-#define ENABLE_TEST_HOOKS 1
 #include "CommonDefines.h"
 #include <map>
 #include <string>
@@ -137,6 +136,9 @@ do { \
     } \
 } while (0)
 
+#ifndef ENABLE_TEST_HOOKS
+#define ENABLE_TEST_HOOKS
+#endif
 #include "TestHooks.h"
 #include "ChakraRtInterface.h"
 #include "HostConfigFlags.h"

build.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 #-------------------------------------------------------------------------------------------------------
 # Copyright (C) Microsoft. All rights reserved.
 # Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
@@ -20,20 +21,21 @@ PRINT_USAGE() {
     echo "build.sh [options]"
     echo ""
     echo "options:"
-    echo "      --cxx=PATH      Path to Clang++ (see example below)"
-    echo "      --cc=PATH       Path to Clang   (see example below)"
-    echo "  -d, --debug         Debug build (by default Release build)"
-    echo "  -h, --help          Show help"
-    echo "      --icu=PATH      Path to ICU include folder (see example below)"
-    echo "  -j [N], --jobs[=N]  Multicore build, allow N jobs at once"
-    echo "  -n, --ninja         Build with ninja instead of make"
-    echo "      --xcode         Generate XCode project"
-    echo "  -t, --test-build    Test build (by default Release build)"
-    echo "      --static        Build as static library (by default shared library)"
-    echo "  -v, --verbose       Display verbose output including all options"
+    echo "      --cxx=PATH       Path to Clang++ (see example below)"
+    echo "      --cc=PATH        Path to Clang   (see example below)"
+    echo "  -d, --debug          Debug build (by default Release build)"
+    echo "  -h, --help           Show help"
+    echo "      --icu=PATH       Path to ICU include folder (see example below)"
+    echo "  -j [N], --jobs[=N]   Multicore build, allow N jobs at once"
+    echo "  -n, --ninja          Build with ninja instead of make"
+    echo "      --xcode          Generate XCode project"
+    echo "  -t, --test-build     Test build (by default Release build)"
+    echo "      --static         Build as static library (by default shared library)"
+    echo "  -v, --verbose        Display verbose output including all options"
+    echo "      --create-deb=V   Create .deb package with given V version"
     echo "      --without=FEATURE,FEATURE,..."
-    echo "                      Disable FEATUREs from JSRT experimental"
-    echo "                      features."
+    echo "                       Disable FEATUREs from JSRT experimental"
+    echo "                       features."
     echo ""
     echo "example:"
     echo "  ./build.sh --cxx=/path/to/clang++ --cc=/path/to/clang -j"
@@ -53,6 +55,7 @@ MULTICORE_BUILD=""
 ICU_PATH=""
 STATIC_LIBRARY=""
 WITHOUT_FEATURES=""
+CREATE_DEB=0
 
 while [[ $# -gt 0 ]]; do
     case "$1" in
@@ -111,11 +114,16 @@ while [[ $# -gt 0 ]]; do
         MAKE=ninja
         ;;
 
-	--xcode)
+    --xcode)
         CMAKE_GEN="-G Xcode -DCC_XCODE_PROJECT=1"
         MAKE=0
         ;;
 
+    --create-deb=*)
+        CREATE_DEB=$1
+        CREATE_DEB="${CREATE_DEB:13}"
+        ;;
+
     --static)
         STATIC_LIBRARY="-DSTATIC_LIBRARY=1"
         ;;
@@ -228,6 +236,34 @@ fi
 
 if [[ $_RET != 0 ]]; then
     echo "See error details above. Exit code was $_RET"
+else
+    if [[ $CREATE_DEB != 0 ]]; then
+        DEB_FOLDER=`realpath .`
+        DEB_FOLDER="${DEB_FOLDER}/chakracore_${CREATE_DEB}"
+
+        mkdir -p $DEB_FOLDER/usr/local/bin
+        mkdir -p $DEB_FOLDER/DEBIAN
+        cp $DEB_FOLDER/../ch $DEB_FOLDER/usr/local/bin/
+        if [[ $STATIC_LIBRARY == "" ]]; then
+            cp $DEB_FOLDER/../*.so $DEB_FOLDER/usr/local/bin/
+        fi
+        echo -e "Package: ChakraCore"\
+            "\nVersion: ${CREATE_DEB}"\
+            "\nSection: base"\
+            "\nPriority: optional"\
+            "\nArchitecture: amd64"\
+            "\nDepends: libc6 (>= 2.19), uuid-dev (>> 0), libunwind-dev (>> 0), libicu-dev (>> 0)"\
+            "\nMaintainer: ChakraCore <[email protected]>"\
+            "\nDescription: Chakra Core"\
+            "\n Open source Core of Chakra Javascript Engine"\
+            > $DEB_FOLDER/DEBIAN/control
+
+        dpkg-deb --build $DEB_FOLDER
+        _RET=$?
+        if [[ $_RET == 0 ]]; then
+            echo ".deb package is available under $build_directory"
+        fi
+    fi
 fi
 
 popd > /dev/null

jenkins/get_system_info.sh

@@ -3,21 +3,55 @@
 # Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
 #-------------------------------------------------------------------------------------------------------
 
+if [[ $# -eq 0 ]]; then
+    echo "No platform passed in- assuming Linux"
+    _PLATFORM="linux"
+fi
+
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+    --linux)
+        _PLATFORM="linux"
+        ;;
+    --osx)
+        _PLATFORM="osx"
+        ;;
+    esac
+
+    shift
+done
+
 echo
 echo "=================================================="
 echo
 
-echo "Number of processors (nproc):"
-echo
-nproc
+if [[ $_PLATFORM =~ "linux" ]]; then
+    echo "Number of processors (nproc):"
+    echo
+    nproc
+elif [[ $_PLATFORM =~ "osx" ]]; then
+    echo "Number of processors (sysctl -n hw.logicalcpu):"
+    echo
+    sysctl -n hw.logicalcpu
+else
+    echo "Unknown platform"
+    exit 1
+fi
 
 echo
 echo "--------------------------------------------------"
 echo
 
-echo "Linux version (lsb_release -a):"
-echo
-lsb_release -a
+if [[ $_PLATFORM =~ "linux" ]]; then
+    echo "Linux version (lsb_release -a):"
+    echo
+    lsb_release -a
+elif [[ $_PLATFORM =~ "osx" ]]; then
+    echo "OS X version (sw_vers -productVersion):"
+    echo
+    sw_vers -productVersion
+fi
+
 
 echo
 echo "--------------------------------------------------"

lib/Common/ChakraCoreVersion.h

@@ -0,0 +1,15 @@
+//-------------------------------------------------------------------------------------------------------
+// Copyright (C) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
+//-------------------------------------------------------------------------------------------------------
+#pragma once
+
+#define CHAKRA_CORE_MAJOR_VERSION 1
+#define CHAKRA_CORE_MINOR_VERSION 2
+#define CHAKRA_CORE_VERSION_RELEASE 0
+#define CHAKRA_CORE_VERSION_PRERELEASE 0
+#define CHAKRA_CORE_VERSION_RELEASE_QFE 0
+
+#define CHAKRA_VERSION_RELEASE 0
+
+// NOTE: need to update the GUID in ByteCodeCacheReleaseFileVersion.h as well

lib/Common/CommonDefines.h

@@ -6,19 +6,7 @@
 
 #include "TargetVer.h"
 #include "Warnings.h"
-
-//----------------------------------------------------------------------------------------------------
-// Chakra Core version
-//----------------------------------------------------------------------------------------------------
-#define CHAKRA_CORE_MAJOR_VERSION 1
-#define CHAKRA_CORE_MINOR_VERSION 2
-#define CHAKRA_CORE_VERSION_RELEASE 0
-#define CHAKRA_CORE_VERSION_PRERELEASE 0
-#define CHAKRA_CORE_VERSION_RELEASE_QFE 0
-
-#define CHAKRA_VERSION_RELEASE 0
-
-// NOTE: need to update the GUID in ByteCodeCacheReleaseFileVersion.h as well
+#include "ChakraCoreVersion.h"
 
 //----------------------------------------------------------------------------------------------------
 // Default debug/fretest/release flags values

lib/Jsrt/ChakraCommon.h

@@ -48,6 +48,7 @@ typedef BYTE* ChakraBytePtr;
 #define _Pre_writable_byte_size_(byteLength)
 #define _Outptr_result_buffer_(byteLength)
 #define _Outptr_result_bytebuffer_(byteLength)
+#define _Outptr_result_maybenull_
 #define _Outptr_result_z_
 #define _Ret_maybenull_
 #define _Out_writes_(size)
@@ -70,6 +71,16 @@ typedef BYTE* ChakraBytePtr;
 #include <stdint.h>  // for uintptr_t
 typedef uintptr_t ChakraCookie;
 typedef unsigned char* ChakraBytePtr;
+
+// xplat-todo: try reduce usage of following types
+#if !defined(__MSTYPES_DEFINED)
+typedef uint32_t UINT32;
+typedef int64_t INT64;
+typedef void* HANDLE;
+typedef unsigned char BYTE;
+typedef UINT32 DWORD;
+#endif
+
 #endif //  defined(_WIN32) && defined(_MSC_VER)
 
     /// <summary>

lib/Jsrt/ChakraCore.h

@@ -110,7 +110,7 @@ CHAKRA_API
 JsParseModuleSource(
     _In_ JsModuleRecord requestModule,
     _In_ JsSourceContext sourceContext,
-    _In_ byte* script,
+    _In_ BYTE* script,
     _In_ unsigned int scriptLength,
     _In_ JsParseModuleSourceFlags sourceFlag,
     _Outptr_result_maybenull_ JsValueRef* exceptionValueRef);