diff --git a/build_release_windows.bat b/build_release_windows.bat index 8e8b75c..0ec0806 100755 --- a/build_release_windows.bat +++ b/build_release_windows.bat @@ -83,14 +83,13 @@ subst X: %WORKSPACE%. REM ensure output dir is clean since we upload the entirety of it rmdir /S /Q output -SET CRASHFIX_UPLOAD_URL=http://crashes.flightgear.org/index.php/debugInfo/uploadExternal SET FGFS_PDB=src\Main\RelWithDebInfo\fgfs.pdb -ECHO Uploading PDB files to %CRASHFIX_UPLOAD_URL% -upload -v -u %CRASHFIX_UPLOAD_URL% FlightGear %WORKSPACE%\build-fg32\%FGFS_PDB% %WORKSPACE%\build-fg64\%FGFS_PDB% +SET SENTRY_ORG=flightgear +SET SENTRY_PROJECT=flightgear +REM ensure SENTRY_AUTH_TOKEN is set in the environment -REM also save the PDB to Output\ so they get uploaded -copy %WORKSPACE%\build-fg64\%FGFS_PDB% %WORKSPACE%\Output\fgfs_64.pdb -copy %WORKSPACE%\build-fg32\%FGFS_PDB% %WORKSPACE%\Output\fgfs_32.pdb +sentry-cli upload-dif %WORKSPACE%\build-fg32\%FGFS_PDB% +sentry-cli upload-dif %WORKSPACE%\build-fg64\%FGFS_PDB% REM indirect way to get command output into an environment variable set PATH=%OSG32%\bin;%PATH% diff --git a/hudson_mac_build_release.sh b/hudson_mac_build_release.sh index 7567a64..6c91395 100755 --- a/hudson_mac_build_release.sh +++ b/hudson_mac_build_release.sh @@ -18,22 +18,26 @@ rm -rf $WORKSPACE/dist/include/simgear $WORKSPACE/dist/libSim* $WORKSPACE/dist/l PATH=$PATH:$QTPATH echo "Build path is: $PATH" +# this shoudl not be needed, since this is inside CMAKE_INSTALL_PREFIX, but seemed +# to be necessary all the same +#export PKG_CONFIG_PATH=$WORKSPACE/dist/lib/pkgconfig + +cmakeCommonArgs="-G Ninja -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DCMAKE_BUILD_TYPE=RelWithDebInfo" + ############################################################################### echo "Starting on SimGear" pushd sgBuild -cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DCMAKE_BUILD_TYPE=RelWithDebInfo ../simgear +cmake ${cmakeCommonArgs} ../simgear # compile -make +cmake --build . --target debug_symbols +cmake --build . --target install if [ $? -ne '0' ]; then echo "make simgear failed" exit 1 fi -make install - - popd ################################################################################ @@ -46,21 +50,22 @@ else FGBUILDTYPE=Nightly fi -cmake -DFG_BUILD_TYPE=$FGBUILDTYPE -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DENABLE_SWIFT:BOOL=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo ../flightgear +cmake -DFG_BUILD_TYPE=$FGBUILDTYPE -DENABLE_SWIFT:BOOL=ON ${cmakeCommonArgs} ../flightgear -make +cmake --build . --target debug_symbols +cmake --build . --target install if [ $? -ne '0' ]; then echo "make flightgear failed" exit 1 fi -make install - popd chmod +x $WORKSPACE/dist/bin/osgversion +echo "Running symbol upload script" +./sentry-dSYM-upload-mac.sh ################################################################################ diff --git a/sentry-dSYM-upload-mac.sh b/sentry-dSYM-upload-mac.sh new file mode 100755 index 0000000..d36b5d9 --- /dev/null +++ b/sentry-dSYM-upload-mac.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +DWARF_DSYM_FOLDER_PATH=$WORKSPACE/dist/symbols + +if which sentry-cli >/dev/null; then + export SENTRY_ORG=flightgear + export SENTRY_PROJECT=flightgear + # export SENTRY_AUTH_TOKEN=YOUR_AUTH_TOKEN + ERROR=$(sentry-cli upload-dif "$DWARF_DSYM_FOLDER_PATH" 2>&1 >/dev/null) + if [ ! $? -eq 0 ]; then + echo "warning: sentry-cli - $ERROR" + fi +else + echo "warning: sentry-cli not installed, download from https://github.com/getsentry/sentry-cli/releases" +fi \ No newline at end of file