lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 00:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

make: allow override of CORE_VERSION, CORE_REVISION and CORE_HASH

Browse Source
This commit is contained in:
Franco Fichtner 2018-12-17 08:14:23 +01:00
parent d9f7574147
commit 663f4baef1
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile
View File

@ -29,8 +29,16 @@ all:
.include "Mk/defaults.mk"
CORE_COMMIT!= ${.CURDIR}/Scripts/version.sh
CORE_VERSION= ${CORE_COMMIT:C/-.*$//1}
CORE_HASH= ${CORE_COMMIT:C/^.*-//1}
CORE_VERSION?= ${CORE_COMMIT:[1]}
CORE_REVISION?= ${CORE_COMMIT:[2]}
CORE_HASH?= ${CORE_COMMIT:[3]}
.if "${CORE_REVISION}" != "" && "${CORE_REVISION}" != "0"
CORE_PKGVER= ${CORE_VERSION}_${CORE_REVISION}
.else
CORE_PKGVER= ${CORE_VERSION}
.endif
CORE_ABI?= 18.7
CORE_ARCH?= ${ARCH}
@ -173,7 +181,7 @@ umount:
manifest:
@echo "name: \"${CORE_NAME}\""
@echo "version: \"${CORE_VERSION}\""
@echo "version: \"${CORE_PKGVER}\""
@echo "origin: \"${CORE_ORIGIN}\""
@echo "comment: \"${CORE_COMMENT}\""
@echo "desc: \"${CORE_HASH}\""
@ -263,13 +271,13 @@ package: plist-check package-check clean-work
.for CORE_DEPEND in ${CORE_DEPENDS}
@if ! ${PKG} info ${CORE_DEPEND} > /dev/null; then ${PKG} install -yfA ${CORE_DEPEND}; fi
.endfor
@echo -n ">>> Generating metadata for ${CORE_NAME}-${CORE_VERSION}..."
@echo -n ">>> Generating metadata for ${CORE_NAME}-${CORE_PKGVER}..."
@${MAKE} DESTDIR=${WRKSRC} FLAVOUR=${FLAVOUR} metadata
@echo " done"
@echo -n ">>> Staging files for ${CORE_NAME}-${CORE_VERSION}..."
@echo -n ">>> Staging files for ${CORE_NAME}-${CORE_PKGVER}..."
@${MAKE} DESTDIR=${WRKSRC} FLAVOUR=${FLAVOUR} install
@echo " done"
@echo ">>> Packaging files for ${CORE_NAME}-${CORE_VERSION}:"
@echo ">>> Packaging files for ${CORE_NAME}-${CORE_PKGVER}:"
@PORTSDIR=${.CURDIR} ${PKG} create -v -m ${WRKSRC} -r ${WRKSRC} \
-p ${WRKSRC}/plist -o ${PKGDIR}
@ -373,8 +381,8 @@ mfc:
@git checkout master
test: want-phpunit6-php${CORE_PHP}
@if [ "$$(${PKG} query %n-%v ${CORE_NAME})" != "${CORE_NAME}-${CORE_VERSION}" ]; then \
echo "Installed version does not match, expected ${CORE_NAME}-${CORE_VERSION}"; \
@if [ "$$(${PKG} query %n-%v ${CORE_NAME})" != "${CORE_NAME}-${CORE_PKGVER}" ]; then \
echo "Installed version does not match, expected ${CORE_NAME}-${CORE_PKGVER}"; \
exit 1; \
fi
@cd ${.CURDIR}/src/opnsense/mvc/tests && \

8
Scripts/version.sh
View File

@ -29,10 +29,6 @@ set -e
VERSION=$(git describe --abbrev=0 --always)
REVISION=$(git rev-list ${VERSION}.. --count)
COMMENT=$(git rev-list HEAD --max-count=1 | cut -c1-9)
if [ "${REVISION}" != "0" ]; then
# must construct full version string manually
VERSION=${VERSION}_${REVISION}
fi
HASH=$(git rev-list HEAD --max-count=1 | cut -c1-9)
echo ${VERSION}-${COMMENT}
echo ${VERSION} ${REVISION} ${HASH}