epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of unnecessary Makefile variables.

Browse Source
This commit is contained in:
Matthias Mailänder
2021-01-10 19:15:23 +01:00
committed by abcdefg30
parent cbf2e2e2ef
commit ddfa5a4d35
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@@ -36,9 +36,6 @@ bindir ?= $(prefix)/bin
libdir ?= $(prefix)/lib libdir ?= $(prefix)/lib
gameinstalldir ?= $(libdir)/openra gameinstalldir ?= $(libdir)/openra
DATA_INSTALL_DIR = $(DESTDIR)$(datadir)
OPENRA_INSTALL_DIR = $(DESTDIR)$(gameinstalldir)
# Toolchain # Toolchain
CWD = $(shell pwd) CWD = $(shell pwd)
MSBUILD = msbuild -verbosity:m -nologo MSBUILD = msbuild -verbosity:m -nologo
@@ -121,14 +118,14 @@ version: VERSION mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mo
@sh -c '. ./packaging/functions.sh; set_mod_version $(VERSION) mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modcontent/mod.yaml mods/all/mod.yaml' @sh -c '. ./packaging/functions.sh; set_mod_version $(VERSION) mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modcontent/mod.yaml mods/all/mod.yaml'
install: install:
@sh -c '. ./packaging/functions.sh; install_assemblies_mono $(CWD) $(OPENRA_INSTALL_DIR) $(TARGETPLATFORM) True True True' @sh -c '. ./packaging/functions.sh; install_assemblies_mono $(CWD) $(DESTDIR)$(gameinstalldir) $(TARGETPLATFORM) True True True'
@sh -c '. ./packaging/functions.sh; install_data $(CWD) $(OPENRA_INSTALL_DIR) cnc d2k ra' @sh -c '. ./packaging/functions.sh; install_data $(CWD) $(DESTDIR)$(gameinstalldir) cnc d2k ra'
install-linux-shortcuts: install-linux-shortcuts:
@sh -c '. ./packaging/functions.sh; install_linux_shortcuts $(CWD) "$(DESTDIR)" "$(gameinstalldir)" "$(bindir)" "$(datadir)" $(VERSION) cnc d2k ra' @sh -c '. ./packaging/functions.sh; install_linux_shortcuts $(CWD) "$(DESTDIR)" "$(gameinstalldir)" "$(bindir)" "$(datadir)" $(VERSION) cnc d2k ra'
install-linux-appdata: install-linux-appdata:
@sh -c '. ./packaging/functions.sh; install_linux_appdata $(CWD) $(DATA_INSTALL_DIR) cnc d2k ra' @sh -c '. ./packaging/functions.sh; install_linux_appdata $(CWD) "$(DESTDIR)" "$(datadir)" cnc d2k ra'
help: help:
@echo 'to compile, run:' @echo 'to compile, run:'

10
packaging/functions.sh
View File

@@ -293,14 +293,16 @@ install_linux_shortcuts() {
# Copy AppStream metadata to the target directory # Copy AppStream metadata to the target directory
# Arguments: # Arguments:
# SRC_PATH: Path to the root OpenRA directory # SRC_PATH: Path to the root OpenRA directory
# BUILD_PATH: Path to packaging filesystem root (e.g. /tmp/openra-build/ or "" for a local install)
# SHARE_PATH: Parent path to the appdata directory (e.g. /usr/local/share) # SHARE_PATH: Parent path to the appdata directory (e.g. /usr/local/share)
# MOD [MOD...]: One or more mod ids to copy (cnc, d2k, ra) # MOD [MOD...]: One or more mod ids to copy (cnc, d2k, ra)
# Used by: # Used by:
# Makefile (install-linux-appdata target for local installs and downstream packaging) # Makefile (install-linux-appdata target for local installs and downstream packaging)
install_linux_appdata() { install_linux_appdata() {
SRC_PATH="${1}" SRC_PATH="${1}"
SHARE_PATH="${2}" BUILD_PATH="${2}"
shift 2 SHARE_PATH="${3}"
shift 3
while [ -n "${1}" ]; do while [ -n "${1}" ]; do
MOD_ID="${1}" MOD_ID="${1}"
SCREENSHOT_CNC= SCREENSHOT_CNC=
@@ -323,10 +325,10 @@ install_linux_appdata() {
fi fi
fi fi
install -d "${SHARE_PATH}/appdata" install -d "${BUILD_PATH}${SHARE_PATH}/appdata"
sed "s/{MODID}/${MOD_ID}/g" "${SRC_PATH}/packaging/linux/openra.appdata.xml.in" | sed "s/{MOD_NAME}/${MOD_NAME}/g" | sed "s/{SCREENSHOT_RA}/${SCREENSHOT_RA}/g" | sed "s/{SCREENSHOT_CNC}/${SCREENSHOT_CNC}/g" | sed "s/{SCREENSHOT_D2K}/${SCREENSHOT_D2K}/g"> "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.appdata.xml" sed "s/{MODID}/${MOD_ID}/g" "${SRC_PATH}/packaging/linux/openra.appdata.xml.in" | sed "s/{MOD_NAME}/${MOD_NAME}/g" | sed "s/{SCREENSHOT_RA}/${SCREENSHOT_RA}/g" | sed "s/{SCREENSHOT_CNC}/${SCREENSHOT_CNC}/g" | sed "s/{SCREENSHOT_D2K}/${SCREENSHOT_D2K}/g"> "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.appdata.xml"
install -m644 "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.appdata.xml" "${SHARE_PATH}/appdata" install -m644 "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.appdata.xml" "${BUILD_PATH}${SHARE_PATH}/appdata"
rm "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.appdata.xml" rm "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.appdata.xml"
shift shift