Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revise tools scripts to be python3 compatible on win32 and enable github ci for win32 #4856

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions .github/workflows/gh-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,54 @@ jobs:
- run: $RUNNER -q --jerry-tests --buildoptions=--compile-flag=-m32,--cpointer-32bit=on
- run: $RUNNER -q --jerry-tests --buildoptions=--compile-flag=-m32,--cpointer-32bit=on --build-debug

Win_x86-64_Conformance_Tests_ESNext:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- run: python $env:RUNNER --test262 update
lygstate marked this conversation as resolved.
Show resolved Hide resolved

Win_x86-64_Conformance_Tests_ESNext_Debug:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- run: python $env:RUNNER --test262 update --build-debug

Win_x86-64_Tests-MINGW:
runs-on: windows-latest
defaults:
run:
shell: msys2 {0}
steps:
- uses: actions/checkout@v4
- uses: msys2/setup-msys2@v2
with:
msystem: MINGW64
update: true
install: >-
mingw-w64-x86_64-python
mingw-w64-x86_64-cmake
mingw-w64-x86_64-make
mingw-w64-x86_64-toolchain
- run: python $RUNNER -q --jerry-tests
- run: python $RUNNER -q --unittests --build-config=''
# FIXME: enable it with upgrade valgrind - run: python $RUNNER -q --buildoption-test

Win_x86-64_Tests:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- run: python $env:RUNNER -q --jerry-tests
- run: python $env:RUNNER -q --unittests
- run: python $env:RUNNER -q --buildoption-test
lygstate marked this conversation as resolved.
Show resolved Hide resolved

Win_x86-64_Tests_Debug:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- run: python $env:RUNNER -q --jerry-tests --build-debug
- run: python $env:RUNNER -q --unittests --build-debug
- run: python $env:RUNNER -q --buildoption-test --build-debug

OSX_x86-64_Build_Correctness_Unit_Tests:
runs-on: macos-13
steps:
Expand Down
13 changes: 7 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,23 @@ set(PLATFORM "${CMAKE_SYSTEM_NAME}")
string(TOUPPER "${PLATFORM}" PLATFORM)

# Determining compiler
if(MSVC)
set(USING_MSVC 1)
endif()

if(CMAKE_C_COMPILER_ID MATCHES "GNU")
set(USING_GCC 1)
endif()

if(CMAKE_C_COMPILER_ID MATCHES "Clang")
# Clang may support for MSVC
if(NOT USING_MSVC AND CMAKE_C_COMPILER_ID MATCHES "Clang")
set(USING_CLANG 1)
endif()

if(CMAKE_C_COMPILER_ID MATCHES "TI")
set(USING_TI 1)
endif()

if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
set(USING_MSVC 1)
endif()

