Merge commit '4a4dd068b3752cbe763375b167836d99b6787255'

ShiftMediaProject · Jan 10, 2021 · 1689589 · 1689589
2 parents 5afae7e + 4a4dd06
commit 1689589
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 16 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -15,6 +15,10 @@ jobs:
           shared: OFF
 
     runs-on: ${{matrix.os}}
+    env:
+      GENERATOR: ${{matrix.generator}}
+      TOOLSET: ${{matrix.toolset}}
+      CONFIG: Release
 
     steps:
     - uses: actions/checkout@v2
@@ -36,19 +40,17 @@ jobs:
 
     - name: Configure CMake
       shell: bash
-      env:
-        GENERATOR: ${{matrix.generator}}
-        TOOLSET: ${{matrix.toolset}}
       run: |
-        cmake ${GENERATOR:+-G "$GENERATOR"} ${TOOLSET:+-T "$TOOLSET"} -DBUILD_SHARED_LIBS=${{matrix.shared}} -S "$GITHUB_WORKSPACE" -B '${{runner.workspace}}/build'
+        cmake ${GENERATOR:+-G "$GENERATOR"} ${TOOLSET:+-T "$TOOLSET"} -DCMAKE_BUILD_TYPE=$CONFIG -DBUILD_SHARED_LIBS=${{matrix.shared}} -S "$GITHUB_WORKSPACE" -B '${{runner.workspace}}/build'
 
     - name: Build
-      run: cmake --build ${{runner.workspace}}/build
+      shell: bash
+      run: cmake --build '${{runner.workspace}}/build' --config $CONFIG
 
     - name: Run ilbc_test
       shell: bash
       run: |
-        cmake --build '${{runner.workspace}}/build' -v -t ilbc_test-sample
+        cmake --build '${{runner.workspace}}/build' --config $CONFIG -v -t ilbc_test-sample
         wc -c "$GITHUB_WORKSPACE/sample.pcm"
         wc -c '${{runner.workspace}}/build/decoded.pcm'
         cmake -E sha256sum '${{runner.workspace}}/build/decoded.pcm'
@@ -61,6 +63,13 @@ jobs:
           echo "  $actual"
         fi
 
+    - name: Install
+      shell: bash
+      run: |
+        mkdir '${{runner.workspace}}/install'
+        DESTDIR='${{runner.workspace}}/install' cmake --install '${{runner.workspace}}/build' --config $CONFIG
+        find '${{runner.workspace}}/install'
+
   check-ci:
     runs-on: ubuntu-latest
     outputs:
@@ -108,6 +117,10 @@ jobs:
     runs-on: ${{matrix.os}}
     needs: [check-ci]
     if: ${{needs.check-ci.outputs.full-ci == 'true'}}
+    env:
+      GENERATOR: ${{matrix.generator}}
+      TOOLSET: ${{matrix.toolset}}
+      CONFIG: Release
 
     steps:
     - uses: actions/checkout@v2
@@ -150,19 +163,17 @@ jobs:
 
     - name: Configure CMake
       shell: bash
-      env:
-        GENERATOR: ${{matrix.generator}}
-        TOOLSET: ${{matrix.toolset}}
       run: |
-        cmake ${GENERATOR:+-G "$GENERATOR"} ${TOOLSET:+-T "$TOOLSET"} -DBUILD_SHARED_LIBS=${{matrix.shared}} -S "$GITHUB_WORKSPACE" -B '${{runner.workspace}}/build'
+        cmake ${GENERATOR:+-G "$GENERATOR"} ${TOOLSET:+-T "$TOOLSET"} -DCMAKE_BUILD_TYPE=$CONFIG -DBUILD_SHARED_LIBS=${{matrix.shared}} -S "$GITHUB_WORKSPACE" -B '${{runner.workspace}}/build'
 
     - name: Build
-      run: cmake --build ${{runner.workspace}}/build
+      shell: bash
+      run: cmake --build '${{runner.workspace}}/build' --config $CONFIG
 
     - name: Run ilbc_test
       shell: bash
       run: |
-        cmake --build '${{runner.workspace}}/build' -v -t ilbc_test-sample
+        cmake --build '${{runner.workspace}}/build' --config $CONFIG -v -t ilbc_test-sample
         wc -c "$GITHUB_WORKSPACE/sample.pcm"
         wc -c '${{runner.workspace}}/build/decoded.pcm'
         cmake -E sha256sum '${{runner.workspace}}/build/decoded.pcm'
