Skip to content

Commit 6e6f489

Browse files
authored
move native project to top-level (#248)
1 parent 27f8b7a commit 6e6f489

17 files changed

+16
-28
lines changed

.github/workflows/main.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
os: [ubuntu-22.04, windows-2022]
1818

1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121

2222
- name: Setup Python 3.x
2323
uses: actions/setup-python@v2
@@ -28,20 +28,14 @@ jobs:
2828
- name: Compile wrapper on Windows
2929
if: startsWith(runner.os, 'Windows')
3030
run: |
31-
mkdir tmp-build
32-
cd tmp-build
33-
cmake $Env:github_workspace/pythonfmu/pythonfmu-export -DCMAKE_BUILD_TYPE=Release -A x64
34-
cmake --build . --config Release
35-
cd ..
31+
cmake . -B build -DCMAKE_BUILD_TYPE=Release -A x64
32+
cmake --build build --config Release
3633
3734
- name: Compile wrapper on Linux / macOS
3835
if: startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS')
3936
run: |
40-
mkdir tmp-build
41-
cd tmp-build
42-
cmake $GITHUB_WORKSPACE/pythonfmu/pythonfmu-export -DCMAKE_BUILD_TYPE=Release
43-
cmake --build . --config Release
44-
cd ..
37+
cmake . -B build -DCMAKE_BUILD_TYPE=Release
38+
cmake --build build
4539
4640
- name: Archive wrapper library
4741
uses: actions/upload-artifact@v4
@@ -53,7 +47,7 @@ jobs:
5347
needs: build-wrapper
5448
runs-on: ubuntu-latest
5549
steps:
56-
- uses: actions/checkout@v3
50+
- uses: actions/checkout@v4
5751

5852
- name: Setup Python 3.x
5953
uses: actions/setup-python@v2
@@ -90,7 +84,7 @@ jobs:
9084
timeout-minutes: 15
9185

9286
steps:
93-
- uses: actions/checkout@v3
87+
- uses: actions/checkout@v4
9488

9589
- name: Setup Python 3.x
9690
uses: actions/setup-python@v2

.github/workflows/publish.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
os: [ubuntu-22.04, windows-2022]
1414

1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v4
1717
- name: Setup Python 3.x
1818
uses: actions/setup-python@v2
1919
with:
@@ -22,19 +22,13 @@ jobs:
2222
- name: Compile wrapper on Windows
2323
if: startsWith(runner.os, 'Windows')
2424
run: |
25-
mkdir tmp-build
26-
cd tmp-build
27-
cmake $Env:github_workspace/pythonfmu/pythonfmu-export -DCMAKE_BUILD_TYPE=Release -A x64
28-
cmake --build . --config Release
29-
cd ..
25+
cmake . -B build -DCMAKE_BUILD_TYPE=Release -A x64
26+
cmake --build build --config Release
3027
- name: Compile wrapper on Linux / macOS
3128
if: startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS')
3229
run: |
33-
mkdir tmp-build
34-
cd tmp-build
35-
cmake $GITHUB_WORKSPACE/pythonfmu/pythonfmu-export -DCMAKE_BUILD_TYPE=Release
36-
cmake --build .
37-
cd ..
30+
cmake . -B build -DCMAKE_BUILD_TYPE=Release
31+
cmake --build build
3832
- name: Archive wrapper library
3933
uses: actions/upload-artifact@v4
4034
with:
@@ -45,7 +39,7 @@ jobs:
4539
needs: build
4640
runs-on: ubuntu-latest
4741
steps:
48-
- uses: actions/checkout@v3
42+
- uses: actions/checkout@v4
4943
- name: Set up Python
5044
uses: actions/setup-python@v2
5145
with:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.18)
2-
project(pythonfmu-export VERSION 0.2.0)
2+
project(pythonfmu-export)
33

44
# ==============================================================================
55
# Build settings

pythonfmu/pythonfmu-export/src/CMakeLists.txt renamed to src/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ target_link_libraries (pythonfmu-export PRIVATE Python3::Module)
2727
if (WIN32)
2828
set_target_properties(pythonfmu-export
2929
PROPERTIES
30-
RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/../resources/binaries/${TARGET_PLATFORM}"
30+
RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/pythonfmu/resources/binaries/${TARGET_PLATFORM}"
3131
)
3232
else ()
3333
set_target_properties(pythonfmu-export
3434
PROPERTIES
35-
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/../resources/binaries/${TARGET_PLATFORM}"
35+
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/pythonfmu/resources/binaries/${TARGET_PLATFORM}"
3636
)
3737
endif ()

pythonfmu/pythonfmu-export/src/fmi/fmi2FunctionTypes.h renamed to src/fmi/fmi2FunctionTypes.h

File renamed without changes.

pythonfmu/pythonfmu-export/src/fmi/fmi2Functions.h renamed to src/fmi/fmi2Functions.h

File renamed without changes.

pythonfmu/pythonfmu-export/src/fmi/fmi2TypesPlatform.h renamed to src/fmi/fmi2TypesPlatform.h

File renamed without changes.

0 commit comments

Comments
 (0)