Skip to content

Move native project to top-level #248

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.

Sign up for GitHub

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

Merged
markaren merged 1 commit into from
Jul 3, 2025
+16 −28
Merged

Move native project to top-level #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
0 pythonfmu/pythonfmu-export/.clang-format → .clang-format
View file
Open in desktop
File renamed without changes.
20 changes: 7 additions & 13 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
os: [ubuntu-22.04, windows-2022]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Python 3.x
uses: actions/setup-python@v2
Expand All @@ -28,20 +28,14 @@ jobs:
- name: Compile wrapper on Windows
if: startsWith(runner.os, 'Windows')
run: |
mkdir tmp-build
cd tmp-build
cmake $Env:github_workspace/pythonfmu/pythonfmu-export -DCMAKE_BUILD_TYPE=Release -A x64
cmake --build . --config Release
cd ..
cmake . -B build -DCMAKE_BUILD_TYPE=Release -A x64
cmake --build build --config Release

- name: Compile wrapper on Linux / macOS
if: startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS')
run: |
mkdir tmp-build
cd tmp-build
cmake $GITHUB_WORKSPACE/pythonfmu/pythonfmu-export -DCMAKE_BUILD_TYPE=Release
cmake --build . --config Release
cd ..
cmake . -B build -DCMAKE_BUILD_TYPE=Release
cmake --build build

- name: Archive wrapper library
uses: actions/upload-artifact@v4
Expand All @@ -53,7 +47,7 @@ jobs:
needs: build-wrapper
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Python 3.x
uses: actions/setup-python@v2
Expand Down Expand Up @@ -90,7 +84,7 @@ jobs:
timeout-minutes: 15

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Python 3.x
uses: actions/setup-python@v2
Expand Down
18 changes: 6 additions & 12 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
os: [ubuntu-22.04, windows-2022]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup Python 3.x
uses: actions/setup-python@v2
with:
Expand All @@ -22,19 +22,13 @@ jobs:
- name: Compile wrapper on Windows
if: startsWith(runner.os, 'Windows')
run: |
mkdir tmp-build
cd tmp-build
cmake $Env:github_workspace/pythonfmu/pythonfmu-export -DCMAKE_BUILD_TYPE=Release -A x64
cmake --build . --config Release
cd ..
cmake . -B build -DCMAKE_BUILD_TYPE=Release -A x64
cmake --build build --config Release
- name: Compile wrapper on Linux / macOS
if: startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS')
run: |
mkdir tmp-build
cd tmp-build
cmake $GITHUB_WORKSPACE/pythonfmu/pythonfmu-export -DCMAKE_BUILD_TYPE=Release
cmake --build .
cd ..
cmake . -B build -DCMAKE_BUILD_TYPE=Release
cmake --build build
- name: Archive wrapper library
uses: actions/upload-artifact@v4
with:
Expand All @@ -45,7 +39,7 @@ jobs:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion pythonfmu/pythonfmu-export/CMakeLists.txt → CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.18)
project(pythonfmu-export VERSION 0.2.0)
project(pythonfmu-export)

# ==============================================================================
# Build settings
Expand Down
0 pythonfmu/pythonfmu-export/build_unix.sh → build_unix.sh
View file
Open in desktop
File renamed without changes.
0 pythonfmu/pythonfmu-export/build_win.sh → build_win.sh
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...onfmu/pythonfmu-export/src/CMakeLists.txt → src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ target_link_libraries (pythonfmu-export PRIVATE Python3::Module)
if (WIN32)
set_target_properties(pythonfmu-export
PROPERTIES
RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/../resources/binaries/${TARGET_PLATFORM}"
RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/pythonfmu/resources/binaries/${TARGET_PLATFORM}"
)
else ()
set_target_properties(pythonfmu-export
PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/../resources/binaries/${TARGET_PLATFORM}"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/pythonfmu/resources/binaries/${TARGET_PLATFORM}"
)
endif ()
0 ...honfmu-export/src/fmi/fmi2FunctionTypes.h → src/fmi/fmi2FunctionTypes.h
View file
Open in desktop
File renamed without changes.
0 .../pythonfmu-export/src/fmi/fmi2Functions.h → src/fmi/fmi2Functions.h
View file
Open in desktop
File renamed without changes.
0 ...honfmu-export/src/fmi/fmi2TypesPlatform.h → src/fmi/fmi2TypesPlatform.h
View file
Open in desktop
File renamed without changes.
0 ...thonfmu-export/src/pythonfmu/IPyState.hpp → src/pythonfmu/IPyState.hpp
View file
Open in desktop
File renamed without changes.
0 ...pythonfmu-export/src/pythonfmu/Logger.hpp → src/pythonfmu/Logger.hpp
View file
Open in desktop
File renamed without changes.
0 ...-export/src/pythonfmu/PySlaveInstance.cpp → src/pythonfmu/PySlaveInstance.cpp
View file
Open in desktop
File renamed without changes.
0 ...ythonfmu-export/src/pythonfmu/PyState.hpp → src/pythonfmu/PyState.hpp
View file
Open in desktop
File renamed without changes.
0 ...mu-export/src/pythonfmu/SlaveInstance.hpp → src/pythonfmu/SlaveInstance.hpp
View file
Open in desktop
File renamed without changes.
0 ...u/pythonfmu-export/src/pythonfmu/fmi2.cpp → src/pythonfmu/fmi2.cpp
View file
Open in desktop
File renamed without changes.
0 ...onfmu-export/src/pythonfmu/fmu_except.hpp → src/pythonfmu/fmu_except.hpp
View file
Open in desktop
File renamed without changes.