From 39a158bd4fb7d198c4958d9fa997093e688247c3 Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Sat, 3 Oct 2020 20:56:45 +0200 Subject: [PATCH] Improved generation of the Manifest. --- Makefile | 205 +++++++++--------- package.cmd | 12 +- res/assets/.gitignore | 1 + res/assets/manifest.xml | 9 +- res/common.rc | 10 +- .../res/.assets/templates/header.mak | 13 +- 6 files changed, 138 insertions(+), 112 deletions(-) create mode 100644 res/assets/.gitignore diff --git a/Makefile b/Makefile index cb7089b..8a27470 100644 --- a/Makefile +++ b/Makefile @@ -14,11 +14,15 @@ MACHINE := $(patsubst %-w64-mingw32,[%],$(shell $(CXX) -dumpmachine)) BUILDNO := $(shell git rev-list --count HEAD 2>&- || echo 0) +VERSION_MAJOR := $(shell grep -Po '#define[[:space:]]+L5J_VERSION_MAJOR[[:space:]]+\K[[:digit:]]+' src/resource.h) +VERSION_MINOR := $(shell grep -Po '#define[[:space:]]+L5J_VERSION_MINOR[[:space:]]+\K[[:digit:]]+' src/resource.h) +VERSION_PATCH := $(shell grep -Po '#define[[:space:]]+L5J_VERSION_PATCH[[:space:]]+\K[[:digit:]]+' src/resource.h) + ifeq ($(MACHINE),[i686]) CPU_ARCH := x86 MARCH ?= i586 else ifeq ($(MACHINE),[x86_64]) - CPU_ARCH := x64 + CPU_ARCH := amd64 MARCH ?= x86-64 else $(error Unknown target machine "$(MACHINE)" encountered!) @@ -52,9 +56,10 @@ init: .PHONY: resources resources: init - windres -DL5J_BUILDNO=$(BUILDNO) -o obj/common.$(CPU_ARCH).o res/common.rc - windres -DL5J_BUILDNO=$(BUILDNO) -o obj/splash_screen.$(CPU_ARCH).o res/splash_screen.rc - windres -DL5J_BUILDNO=$(BUILDNO) -o obj/registry.$(CPU_ARCH).o res/registry.rc + sed -e 's/$${{version}}/$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH).$(BUILDNO)/g' -e 's/$${{processorArchitecture}}/$(CPU_ARCH)/g' res/assets/manifest.xml > res/assets/manifest.$(CPU_ARCH).xml + windres -DL5J_CPU_ARCH=$(CPU_ARCH) -DL5J_BUILDNO=$(BUILDNO) -o obj/common.$(CPU_ARCH).o res/common.rc + windres -DL5J_CPU_ARCH=$(CPU_ARCH) -DL5J_BUILDNO=$(BUILDNO) -o obj/splash_screen.$(CPU_ARCH).o res/splash_screen.rc + windres -DL5J_CPU_ARCH=$(CPU_ARCH) -DL5J_BUILDNO=$(BUILDNO) -o obj/registry.$(CPU_ARCH).o res/registry.rc .PHONY: clean clean: init @@ -65,225 +70,225 @@ clean: init # Binaries # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.PHONY: l5j_F9F9A1F5 -l5j_F9F9A1F5: resources +.PHONY: l5j_9F20B84D +l5j_9F20B84D: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=0 -DL5J_DETECT_REGISTRY=0 -DL5J_STAY_ALIVE=1 -DL5J_ENABLE_SPLASH=1 -DL5J_ENCODE_ARGS=1 -o bin/launch5j_$(CPU_ARCH).exe src/head.c obj/common.$(CPU_ARCH).o obj/splash_screen.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH).exe endif -.PHONY: l5j_387BDF25 -l5j_387BDF25: resources +.PHONY: l5j_6EB7DACE +l5j_6EB7DACE: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=0 -DL5J_DETECT_REGISTRY=0 -DL5J_STAY_ALIVE=1 -DL5J_ENABLE_SPLASH=1 -DL5J_ENCODE_ARGS=0 -o bin/launch5j_$(CPU_ARCH)_noenc.exe src/head.c obj/common.$(CPU_ARCH).o obj/splash_screen.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_noenc.exe endif -.PHONY: l5j_31F684B4 -l5j_31F684B4: resources +.PHONY: l5j_F5B13FCD +l5j_F5B13FCD: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=0 -DL5J_DETECT_REGISTRY=0 -DL5J_STAY_ALIVE=1 -DL5J_ENABLE_SPLASH=0 -DL5J_ENCODE_ARGS=1 -o bin/launch5j_$(CPU_ARCH)_nosplash.exe src/head.c obj/common.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_nosplash.exe endif -.PHONY: l5j_6A985F3B -l5j_6A985F3B: resources +.PHONY: l5j_4739563B +l5j_4739563B: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=0 -DL5J_DETECT_REGISTRY=0 -DL5J_STAY_ALIVE=1 -DL5J_ENABLE_SPLASH=0 -DL5J_ENCODE_ARGS=0 -o bin/launch5j_$(CPU_ARCH)_nosplash_noenc.exe src/head.c obj/common.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_nosplash_noenc.exe endif -.PHONY: l5j_A813D876 -l5j_A813D876: resources +.PHONY: l5j_6E959748 +l5j_6E959748: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=0 -DL5J_DETECT_REGISTRY=0 -DL5J_STAY_ALIVE=0 -DL5J_ENABLE_SPLASH=1 -DL5J_ENCODE_ARGS=1 -o bin/launch5j_$(CPU_ARCH)_nowait.exe src/head.c obj/common.$(CPU_ARCH).o obj/splash_screen.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_nowait.exe endif -.PHONY: l5j_F8EC1E57 -l5j_F8EC1E57: resources +.PHONY: l5j_2E20373E +l5j_2E20373E: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=0 -DL5J_DETECT_REGISTRY=0 -DL5J_STAY_ALIVE=0 -DL5J_ENABLE_SPLASH=1 -DL5J_ENCODE_ARGS=0 -o bin/launch5j_$(CPU_ARCH)_nowait_noenc.exe src/head.c obj/common.$(CPU_ARCH).o obj/splash_screen.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_nowait_noenc.exe endif -.PHONY: l5j_5E261357 -l5j_5E261357: resources +.PHONY: l5j_9FDC0678 +l5j_9FDC0678: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=0 -DL5J_DETECT_REGISTRY=0 -DL5J_STAY_ALIVE=0 -DL5J_ENABLE_SPLASH=0 -DL5J_ENCODE_ARGS=1 -o bin/launch5j_$(CPU_ARCH)_nowait_nosplash.exe src/head.c obj/common.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_nowait_nosplash.exe endif -.PHONY: l5j_07A9F8CB -l5j_07A9F8CB: resources +.PHONY: l5j_4CA6A4DC +l5j_4CA6A4DC: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=0 -DL5J_DETECT_REGISTRY=0 -DL5J_STAY_ALIVE=0 -DL5J_ENABLE_SPLASH=0 -DL5J_ENCODE_ARGS=0 -o bin/launch5j_$(CPU_ARCH)_nowait_nosplash_noenc.exe src/head.c obj/common.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_nowait_nosplash_noenc.exe endif -.PHONY: l5j_43E42BBF -l5j_43E42BBF: resources +.PHONY: l5j_F2F69A4A +l5j_F2F69A4A: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=0 -DL5J_DETECT_REGISTRY=1 -DL5J_STAY_ALIVE=1 -DL5J_ENABLE_SPLASH=1 -DL5J_ENCODE_ARGS=1 -o bin/launch5j_$(CPU_ARCH)_registry.exe src/head.c obj/common.$(CPU_ARCH).o obj/splash_screen.$(CPU_ARCH).o obj/registry.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_registry.exe endif -.PHONY: l5j_0A5615A8 -l5j_0A5615A8: resources +.PHONY: l5j_D4F4011F +l5j_D4F4011F: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=0 -DL5J_DETECT_REGISTRY=1 -DL5J_STAY_ALIVE=1 -DL5J_ENABLE_SPLASH=1 -DL5J_ENCODE_ARGS=0 -o bin/launch5j_$(CPU_ARCH)_registry_noenc.exe src/head.c obj/common.$(CPU_ARCH).o obj/splash_screen.$(CPU_ARCH).o obj/registry.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_registry_noenc.exe endif -.PHONY: l5j_6BF2F1D5 -l5j_6BF2F1D5: resources +.PHONY: l5j_11C4FEF5 +l5j_11C4FEF5: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=0 -DL5J_DETECT_REGISTRY=1 -DL5J_STAY_ALIVE=1 -DL5J_ENABLE_SPLASH=0 -DL5J_ENCODE_ARGS=1 -o bin/launch5j_$(CPU_ARCH)_registry_nosplash.exe src/head.c obj/common.$(CPU_ARCH).o obj/registry.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_registry_nosplash.exe endif -.PHONY: l5j_42DD17AD -l5j_42DD17AD: resources +.PHONY: l5j_6BE922C9 +l5j_6BE922C9: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=0 -DL5J_DETECT_REGISTRY=1 -DL5J_STAY_ALIVE=1 -DL5J_ENABLE_SPLASH=0 -DL5J_ENCODE_ARGS=0 -o bin/launch5j_$(CPU_ARCH)_registry_nosplash_noenc.exe src/head.c obj/common.$(CPU_ARCH).o obj/registry.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_registry_nosplash_noenc.exe endif -.PHONY: l5j_7C2731CC -l5j_7C2731CC: resources +.PHONY: l5j_25501419 +l5j_25501419: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=0 -DL5J_DETECT_REGISTRY=1 -DL5J_STAY_ALIVE=0 -DL5J_ENABLE_SPLASH=1 -DL5J_ENCODE_ARGS=1 -o bin/launch5j_$(CPU_ARCH)_registry_nowait.exe src/head.c obj/common.$(CPU_ARCH).o obj/splash_screen.$(CPU_ARCH).o obj/registry.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_registry_nowait.exe endif -.PHONY: l5j_A101EF16 -l5j_A101EF16: resources +.PHONY: l5j_11BE9EC8 +l5j_11BE9EC8: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=0 -DL5J_DETECT_REGISTRY=1 -DL5J_STAY_ALIVE=0 -DL5J_ENABLE_SPLASH=1 -DL5J_ENCODE_ARGS=0 -o bin/launch5j_$(CPU_ARCH)_registry_nowait_noenc.exe src/head.c obj/common.$(CPU_ARCH).o obj/splash_screen.$(CPU_ARCH).o obj/registry.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_registry_nowait_noenc.exe endif -.PHONY: l5j_7ADBDAB1 -l5j_7ADBDAB1: resources +.PHONY: l5j_02A2A05C +l5j_02A2A05C: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=0 -DL5J_DETECT_REGISTRY=1 -DL5J_STAY_ALIVE=0 -DL5J_ENABLE_SPLASH=0 -DL5J_ENCODE_ARGS=1 -o bin/launch5j_$(CPU_ARCH)_registry_nowait_nosplash.exe src/head.c obj/common.$(CPU_ARCH).o obj/registry.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_registry_nowait_nosplash.exe endif -.PHONY: l5j_37115C1A -l5j_37115C1A: resources +.PHONY: l5j_78CABE2B +l5j_78CABE2B: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=0 -DL5J_DETECT_REGISTRY=1 -DL5J_STAY_ALIVE=0 -DL5J_ENABLE_SPLASH=0 -DL5J_ENCODE_ARGS=0 -o bin/launch5j_$(CPU_ARCH)_registry_nowait_nosplash_noenc.exe src/head.c obj/common.$(CPU_ARCH).o obj/registry.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_registry_nowait_nosplash_noenc.exe endif -.PHONY: l5j_44D8B4F3 -l5j_44D8B4F3: resources +.PHONY: l5j_ED85B0DE +l5j_ED85B0DE: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=1 -DL5J_DETECT_REGISTRY=0 -DL5J_STAY_ALIVE=1 -DL5J_ENABLE_SPLASH=1 -DL5J_ENCODE_ARGS=1 -o bin/launch5j_$(CPU_ARCH)_wrapped.exe src/head.c obj/common.$(CPU_ARCH).o obj/splash_screen.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_wrapped.exe endif -.PHONY: l5j_61D7AF7F -l5j_61D7AF7F: resources +.PHONY: l5j_853C1537 +l5j_853C1537: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=1 -DL5J_DETECT_REGISTRY=0 -DL5J_STAY_ALIVE=1 -DL5J_ENABLE_SPLASH=1 -DL5J_ENCODE_ARGS=0 -o bin/launch5j_$(CPU_ARCH)_wrapped_noenc.exe src/head.c obj/common.$(CPU_ARCH).o obj/splash_screen.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_wrapped_noenc.exe endif -.PHONY: l5j_043C058B -l5j_043C058B: resources +.PHONY: l5j_F5506AE6 +l5j_F5506AE6: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=1 -DL5J_DETECT_REGISTRY=0 -DL5J_STAY_ALIVE=1 -DL5J_ENABLE_SPLASH=0 -DL5J_ENCODE_ARGS=1 -o bin/launch5j_$(CPU_ARCH)_wrapped_nosplash.exe src/head.c obj/common.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_wrapped_nosplash.exe endif -.PHONY: l5j_614431D9 -l5j_614431D9: resources +.PHONY: l5j_5C448B7B +l5j_5C448B7B: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=1 -DL5J_DETECT_REGISTRY=0 -DL5J_STAY_ALIVE=1 -DL5J_ENABLE_SPLASH=0 -DL5J_ENCODE_ARGS=0 -o bin/launch5j_$(CPU_ARCH)_wrapped_nosplash_noenc.exe src/head.c obj/common.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_wrapped_nosplash_noenc.exe endif -.PHONY: l5j_DD3611A9 -l5j_DD3611A9: resources +.PHONY: l5j_895ED50D +l5j_895ED50D: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=1 -DL5J_DETECT_REGISTRY=0 -DL5J_STAY_ALIVE=0 -DL5J_ENABLE_SPLASH=1 -DL5J_ENCODE_ARGS=1 -o bin/launch5j_$(CPU_ARCH)_wrapped_nowait.exe src/head.c obj/common.$(CPU_ARCH).o obj/splash_screen.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_wrapped_nowait.exe endif -.PHONY: l5j_C267A006 -l5j_C267A006: resources +.PHONY: l5j_39ABD48C +l5j_39ABD48C: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=1 -DL5J_DETECT_REGISTRY=0 -DL5J_STAY_ALIVE=0 -DL5J_ENABLE_SPLASH=1 -DL5J_ENCODE_ARGS=0 -o bin/launch5j_$(CPU_ARCH)_wrapped_nowait_noenc.exe src/head.c obj/common.$(CPU_ARCH).o obj/splash_screen.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_wrapped_nowait_noenc.exe endif -.PHONY: l5j_C15BE671 -l5j_C15BE671: resources +.PHONY: l5j_38B963DC +l5j_38B963DC: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=1 -DL5J_DETECT_REGISTRY=0 -DL5J_STAY_ALIVE=0 -DL5J_ENABLE_SPLASH=0 -DL5J_ENCODE_ARGS=1 -o bin/launch5j_$(CPU_ARCH)_wrapped_nowait_nosplash.exe src/head.c obj/common.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_wrapped_nowait_nosplash.exe endif -.PHONY: l5j_E8DDCABF -l5j_E8DDCABF: resources +.PHONY: l5j_092D167A +l5j_092D167A: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=1 -DL5J_DETECT_REGISTRY=0 -DL5J_STAY_ALIVE=0 -DL5J_ENABLE_SPLASH=0 -DL5J_ENCODE_ARGS=0 -o bin/launch5j_$(CPU_ARCH)_wrapped_nowait_nosplash_noenc.exe src/head.c obj/common.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_wrapped_nowait_nosplash_noenc.exe endif -.PHONY: l5j_3645B652 -l5j_3645B652: resources +.PHONY: l5j_07C35DAB +l5j_07C35DAB: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=1 -DL5J_DETECT_REGISTRY=1 -DL5J_STAY_ALIVE=1 -DL5J_ENABLE_SPLASH=1 -DL5J_ENCODE_ARGS=1 -o bin/launch5j_$(CPU_ARCH)_wrapped_registry.exe src/head.c obj/common.$(CPU_ARCH).o obj/splash_screen.$(CPU_ARCH).o obj/registry.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_wrapped_registry.exe endif -.PHONY: l5j_45BDFACE -l5j_45BDFACE: resources +.PHONY: l5j_D7AE1B5C +l5j_D7AE1B5C: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=1 -DL5J_DETECT_REGISTRY=1 -DL5J_STAY_ALIVE=1 -DL5J_ENABLE_SPLASH=1 -DL5J_ENCODE_ARGS=0 -o bin/launch5j_$(CPU_ARCH)_wrapped_registry_noenc.exe src/head.c obj/common.$(CPU_ARCH).o obj/splash_screen.$(CPU_ARCH).o obj/registry.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_wrapped_registry_noenc.exe endif -.PHONY: l5j_C1FDBA19 -l5j_C1FDBA19: resources +.PHONY: l5j_61E6D532 +l5j_61E6D532: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=1 -DL5J_DETECT_REGISTRY=1 -DL5J_STAY_ALIVE=1 -DL5J_ENABLE_SPLASH=0 -DL5J_ENCODE_ARGS=1 -o bin/launch5j_$(CPU_ARCH)_wrapped_registry_nosplash.exe src/head.c obj/common.$(CPU_ARCH).o obj/registry.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_wrapped_registry_nosplash.exe endif -.PHONY: l5j_0DD7490D -l5j_0DD7490D: resources +.PHONY: l5j_2BD26F88 +l5j_2BD26F88: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=1 -DL5J_DETECT_REGISTRY=1 -DL5J_STAY_ALIVE=1 -DL5J_ENABLE_SPLASH=0 -DL5J_ENCODE_ARGS=0 -o bin/launch5j_$(CPU_ARCH)_wrapped_registry_nosplash_noenc.exe src/head.c obj/common.$(CPU_ARCH).o obj/registry.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_wrapped_registry_nosplash_noenc.exe endif -.PHONY: l5j_25375FF3 -l5j_25375FF3: resources +.PHONY: l5j_36418169 +l5j_36418169: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=1 -DL5J_DETECT_REGISTRY=1 -DL5J_STAY_ALIVE=0 -DL5J_ENABLE_SPLASH=1 -DL5J_ENCODE_ARGS=1 -o bin/launch5j_$(CPU_ARCH)_wrapped_registry_nowait.exe src/head.c obj/common.$(CPU_ARCH).o obj/splash_screen.$(CPU_ARCH).o obj/registry.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_wrapped_registry_nowait.exe endif -.PHONY: l5j_988AA638 -l5j_988AA638: resources +.PHONY: l5j_80723D82 +l5j_80723D82: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=1 -DL5J_DETECT_REGISTRY=1 -DL5J_STAY_ALIVE=0 -DL5J_ENABLE_SPLASH=1 -DL5J_ENCODE_ARGS=0 -o bin/launch5j_$(CPU_ARCH)_wrapped_registry_nowait_noenc.exe src/head.c obj/common.$(CPU_ARCH).o obj/splash_screen.$(CPU_ARCH).o obj/registry.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_wrapped_registry_nowait_noenc.exe endif -.PHONY: l5j_939A7B9C -l5j_939A7B9C: resources +.PHONY: l5j_2CD367E0 +l5j_2CD367E0: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=1 -DL5J_DETECT_REGISTRY=1 -DL5J_STAY_ALIVE=0 -DL5J_ENABLE_SPLASH=0 -DL5J_ENCODE_ARGS=1 -o bin/launch5j_$(CPU_ARCH)_wrapped_registry_nowait_nosplash.exe src/head.c obj/common.$(CPU_ARCH).o obj/registry.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_wrapped_registry_nowait_nosplash.exe endif -.PHONY: l5j_F2A93271 -l5j_F2A93271: resources +.PHONY: l5j_B63A975C +l5j_B63A975C: resources $(CC) $(CFLAGS) -DL5J_BUILDNO=$(BUILDNO) -DL5J_JAR_FILE_WRAPPED=1 -DL5J_DETECT_REGISTRY=1 -DL5J_STAY_ALIVE=0 -DL5J_ENABLE_SPLASH=0 -DL5J_ENCODE_ARGS=0 -o bin/launch5j_$(CPU_ARCH)_wrapped_registry_nowait_nosplash_noenc.exe src/head.c obj/common.$(CPU_ARCH).o obj/registry.$(CPU_ARCH).o $(LDFLAGS) ifeq ($(DEBUG),0) strip bin/launch5j_$(CPU_ARCH)_wrapped_registry_nowait_nosplash_noenc.exe @@ -295,36 +300,36 @@ endif .PHONY: all all: \ - l5j_F9F9A1F5 \ - l5j_387BDF25 \ - l5j_31F684B4 \ - l5j_6A985F3B \ - l5j_A813D876 \ - l5j_F8EC1E57 \ - l5j_5E261357 \ - l5j_07A9F8CB \ - l5j_43E42BBF \ - l5j_0A5615A8 \ - l5j_6BF2F1D5 \ - l5j_42DD17AD \ - l5j_7C2731CC \ - l5j_A101EF16 \ - l5j_7ADBDAB1 \ - l5j_37115C1A \ - l5j_44D8B4F3 \ - l5j_61D7AF7F \ - l5j_043C058B \ - l5j_614431D9 \ - l5j_DD3611A9 \ - l5j_C267A006 \ - l5j_C15BE671 \ - l5j_E8DDCABF \ - l5j_3645B652 \ - l5j_45BDFACE \ - l5j_C1FDBA19 \ - l5j_0DD7490D \ - l5j_25375FF3 \ - l5j_988AA638 \ - l5j_939A7B9C \ - l5j_F2A93271 + l5j_9F20B84D \ + l5j_6EB7DACE \ + l5j_F5B13FCD \ + l5j_4739563B \ + l5j_6E959748 \ + l5j_2E20373E \ + l5j_9FDC0678 \ + l5j_4CA6A4DC \ + l5j_F2F69A4A \ + l5j_D4F4011F \ + l5j_11C4FEF5 \ + l5j_6BE922C9 \ + l5j_25501419 \ + l5j_11BE9EC8 \ + l5j_02A2A05C \ + l5j_78CABE2B \ + l5j_ED85B0DE \ + l5j_853C1537 \ + l5j_F5506AE6 \ + l5j_5C448B7B \ + l5j_895ED50D \ + l5j_39ABD48C \ + l5j_38B963DC \ + l5j_092D167A \ + l5j_07C35DAB \ + l5j_D7AE1B5C \ + l5j_61E6D532 \ + l5j_2BD26F88 \ + l5j_36418169 \ + l5j_80723D82 \ + l5j_2CD367E0 \ + l5j_B63A975C diff --git a/package.cmd b/package.cmd index 3952b6f..ae7a9cd 100644 --- a/package.cmd +++ b/package.cmd @@ -66,12 +66,12 @@ mkdir "%PACK_PATH%\etc\img" mkdir "%PACK_PATH%\etc\style" mkdir "%PACK_PATH%\example" -copy /Y "%~dp0.\*.txt" "%PACK_PATH%" -copy /Y "%~dp0.\*.html" "%PACK_PATH%" -copy /Y "%~dp0.\bin\launch5j_x86*.exe" "%PACK_PATH%" -copy /Y "%~dp0.\bin\launch5j_x64*.exe" "%PACK_PATH%\x64" -copy /Y "%~dp0.\etc\img\*.png" "%PACK_PATH%\etc\img" -copy /Y "%~dp0.\etc\style\*.css" "%PACK_PATH%\etc\style" +copy /Y "%~dp0.\*.txt" "%PACK_PATH%" +copy /Y "%~dp0.\*.html" "%PACK_PATH%" +copy /Y "%~dp0.\bin\launch5j_x86*.exe" "%PACK_PATH%" +copy /Y "%~dp0.\bin\launch5j_amd64*.exe" "%PACK_PATH%\x64" +copy /Y "%~dp0.\etc\style\*.css" "%PACK_PATH%\etc\style" +copy /Y "%~dp0.\etc\img\*.png" "%PACK_PATH%\etc\img" copy /Y /B "%~dp0.\bin\launch5j_x86_wrapped_registry.exe" + "%~dp0.\src\example\dist\example.jar" "%PACK_PATH%\example\example.exe" copy /Y "%~dp0.\src\example\src\com\muldersoft\l5j\example\Main.java" "%PACK_PATH%\example\example.java" diff --git a/res/assets/.gitignore b/res/assets/.gitignore new file mode 100644 index 0000000..9445121 --- /dev/null +++ b/res/assets/.gitignore @@ -0,0 +1 @@ +/manifest.*.xml diff --git a/res/assets/manifest.xml b/res/assets/manifest.xml index 91ace65..6b6d550 100644 --- a/res/assets/manifest.xml +++ b/res/assets/manifest.xml @@ -1,5 +1,7 @@ + + Launch5j @@ -23,7 +25,12 @@ - + + + + true + + diff --git a/res/common.rc b/res/common.rc index dfef3cb..216de0c 100644 --- a/res/common.rc +++ b/res/common.rc @@ -17,6 +17,10 @@ #include "../src/resource.h" +#ifndef L5J_CPU_ARCH +#error L5J_CPU_ARCH is not defined! +#endif + ///////////////////////////////////////////////////////////////////////////// // Neutral resources ///////////////////////////////////////////////////////////////////////////// @@ -91,4 +95,8 @@ END // Manifest ///////////////////////////////////////////////////////////////////////////// -1 RT_MANIFEST "assets/manifest.xml" +#define L5J_MANIFEST_GLUE1(X,Y,Z) #X #Y #Z +#define L5J_MANIFEST_GLUE2(X,Y,Z) L5J_MANIFEST_GLUE1(X,Y,Z) +#define L5J_MANIFEST_STR L5J_MANIFEST_GLUE2(assets/manifest.,L5J_CPU_ARCH,.xml) + +1 RT_MANIFEST L5J_MANIFEST_STR diff --git a/src/makefile-generator/res/.assets/templates/header.mak b/src/makefile-generator/res/.assets/templates/header.mak index bb5fdd6..b49bb43 100644 --- a/src/makefile-generator/res/.assets/templates/header.mak +++ b/src/makefile-generator/res/.assets/templates/header.mak @@ -14,11 +14,15 @@ MACHINE := $(patsubst %-w64-mingw32,[%],$(shell $(CXX) -dumpmachine)) BUILDNO := $(shell git rev-list --count HEAD 2>&- || echo 0) +VERSION_MAJOR := $(shell grep -Po '#define[[:space:]]+L5J_VERSION_MAJOR[[:space:]]+\K[[:digit:]]+' src/resource.h) +VERSION_MINOR := $(shell grep -Po '#define[[:space:]]+L5J_VERSION_MINOR[[:space:]]+\K[[:digit:]]+' src/resource.h) +VERSION_PATCH := $(shell grep -Po '#define[[:space:]]+L5J_VERSION_PATCH[[:space:]]+\K[[:digit:]]+' src/resource.h) + ifeq ($(MACHINE),[i686]) CPU_ARCH := x86 MARCH ?= i586 else ifeq ($(MACHINE),[x86_64]) - CPU_ARCH := x64 + CPU_ARCH := amd64 MARCH ?= x86-64 else $(error Unknown target machine "$(MACHINE)" encountered!) @@ -52,9 +56,10 @@ init: .PHONY: resources resources: init - windres -DL5J_BUILDNO=$(BUILDNO) -o obj/common.$(CPU_ARCH).o res/common.rc - windres -DL5J_BUILDNO=$(BUILDNO) -o obj/splash_screen.$(CPU_ARCH).o res/splash_screen.rc - windres -DL5J_BUILDNO=$(BUILDNO) -o obj/registry.$(CPU_ARCH).o res/registry.rc + sed -e 's/$${{version}}/$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH).$(BUILDNO)/g' -e 's/$${{processorArchitecture}}/$(CPU_ARCH)/g' res/assets/manifest.xml > res/assets/manifest.$(CPU_ARCH).xml + windres -DL5J_CPU_ARCH=$(CPU_ARCH) -DL5J_BUILDNO=$(BUILDNO) -o obj/common.$(CPU_ARCH).o res/common.rc + windres -DL5J_CPU_ARCH=$(CPU_ARCH) -DL5J_BUILDNO=$(BUILDNO) -o obj/splash_screen.$(CPU_ARCH).o res/splash_screen.rc + windres -DL5J_CPU_ARCH=$(CPU_ARCH) -DL5J_BUILDNO=$(BUILDNO) -o obj/registry.$(CPU_ARCH).o res/registry.rc .PHONY: clean clean: init