Skip to content

Commit 6eda671

Browse files
lijy91lijy91
committed
Migrate nativeapi submodule to cxx_impl directory
Replaces the libnativeapi submodule in src/ with cxx_impl at the package root. Updates all references in build scripts, YAML, podspecs, and source includes to use cxx_impl. This improves organization and simplifies cross-platform source sharing.
1 parent 9821bf6 commit 6eda671

10 files changed

Lines changed: 111 additions & 111 deletions

File tree

‎.gitmodules‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
[submodule "packages/cnativeapi/src/libnativeapi"]
2-
path = packages/cnativeapi/src/libnativeapi
1+
[submodule "packages/cnativeapi/cxx_impl"]
2+
path = packages/cnativeapi/cxx_impl
33
url = https://github.com/libnativeapi/nativeapi.git

‎packages/cnativeapi/cxx_impl‎

Submodule cxx_impl added at 5c64c9a

‎packages/cnativeapi/ffigen.yaml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,38 @@ description: |
77
output: "lib/src/bindings_generated.dart"
88
headers:
99
entry-points:
10-
- "src/libnativeapi/src/capi/accessibility_manager_c.h"
11-
- "src/libnativeapi/src/capi/application_c.h"
12-
- "src/libnativeapi/src/capi/display_c.h"
13-
- "src/libnativeapi/src/capi/display_manager_c.h"
14-
- "src/libnativeapi/src/capi/geometry_c.h"
15-
- "src/libnativeapi/src/capi/image_c.h"
16-
- "src/libnativeapi/src/capi/menu_c.h"
17-
- "src/libnativeapi/src/capi/positioning_strategy_c.h"
18-
- "src/libnativeapi/src/capi/preferences_c.h"
19-
- "src/libnativeapi/src/capi/secure_storage_c.h"
20-
- "src/libnativeapi/src/capi/string_utils_c.h"
21-
- "src/libnativeapi/src/capi/tray_icon_c.h"
22-
- "src/libnativeapi/src/capi/tray_manager_c.h"
23-
- "src/libnativeapi/src/capi/window_c.h"
24-
- "src/libnativeapi/src/capi/window_manager_c.h"
10+
- "cxx_impl/src/capi/accessibility_manager_c.h"
11+
- "cxx_impl/src/capi/application_c.h"
12+
- "cxx_impl/src/capi/display_c.h"
13+
- "cxx_impl/src/capi/display_manager_c.h"
14+
- "cxx_impl/src/capi/geometry_c.h"
15+
- "cxx_impl/src/capi/image_c.h"
16+
- "cxx_impl/src/capi/menu_c.h"
17+
- "cxx_impl/src/capi/positioning_strategy_c.h"
18+
- "cxx_impl/src/capi/preferences_c.h"
19+
- "cxx_impl/src/capi/secure_storage_c.h"
20+
- "cxx_impl/src/capi/string_utils_c.h"
21+
- "cxx_impl/src/capi/tray_icon_c.h"
22+
- "cxx_impl/src/capi/tray_manager_c.h"
23+
- "cxx_impl/src/capi/window_c.h"
24+
- "cxx_impl/src/capi/window_manager_c.h"
2525

