Project

General

Profile

« Previous | Next » 

Revision 5fcc717d

Added by Renato Botelho almost 10 years ago

Improve base package versioning scheme to deal with -DEVELOPMENT, -ALPHA, -BETA and -RC

View differences:

tools/builder_defaults.sh
274 274
export PKG_REPO_SERVER=${PKG_REPO_SERVER:-"pkg+http://beta.pfsense.org/packages"}
275 275
export PKG_REPO_CONF_BRANCH=${PKG_REPO_CONF_BRANCH:-"${GIT_REPO_BRANCH_OR_TAG}"}
276 276

  
277
if echo "${PRODUCT_VERSION}" | grep -q -- '-RELEASE'; then
278
	export _IS_RELEASE=yes
279
else
280
	unset _IS_RELEASE
281
fi
277
unset _IS_RELEASE
278
unset CORE_PKG_DATESTRING
279
export TIMESTAMP_SUFFIX="-${DATESTRING}"
280
# pkg doesn't like - as version separator, use . instead
281
export PKG_DATESTRING=$(echo "${DATESTRING}" | sed 's,-,.,g')
282
case "${PRODUCT_VERSION##*-}" in
283
	RELEASE)
284
		export _IS_RELEASE=yes
285
		unset TIMESTAMP_SUFFIX
286
		;;
287
	ALPHA|DEVELOPMENT)
288
		export CORE_PKG_DATESTRING=".a.${PKG_DATESTRING}"
289
		;;
290
	BETA)
291
		export CORE_PKG_DATESTRING=".b.${PKG_DATESTRING}"
292
		;;
293
	RC)
294
		export CORE_PKG_DATESTRING=".r.${PKG_DATESTRING}"
295
		;;
296
	*)
297
		echo ">>> ERROR: Invalid PRODUCT_VERSION format ${PRODUCT_VERSION}"
298
		exit 1
299
esac
282 300

  
283 301
# Define base package version, based on date for snaps
284
CORE_PKG_VERSION=${PRODUCT_VERSION%%-*}
285
if [ -z "${_IS_RELEASE}" ]; then
286
	CORE_PKG_VERSION="${CORE_PKG_VERSION}.${DATESTRING}"
287
fi
302
export CORE_PKG_VERSION="${PRODUCT_VERSION%%-*}${CORE_PKG_DATESTRING}"
288 303
export CORE_PKG_PATH=${CORE_PKG_PATH:-"${SCRATCHDIR}/${PRODUCT_NAME}_${GIT_REPO_BRANCH_OR_TAG}_${TARGET}_${TARGET_ARCH}-core"}
289 304
export CORE_PKG_TMP=${CORE_PKG_TMP:-"${SCRATCHDIR}/core_pkg_tmp"}
290 305

  
......
298 313
#export custom_package_list=""
299 314

  
300 315
# General builder output filenames
301
if [ -n "${_IS_RELEASE}" ]; then
302
	export TIMESTAMP_SUFFIX=""
303
else
304
	export TIMESTAMP_SUFFIX="-${DATESTRING}"
305
fi
306

  
307 316
export UPDATESDIR=${UPDATESDIR:-"${IMAGES_FINAL_DIR}/updates"}
308 317
export ISOPATH=${ISOPATH:-"${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-LiveCD-${PRODUCT_VERSION}-${TARGET}${TIMESTAMP_SUFFIX}.iso"}
309 318
export MEMSTICKPATH=${MEMSTICKPATH:-"${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-memstick-${PRODUCT_VERSION}-${TARGET}${TIMESTAMP_SUFFIX}.img"}

Also available in: Unified diff