diff --git a/.github/workflows/package-main.yml b/.github/workflows/package-main.yml index 94867a0c17..fdc71457d1 100644 --- a/.github/workflows/package-main.yml +++ b/.github/workflows/package-main.yml @@ -40,9 +40,19 @@ jobs: - name: Fixup loader paths for icu4c if: ${{ matrix.os == 'macos-latest' }} run: | - sudo install_name_tool -change /opt/local/lib/libicudata.74.dylib @loader_path/libicudata.74.dylib /opt/local/lib/libicuuc.74.dylib - sudo install_name_tool -change /opt/local/lib/libicudata.74.dylib @loader_path/libicudata.74.dylib /opt/local/lib/libicui18n.74.dylib - sudo install_name_tool -change /opt/local/lib/libicuuc.74.dylib @loader_path/libicuuc.74.dylib /opt/local/lib/libicui18n.74.dylib + ICU_VERSION=74 + LIB_DEPENDENCIES=" + i18n data + i18n uc + io data + io i18n + io uc + uc data + " + while IFS= read -r line; do + set -- $line + sudo install_name_tool -change "/opt/local/lib/libicu$2.$ICU_VERSION.dylib" "@loader_path/libicu$2.$ICU_VERSION.dylib" "/opt/local/lib/libicu$1.$ICU_VERSION.dylib" + done <<< "$LIB_DEPENDENCIES" - name: Checkout git repo uses: actions/checkout@v4 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index cb46756af0..c3c3ec37c4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -40,9 +40,19 @@ jobs: - name: Fixup loader paths for icu4c if: ${{ matrix.os == 'macos-latest' }} run: | - sudo install_name_tool -change /opt/local/lib/libicudata.74.dylib @loader_path/libicudata.74.dylib /opt/local/lib/libicuuc.74.dylib - sudo install_name_tool -change /opt/local/lib/libicudata.74.dylib @loader_path/libicudata.74.dylib /opt/local/lib/libicui18n.74.dylib - sudo install_name_tool -change /opt/local/lib/libicuuc.74.dylib @loader_path/libicuuc.74.dylib /opt/local/lib/libicui18n.74.dylib + ICU_VERSION=74 + LIB_DEPENDENCIES=" + i18n data + i18n uc + io data + io i18n + io uc + uc data + " + while IFS= read -r line; do + set -- $line + sudo install_name_tool -change "/opt/local/lib/libicu$2.$ICU_VERSION.dylib" "@loader_path/libicu$2.$ICU_VERSION.dylib" "/opt/local/lib/libicu$1.$ICU_VERSION.dylib" + done <<< "$LIB_DEPENDENCIES" - name: Checkout git repo uses: actions/checkout@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2cdb086b7e..279eb91d7f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,9 +43,19 @@ jobs: - name: Fixup loader paths for icu4c if: ${{ matrix.os == 'macos-latest' }} run: | - sudo install_name_tool -change /opt/local/lib/libicudata.74.dylib @loader_path/libicudata.74.dylib /opt/local/lib/libicuuc.74.dylib - sudo install_name_tool -change /opt/local/lib/libicudata.74.dylib @loader_path/libicudata.74.dylib /opt/local/lib/libicui18n.74.dylib - sudo install_name_tool -change /opt/local/lib/libicuuc.74.dylib @loader_path/libicuuc.74.dylib /opt/local/lib/libicui18n.74.dylib + ICU_VERSION=74 + LIB_DEPENDENCIES=" + i18n data + i18n uc + io data + io i18n + io uc + uc data + " + while IFS= read -r line; do + set -- $line + sudo install_name_tool -change "/opt/local/lib/libicu$2.$ICU_VERSION.dylib" "@loader_path/libicu$2.$ICU_VERSION.dylib" "/opt/local/lib/libicu$1.$ICU_VERSION.dylib" + done <<< "$LIB_DEPENDENCIES" - name: Check out Git repository uses: actions/checkout@v4 diff --git a/c-sharp/ParanextDataProvider.csproj b/c-sharp/ParanextDataProvider.csproj index ecd2bff7fe..4bd470d723 100644 --- a/c-sharp/ParanextDataProvider.csproj +++ b/c-sharp/ParanextDataProvider.csproj @@ -60,7 +60,7 @@ by default. --> - + PreserveNewest