2626
include-directives:
27-
- "src/libnativeapi/src/capi/accessibility_manager_c.h"
28-
- "src/libnativeapi/src/capi/application_c.h"
29-
- "src/libnativeapi/src/capi/display_c.h"
30-
- "src/libnativeapi/src/capi/display_manager_c.h"
31-
- "src/libnativeapi/src/capi/geometry_c.h"
32-
- "src/libnativeapi/src/capi/image_c.h"
33-
- "src/libnativeapi/src/capi/menu_c.h"
34-
- "src/libnativeapi/src/capi/positioning_strategy_c.h"
35-
- "src/libnativeapi/src/capi/preferences_c.h"
36-
- "src/libnativeapi/src/capi/secure_storage_c.h"
37-
- "src/libnativeapi/src/capi/string_utils_c.h"
38-
- "src/libnativeapi/src/capi/tray_icon_c.h"
39-
- "src/libnativeapi/src/capi/tray_manager_c.h"
40-
- "src/libnativeapi/src/capi/window_c.h"
41-
- "src/libnativeapi/src/capi/window_manager_c.h"
27+
- "cxx_impl/src/capi/accessibility_manager_c.h"
28+
- "cxx_impl/src/capi/application_c.h"
29+
- "cxx_impl/src/capi/display_c.h"
30+
- "cxx_impl/src/capi/display_manager_c.h"
31+
- "cxx_impl/src/capi/geometry_c.h"
32+
- "cxx_impl/src/capi/image_c.h"
33+
- "cxx_impl/src/capi/menu_c.h"
34+
- "cxx_impl/src/capi/positioning_strategy_c.h"
35+
- "cxx_impl/src/capi/preferences_c.h"
36+
- "cxx_impl/src/capi/secure_storage_c.h"
37+
- "cxx_impl/src/capi/string_utils_c.h"
38+
- "cxx_impl/src/capi/tray_icon_c.h"
39+
- "cxx_impl/src/capi/tray_manager_c.h"
40+
- "cxx_impl/src/capi/window_c.h"
41+
- "cxx_impl/src/capi/window_manager_c.h"
4242

4343
preamble: |
4444
// ignore_for_file: always_specify_types

‎packages/cnativeapi/ios/Classes/cnativeapi.mm‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,36 @@
22
// See the comment in ../nativeapi.podspec for more information.
33

