Skip to content

Commit

Permalink
Mingw64 ccache and debug sym fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@elpaso
elpaso committed Feb 19, 2021
1 parent 09f53d1 commit 25f12e8
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 45 deletions.
69 changes: 55 additions & 14 deletions .github/workflows/minw64.yml
View file
@@ -1,4 +1,4 @@
name: MinGW64 Windows Build
name: MingW64 Windows 64bit Build

on:
push:
Expand Down Expand Up @@ -29,31 +29,72 @@ on:

jobs:
build:
env:
CCACHE_DIR: ${{ github.workspace }}/.ccache
name: MinGW64 Windows Build
runs-on: ubuntu-latest
steps:

- uses: actions/checkout@v1
- uses: actions/checkout@v2

- name: Build Docker Container with Build Environment
run: docker build -t qgis3-mingw-buildenv -f ms-windows/mingw/qgis3-build-deps-mingw.dockerfile .

- name: Prepare build cache for pull request
uses: pat-s/always-upload-cache@v2.1.3
if: github.event_name == 'pull_request'
with:
path: ${{ github.workspace }}/.ccache
key: mingw64-ccache-${{ github.actor }}-${{ github.head_ref }}-${{ github.sha }}
# The head_ref or source branch of the pull request in a workflow run.
# The base_ref or target branch of the pull request in a workflow run.
restore-keys: |
mingw64-ccache-${{ github.actor }}-${{ github.head_ref }}-
mingw64-ccache-${{ github.base_ref }}-
mingw64-ccache-refs/heads/master-
- name: Prepare build cache for branch/tag
# use a fork of actions/cache@v2 to upload cache even when the build or test failed
uses: pat-s/always-upload-cache@v2.1.3
if: github.event_name != 'pull_request'
with:
path: ${{ github.workspace }}/.ccache
# The branch or tag ref that triggered the workflow run. For branches this in the format refs/heads/<branch_name>, and for tags it is refs/tags/<tag_name>
key: mingw64-ccache-${{ github.ref }}-${{ github.sha }}
restore-keys: |
mingw64-ccache-${{ github.ref }}-
mingw64-ccache-refs/heads/master-
- name: Build QGIS Application
run: docker run -w /QGIS -v $PWD:/QGIS qgis3-mingw-buildenv ms-windows/mingw/build.sh x86_64 nodebug 4
run: |
docker run \
--env CCACHE_DIR=/QGIS/.ccache \
-w /QGIS \
-v ${GITHUB_WORKSPACE}:/QGIS \
qgis3-mingw-buildenv \
ms-windows/mingw/build.sh x86_64 nodebug 4
- name: Create Portable zip
run: |
distroot=build_mingw64/dist/usr/x86_64-w64-mingw32/sys-root/mingw
debugroot=dist_debug
for file in $(find $distroot -name '*.debug' \( -type l -or -type f \)); do
dest=${file/$distroot/$debugroot}
mkdir -p "$(dirname $dest)"
sudo mv "$file" "$dest"
DISTROOT=build_mingw64/dist/usr/x86_64-w64-mingw32/sys-root/mingw
DEBUGROOT=dist_debug
for file in $(find $DISTROOT -name '*.debug' \( -type l -or -type f \)); do
DEST=${file/$DISTROOT/$DEBUGROOT}
mkdir -p "$(dirname $DEST)"
sudo mv "$file" "$DEST"
done
sudo mv $distroot QGIS-Portable
sudo mv $DISTROOT QGIS-Portable
zip -r qgis-portable-win64.zip QGIS-Portable
(cd $debugroot && zip -r - *) > qgis-portable-win64-debugsym.zip
(cd $DEBUGROOT && zip -r - *) > qgis-portable-win64-debugsym.zip
- name: Upload Build Artifact
uses: actions/upload-artifact@v1
- name: Upload QGIS for Windows 64bit
uses: actions/upload-artifact@v2.2.2
with:
name: QGIS for Windows 64bit
path: qgis-windows-64bit.zip
path: qgis-portable-win64.zip

- name: Upload QGIS for Windows 64bit Debug Symbols
uses: actions/upload-artifact@v2.2.2
with:
name: QGIS for Windows 64bit Debug Symbols
path: qgis-portable-win64-debugsym.zip
64 changes: 33 additions & 31 deletions ms-windows/mingw/build.sh
View file
Expand Up @@ -6,20 +6,22 @@

