Ros-diffs February 2019

ros-diffs@reactos.org

23 participants
208 discussions

[reactos] 06/06: [CRT] Implement thread/fiber safe support for MSVC and Clang-CL
by Timo Kreuzer 12 Feb '19

12 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a5bf9689144d2ec78f41… commit 2a5bf9689144d2ec78f4114d4d0f43758399f427 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Feb 4 00:06:35 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Feb 12 19:31:33 2019 +0100 [CRT] Implement thread/fiber safe support for MSVC and Clang-CL This is the most trivial (but also most efficient) implementation possible. Should be good enough for now. --- sdk/lib/crt/msvcrtex.cmake | 5 ++- sdk/lib/crt/startup/threadSafeInit.c | 60 ++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/sdk/lib/crt/msvcrtex.cmake b/sdk/lib/crt/msvcrtex.cmake index cd058cf089..c46751007a 100644 --- a/sdk/lib/crt/msvcrtex.cmake +++ b/sdk/lib/crt/msvcrtex.cmake @@ -41,7 +41,10 @@ list(APPEND MSVCRTEX_SOURCE misc/iswblank.c misc/ofmt_stub.c) -if(NOT MSVC) +if(MSVC) + list(APPEND MSVCRTEX_SOURCE + startup/threadSafeInit.c) +else() list(APPEND MSVCRTEX_SOURCE startup/pseudo-reloc.c startup/pseudo-reloc-list.c) diff --git a/sdk/lib/crt/startup/threadSafeInit.c b/sdk/lib/crt/startup/threadSafeInit.c new file mode 100644 index 0000000000..4ceb5ded6d --- /dev/null +++ b/sdk/lib/crt/startup/threadSafeInit.c @@ -0,0 +1,60 @@ +/* + * PROJECT: ReactOS CRT library + * LICENSE: CC0-1.0 (https://spdx.org/licenses/CC0-1.0) + * PURPOSE: Thread safe initialization support routines for MSVC and Clang-CL + * COPYRIGHT: Copyright 2019 Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <intrin.h> + +int _stdcall SwitchToThread(void); + +unsigned int _tls_array; +unsigned int _tls_index; +long _Init_global_epoch; +long _Init_thread_epoch; + +/* + This function tries to acquire a lock on the initialization for the static + variable by changing the value saved in *ptss to -1. If *ptss is 0, the + variable was not initialized yet and the function tries to set it to -1. + If that succeeds, the function will return. If the value is already -1, + another thread is in the process of doing the initialization and we + wait for it. If it is any other value the initialization is complete. + After returning the compiler generated code will check the value: + if it is -1 it will continue with the initialization, otherwise the + initialization must be complete and will be skipped. +*/ +void +_Init_thread_header(volatile int* ptss) +{ + while (1) + { + /* Try to acquire the first initialization lock */ + int oldTss = _InterlockedCompareExchange((long*)ptss, -1, 0); + if (oldTss == -1) + { + /* Busy, wait for the other thread to do the initialization */ + SwitchToThread(); + continue; + } + + /* Either we acquired the lock and the caller will do the initializaion + or the initialization is complete and the caller will skip it */ + break; + } +} + +void +_Init_thread_footer(volatile int* ptss) +{ + /* Initialization is complete */ + *ptss = _InterlockedIncrement(&_Init_global_epoch); +} + +void +_Init_thread_abort(volatile int* ptss) +{ + /* Abort the initialization */ + _InterlockedAnd((volatile long*)ptss, 0); +}

1 0

[reactos] 05/06: [CRT] Use alias names for rot functions when compiling with Clang-CL
by Timo Kreuzer 12 Feb '19