44
// Include source files
5-
#include "../../src/libnativeapi/src/capi/accessibility_manager_c.cpp"
6-
#include "../../src/libnativeapi/src/capi/application_c.cpp"
7-
#include "../../src/libnativeapi/src/capi/display_c.cpp"
8-
#include "../../src/libnativeapi/src/capi/display_manager_c.cpp"
9-
#include "../../src/libnativeapi/src/capi/image_c.cpp"
10-
#include "../../src/libnativeapi/src/capi/keyboard_monitor_c.cpp"
11-
#include "../../src/libnativeapi/src/capi/menu_c.cpp"
12-
#include "../../src/libnativeapi/src/capi/positioning_strategy_c.cpp"
13-
#include "../../src/libnativeapi/src/capi/run_example_app_c.cpp"
14-
#include "../../src/libnativeapi/src/capi/string_utils_c.cpp"
15-
#include "../../src/libnativeapi/src/capi/tray_icon_c.cpp"
16-
#include "../../src/libnativeapi/src/capi/tray_manager_c.cpp"
17-
#include "../../src/libnativeapi/src/capi/window_c.cpp"
18-
#include "../../src/libnativeapi/src/capi/window_manager_c.cpp"
19-
#include "../../src/libnativeapi/src/accessibility_manager.cpp"
20-
#include "../../src/libnativeapi/src/application.cpp"
21-
#include "../../src/libnativeapi/src/display_manager.cpp"
22-
#include "../../src/libnativeapi/src/foundation/id_allocator.cpp"
23-
#include "../../src/libnativeapi/src/foundation/positioning_strategy.cpp"
24-
#include "../../src/libnativeapi/src/menu.cpp"
25-
#include "../../src/libnativeapi/src/platform/ios/accessibility_manager_ios.mm"
26-
#include "../../src/libnativeapi/src/platform/ios/application_ios.mm"
27-
#include "../../src/libnativeapi/src/platform/ios/display_ios.mm"
28-
#include "../../src/libnativeapi/src/platform/ios/display_manager_ios.mm"
29-
#include "../../src/libnativeapi/src/platform/ios/image_ios.mm"
30-
#include "../../src/libnativeapi/src/platform/ios/keyboard_monitor_ios.mm"
31-
#include "../../src/libnativeapi/src/platform/ios/menu_ios.mm"
32-
#include "../../src/libnativeapi/src/platform/ios/tray_icon_ios.mm"
33-
#include "../../src/libnativeapi/src/platform/ios/tray_manager_ios.mm"
34-
#include "../../src/libnativeapi/src/platform/ios/window_ios.mm"
35-
#include "../../src/libnativeapi/src/platform/ios/window_manager_ios.mm"
36-
#include "../../src/libnativeapi/src/tray_manager.cpp"
37-
#include "../../src/libnativeapi/src/window_manager.cpp"
5+
#include "../../cxx_impl/src/capi/accessibility_manager_c.cpp"
6+
#include "../../cxx_impl/src/capi/application_c.cpp"
7+
#include "../../cxx_impl/src/capi/display_c.cpp"
8+
#include "../../cxx_impl/src/capi/display_manager_c.cpp"
9+
#include "../../cxx_impl/src/capi/image_c.cpp"
10+
#include "../../cxx_impl/src/capi/keyboard_monitor_c.cpp"
11+
#include "../../cxx_impl/src/capi/menu_c.cpp"
12+
#include "../../cxx_impl/src/capi/positioning_strategy_c.cpp"
13+
#include "../../cxx_impl/src/capi/run_example_app_c.cpp"
14+
#include "../../cxx_impl/src/capi/string_utils_c.cpp"
15+
#include "../../cxx_impl/src/capi/tray_icon_c.cpp"
16+
#include "../../cxx_impl/src/capi/tray_manager_c.cpp"
17+
#include "../../cxx_impl/src/capi/window_c.cpp"
18+
#include "../../cxx_impl/src/capi/window_manager_c.cpp"
19+
#include "../../cxx_impl/src/accessibility_manager.cpp"
20+
#include "../../cxx_impl/src/application.cpp"
21+
#include "../../cxx_impl/src/display_manager.cpp"
22+
#include "../../cxx_impl/src/foundation/id_allocator.cpp"
23+
#include "../../cxx_impl/src/foundation/positioning_strategy.cpp"
24+
#include "../../cxx_impl/src/menu.cpp"
25+
#include "../../cxx_impl/src/platform/ios/accessibility_manager_ios.mm"
26+
#include "../../cxx_impl/src/platform/ios/application_ios.mm"
27+
#include "../../cxx_impl/src/platform/ios/display_ios.mm"
28+
#include "../../cxx_impl/src/platform/ios/display_manager_ios.mm"
29+
#include "../../cxx_impl/src/platform/ios/image_ios.mm"
30+
#include "../../cxx_impl/src/platform/ios/keyboard_monitor_ios.mm"
31+
#include "../../cxx_impl/src/platform/ios/menu_ios.mm"
32+
#include "../../cxx_impl/src/platform/ios/tray_icon_ios.mm"
33+
#include "../../cxx_impl/src/platform/ios/tray_manager_ios.mm"
34+
#include "../../cxx_impl/src/platform/ios/window_ios.mm"
35+
#include "../../cxx_impl/src/platform/ios/window_manager_ios.mm"
36+
#include "../../cxx_impl/src/tray_manager.cpp"
37+
#include "../../cxx_impl/src/window_manager.cpp"

‎packages/cnativeapi/ios/cnativeapi.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ A new Flutter FFI plugin project.
1616
# This will ensure the source files in Classes/ are included in the native
1717
# builds of apps using this FFI plugin. Podspec does not support relative
1818
# paths, so Classes contains a forwarder C file that relatively imports
19-
# `../src/*` so that the C sources can be shared among all target platforms.
19+
# `../cxx_impl/*` so that the C sources can be shared among all target platforms.
2020
s.source = { :path => '.' }
21-
s.source_files = 'Classes/**/*.{cpp,h,mm}', '../src/**/*.{cpp,h,mm}'
21+
s.source_files = 'Classes/**/*.{cpp,h,mm}', '../cxx_impl/**/*.{cpp,h,mm}'
2222
s.dependency 'Flutter'
2323
s.platform = :ios, '13.0'
2424

‎packages/cnativeapi/macos/Classes/cnativeapi.mm‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,42 @@
55
#import <Cocoa/Cocoa.h>
66