@@ -175,6 +186,13 @@ jobs:
           echo "  $actual"
         fi
 
+    - name: Install
+      shell: bash
+      run: |
+        mkdir '${{runner.workspace}}/install'
+        DESTDIR='${{runner.workspace}}/install' cmake --install '${{runner.workspace}}/build' --config $CONFIG
+        find '${{runner.workspace}}/install'
+
   cross-compile:
     strategy:
       matrix:
@@ -265,6 +283,8 @@ jobs:
     runs-on: ${{matrix.os}}
     needs: [check-ci]
     if: ${{needs.check-ci.outputs.full-ci == 'true'}}
+    env:
+      CONFIG: Release
 
     steps:
     - uses: actions/checkout@v2
@@ -286,6 +306,7 @@ jobs:
       shell: bash
       run: |
         cmake \
+          -DCMAKE_BUILD_TYPE=$CONFIG \
           -DBUILD_SHARED_LIBS=${{matrix.shared}} \
           -DCMAKE_SYSTEM_NAME=${{matrix.target.name}} \
           -DCMAKE_SYSTEM_PROCESSOR=${{matrix.target.processor}} \
@@ -298,12 +319,14 @@ jobs:
       shell: bash
       run: |
         cmake \
+          -DCMAKE_BUILD_TYPE=$CONFIG \
           -DBUILD_SHARED_LIBS=${{matrix.shared}} \
           -DCMAKE_GENERATOR_PLATFORM=${{matrix.target.platform}} \
           -S "$GITHUB_WORKSPACE" -B '${{runner.workspace}}/build'
 
     - name: Build
-      run: cmake --build ${{runner.workspace}}/build
+      shell: bash
+      run: cmake --build '${{runner.workspace}}/build' --config $CONFIG
 
     - name: Run QEMU
       if: ${{matrix.docker}}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,7 +18,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 project(libilbc
-        VERSION 3.0.1
+        VERSION 3.0.2
         DESCRIPTION "WebRTC's implementation of the Internet Low Bitrate Codec (iLBC)"
         HOMEPAGE_URL "https://github.com/TimothyGu/libilbc"
         LANGUAGES C CXX)
@@ -323,7 +323,7 @@ add_custom_target(ilbc_test-sample
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libilbc.pc
         DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-install(FILES ilbc.h ilbc_export.h
+install(FILES ilbc.h ${CMAKE_CURRENT_BINARY_DIR}/ilbc_export.h
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 install(FILES CONTRIBUTING.md NEWS.md README.md
         DESTINATION ${CMAKE_INSTALL_DOCDIR})

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,9 @@
+Changes in 3.0.2 (2020-12-18)
+-----------------------------
+
+Fixed installation from out-of-tree builds. ([#28]) Thanks to Daniel Bermond
+<[email protected]>.
+
 Changes in 3.0.1 (2020-12-18)
 -----------------------------
 
@@ -115,3 +121,5 @@ Changes in 2.0.0 (2014-11-17)
   corrected.
 - Git metadata for merging from upstream is added for easier merging.
 - Travis CI support is added.
+
+[#28]: https://github.com/TimothyGu/libilbc/issues/28
diff --git a/ilbc.h b/ilbc.h
@@ -470,7 +470,7 @@ void WebRtcIlbcfix_EncodeImpl(
 // Version macros
 #define LIBILBC_VERSION_MAJOR 3
 #define LIBILBC_VERSION_MINOR 0
-#define LIBILBC_VERSION_PATCH 1
+#define LIBILBC_VERSION_PATCH 2
 
 // Old type names:
 typedef ILBC_DEPRECATED IlbcEncoderInstance iLBC_encinst_t;

diff --git a/make-archive.sh b/make-archive.sh
@@ -6,6 +6,8 @@ if [ -z "$version" ]; then
   exit 1
 fi
 
+GPG_SIGNING_KEY=-u 7FE6B095B582B0D4!
+
 set -ex
 
 git clean -fxd
@@ -31,4 +33,14 @@ zstd -19 $cur/libilbc-$version.tar
 gzip -9 $cur/libilbc-$version.tar
 zip -r -9 $cur/libilbc-$version.zip libilbc-$version
 
+cd -
+
+for f in libilbc-$version.*; do
+  gpg -ab $GPG_SIGNING_KEY $f
+done
+
+sha256sum libilbc-$version.*
+sha512sum libilbc-$version.*
+b2sum libilbc-$version.*
+
 rm -rf $tmpdir