12 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dc77e7d37904fc9f31703… commit dc77e7d37904fc9f3170379481fa2ff185e7d555 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 3 23:36:49 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Feb 12 19:31:33 2019 +0100 [CRT] Use alias names for rot functions when compiling with Clang-CL Clang-CL does not support #pragma function like CL. The alternative to this approach is to disable all intrinsics for this single source file, but that is not trivial to do, as it can only be done by removing a compiler switch, which we have no CMake support for. Therefore this solution is simpler and as good. --- sdk/lib/crt/crt.cmake | 4 ++++ sdk/lib/crt/stdlib/clang-alias.s | 22 ++++++++++++++++++++++ sdk/lib/crt/stdlib/rot.c | 10 ++++++++-- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/sdk/lib/crt/crt.cmake b/sdk/lib/crt/crt.cmake index a6a7e5dc13..144a600097 100644 --- a/sdk/lib/crt/crt.cmake +++ b/sdk/lib/crt/crt.cmake @@ -441,6 +441,10 @@ if(ARCH STREQUAL "i386") list(APPEND CRT_ASM_SOURCE except/i386/cpp.s) endif() + if(USE_CLANG_CL) + list(APPEND CRT_ASM_SOURCE + stdlib/clang-alias.s) + endif() elseif(ARCH STREQUAL "amd64") list(APPEND CRT_ASM_SOURCE except/amd64/seh.s diff --git a/sdk/lib/crt/stdlib/clang-alias.s b/sdk/lib/crt/stdlib/clang-alias.s new file mode 100644 index 0000000000..56550073af --- /dev/null +++ b/sdk/lib/crt/stdlib/clang-alias.s @@ -0,0 +1,22 @@ +#include <asm.inc> + +.code + +MACRO(DEFINE_ALIAS, alias, orig, type) +EXTERN &orig:&type +ALIAS <&alias> = <&orig> +ENDM + +#ifdef _M_X64 +DEFINE_ALIAS _rotl, __function_rotl +DEFINE_ALIAS _rotr, __function_rotr +DEFINE_ALIAS _lrotl, __function_lrotl +DEFINE_ALIAS _lrotr, __function_lrotr +#else +DEFINE_ALIAS __rotl, ___function_rotl +DEFINE_ALIAS __rotr, ___function_rotr +DEFINE_ALIAS __lrotl, ___function_lrotl +DEFINE_ALIAS __lrotr, ___function_lrotr +#endif + +END diff --git a/sdk/lib/crt/stdlib/rot.c b/sdk/lib/crt/stdlib/rot.c index 7637a5e9b6..3c4b613a3a 100644 --- a/sdk/lib/crt/stdlib/rot.c +++ b/sdk/lib/crt/stdlib/rot.c @@ -10,11 +10,18 @@ #include <stdlib.h> -#ifdef _MSC_VER +#ifdef __clang__ +#define _rotl __function_rotl +#define _rotr __function_rotr +#define _lrotl __function_lrotl +#define _lrotr __function_lrotr +#elif defined(_MSC_VER) #pragma function(_rotr, _rotl, _rotr, _lrotl, _lrotr) #endif unsigned int _rotr( unsigned int value, int shift ); +unsigned long _lrotr(unsigned long value, int shift); + /* * @implemented */ @@ -43,7 +50,6 @@ unsigned int _rotr( unsigned int value, int shift ) return (value >> shift) | (value << (max_bits-shift)); } - /* * @implemented */

1 0

[reactos] 04/06: [MVDM] hack-fix Clang-CL build
by Timo Kreuzer 12 Feb '19

