POSIX installer - Package name according to build mode.

pkg-posix (release-deployment)        - oolite-MAJ.MIN.REV.linux-ARCH.run
  pkg-posix-test (release)              - oolite-MAJ.MIN.REV-(test, beta, rc1, etc.).linux-ARCH.run
  pkg-posix-snapshot (release-snapshot) - oolite-MAJ.MIN.REV.SVNREV.linux-ARCH.run
  pkg-posix-nightly (release-snapshot)  - oolite-trunk-MAJ.MIN.REV.SVNREV-dev.linux-ARCH.run


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4512 127b21dd-08f5-0310-b4b7-95ae10353056
master
getafix 2011-04-12 15:52:33 +00:00
parent cfb54ae6c7
commit f6a0d8b3ac
1 changed files with 17 additions and 6 deletions

View File

@ -16,8 +16,11 @@
#
release_mode="" # Leave this empty. In the code you should define conditions for values like "-dev", "-test", "-beta", "-rc1", etc.
make_rc=0
build_mode=$3
build_mode=$3 # Should take [release-deployment, release, release-snapshot]
build_submode=`echo $build_mode | cut -d '-' -f 2 | sed -e s/release/test/` # Should take [deployment, test, snapshot]
echo $build_mode
if [ "$build_mode" = "release-deployment" ]
then
make -f Makefile distclean # force libraries clean build
@ -33,12 +36,15 @@ fi
cpu_architecture=$1
oolite_version_extended=$2
if [ "$4" = "nightly" ]
if [ "$build_submode" = "snapshot" ]
then
trunk="-trunk"
oolite_version=$oolite_version_extended
dev_linux="-dev.linux"
noxterm="--nox11" # If nightly, do NOT spawn an x11 terminal when installer is started from desktop
if [ "$4" = "nightly" ]
then
trunk="-trunk"
release_mode="-dev" # This is the only case to define release_mode as "-dev"
noxterm="--nox11" # If nightly, do NOT spawn an x11 terminal when installer is started from desktop
fi
else
oolite_version=`echo $oolite_version_extended | awk -F"\." '{print $1"."$2}'`
ver_rev=`echo $oolite_version_extended | cut -d '.' -f 3`
@ -46,6 +52,11 @@ else
then
oolite_version=${oolite_version}"."${ver_rev}
fi
if [ "$build_submode" = "test" ]
then
release_mode="-beta" # Here is the right place to define if this is "-test", "-beta", "-rc1", etc.
fi
fi
oolite_app=oolite.app
setup_root=${oolite_app}/oolite.installer.tmp
@ -100,7 +111,7 @@ cp -p uninstall.source ../../${oolite_app}/.
echo
./makeself.sh ${noxterm} ../../${oolite_app} oolite${trunk}-${oolite_version}${dev_linux}.${cpu_architecture}.run "Oolite${trunk} ${oolite_version} " ./setup $oolite_version
./makeself.sh ${noxterm} ../../${oolite_app} oolite${trunk}-${oolite_version}${release_mode}.linux-${cpu_architecture}.run "Oolite${trunk} ${oolite_version} " ./setup $oolite_version
ms_rc=$?
if [ $ms_rc -eq 0 ]
then