77
// Include source files
8-
#include "../../src/libnativeapi/src/capi/accessibility_manager_c.cpp"
9-
#include "../../src/libnativeapi/src/capi/application_c.cpp"
10-
#include "../../src/libnativeapi/src/capi/display_c.cpp"
11-
#include "../../src/libnativeapi/src/capi/display_manager_c.cpp"
12-
#include "../../src/libnativeapi/src/capi/image_c.cpp"
13-
#include "../../src/libnativeapi/src/capi/keyboard_monitor_c.cpp"
14-
#include "../../src/libnativeapi/src/capi/menu_c.cpp"
15-
#include "../../src/libnativeapi/src/capi/positioning_strategy_c.cpp"
16-
#include "../../src/libnativeapi/src/capi/preferences_c.cpp"
17-
#include "../../src/libnativeapi/src/capi/run_example_app_c.cpp"
18-
#include "../../src/libnativeapi/src/capi/secure_storage_c.cpp"
19-
#include "../../src/libnativeapi/src/capi/string_utils_c.cpp"
20-
#include "../../src/libnativeapi/src/capi/tray_icon_c.cpp"
21-
#include "../../src/libnativeapi/src/capi/tray_manager_c.cpp"
22-
#include "../../src/libnativeapi/src/capi/window_c.cpp"
23-
#include "../../src/libnativeapi/src/capi/window_manager_c.cpp"
24-
#include "../../src/libnativeapi/src/platform/macos/accessibility_manager_macos.mm"
25-
#include "../../src/libnativeapi/src/platform/macos/application_macos.mm"
26-
#include "../../src/libnativeapi/src/platform/macos/display_macos.mm"
27-
#include "../../src/libnativeapi/src/platform/macos/display_manager_macos.mm"
28-
#include "../../src/libnativeapi/src/platform/macos/image_macos.mm"
29-
#include "../../src/libnativeapi/src/platform/macos/keyboard_monitor_macos.mm"
30-
#include "../../src/libnativeapi/src/platform/macos/menu_macos.mm"
31-
#include "../../src/libnativeapi/src/platform/macos/preferences_macos.mm"
32-
#include "../../src/libnativeapi/src/platform/macos/secure_storage_macos.mm"
33-
#include "../../src/libnativeapi/src/platform/macos/tray_icon_macos.mm"
34-
#include "../../src/libnativeapi/src/platform/macos/tray_manager_macos.mm"
35-
#include "../../src/libnativeapi/src/platform/macos/window_macos.mm"
36-
#include "../../src/libnativeapi/src/platform/macos/window_manager_macos.mm"
37-
#include "../../src/libnativeapi/src/accessibility_manager.cpp"
38-
#include "../../src/libnativeapi/src/application.cpp"
39-
#include "../../src/libnativeapi/src/display_manager.cpp"
40-
#include "../../src/libnativeapi/src/foundation/id_allocator.cpp"
41-
#include "../../src/libnativeapi/src/menu.cpp"
42-
#include "../../src/libnativeapi/src/positioning_strategy.cpp"
43-
#include "../../src/libnativeapi/src/preferences.cpp"
44-
#include "../../src/libnativeapi/src/secure_storage.cpp"
45-
#include "../../src/libnativeapi/src/tray_manager.cpp"
46-
#include "../../src/libnativeapi/src/window_manager.cpp"
8+
#include "../../cxx_impl/src/capi/accessibility_manager_c.cpp"
9+
#include "../../cxx_impl/src/capi/application_c.cpp"
10+
#include "../../cxx_impl/src/capi/display_c.cpp"
11+
#include "../../cxx_impl/src/capi/display_manager_c.cpp"
12+
#include "../../cxx_impl/src/capi/image_c.cpp"
13+
#include "../../cxx_impl/src/capi/keyboard_monitor_c.cpp"
14+
#include "../../cxx_impl/src/capi/menu_c.cpp"
15+
#include "../../cxx_impl/src/capi/positioning_strategy_c.cpp"
16+
#include "../../cxx_impl/src/capi/preferences_c.cpp"
17+
#include "../../cxx_impl/src/capi/run_example_app_c.cpp"
18+
#include "../../cxx_impl/src/capi/secure_storage_c.cpp"
19+
#include "../../cxx_impl/src/capi/string_utils_c.cpp"
20+
#include "../../cxx_impl/src/capi/tray_icon_c.cpp"
21+
#include "../../cxx_impl/src/capi/tray_manager_c.cpp"
22+
#include "../../cxx_impl/src/capi/window_c.cpp"
23+
#include "../../cxx_impl/src/capi/window_manager_c.cpp"
24+
#include "../../cxx_impl/src/platform/macos/accessibility_manager_macos.mm"
25+
#include "../../cxx_impl/src/platform/macos/application_macos.mm"
26+
#include "../../cxx_impl/src/platform/macos/display_macos.mm"
27+
#include "../../cxx_impl/src/platform/macos/display_manager_macos.mm"
28+
#include "../../cxx_impl/src/platform/macos/image_macos.mm"
29+
#include "../../cxx_impl/src/platform/macos/keyboard_monitor_macos.mm"
30+
#include "../../cxx_impl/src/platform/macos/menu_macos.mm"
31+
#include "../../cxx_impl/src/platform/macos/preferences_macos.mm"
32+
#include "../../cxx_impl/src/platform/macos/secure_storage_macos.mm"
33+
#include "../../cxx_impl/src/platform/macos/tray_icon_macos.mm"
34+
#include "../../cxx_impl/src/platform/macos/tray_manager_macos.mm"
35+
#include "../../cxx_impl/src/platform/macos/window_macos.mm"
36+
#include "../../cxx_impl/src/platform/macos/window_manager_macos.mm"
37+
#include "../../cxx_impl/src/accessibility_manager.cpp"
38+
#include "../../cxx_impl/src/application.cpp"
39+
#include "../../cxx_impl/src/display_manager.cpp"
40+
#include "../../cxx_impl/src/foundation/id_allocator.cpp"
41+
#include "../../cxx_impl/src/menu.cpp"
42+
#include "../../cxx_impl/src/positioning_strategy.cpp"
43+
#include "../../cxx_impl/src/preferences.cpp"
44+
#include "../../cxx_impl/src/secure_storage.cpp"
45+
#include "../../cxx_impl/src/tray_manager.cpp"
46+
#include "../../cxx_impl/src/window_manager.cpp"