#!/bin/sh

ARCH=${1:-x86_64}

arch=${1:-x86_64}
DEBUG=false
if [ "$2" == "DEBUG" ]; then
if [ "$2" == "debug" ]; then
DEBUG=true
fi
NJOBS=${3:-$(($(grep -c ^processor /proc/cpuinfo) * 3 / 2))}

njobs=${3:-$(($(grep -c ^processor /proc/cpuinfo) * 3 / 2))}


if [ "$ARCH" == "i686" ]; then
if [ "$arch" == "i686" ]; then
bits=32
elif [ "$ARCH" == "x86_64" ]; then
elif [ "$arch" == "x86_64" ]; then
bits=64
else
echo "Error: unrecognized ARCHitecture $ARCH"
echo "Error: unrecognized architecture $arch"
exit 1
fi

Expand All @@ -35,33 +37,34 @@ else
fi

# Note: This script is written to be used with the Fedora mingw environment
MINGWROOT=/usr/$ARCH-w64-mingw32/sys-root/mingw
MINGWROOT=/usr/$arch-w64-mingw32/sys-root/mingw

if $DEBUG; then
OPTFLAGS="-O0 -g1 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-omit-frame-pointer"
buildtype="DEBUG"
optflags="-O0 -g1 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-omit-frame-pointer"
buildtype="Debug"
else
OPTFLAGS="-O2 -g1 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-omit-frame-pointer"
buildtype="RelWithDEBUGInfo"
optflags="-O2 -g1 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-omit-frame-pointer"
buildtype="RelWithDebugInfo"
fi
pyver=$(mingw${bits}-python3 -c "import sys; print('.'.join(list(map(str, sys.version_info))[0:2]))")

# Halt on errors
set -e

export MINGW32_CFLAGS="$OPTFLAGS"
export MINGW32_CXXFLAGS="$OPTFLAGS"
export MINGW64_CFLAGS="$OPTFLAGS"
export MINGW64_CXXFLAGS="$OPTFLAGS"
export MINGW32_CFLAGS="$optflags"
export MINGW32_CXXFLAGS="$optflags"
export MINGW64_CFLAGS="$optflags"
export MINGW64_CXXFLAGS="$optflags"

SRCDIR="$(readlink -f "$(dirname "$(readlink -f "$0")")/../..")"

if $DEBUG; then
BUILDDIR="$SRCDIR/build_mingw${bits}_DEBUG"
BUILDDIR="$SRCDIR/build_mingw${bits}_debug"
else
BUILDDIR="$SRCDIR/build_mingw${bits}"
fi
installroot="$BUILDDIR/dist"
installprefix="$installroot/usr/$ARCH-w64-mingw32/sys-root/mingw"
installprefix="$installroot/usr/$arch-w64-mingw32/sys-root/mingw"

# Cleanup
rm -rf "$installroot"
Expand All @@ -81,7 +84,6 @@ mkdir -p $BUILDDIR
-DQWT_INCLUDE_DIR=$MINGWROOT/include/qt5/qwt \
-DQSCI_SIP_DIR=$MINGWROOT/share/sip/PyQt5/Qsci/ \
-DBUILD_TESTING=OFF \
-DZSTD_INCLUDE_DIR=/usr/x86_64-w64-mingw32/sys-root/mingw/include/zstd/ \
-DENABLE_TESTS=OFF \
-DQGIS_BIN_SUBDIR=bin \
-DQGIS_CGIBIN_SUBDIR=bin \
Expand All @@ -104,37 +106,37 @@ mkdir -p $BUILDDIR
# cd $BUILDDIR/native_crssync
# echo "Building native crssync..."
# moc-qt5 $SRCDIR/src/core/qgsapplication.h > moc_qgsapplication.cpp
# g++ $OPTFLAGS -fPIC -o crssync $SRCDIR/src/crssync/main.cpp $SRCDIR/src/crssync/qgscrssync.cpp moc_qgsapplication.cpp $SRCDIR/src/core/qgsapplication.cpp -DCORE_EXPORT= -DCOMPILING_CRSSYNC -I$SRCDIR/src/core/ -I$SRCDIR/src/core/geometry -I$BUILDDIR $(pkg-config --cflags --libs Qt5Widgets gdal sqlite3 proj)
# g++ $optflags -fPIC -o crssync $SRCDIR/src/crssync/main.cpp $SRCDIR/src/crssync/qgscrssync.cpp moc_qgsapplication.cpp $SRCDIR/src/core/qgsapplication.cpp -DCORE_EXPORT= -DCOMPILING_CRSSYNC -I$SRCDIR/src/core/ -I$SRCDIR/src/core/geometry -I$BUILDDIR $(pkg-config --cflags --libs Qt5Widgets gdal sqlite3 proj)
# )
# crssync needs X at runtime
# Xvfb :99 &
# export DISPLAY=:99

