Skip to content

Commit 00568f0

Browse files
committed
added set build config from CI
1 parent fdb3502 commit 00568f0

File tree

7 files changed

+47
-10
lines changed

7 files changed

+47
-10
lines changed

CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,11 @@ set(CMAKE_AUTOMOC TRUE)
100100
set(USE_SSE TRUE)
101101

102102
# Setup version number and general build settings
103+
SET(MUSESCORE_BUILD_CONFIG "release" CACHE STRING "Build config")
104+
# Possible MUSESCORE_BUILD_CONFIG values:
105+
# - dev - for development/nightly builds
106+
# - testing - for testing versions (alpha, beta, RC)
107+
# - release - for stable release builds
103108
include("${CMAKE_CURRENT_LIST_DIR}/config.cmake")
104109

105110
if (MUSESCORE_LABEL)

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSOR
2121

2222
PREFIX = "/usr/local"
2323
VERSION := $(shell cmake -P config.cmake | sed -n -e "s/^.*VERSION *//p")
24-
BUILD_NUMBER=""
2524

25+
MUSESCORE_BUILD_CONFIG="dev"
26+
BUILD_NUMBER=""
2627
TELEMETRY_TRACK_ID=""
2728

2829
# Override SUFFIX and LABEL when multiple versions are installed to avoid conflicts.
@@ -57,6 +58,7 @@ release:
5758
-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
5859
-DMSCORE_INSTALL_SUFFIX="${SUFFIX}" \
5960
-DMUSESCORE_LABEL="${LABEL}" \
61+
-DMUSESCORE_BUILD_CONFIG="${MUSESCORE_BUILD_CONFIG}" \
6062
-DCMAKE_BUILD_NUMBER="${BUILD_NUMBER}" \
6163
-DTELEMETRY_TRACK_ID="${TELEMETRY_TRACK_ID}" \
6264
-DBUILD_LAME="${BUILD_LAME}" \

Makefile.osx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ VERSION := $(cmake -P config.cmake | sed -n -e "s/^.*VERSION *//p")
2121
BUILD_NUMBER = ""
2222
PREFIX=../applebuild
2323
TELEMETRY_TRACK_ID=""
24+
MUSESCORE_BUILD_CONFIG="dev"
2425

2526
XCODEPROJ = mscore.xcodeproj
2627

@@ -34,7 +35,7 @@ release:
3435
mkdir build.release; \
3536
cd build.release; \
3637
cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DCMAKE_BUILD_TYPE=RELEASE \
37-
-DCMAKE_BUILD_NUMBER="${BUILD_NUMBER}" -DTELEMETRY_TRACK_ID="${TELEMETRY_TRACK_ID}" \
38+
-DMUSESCORE_BUILD_CONFIG="${MUSESCORE_BUILD_CONFIG}" -DCMAKE_BUILD_NUMBER="${BUILD_NUMBER}" -DTELEMETRY_TRACK_ID="${TELEMETRY_TRACK_ID}" \
3839
.. -G Xcode; \
3940
xcodebuild -project ${XCODEPROJ} -target lrelease; \
4041
$(FORMATTER_START) xcodebuild -project ${XCODEPROJ} -configuration Release -target ALL_BUILD $(FORMATTER_END); \
@@ -83,7 +84,7 @@ ci: revision
8384
mkdir build.release; \
8485
cd build.release; \
8586
cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DCMAKE_BUILD_TYPE=RELEASE \
86-
-DCMAKE_BUILD_NUMBER="${BUILD_NUMBER}" -DBUILD_AUTOUPDATE=ON -DTELEMETRY_TRACK_ID="${TELEMETRY_TRACK_ID}" \
87+
-DMUSESCORE_BUILD_CONFIG="${MUSESCORE_BUILD_CONFIG}" -DCMAKE_BUILD_NUMBER="${BUILD_NUMBER}" -DBUILD_AUTOUPDATE=ON -DTELEMETRY_TRACK_ID="${TELEMETRY_TRACK_ID}" \
8788
.. -G Xcode; \
8889
xcodebuild -project ${XCODEPROJ} -target lrelease; \
8990
$(FORMATTER_START) xcodebuild -project ${XCODEPROJ} -configuration Release -target install $(FORMATTER_END);

build/ci/linux/build.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,16 @@ done
1616
if [ -z "$BUILD_NUMBER" ]; then echo "error: not set BUILD_NUMBER"; exit 1; fi
1717
if [ -z "$TELEMETRY_TRACK_ID" ]; then TELEMETRY_TRACK_ID=""; fi
1818

19+
BUILD_MODE=$(cat $ARTIFACTS_DIR/env/build_mode.env)
20+
MUSESCORE_BUILD_CONFIG=dev
21+
if [ "$BUILD_MODE" == "devel_build" ]; then MUSESCORE_BUILD_CONFIG=dev; fi
22+
if [ "$BUILD_MODE" == "nightly_build" ]; then MUSESCORE_BUILD_CONFIG=dev; fi
23+
if [ "$BUILD_MODE" == "testing_build" ]; then MUSESCORE_BUILD_CONFIG=testing; fi
24+
if [ "$BUILD_MODE" == "stable_build" ]; then MUSESCORE_BUILD_CONFIG=release; fi
25+
26+
echo "MUSESCORE_BUILD_CONFIG: $MUSESCORE_BUILD_CONFIG"
1927
echo "BUILD_NUMBER: $BUILD_NUMBER"
28+
echo "TELEMETRY_TRACK_ID: $TELEMETRY_TRACK_ID"
2029

