Skip to content

Commit

Permalink
MAKE: Preparing for the new Release v2.1.7
Browse files Browse the repository at this point in the history
If due to certain decision the developer provides two versions
of dummy-interface for the same file, no STAT applies the
ordering rules as well. The first declared one is the version
that is taken.

Signed-off-by: Arseniy Aharonov <[email protected]>
  • Loading branch information
Arseniy Aharonov authored and are-scenic committed Apr 12, 2021
1 parent 8cf6c62 commit c0483d1
Show file tree
Hide file tree
Showing 6 changed files with 72 additions and 6 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/vs_ide.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# This workflow will install Python dependencies, run tests and lint with a single version of Python
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: VS build tests

on:
push:
branches: [master, feature/**, bugfix/**]
paths-ignore: ['docs/**', '*.md']
pull_request:
branches: [master]
paths-ignore: ['docs/**', '*.md']

jobs:
framework-regression:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest]
python-version: [2.7, 3.8]

steps:

- uses: actions/checkout@v2

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- name: Run VS building tests
run: |
Start-Process "cmd.exe" "/c test_vs_build.cmd"
15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,20 @@ All notable changes to this project will be documented in this file.
Release name format: [2.2.1] - 2020-02-02
-->

## [Unreleased]
## [2.1.7] - 2021-04-13

### Added

- Added support for double-versioning of dummy-interfaces
- It allows more flexibility, though usually signals bad test-design

### Changed

- Improved performance of rebuild (-c) and 'gear'-ed (-g) command-line configurations.

### Fixed

- Fixed an issue with the performance of the framework on Windows platform.

None

Expand Down
11 changes: 8 additions & 3 deletions build/copy.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ setlocal
set ITEMS_COUNT=0
:ARG_LOOP
set "ARGUMENT=%~1"
set "FULL_PATHNAME=%~1"
set "FULL_PATHNAME=%~f1"
SHIFT /1
IF "%ARGUMENT%" EQU "" GOTO :NO_MORE_ARGS
IF "%ARGUMENT:~0,1%" EQU "-" (
Expand Down Expand Up @@ -53,9 +53,14 @@ FOR /L %%a in (0,1,%LAST_SOURCE_INDEX%) DO set COPY_SOURCES=!COPY_SOURCES! "!COP
IF DEFINED OPTION_s (
:: If symbolic link shall be created instead of copying
IF DEFINED OPTION_n (
FOR %%F IN (%COPY_SOURCES%) DO IF NOT EXIST "%INCLUDES_PATH%\%%~nxF" mklink "%INCLUDES_PATH%\%%~nxF" "%%~fF"
FOR %%F IN (%COPY_SOURCES%) DO IF NOT EXIST "%INCLUDES_PATH%\%%~nxF" (
mklink "%INCLUDES_PATH%\%%~nxF" "%%~fF"
)
) ELSE (
FOR %%F IN (%COPY_SOURCES%) DO mklink "%INCLUDES_PATH%\%%~nxF" "%%~fF"
FOR %%F IN (%COPY_SOURCES%) DO (
IF EXIST "%INCLUDES_PATH%\%%~nxF" del /q /f "%INCLUDES_PATH%\%%~nxF"
mklink "%INCLUDES_PATH%\%%~nxF" "%%~fF"
)
)
) ELSE (
:: If regular copying was requested
Expand Down
2 changes: 1 addition & 1 deletion build/engine.mak
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ build: $(EXECUTABLE) | $(PRECEDING_CLEANUP) $(ALL_OUTPUT_DIRS)

rebuild: $(PRECEDING_CLEANUP) $(ALL_OUTPUT_DIRS)
@echo Installing dependencies...
$(call OS.COPY,$(COPY_METHOD_FLAGS),$(DUMMY_INTERFACES),$(HEADERS_DIR))
$(call OS.COPY,-n $(COPY_METHOD_FLAGS),$(DUMMY_INTERFACES),$(HEADERS_DIR))
$(call OS.COPY,-n $(COPY_METHOD_FLAGS),$(foreach _dir_,$(INCLUDES),$(_dir_)*.h),$(HEADERS_DIR))
@echo Compiling all...
$(foreach SOURCE_FILE,$(SOURCES),$(RECOMPILE_COMMAND) $(NEW_LINE_BREAK))
Expand Down
15 changes: 15 additions & 0 deletions lib/tests/test_vs_build.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
@echo off
for /f usebackq^ tokens^=2^ delims^=^" %%i in (`makestat.py -p lib stat_mock.mak -vs`) do set solution=%%i
for /f "usebackq tokens=1* delims=: " %%i in (`..\..\resources\vswhere.exe -latest -requires Microsoft.VisualStudio.Workload.NativeDesktop`) do (
if /i "%%i"=="productPath" set ide=%%j
)
if "%solution%"=="" (
echo Failed to create a VS solution file.
exit 1
)
if "%ide%"=="" (
echo Failed to retrieve the location of devenv.ext file.
exit 1
)
echo Building...
"%ide%" "%solution%" /Rebuild
2 changes: 1 addition & 1 deletion stat_attributes.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# SPDX-License-Identifier: MIT

# ----------------------------------------------------------------------------------------------------------------------
VERSION = '2.1.6'
VERSION = '2.1.7'

WEB_URL = "https://github.com/westerndigitalcorporation/stat#3-usage"
RESOURCES_DIRECTORY = 'resources'
Expand Down

0 comments on commit c0483d1

Please sign in to comment.