12 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0493e8e43229ceb25436d… commit 0493e8e43229ceb25436d0a97134cc246e6e4851 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 3 19:57:30 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Feb 12 19:31:33 2019 +0100 [MVDM] hack-fix Clang-CL build --- subsystems/mvdm/asm16.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/subsystems/mvdm/asm16.cmake b/subsystems/mvdm/asm16.cmake index 8cc77dd1d5..7d4832f354 100644 --- a/subsystems/mvdm/asm16.cmake +++ b/subsystems/mvdm/asm16.cmake @@ -113,10 +113,16 @@ function(add_asm16_bin _target _binary_file _base_address) endif() add_custom_command( - OUTPUT ${_preprocessed_asm_file} ${_object_file} - COMMAND ${CMAKE_C_COMPILER} /nologo ${_no_std_includes_flag} /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm ${_directory_includes} ${_source_file_defines} ${_directory_defines} /D__ASM__ /D_USE_ML /EP /c ${_concatenated_asm_file} > ${_preprocessed_asm_file} && ${_pp_asm16_compile_command} + OUTPUT ${_preprocessed_asm_file} + #COMMAND ${CMAKE_C_COMPILER} /nologo ${_no_std_includes_flag} /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm ${_directory_includes} ${_source_file_defines} ${_directory_defines} /D__ASM__ /D_USE_ML /EP /c ${_concatenated_asm_file} > ${_preprocessed_asm_file} + COMMAND cl /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm ${_directory_includes} ${_source_file_defines} ${_directory_defines} /D__ASM__ /D_USE_ML /EP /c ${_concatenated_asm_file} > ${_preprocessed_asm_file} DEPENDS ${_concatenated_asm_file}) + add_custom_command( + OUTPUT ${_object_file} + COMMAND ${_pp_asm16_compile_command} + DEPENDS ${_preprocessed_asm_file}) + add_custom_command( OUTPUT ${_binary_file} COMMAND native-obj2bin ${_object_file} ${_binary_file} ${_base_address}

1 0

[reactos] 03/06: [CPPRT] Implement __std_terminate wrapper for Clang-CL
by Timo Kreuzer 12 Feb '19

12 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf5926c207f8c9e95da13… commit cf5926c207f8c9e95da136e43f00392086b11f8b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 3 18:25:04 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Feb 12 19:31:33 2019 +0100 [CPPRT] Implement __std_terminate wrapper for Clang-CL --- sdk/lib/cpprt/CMakeLists.txt | 1 + sdk/lib/cpprt/terminate.cpp | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/sdk/lib/cpprt/CMakeLists.txt b/sdk/lib/cpprt/CMakeLists.txt index 4e090f2a0a..de120e4042 100644 --- a/sdk/lib/cpprt/CMakeLists.txt +++ b/sdk/lib/cpprt/CMakeLists.txt @@ -8,6 +8,7 @@ include_directories( list(APPEND SOURCE ehvec.cpp new_nothrow.cpp + terminate.cpp typeinfo.cpp) if(ARCH STREQUAL "i386") diff --git a/sdk/lib/cpprt/terminate.cpp b/sdk/lib/cpprt/terminate.cpp new file mode 100644 index 0000000000..14fc919c81 --- /dev/null +++ b/sdk/lib/cpprt/terminate.cpp @@ -0,0 +1,14 @@ +/* + * PROJECT: ReactOS C++ Runtime Library + * LICENSE: CC0-1.0 (https://spdx.org/licenses/CC0-1.0) + * PURPOSE: __std_terminate implementation + * COPYRIGHT: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <exception> + +extern "C" +void __std_terminate() +{ + terminate(); +}

1 0

[reactos] 02/06: [NDK] Fix INIT_SECTION for Clang (use the GCC definition)
by Timo Kreuzer 12 Feb '19

12 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=68abf035c646a54adf7f4… commit 68abf035c646a54adf7f4e424fcccd1602d23938 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 3 18:04:03 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Feb 12 19:31:33 2019 +0100 [NDK] Fix INIT_SECTION for Clang (use the GCC definition) --- sdk/include/ndk/section_attribs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/ndk/section_attribs.h b/sdk/include/ndk/section_attribs.h index a35fae81eb..2d1007aac6 100644 --- a/sdk/include/ndk/section_attribs.h +++ b/sdk/include/ndk/section_attribs.h @@ -18,7 +18,7 @@ Author: #pragma once -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__clang__) #define INIT_SECTION __attribute__((section ("INIT"))) #define INIT_FUNCTION __attribute__((section ("INIT")))

1 0

[reactos] 01/06: [CRT] Don't define _DECLSPEC_I on Clang builds
by Timo Kreuzer 12 Feb '19

12 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=afe203a1a5345a801f23e… commit afe203a1a5345a801f23ec908dd5ca8470b91f91 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 3 17:49:29 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Feb 12 19:31:33 2019 +0100 [CRT] Don't define _DECLSPEC_I on Clang builds --- sdk/include/crt/_mingw.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/crt/_mingw.h b/sdk/include/crt/_mingw.h index 203ac56627..7aa8c21cb7 100644 --- a/sdk/include/crt/_mingw.h +++ b/sdk/include/crt/_mingw.h @@ -207,7 +207,7 @@ allow GCC to optimize away some EH unwind code, at least in DW2 case. */ #define _CRT_UNUSED(x) (void)x #endif -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(__clang__) #define ATTRIB_NORETURN #define _DECLSPEC_INTRIN_TYPE __declspec(intrin_type) #else

1 0

[reactos] 01/01: [SNDVOL32] Read the Style value from the registry and use it as the default display mode. The /n option is no longer needed.
by Eric Kohl 11 Feb '19

11 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f6e819fcb82eea5db0e8f… commit f6e819fcb82eea5db0e8ff39e2817dde4fff45c7 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Feb 11 23:44:01 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Feb 11 23:44:01 2019 +0100 [SNDVOL32] Read the Style value from the registry and use it as the default display mode. The /n option is no longer needed. CORE-15743 --- base/applications/sndvol32/misc.c | 30 ++++++++++++++++++++++++++++-- base/applications/sndvol32/sndvol32.c | 14 ++++++-------- base/applications/sndvol32/sndvol32.h | 3 +++ 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/base/applications/sndvol32/misc.c b/base/applications/sndvol32/misc.c index 1f0ff8496d..670fa12f25 100644 --- a/base/applications/sndvol32/misc.c +++ b/base/applications/sndvol32/misc.c @@ -128,9 +128,9 @@ LoadAndFormatString(IN HINSTANCE hInstance, } static const TCHAR AppRegSettings[] = TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Volume Control"); -//static const TCHAR AppOptionsKey[] = TEXT("Options"); +static const TCHAR AppOptionsKey[] = TEXT("Options"); static const TCHAR LineStatesValue[] = TEXT("LineStates"); -//static const TCHAR StyleValue[] = TEXT("Style"); +static const TCHAR StyleValue[] = TEXT("Style"); HKEY hAppSettingsKey = NULL; @@ -273,3 +273,29 @@ ExitClose: return Ret; } + +DWORD +GetStyleValue(VOID) +{ + HKEY hOptionsKey; + DWORD dwStyle = 0, dwSize; + + if (RegOpenKeyEx(hAppSettingsKey, + AppOptionsKey, + 0, + KEY_READ, + &hOptionsKey) == ERROR_SUCCESS) + { + dwSize = sizeof(DWORD); + RegQueryValueEx(hOptionsKey, + StyleValue, + NULL, + NULL, + (LPBYTE)&dwStyle, + &dwSize); + + RegCloseKey(hOptionsKey); + } + + return dwStyle; +} diff --git a/base/applications/sndvol32/sndvol32.c b/base/applications/sndvol32/sndvol32.c index 29e6dcf367..011bec2f12 100644 --- a/base/applications/sndvol32/sndvol32.c +++ b/base/applications/sndvol32/sndvol32.c @@ -1322,13 +1322,14 @@ CreateApplicationWindow( static BOOL HandleCommandLine(LPTSTR cmdline, + DWORD dwStyle, PWINDOW_MODE pMode, PUINT pMixerId) { TCHAR option; *pMixerId = 0; - *pMode = SMALL_MODE; + *pMode = (dwStyle & 0x20) ? SMALL_MODE : NORMAL_MODE; while (*cmdline == _T(' ') || *cmdline == _T('-') || *cmdline == _T('/')) { @@ -1347,11 +1348,6 @@ HandleCommandLine(LPTSTR cmdline, case 'D': break; - case 'n': /* Normal size */ - case 'N': - *pMode = NORMAL_MODE; - break; - case 's': /* Small size */ case 'S': *pMode = SMALL_MODE; @@ -1391,6 +1387,7 @@ _tWinMain(HINSTANCE hInstance, INITCOMMONCONTROLSEX Controls; WINDOW_MODE WindowMode = SMALL_MODE; UINT MixerId = 0; + DWORD dwStyle; UNREFERENCED_PARAMETER(hPrevInstance); UNREFERENCED_PARAMETER(nCmdShow); @@ -1398,10 +1395,11 @@ _tWinMain(HINSTANCE hInstance, hAppInstance = hInstance; hAppHeap = GetProcessHeap(); - HandleCommandLine(lpszCmdLine, &WindowMode, &MixerId); - if (InitAppConfig()) { + dwStyle = GetStyleValue(); + HandleCommandLine(lpszCmdLine, dwStyle, &WindowMode, &MixerId); + /* load the application title */ if (!AllocAndLoadString(&lpAppTitle, hAppInstance, diff --git a/base/applications/sndvol32/sndvol32.h b/base/applications/sndvol32/sndvol32.h index cf20366480..65fcb36176 100644 --- a/base/applications/sndvol32/sndvol32.h +++ b/base/applications/sndvol32/sndvol32.h @@ -185,6 +185,9 @@ WriteLineConfig(IN LPTSTR szDeviceName, IN PSNDVOL_REG_LINESTATE LineState, IN DWORD cbSize); +DWORD +GetStyleValue(VOID); + /* tray.c */ INT_PTR

1 0

[reactos] 01/01: [SNDVOL32] Disable the balance trackbar for mono channels.
by Eric Kohl 11 Feb '19

11 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45f0d7413c1eec69fe672… commit 45f0d7413c1eec69fe6728fcd26acc561d93f46f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Feb 11 21:16:32 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Feb 11 21:16:32 2019 +0100 [SNDVOL32] Disable the balance trackbar for mono channels. CORE-15743 --- base/applications/sndvol32/dialog.c | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/base/applications/sndvol32/dialog.c b/base/applications/sndvol32/dialog.c index 8ff9a490b4..a93a638034 100644 --- a/base/applications/sndvol32/dialog.c +++ b/base/applications/sndvol32/dialog.c @@ -562,21 +562,36 @@ EnumConnectionsCallback( } } - /* Set the balance trackbar */ - wID = (PrefContext->Count + 1) * IDC_LINE_SLIDER_HORZ; - - /* get dialog control */ - hDlgCtrl = GetDlgItem(PrefContext->MixerWindow->hWnd, wID); + if (Line->cChannels == 1) + { + /* Disable the balance trackbar for mono channels */ + wID = (PrefContext->Count + 1) * IDC_LINE_SLIDER_HORZ; - if (hDlgCtrl != NULL) + /* get dialog control */ + hDlgCtrl = GetDlgItem(PrefContext->MixerWindow->hWnd, wID); + if (hDlgCtrl != NULL) + { + EnableWindow(hDlgCtrl, FALSE); + } + } + else if (Line->cChannels == 2) { - /* check state */ - LRESULT OldPosition = SendMessageW(hDlgCtrl, TBM_GETPOS, 0, 0); + /* Set the balance trackbar */ + wID = (PrefContext->Count + 1) * IDC_LINE_SLIDER_HORZ; + + /* get dialog control */ + hDlgCtrl = GetDlgItem(PrefContext->MixerWindow->hWnd, wID); - if (OldPosition != balancePosition) + if (hDlgCtrl != NULL) { - /* update control state */ - SendMessageW(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, balancePosition); + /* check state */ + LRESULT OldPosition = SendMessageW(hDlgCtrl, TBM_GETPOS, 0, 0); + + if (OldPosition != balancePosition) + { + /* update control state */ + SendMessageW(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, balancePosition); + } } } }