# Determining build type
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "MinSizeRel")
Expand All @@ -68,7 +69,7 @@ set(ENABLE_STRIP ON CACHE BOOL "Enable stripping all symbols from
set(ENABLE_COMPILE_COMMANDS ON CACHE BOOL "Enable generating compile_commands.json?")

if(USING_MSVC)
set(ENABLE_STATIC_CRT OFF CACHE BOOL "Enable MSVC static CRT?")
set(ENABLE_STATIC_CRT OFF CACHE BOOL "Enable MSVC static CRT?")
endif()

# Option overrides
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# JerryScript: JavaScript engine for the Internet of Things
[![License](https://img.shields.io/badge/licence-Apache%202.0-brightgreen.svg?style=flat)](LICENSE)
[![GitHub Actions Status](https://github.com/jerryscript-project/jerryscript/workflows/JerryScript%20CI/badge.svg)](https://github.com/jerryscript-project/jerryscript/actions)
[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/ct8reap35u2vooa5/branch/master?svg=true)](https://ci.appveyor.com/project/jerryscript-project/jerryscript/branch/master)
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgh.neting.cc%2Fjerryscript-project%2Fjerryscript.svg?type=shield)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgh.neting.cc%2Fjerryscript-project%2Fjerryscript?ref=badge_shield)
[![IRC Channel](https://img.shields.io/badge/chat-on%20freenode-brightgreen.svg)](https://kiwiirc.com/client/irc.freenode.net/#jerryscript)

Expand Down
27 changes: 0 additions & 27 deletions appveyor.yml

This file was deleted.

14 changes: 7 additions & 7 deletions jerry-core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,13 @@ set(INCLUDE_CORE_PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/parser/regexp"
"${CMAKE_CURRENT_SOURCE_DIR}/vm")

# Third-party
# Valgrind
set(INCLUDE_THIRD_PARTY_VALGRIND "${CMAKE_SOURCE_DIR}/third-party/valgrind")
if(JERRY_VALGRIND)
set(INCLUDE_CORE_PRIVATE ${INCLUDE_CORE_PRIVATE} ${INCLUDE_THIRD_PARTY_VALGRIND})
endif()

set(INCLUDE_CORE_PUBLIC ${INCLUDE_CORE_PUBLIC} PARENT_SCOPE) # for jerry-port
set(INCLUDE_CORE_PRIVATE ${INCLUDE_CORE_PRIVATE} PARENT_SCOPE) # for tests/unit-core

Expand Down Expand Up @@ -533,10 +540,6 @@ if(ENABLE_AMALGAM)
set(INCLUDE_CORE_PRIVATE PARENT_SCOPE)
endif()

# Third-party
# Valgrind
set(INCLUDE_THIRD_PARTY_VALGRIND "${CMAKE_SOURCE_DIR}/third-party/valgrind")

# build mode specific compile/link flags
set(DEFINES_JERRY ${DEFINES_JERRY} $<$<NOT:$<CONFIG:Debug>>:JERRY_NDEBUG>)

Expand Down Expand Up @@ -641,9 +644,6 @@ jerry_add_define01(JERRY_SYSTEM_ALLOCATOR)

# Valgrind
jerry_add_define01(JERRY_VALGRIND)
lygstate marked this conversation as resolved.
Show resolved Hide resolved
if(JERRY_VALGRIND)
set(INCLUDE_CORE_PRIVATE ${INCLUDE_CORE_PRIVATE} ${INCLUDE_THIRD_PARTY_VALGRIND})
endif()

# Enable VM execution stop callback
jerry_add_define01(JERRY_VM_HALT)
Expand Down
3 changes: 2 additions & 1 deletion jerry-core/ecma/base/ecma-helpers-string.c
Original file line number Diff line number Diff line change
Expand Up @@ -1605,7 +1605,8 @@ ecma_compare_ecma_strings_longpath (const ecma_string_t *string1_p, /**< ecma-st
const ecma_string_t *string2_p) /**< ecma-string */
{
const lit_utf8_byte_t *utf8_string1_p, *utf8_string2_p;
lit_utf8_size_t string1_size_and_length[2], string2_size_and_length[2];
lit_utf8_size_t string1_size_and_length[2] = { 0 };
lit_utf8_size_t string2_size_and_length[2] = { 0 };

utf8_string1_p = ecma_compare_get_string_chars (string1_p, string1_size_and_length);
utf8_string2_p = ecma_compare_get_string_chars (string2_p, string2_size_and_length);
Expand Down
15 changes: 13 additions & 2 deletions jerry-core/include/jerryscript-compiler.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@ JERRY_C_API_BEGIN
* @{
*/

/*
* Compiler-specific macros relevant for Win32.
*/
#ifdef _WIN32
/**
* Both MINGW/MSVC do not support for declare a function a weak symbol.
*/
#define JERRY_ATTR_WEAK
#endif /* _WIN32 */

#ifdef __GNUC__

/*
Expand All @@ -45,9 +55,10 @@ JERRY_C_API_BEGIN
#define JERRY_ATTR_NORETURN __attribute__ ((noreturn))
#define JERRY_ATTR_PURE __attribute__ ((pure))
#define JERRY_ATTR_WARN_UNUSED_RESULT __attribute__ ((warn_unused_result))
#define JERRY_ATTR_WEAK __attribute__ ((weak))

#define JERRY_WEAK_SYMBOL_SUPPORT
#ifndef JERRY_ATTR_WEAK
#define JERRY_ATTR_WEAK __attribute__ ((weak))
#endif /* !JERRY_ATTR_WEAK*/

#ifndef JERRY_LIKELY
#define JERRY_LIKELY(x) __builtin_expect (!!(x), 1)
Expand Down
4 changes: 2 additions & 2 deletions jerry-port/common/jerry-port-fs.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jerry_port_source_free (uint8_t *buffer_p) /**< buffer to free */
* These functions provide generic implementation for paths and are only enabled when the compiler support weak symbols,
* and we are not building for a platform that has platform specific versions.
*/
#if defined(JERRY_WEAK_SYMBOL_SUPPORT) && !(defined(__unix__) || defined(__APPLE__) || defined(_WIN32))
#if !(defined(__unix__) || defined(__APPLE__) || defined(_WIN32))

/**
* Normalize a file path.
Expand Down Expand Up @@ -159,4 +159,4 @@ jerry_port_path_base (const jerry_char_t *path_p) /**< path */
return (jerry_size_t) (basename_p - path_p);
} /* jerry_port_get_directory_end */

#endif /* defined(JERRY_WEAK_SYMBOL_SUPPORT) && !(defined(__unix__) || defined(__APPLE__) || defined(_WIN32)) */
#endif /* !(defined(__unix__) || defined(__APPLE__) || defined(_WIN32)) */
37 changes: 17 additions & 20 deletions jerry-port/win/jerry-port-win-date.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include <winbase.h>
#include <winnt.h>

#define UNIX_EPOCH_IN_TICKS 116444736000000000ull /* difference between 1970 and 1601 */
#define TICKS_PER_MS 10000ull /* 1 tick is 100 nanoseconds */
#define UNIX_EPOCH_IN_TICKS 116444736000000000LL /* difference between 1970 and 1601 */
#define TICKS_PER_MS 10000LL /* 1 tick is 100 nanoseconds */

/*
* If you take the limit of SYSTEMTIME (last millisecond in 30827) then you end up with
Expand All @@ -44,15 +44,9 @@
* https://support.microsoft.com/en-us/help/167296/how-to-convert-a-unix-time-t-to-a-win32-filetime-or-systemtime
*/
static void
unix_time_to_filetime (double t, LPFILETIME ft_p)
unix_time_to_filetime (LONGLONG t, LPFILETIME ft_p)
{
LONGLONG ll = (LONGLONG) t * TICKS_PER_MS + UNIX_EPOCH_IN_TICKS;

/* FILETIME values before the epoch are invalid. */
if (ll < 0)
{
ll = 0;
}
LONGLONG ll = t * TICKS_PER_MS + UNIX_EPOCH_IN_TICKS;

ft_p->dwLowDateTime = (DWORD) ll;
ft_p->dwHighDateTime = (DWORD) (ll >> 32);
Expand All @@ -63,13 +57,15 @@ unix_time_to_filetime (double t, LPFILETIME ft_p)
*
* @return unix time
*/
static double
static LONGLONG
filetime_to_unix_time (LPFILETIME ft_p)
{
ULARGE_INTEGER date;
LONGLONG ll;
date.HighPart = ft_p->dwHighDateTime;
date.LowPart = ft_p->dwLowDateTime;
return (double) (((LONGLONG) date.QuadPart - UNIX_EPOCH_IN_TICKS) / TICKS_PER_MS);
ll = (LONGLONG) date.QuadPart - UNIX_EPOCH_IN_TICKS;
return ll / TICKS_PER_MS;
} /* filetime_to_unix_time */

/**
Expand All @@ -85,6 +81,7 @@ jerry_port_local_tza (double unix_ms)
FILETIME local;
SYSTEMTIME utc_sys;
SYSTEMTIME local_sys;
LONGLONG t = (LONGLONG) (unix_ms);

/*
* If the time is earlier than the date 1601-01-02, then always using date 1601-01-02 to
Expand All @@ -93,23 +90,23 @@ jerry_port_local_tza (double unix_ms)
* after converting between local time and utc time, the time may be earlier than 1601-01-01
* in UTC time, that exceeds the FILETIME representation range.
*/
if (unix_ms < (double) UNIX_EPOCH_DATE_1601_01_02)
if (t < UNIX_EPOCH_DATE_1601_01_02)
{
unix_ms = (double) UNIX_EPOCH_DATE_1601_01_02;
t = UNIX_EPOCH_DATE_1601_01_02;
}

/* Like above, do not use the last supported day */
if (unix_ms > (double) UNIX_EPOCH_DATE_30827_12_29)
if (t > UNIX_EPOCH_DATE_30827_12_29)
{
unix_ms = (double) UNIX_EPOCH_DATE_30827_12_29;
t = UNIX_EPOCH_DATE_30827_12_29;
}
unix_time_to_filetime (unix_ms, &utc);
unix_time_to_filetime (t, &utc);

if (FileTimeToSystemTime (&utc, &utc_sys) && SystemTimeToTzSpecificLocalTime (NULL, &utc_sys, &local_sys)
&& SystemTimeToFileTime (&local_sys, &local))
{
double unix_local = filetime_to_unix_time (&local);
return (int32_t) (unix_local - unix_ms);
LONGLONG unix_local = filetime_to_unix_time (&local);
return (int32_t) (unix_local - t);
}

return 0;
Expand All @@ -125,7 +122,7 @@ jerry_port_current_time (void)
{
FILETIME ft;
GetSystemTimeAsFileTime (&ft);
return filetime_to_unix_time (&ft);
return (double) filetime_to_unix_time (&ft);
} /* jerry_port_current_time */

#endif /* defined(_WIN32) */
2 changes: 1 addition & 1 deletion jerry-port/win/jerry-port-win-fs.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jerry_port_path_normalize (const jerry_char_t *path_p, /**< input path */
{
(void) path_size;

return (jerry_char_t *) _fullpath (NULL, path_p, _MAX_PATH);
return (jerry_char_t *) _fullpath (NULL, (const char *) path_p, _MAX_PATH);
} /* jerry_port_path_normalize */

/**
Expand Down
8 changes: 8 additions & 0 deletions tests/jerry/date-getters.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,16 @@ assert (new Date(-1, -1, -1, -1, -1, -1, -1, -1).getMilliseconds() === 999);
assert (isNaN(new Date(20000000, 0).getFullYear()));
assert (new Date(0, 0).getFullYear() === 1900);
assert (new Date(1.2, 0).getFullYear() === 1901);

/* 7. test case */
/* A Number can exactly represent all integers from -9,007,199,254,740,992 to 9,007,199,254,740,992 (21.1.2.8 and 21.1.2.6).
A time value supports a slightly smaller range of -8,640,000,000,000,000 to 8,640,000,000,000,000 milliseconds. */
assert((new Date(8640000000000000).getFullYear()) == 275760);
assert(isNaN(new Date(8640000000000001).getFullYear()));
assert((new Date(-8640000000000000).getFullYear()) == -271821);
assert(isNaN(new Date(-8640000000000001).getFullYear()));

/* 8. test case */
assert((new Date(-271821, 3, 21).getFullYear()) == -271821);
assert(isNaN(new Date(1970, 0, -100000000).getFullYear()));
assert(new Date(1970, 0, -100000000 + 1).getFullYear() == -271821);
Expand Down
Loading
Loading