2130
echo "=== ENVIRONMENT === "
2231

@@ -34,7 +43,7 @@ echo " "
3443
echo "=== BUILD === "
3544

3645
make revision
37-
make -j2 BUILD_NUMBER=$BUILD_NUMBER TELEMETRY_TRACK_ID=$TELEMETRY_TRACK_ID portable
46+
make -j2 MUSESCORE_BUILD_CONFIG=$MUSESCORE_BUILD_CONFIG BUILD_NUMBER=$BUILD_NUMBER TELEMETRY_TRACK_ID=$TELEMETRY_TRACK_ID portable
3847

3948

4049
bash ./build/ci/tools/make_release_channel_env.sh

build/ci/macos/build.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,18 @@ done
1616
if [ -z "$BUILD_NUMBER" ]; then echo "error: not set BUILD_NUMBER"; exit 1; fi
1717
if [ -z "$TELEMETRY_TRACK_ID" ]; then TELEMETRY_TRACK_ID=""; fi
1818

19+
BUILD_MODE=$(cat $ARTIFACTS_DIR/env/build_mode.env)
20+
MUSESCORE_BUILD_CONFIG=dev
21+
if [ "$BUILD_MODE" == "devel_build" ]; then MUSESCORE_BUILD_CONFIG=dev; fi
22+
if [ "$BUILD_MODE" == "nightly_build" ]; then MUSESCORE_BUILD_CONFIG=dev; fi
23+
if [ "$BUILD_MODE" == "testing_build" ]; then MUSESCORE_BUILD_CONFIG=testing; fi
24+
if [ "$BUILD_MODE" == "stable_build" ]; then MUSESCORE_BUILD_CONFIG=release; fi
25+
26+
echo "MUSESCORE_BUILD_CONFIG: $MUSESCORE_BUILD_CONFIG"
1927
echo "BUILD_NUMBER: $BUILD_NUMBER"
2028
echo "TELEMETRY_TRACK_ID: $TELEMETRY_TRACK_ID"
2129

22-
make -f Makefile.osx ci BUILD_NUMBER=$BUILD_NUMBER TELEMETRY_TRACK_ID=$TELEMETRY_TRACK_ID
30+
make -f Makefile.osx ci MUSESCORE_BUILD_CONFIG=$MUSESCORE_BUILD_CONFIG BUILD_NUMBER=$BUILD_NUMBER TELEMETRY_TRACK_ID=$TELEMETRY_TRACK_ID
2331

2432

2533
bash ./build/ci/tools/make_release_channel_env.sh

build/ci/windows/build.bat

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@echo off
22
ECHO "MuseScore build"
33

4+
SET ARTIFACTS_DIR=build.artifacts
45
SET BUILD_NUMBER=""
56
SET TELEMETRY_TRACK_ID=""
67
SET CRASH_LOG_SERVER_URL=""
@@ -24,6 +25,17 @@ IF NOT %TARGET_PROCESSOR_BITS% == 64 (
2425
)
2526
)
2627

28+
SET /p BUILD_MODE=<%ARTIFACTS_DIR%\env\build_mode.env
29+
SET "MUSESCORE_BUILD_CONFIG=dev"
30+
IF %BUILD_MODE% == devel_build ( SET "MUSESCORE_BUILD_CONFIG=dev" ) ELSE (
31+
IF %BUILD_MODE% == nightly_build ( SET "MUSESCORE_BUILD_CONFIG=dev" ) ELSE (
32+
IF %BUILD_MODE% == testing_build ( SET "MUSESCORE_BUILD_CONFIG=testing" ) ELSE (
33+
IF %BUILD_MODE% == stable_build ( SET "MUSESCORE_BUILD_CONFIG=release" ) ELSE (
34+
ECHO "error: unknown BUILD_MODE: %BUILD_MODE%"
35+
EXIT /b 1
36+
))))
37+
38+
ECHO "MUSESCORE_BUILD_CONFIG: %MUSESCORE_BUILD_CONFIG%"
2739
ECHO "BUILD_NUMBER: %BUILD_NUMBER%"
2840
ECHO "TARGET_PROCESSOR_BITS: %TARGET_PROCESSOR_BITS%"
2941
ECHO "TELEMETRY_TRACK_ID: %TELEMETRY_TRACK_ID%"

config.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ SET(MUSESCORE_VERSION_MAJOR "3")
2323
SET(MUSESCORE_VERSION_MINOR "5")
2424
SET(MUSESCORE_VERSION_PATCH "0")
2525
SET(MUSESCORE_VERSION_LABEL "")
26-
SET(MUSESCORE_BUILD_CONFIG "dev")
27-
# Possible MUSESCORE_BUILD_CONFIG values:
28-
# - dev - for development/nightly builds
29-
# - testing - for testing versions (alpha, beta, RC)
30-
# - release - for stable release builds
26+
27+
message(STATUS "MUSESCORE_BUILD_CONFIG ${MUSESCORE_BUILD_CONFIG}")
28+
if (NOT MUSESCORE_BUILD_CONFIG)
29+
SET(MUSESCORE_BUILD_CONFIG "dev")
30+
endif (NOT MUSESCORE_VERSION_LABEL)
3131

3232
include("${CMAKE_CURRENT_LIST_DIR}/build/config/${MUSESCORE_BUILD_CONFIG}.cmake")
3333

0 commit comments

Comments
 (0)