Skip to content

Commit

Permalink
Adjust build configuration for telemetry on Linux and Mac
Browse files Browse the repository at this point in the history
  • Loading branch information
dmitrio95 committed Dec 25, 2019
1 parent 1dd409d commit 9003987
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ VERSION = "3.4b-${REVISION}"
#VERSION = 3.3.3
BUILD_NUMBER=""

TELEMETRY_TRACK_ID=""

# Override SUFFIX and LABEL when multiple versions are installed to avoid conflicts.
SUFFIX=""# E.g.: SUFFIX="dev" --> "mscore" becomes "mscoredev"
LABEL=""# E.g.: LABEL="Development Build" --> "MuseScore 2" becomes "MuseScore 2 Development Build"
Expand Down Expand Up @@ -56,6 +58,7 @@ release:
-DMSCORE_INSTALL_SUFFIX="${SUFFIX}" \
-DMUSESCORE_LABEL="${LABEL}" \
-DCMAKE_BUILD_NUMBER="${BUILD_NUMBER}" \
-DTELEMETRY_TRACK_ID="${TELEMETRY_TRACK_ID}" \
-DBUILD_LAME="${BUILD_LAME}" \
-DBUILD_PULSEAUDIO="${BUILD_PULSEAUDIO}" \
-DBUILD_JACK="${BUILD_JACK}" \
Expand Down
2 changes: 1 addition & 1 deletion build/travis/job2_AppImage/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ then # Build is marked UNSTABLE inside CMakeLists.txt
fi
else
# Build is STABLE so create a stable release!
makefile_overrides="" # use Makefile defaults
makefile_overrides="TELEMETRY_TRACK_ID=${TELEMETRY_TRACK_ID}" # use Makefile defaults for other parameters
update_info="gh-releases-zsync|musescore|MuseScore|latest|MuseScore-*x86_64.AppImage.zsync"
fi

Expand Down
2 changes: 1 addition & 1 deletion build/travis/job_macos/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ cp -f build/travis/resources/splash-nightly.png mscore/data/splash.png
cp -f build/travis/resources/mscore-nightly.icns mscore/data/mscore.icns
fi

make -f Makefile.osx ci BUILD_NUMBER=${TRAVIS_BUILD_NUMBER}
make -f Makefile.osx ci BUILD_NUMBER=${TRAVIS_BUILD_NUMBER} TELEMETRY_TRACK_ID=${TELEMETRY_TRACK_ID}


mkdir -p applebuild/mscore.app/Contents/Resources/Frameworks
Expand Down

0 comments on commit 9003987

Please sign in to comment.