‎packages/cnativeapi/macos/cnativeapi.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ A new Flutter FFI plugin project.
1616
# This will ensure the source files in Classes/ are included in the native
1717
# builds of apps using this FFI plugin. Podspec does not support relative
1818
# paths, so Classes contains a forwarder C file that relatively imports
19-
# `../src/*` so that the C sources can be shared among all target platforms.
19+
# `../cxx_impl/*` so that the C sources can be shared among all target platforms.
2020
s.source = { :path => '.' }
21-
s.source_files = 'Classes/**/*.{cpp,h,mm}', '../src/**/*.{cpp,h,mm}'
21+
s.source_files = 'Classes/**/*.{cpp,h,mm}', '../cxx_impl/**/*.{cpp,h,mm}'
2222

2323
# If your plugin requires a privacy manifest, for example if it collects user
2424
# data, update the PrivacyInfo.xcprivacy file to describe your plugin's

‎packages/cnativeapi/src/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set(CMAKE_CXX_STANDARD 17)
1010
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1111

1212
# Define base paths
13-
set(LIBNATIVEAPI_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/libnativeapi")
13+
set(LIBNATIVEAPI_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../cxx_impl")
1414
set(LIBNATIVEAPI_SRC_DIR "${LIBNATIVEAPI_ROOT}/src")
1515
set(LIBNATIVEAPI_INCLUDE_DIR "${LIBNATIVEAPI_ROOT}/include")
1616

‎packages/cnativeapi/src/libnativeapi‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎packages/nativeapi/example/macos/Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ EXTERNAL SOURCES:
1414
:path: Flutter/ephemeral
1515

1616
SPEC CHECKSUMS:
17-
cnativeapi: 77de86834e1965f01d942bd360a8ae89a5b57bf6
17+
cnativeapi: c53f1f21415809c8359ca8cbfa12fdf1af56a5f5
1818
FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1
1919

2020
PODFILE CHECKSUM: 54d867c82ac51cbd61b565781b9fada492027009

0 commit comments

Comments
 (0)