github: linux debug build

Author: Oleksiy-Yakovenko

.github/workflows/linuxdebugbuild.yml

@@ -0,0 +1,38 @@
+name: Build Debug for Linux
+
+on: [ push, pull_request ]
+
+jobs:
+  build_linux:
+    name: CI for Linux
+    runs-on: ubuntu-latest
+    container: ubuntu:20.04
+    steps:
+    - name: Install dependencies for Linux
+      env:
+        DEBIAN_FRONTEND: noninteractive
+      run: |
+        apt-get -qq update
+        apt-get install -y -qq autopoint automake autoconf intltool libc6-dev yasm libglib2.0-bin perl wget zip bzip2 make libtool pkg-config fakeroot clang openssh-client rsync libglib2.0-dev-bin git
+    - name: Checkout for Linux
+      uses: actions/checkout@v4
+      with:
+        submodules: true
+    - name: Fetch static-deps
+      run: travis/download-linux-static-deps.sh
+    - name: Run Tests
+      run: scripts/test.sh
+    - name: Build for Linux
+      run: TRAVIS_OS_NAME=linux travis/build.sh --debug
+    - name: Upload for Linux
+      env:
+          gh_ed25519_key: ${{ secrets.GH_ENCRYPTED_ED25519_KEY }}
+          gh_ed25519_iv: ${{ secrets.GH_ENCRYPTED_ED25519_IV }}
+      run: TRAVIS_OS_NAME=linux travis/upload.sh --debug
+    - name: Upload artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: linux-debug
+        # todo: rename and upload only one artifact (the build)
+        path: portable_out/build/*.tar.bz2
+

scripts/portable_package_static.sh

@@ -2,6 +2,15 @@
 
 ./scripts/portable_postbuild.sh
 
+DEBUG=false
+
+for arg in "$@"; do
+    if [[ "$arg" == "--debug" ]]; then
+        DEBUG=true
+        break
+    fi
+done
+
 # package for distribution
 VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'`
 BUILD=`cat PORTABLE_BUILD | perl -ne 'chomp and print'`
@@ -20,8 +29,11 @@ PLUGDIR=$SRCDIR/plugins
 LIBDIR=$SRCDIR/lib
 DOCDIR=$SRCDIR/doc
 PIXMAPDIR=$SRCDIR/pixmaps
-OUTNAME=deadbeef-static_${VERSION}-${BUILD}_${ARCH}.tar.bz2
-DEBUG_OUTNAME=deadbeef-debug-symbols_${VERSION}-${BUILD}_${ARCH}.tar.bz2
+if ! $DEBUG; then
+    OUTNAME=deadbeef-static_${VERSION}-${BUILD}_${ARCH}.tar.bz2
+else
+    OUTNAME=deadbeef-static-debug_${VERSION}-${BUILD}_${ARCH}.tar.bz2
+fi
 
 mkdir -p portable_out/build
 rm portable_out/build/$OUTNAME
@@ -94,8 +106,4 @@ tar jcvf ../../portable_out/build/$OUTNAME\
     $SRCDIR/locale\
     || exit 1
 
-tar jcvf ../../portable_out/build/$DEBUG_OUTNAME\
-    ./deadbeef.debug\
-    || exit 1
-
 cd ../..

scripts/static_build.sh

@@ -1,12 +1,21 @@
 #!/bin/bash
+
+DEBUG=false
+
+for arg in "$@"; do
+    if [[ "$arg" == "--debug" ]]; then
+        DEBUG=true
+        break
+    fi
+done
+
 VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'`
 ORIGIN=$PWD
 STATIC_DEPS=static-deps
 AP=$ORIGIN/external/apbuild
 #ARCH=`uname -m | perl -ne 'chomp and print'`
 if [[ "$ARCH" == "i686" ]]; then
     export CFLAGS="-m32 -I$ORIGIN/$STATIC_DEPS/lib-x86-32/include"
-    export CXXFLAGS=$CFLAGS
     export LDFLAGS="-m32 -L$ORIGIN/$STATIC_DEPS/lib-x86-32/lib -L$ORIGIN/$STATIC_DEPS/lib-x86-32/lib/i386-linux-gnu"
     export CONFIGURE_FLAGS="--build=i686-unknown-linux-gnu"
     export LIBRARY_PATH="$ORIGIN/$STATIC_DEPS/lib-x86-32/lib"
@@ -65,10 +74,18 @@ export OBJC=$AP/apgcc
 
 ./autogen.sh || exit 1
 
-CFLAGS="$CFLAGS -g"
+CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=0"
+
+if $DEBUG; then
+    CFLAGS="$CFLAGS -O0 -g"
+else
+    CFLAGS="$CFLAGS -O3"
+fi
+
+CXXFLAGS=$CFLAGS
 LDFLAGS="$LDFLAGS -Wl,--build-id"
 
-./configure CFLAGS="$CFLAGS -O3 -D_FORTIFY_SOURCE=0" CXXFLAGS="$CXXFLAGS -O3 -D_FORTIFY_SOURCE=0" LDFLAGS="$LDFLAGS" $CONFIGURE_FLAGS --enable-staticlink --prefix=/opt/deadbeef || {
+./configure CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" $CONFIGURE_FLAGS --enable-staticlink --prefix=/opt/deadbeef || {
     # store failed config.log in portable dir, which is mapped to
     # docker-artifacts when using docker.
     cp config.log ./portable/
@@ -82,16 +99,6 @@ make clean
 make V=1 -j8 DESTDIR=`pwd`/static/$ARCH/deadbeef-$VERSION || exit 1
 export DESTDIR=`pwd`/static/$ARCH/deadbeef-$VERSION
 
-echo "Extracting debug symbols..."
-# Note: need to do it before make install!
-mkdir -p "portable/$ARCH"
-cd src
-objcopy --only-keep-debug ./deadbeef deadbeef.debug || exit 1
-strip --strip-debug --strip-unneeded ./deadbeef || exit 1
-objcopy --add-gnu-debuglink=deadbeef.debug ./deadbeef || exit 1
-cd ..
-mv src/deadbeef.debug "portable/$ARCH/" || exit 1
-
 make DESTDIR=$DESTDIR install || exit 1
 mkdir -p $LIBRARY_PATH
 cp -r $LIBRARY_PATH/libBlocksRuntime.so* $DESTDIR/opt/deadbeef/lib/

travis/build.sh

@@ -1,23 +1,32 @@
 #!/bin/bash
 set -e
+
+DEBUG=false
+
+for arg in "$@"; do
+    if [[ "$arg" == "--debug" ]]; then
+        DEBUG=true
+        break
+    fi
+done
+
 case "$TRAVIS_OS_NAME" in
     linux)
         ls -l .
 #        echo "building for i686"
 #        ARCH=i686 ./scripts/static_build.sh
 #        ARCH=i686 ./scripts/portable_package_static.sh
         echo "Building for x86_64"
-        if [[ "$1" == "--clang" ]] ; then
-            CLANG_FLAG="--clang"
+        ARCH=x86_64 ./scripts/static_build.sh $@
+        ARCH=x86_64 ./scripts/portable_package_static.sh $@
+        if ! $DEBUG; then
+            echo "Making deb package"
+            ARCH=x86_64 ./tools/packages/debian.sh
+            echo "Making arch package"
+            ARCH=x86_64 ./tools/packages/arch.sh
+            echo "Running make dist"
+            make dist
         fi
-        ARCH=x86_64 ./scripts/static_build.sh $CLANG_FLAG
-        ARCH=x86_64 ./scripts/portable_package_static.sh
-        echo "Making deb package"
-        ARCH=x86_64 ./tools/packages/debian.sh
-        echo "Making arch package"
-        ARCH=x86_64 ./tools/packages/arch.sh
-        echo "Running make dist"
-        make dist
     ;;
     osx)
         echo "Install xcbeautify ..."

travis/upload.sh

@@ -25,13 +25,27 @@ if [ ! -z $GITHUB_REF ]; then
     echo "Branch/Tag: $TRAVIS_BRANCH"
 fi
 
+DEBUG=false
+
+for arg in "$@"; do
+    if [[ "$arg" == "--debug" ]]; then
+        DEBUG=true
+        break
+    fi
+done
+
+
 case "$TRAVIS_OS_NAME" in
     linux)
         echo Uploading linux artifacts...
-        rsync -e "$SSHOPTS" deadbeef-*.tar.bz2 waker,deadbeef@frs.sourceforge.net:/home/frs/project/d/de/deadbeef/travis/linux/$TRAVIS_BRANCH/ || exit 1
+        if ! $DEBUG; then
+            # Do not upload packages / source for debug build
+            rsync -e "$SSHOPTS" deadbeef-*.tar.bz2 waker,deadbeef@frs.sourceforge.net:/home/frs/project/d/de/deadbeef/travis/linux/$TRAVIS_BRANCH/ || exit 1
+            rsync -e "$SSHOPTS" package_out/x86_64/debian/*.deb waker,deadbeef@frs.sourceforge.net:/home/frs/project/d/de/deadbeef/travis/linux/$TRAVIS_BRANCH/ || exit 1
+            rsync -e "$SSHOPTS" package_out/x86_64/arch/*.pkg.tar.xz waker,deadbeef@frs.sourceforge.net:/home/frs/project/d/de/deadbeef/travis/linux/$TRAVIS_BRANCH/ || exit 1
+        fi
+        # This will match the build tarballs and debug symbols
         rsync -e "$SSHOPTS" portable_out/build/*.tar.bz2 waker,deadbeef@frs.sourceforge.net:/home/frs/project/d/de/deadbeef/travis/linux/$TRAVIS_BRANCH/ || exit 1
-        rsync -e "$SSHOPTS" package_out/x86_64/debian/*.deb waker,deadbeef@frs.sourceforge.net:/home/frs/project/d/de/deadbeef/travis/linux/$TRAVIS_BRANCH/ || exit 1
-        rsync -e "$SSHOPTS" package_out/x86_64/arch/*.pkg.tar.xz waker,deadbeef@frs.sourceforge.net:/home/frs/project/d/de/deadbeef/travis/linux/$TRAVIS_BRANCH/ || exit 1
     ;;
     osx)
         echo Uploading mac artifacts...