1 0

[reactos] 01/01: [MEDIA][INF] Fix E1000 driver date
by Stanislav Motylkov 11 Feb '19

11 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=008344fd0917bae3904af… commit 008344fd0917bae3904af10c2f877930619b003a Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Feb 11 21:16:26 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 11 19:35:34 2019 +0100 [MEDIA][INF] Fix E1000 driver date DriverVer date format is mm/dd/yyyy --- media/inf/nete1000.inf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/inf/nete1000.inf b/media/inf/nete1000.inf index 9b026154dc..9eabcecfad 100644 --- a/media/inf/nete1000.inf +++ b/media/inf/nete1000.inf @@ -9,7 +9,7 @@ LayoutFile = layout.inf Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %ReactOS% -DriverVer = 22/01/2019,1.00 +DriverVer = 01/22/2019,1.00 [DestinationDirs] DefaultDestDir = 12

1 0

[reactos] 01/01: [CONFIGURE] Do not create another "reactos" directory in build directory. This makes configure.sh consistent with configure.cmd
by Victor Perevertkin 11 Feb '19

11 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=53ce7d4370d2dbcce0217… commit 53ce7d4370d2dbcce0217b12d8a93d556a36a55b Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Sun Sep 16 15:07:46 2018 +0300 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Feb 11 09:55:17 2019 +0100 [CONFIGURE] Do not create another "reactos" directory in build directory. This makes configure.sh consistent with configure.cmd --- .travis.yml | 2 +- configure.sh | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 447a77b553..a91c8c95fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ git: before_script: - wget https://svn.reactos.org/amine/RosBEBinFull.tar.gz -O RosBE.tar.gz - tar -xzf RosBE.tar.gz - - echo 'mkdir ../Build && cd ../Build && $TRAVIS_BUILD_DIR/configure.sh -DENABLE_ROSTESTS=1 && cd reactos && ninja -k 0 && ninja bootcd' > tmp_file + - echo 'mkdir ../Build && cd ../Build && $TRAVIS_BUILD_DIR/configure.sh -DENABLE_ROSTESTS=1 && ninja -k 0 && ninja bootcd' > tmp_file script: - ./RosBEBinFull/RosBE.sh < tmp_file diff --git a/configure.sh b/configure.sh index 64a18db4c8..52417c06e5 100755 --- a/configure.sh +++ b/configure.sh @@ -50,11 +50,10 @@ if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then cd "$REACTOS_OUTPUT_PATH" fi -mkdir -p reactos - #EXTRA_ARGS="" if [ $USE_NEW_STYLE -eq 0 ]; then mkdir -p host-tools + mkdir -p reactos echo Preparing host tools... cd host-tools rm -f CMakeCache.txt @@ -68,7 +67,11 @@ if [ $USE_NEW_STYLE -eq 0 ]; then fi echo Preparing reactos... -cd reactos + +if [ $USE_NEW_STYLE -eq 0 ]; then + cd reactos +fi + rm -f CMakeCache.txt host-tools/CMakeCache.txt cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-gcc.cmake -DARCH:STRING=$ARCH -DNEW_STYLE_BUILD:BOOL=$USE_NEW_STYLE $EXTRA_ARGS $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
21
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2019