mingw$bits-make -C$BUILDDIR -j$NJOBS DESTDIR="${installroot}" install VERBOSE=1
mingw$bits-make -C$BUILDDIR -j$njobs DESTDIR="${installroot}" install VERBOSE=1

# Remove plugins with missing dependencies
rm -rf ${installroot}/share/qgis/python/plugins/{MetaSeARCH,processing}
rm -rf ${installroot}/share/qgis/python/plugins/{MetaSearch,processing}

# Strip DEBUGinfo
# Strip debuginfo
binaries=$(find $installprefix -name '*.exe' -or -name '*.dll' -or -name '*.pyd')
for f in $binaries
do
case $(mingw-objdump -h $f 2>/dev/null | egrep -o '(DEBUG[\.a-z_]*|gnu.version)') in
*DEBUGlink*) continue ;;
*DEBUG*) ;;
case $(mingw-objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in
*debuglink*) continue ;;
*debug*) ;;
*gnu.version*)
echo "WARNING: $(basename $f) is already stripped!"
continue
;;
*) continue ;;
esac

echo extracting DEBUG info from $f
mingw-objcopy --only-keep-DEBUG $f $f.DEBUG || :
echo extracting debug info from $f
mingw-objcopy --only-keep-debug $f $f.debug || :
pushd $(dirname $f)
keep_symbols=`mktemp`
mingw-nm $f.DEBUG --format=sysv --defined-only | awk -F \| '{ if ($4 ~ "Function") print $1 }' | sort > "$keep_symbols"
mingw-objcopy --add-gnu-DEBUGlink=`basename $f.DEBUG` --strip-unneeded `basename $f` --keep-symbols="$keep_symbols" || :
mingw-nm $f.debug --format=sysv --defined-only | awk -F \| '{ if ($4 ~ "Function") print $1 }' | sort > "$keep_symbols"
mingw-objcopy --add-gnu-debuglink=`basename $f.debug` --strip-unneeded `basename $f` --keep-symbols="$keep_symbols" || :
rm -f "$keep_symbols"
popd
done
Expand All @@ -160,7 +162,7 @@ function linkDep {
lnk "$MINGWROOT/$1" "$destdir/$name" || return 1
echo "${2:-bin}/$name: $(rpm -qf "$MINGWROOT/$1")" >> $installprefix/origins.txt
autoLinkDeps "$destdir/$name" "${indent} " || return 1
[ -e "$MINGWROOT/$1.DEBUG" ] && lnk "$MINGWROOT/$1.DEBUG" "$destdir/$name.DEBUG" || ($DEBUG && echo "Warning: missing $name.DEBUG" || :)
[ -e "$MINGWROOT/$1.debug" ] && lnk "$MINGWROOT/$1.debug" "$destdir/$name.debug" || ($debug && echo "Warning: missing $name.debug" || :)
return 0
}

Expand Down Expand Up @@ -243,7 +245,7 @@ cat $installprefix/origins.txt | sort | uniq > $installprefix/origins.new && mv
# Create package
DISTROOT=build_mingw64/dist/usr/x86_64-w64-mingw32/sys-root/mingw
DEBUGROOT=dist_debug
for file in $(find $DISTROOT -name '*.DEBUG' \( -type l -or -type f \)); do
for file in $(find $DISTROOT -name '*.debug' \( -type l -or -type f \)); do
dest=${file/$DISTROOT/$DEBUGROOT}
mkdir -p "$(dirname $dest)"
sudo mv "$file" "$dest"
Expand Down

0 comments on commit 25f12e8

Please sign in to comment.