Skip to content

Commit 99545b9

Browse files
authored
feat #42: do not build dylib anymore (#44)
1 parent 6d75845 commit 99545b9

File tree

4 files changed

+5
-11
lines changed

4 files changed

+5
-11
lines changed

.github/workflows/custom-build.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -176,21 +176,15 @@ jobs:
176176
-f ${{ steps.strings.outputs.build-dir }}
177177
-b ${{ steps.strings.outputs.build-output-dir }}
178178
179-
- name: Build for iOS and xrOS
180-
if: ${{ matrix.os == 'macos-latest' && (matrix.target_platform == 'ios' || matrix.target_platform == 'xros') }}
179+
- name: Build for macOS iOS and xrOS
180+
if: ${{ matrix.os == 'macos-latest' && (matrix.target_platform == 'macos' || matrix.target_platform == 'ios' || matrix.target_platform == 'xros') }}
181181
run: >
182182
sh scripts/build.sh -p ${{ matrix.target_platform }}
183183
-v ${{ inputs.build_version }}
184184
-t ${{ inputs.build_type }}
185185
-f ${{ steps.strings.outputs.build-dir }}
186186
-b ${{ steps.strings.outputs.build-output-dir }}
187187
188-
- name: Build for macOS
189-
if: ${{ matrix.os == 'macos-latest' && (matrix.target_platform == 'macos') }}
190-
run: |
191-
sh scripts/build.sh -p ${{ matrix.target_platform }} -v ${{ inputs.build_version }} -t ${{ inputs.build_type }} -f ${{ steps.strings.outputs.build-dir }} -b ${{ steps.strings.outputs.build-output-dir }}
192-
sh scripts/build.sh -p ${{ matrix.target_platform }} -v ${{ inputs.build_version }} -t ${{ inputs.build_type }} -f ${{ steps.strings.outputs.build-dir }} -b ${{ steps.strings.outputs.build-output-dir }} --no-framework
193-
194188
- name: Upload artifacts
195189
if: ${{ inputs.upload_artifacts == true }}
196190
uses: actions/upload-artifact@v4

src/main/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ set_target_properties(${TRAA_LIBRARY_MAIN} PROPERTIES
8181

8282
# platform flags
8383
if(APPLE)
84-
set(TRAA_LIBRARY_IDENTIFIER "io.traa.core")
84+
set(TRAA_LIBRARY_IDENTIFIER "org.opentraa.traa")
8585

8686
target_link_libraries(${TRAA_LIBRARY_MAIN} PRIVATE "${TRAA_LIBRARY_FRAMEWORKS}")
8787

tests/smoke_test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ set_target_properties(${TRAA_SMOKE_TEST} PROPERTIES
5252

5353
# platform flags
5454
if(APPLE)
55-
set(TRAA_SMOKE_TEST_IDENTIFIER "io.traa.smoketest")
55+
set(TRAA_SMOKE_TEST_IDENTIFIER "org.opentraa.traa.smoketest")
5656

5757
target_link_libraries(${TRAA_SMOKE_TEST} PRIVATE "${TRAA_LIBRARY_FRAMEWORKS}")
5858

tests/unit_test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ set_target_properties(${TRAA_UNIT_TEST} PROPERTIES
163163

164164
# platform flags
165165
if(APPLE)
166-
set(TRAA_UNIT_TEST_IDENTIFIER "io.traa.unittest")
166+
set(TRAA_UNIT_TEST_IDENTIFIER "org.opentraa.traa.unittest")
167167

168168
target_link_libraries(${TRAA_UNIT_TEST} PRIVATE "${TRAA_LIBRARY_FRAMEWORKS}")
169169

0 commit comments

Comments
 (0)