バージョン変更が反映されていなかったのを修正

Makefile

@@ -17,6 +17,9 @@ TARGET = momo
 RTC_LIB = libWebRTC_$(ARCH).a
 
 CFLAGS += -fno-lto -pthread -std=gnu++11 -nostdinc++ -isystem$(RTC_ROOT)/src/buildtools/third_party/libc++/trunk/include -DWEBRTC_POSIX -DOPENSSL_IS_BORINGSSL -Isrc/
+ifdef MOMO_VERSION
+	CFLAGS += -DMOMO_VERSION='"$(MOMO_VERSION)"'
+endif
 
 # webrtc
 CFLAGS += -I$(RTC_ROOT)/src -I$(RTC_ROOT)/src/third_party/libyuv/include -I$(RTC_ROOT)/src/third_party/abseil-cpp

build/Makefile

@@ -1,5 +1,6 @@
 BUILD_NUMBER=$(shell date +"%Y%m%d%H%M%S")
 WEBRTC_VERSION=70
+MOMO_VERSION=18.10.0-rc2
 
 TARGET=$@
 
@@ -12,7 +13,7 @@ armv6 armv7 armv8:
 	docker image build --rm -t momo/webrtc-arm-buildbase arm --file arm/buildbase.Dockerfile
 
 	# 各 ARM 用ビルド
-	$(MAKE) -C arm/$(TARGET) WEBRTC_VERSION=$(WEBRTC_VERSION) BUILD_NUMBER=$(BUILD_NUMBER)
+	$(MAKE) -C arm/$(TARGET) WEBRTC_VERSION=$(WEBRTC_VERSION) BUILD_NUMBER=$(BUILD_NUMBER) MOMO_VERSION=$(MOMO_VERSION)
 
 	# 生成されたバイナリをこのディレクトリに移動
 	mv arm/$(TARGET)/momo ./momo-$(TARGET)-m$(WEBRTC_VERSION)-$(BUILD_NUMBER)
@@ -22,17 +23,17 @@ armv6 armv7 armv8:
 .PHONY: armv6.rebuild
 armv6.rebuild:
 	$(MAKE) -C arm/armv6 clean.image WEBRTC_VERSION=$(WEBRTC_VERSION)
-	$(MAKE) -C arm/armv6 WEBRTC_VERSION=$(WEBRTC_VERSION) BUILD_NUMBER=$(BUILD_NUMBER)
+	$(MAKE) -C arm/armv6 WEBRTC_VERSION=$(WEBRTC_VERSION) BUILD_NUMBER=$(BUILD_NUMBER) MOMO_VERSION=$(MOMO_VERSION)
 
 .PHONY: armv7.rebuild
 armv7.rebuild:
 	$(MAKE) -C arm/armv7 clean.image WEBRTC_VERSION=$(WEBRTC_VERSION)
-	$(MAKE) -C arm/armv7 WEBRTC_VERSION=$(WEBRTC_VERSION) BUILD_NUMBER=$(BUILD_NUMBER)
+	$(MAKE) -C arm/armv7 WEBRTC_VERSION=$(WEBRTC_VERSION) BUILD_NUMBER=$(BUILD_NUMBER) MOMO_VERSION=$(MOMO_VERSION)
 
 .PHONY: armv8.rebuild
 armv8.rebuild:
 	$(MAKE) -C arm/armv8 clean.image WEBRTC_VERSION=$(WEBRTC_VERSION)
-	$(MAKE) -C arm/armv8 WEBRTC_VERSION=$(WEBRTC_VERSION) BUILD_NUMBER=$(BUILD_NUMBER)
+	$(MAKE) -C arm/armv8 WEBRTC_VERSION=$(WEBRTC_VERSION) BUILD_NUMBER=$(BUILD_NUMBER) MOMO_VERSION=$(MOMO_VERSION)
 
 # 各プラットフォーム用イメージの掃除。これをすると全体的にビルドし直すことになる。
 .PHONY: armv6.clean
@@ -50,22 +51,21 @@ armv8.clean:
 .PHONY: x86_64
 x86_64:
 	# x86_64 用ビルド
-	$(MAKE) -C $(TARGET) WEBRTC_VERSION=$(WEBRTC_VERSION) BUILD_NUMBER=$(BUILD_NUMBER)
+	$(MAKE) -C $(TARGET) WEBRTC_VERSION=$(WEBRTC_VERSION) BUILD_NUMBER=$(BUILD_NUMBER) MOMO_VERSION=$(MOMO_VERSION)
 
 	# 生成されたバイナリをこのディレクトリに移動
 	mv $(TARGET)/momo ./momo-$(TARGET)-m$(WEBRTC_VERSION)-$(BUILD_NUMBER)
 
 .PHONY: macos
 macos:
-	$(MAKE) -C $(TARGET) WEBRTC_VERSION=$(WEBRTC_VERSION) BUILD_NUMBER=$(BUILD_NUMBER)
+	$(MAKE) -C $(TARGET) WEBRTC_VERSION=$(WEBRTC_VERSION) BUILD_NUMBER=$(BUILD_NUMBER) MOMO_VERSION=$(MOMO_VERSION)
 	mv ../momo momo-$(TARGET)-m$(WEBRTC_VERSION)-$(BUILD_NUMBER)
 
 .PHONY: macos.clean
 macos.clean:
-	$(MAKE) -C macos clean WEBRTC_VERSION=$(WEBRTC_VERSION) BUILD_NUMBER=$(BUILD_NUMBER)
+	$(MAKE) -C macos clean WEBRTC_VERSION=$(WEBRTC_VERSION) BUILD_NUMBER=$(BUILD_NUMBER) MOMO_VERSION=$(MOMO_VERSION)
 
 .PHONY: pkg
-MOMO_VERSION=18.10.0-rc2
 FILENAMES:=LICENSE NOTICE html
 
 define COPY

build/arm/armv6/Makefile

@@ -19,7 +19,7 @@ all: clean
 	docker container create -it --name momo momo/webrtc-armv6:m$(WEBRTC_VERSION)
 	docker container start momo
 	docker container cp momo.tar.gz momo:/root/
-	docker container exec momo /bin/bash -c "cd /root && tar xf momo.tar.gz && cd momo && make USE_IL_ENCODER=$(USE_IL_ENCODER) ARCH=armv6 BUILD_MODE=$(BUILD_MODE)"
+	docker container exec momo /bin/bash -c "cd /root && tar xf momo.tar.gz && cd momo && make USE_IL_ENCODER=$(USE_IL_ENCODER) ARCH=armv6 BUILD_MODE=$(BUILD_MODE) MOMO_VERSION=$(MOMO_VERSION)"
 	docker container cp momo:/root/momo/momo .
 	docker container stop momo
 	docker container rm momo

build/arm/armv7/Makefile

@@ -19,7 +19,7 @@ all: clean
 	docker container create -it --name momo momo/webrtc-armv7:m$(WEBRTC_VERSION)
 	docker container start momo
 	docker container cp momo.tar.gz momo:/root/
-	docker container exec momo /bin/bash -c "cd /root && tar xf momo.tar.gz && cd momo && make USE_IL_ENCODER=$(USE_IL_ENCODER) BUILD_MODE=$(BUILD_MODE)"
+	docker container exec momo /bin/bash -c "cd /root && tar xf momo.tar.gz && cd momo && make USE_IL_ENCODER=$(USE_IL_ENCODER) BUILD_MODE=$(BUILD_MODE) MOMO_VERSION=$(MOMO_VERSION)"
 	docker container cp momo:/root/momo/momo .
 	docker container stop momo
 	docker container rm momo

build/arm/armv8/Makefile

@@ -19,7 +19,7 @@ all: clean
 	docker container create -it --name momo momo/webrtc-armv8:m$(WEBRTC_VERSION)
 	docker container start momo
 	docker container cp momo.tar.gz momo:/root/
-	docker container exec momo /bin/bash -c 'cd /root && tar xf momo.tar.gz && cd momo && make ARCH=arm64 OS=xenial RTC_ROOT=/root BUILD_MODE=$(BUILD_MODE)'
+	docker container exec momo /bin/bash -c 'cd /root && tar xf momo.tar.gz && cd momo && make ARCH=arm64 OS=xenial RTC_ROOT=/root BUILD_MODE=$(BUILD_MODE) MOMO_VERSION=$(MOMO_VERSION)'
 	docker container cp momo:/root/momo/momo .
 	docker container stop momo
 	docker container rm momo

build/macos/Makefile

@@ -2,7 +2,7 @@ LIBWEBRTC = src/out/x86_64/obj/libwebrtc.a
 
 .PHONY: all
 all: $(LIBWEBRTC)
-	make -C ../../ ARCH=x86_64 RTC_ROOT=build/macos
+	make -C ../../ ARCH=x86_64 RTC_ROOT=build/macos MOMO_VERSION=$(MOMO_VERSION)
 
 .PHONY: clean
 clean:

build/x86_64/Makefile

@@ -16,7 +16,7 @@ all: clean
 	docker container create -it --name momo momo/webrtc-x86_64:m$(WEBRTC_VERSION)
 	docker container start momo
 	docker container cp momo.tar.gz momo:/root/
-	docker container exec momo /bin/bash -c 'cd /root && tar xf momo.tar.gz && cd momo && make ARCH=x86_64 BUILD_MODE=$(BUILD_MODE)'
+	docker container exec momo /bin/bash -c 'cd /root && tar xf momo.tar.gz && cd momo && make ARCH=x86_64 BUILD_MODE=$(BUILD_MODE) MOMO_VERSION=$(MOMO_VERSION)'
 	docker container cp momo:/root/momo/momo .
 	docker container stop momo
 	docker container rm momo

src/main.cpp

@@ -23,7 +23,10 @@
 #include "p2p/p2p_server.h"
 
 // バージョン情報
-#define MOMO_VERSION "18.10.0-rc0"
+// 通常は外から渡すが、渡されていなかった場合の対応
+#ifndef MOMO_VERSION
+#  define MOMO_VERSION "internal-build"
+#endif
 
 // HWA を効かせる場合は 1 になる
 #if USE_IL_ENCODER