abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix release build scripts

Browse Source 
Exclude dev.cfg from the Windows installer.
Use the correct filename for the Windows installer.
Update some paths to match the new EC2 build process.

This was SVN commit r13802.
This commit is contained in:
Ykkrosh 2013-09-06 19:43:45 +00:00
parent 63f28f1a43
commit 16c9724c24
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/tools/dist/0ad.nsi vendored
View File

@ -1,6 +1,6 @@
; To generate the installer (on Linux):
; Do an 'svn export' into a directory called e.g. "export-win32"
; wine ~/.wine/drive_c/Program\ Files/NSIS/makensis.exe /nocd /dcheckoutpath=export-win32 /drevision=1234 export-win32/source/tools/dist/0ad.nsi
; makensis -nocd -dcheckoutpath=export-win32 -drevision=1234 -dprefix=0ad-0.1.2-alpha export-win32/source/tools/dist/0ad.nsi
SetCompressor /SOLID lzma
@ -15,7 +15,7 @@
;Name and file
Name "0 A.D."
OutFile "0ad-r${REVISION}-alpha-win32.exe"
OutFile "${PREFIX}-win32.exe"
;Default installation folder
InstallDir "$LOCALAPPDATA\0 A.D. alpha"
@ -76,7 +76,7 @@ Section "!Game and data files" GameSection
SetOutPath "$INSTDIR"
File "${CHECKOUTPATH}\*.txt"
File "${CHECKOUTPATH}\source\tools\openlogsfolder\*.*"
File /r /x "public" "${CHECKOUTPATH}\binaries"
File /r /x "public" /x "dev.cfg" "${CHECKOUTPATH}\binaries"
SetOutPath "$INSTDIR\binaries\data\mods\public"
File "${CHECKOUTPATH}\binaries\data\mods\public\public.zip"

12
source/tools/dist/build.sh vendored
View File

@ -3,13 +3,13 @@
set -ev
# Compiled executable for archive-builder tool
EXE=~/0ad/hg/ps/binaries/system/pyrogenesis
EXE=/mnt/0ad/0ad/binaries/system/pyrogenesis
# Location of clean checkout
SVNWC=~/0ad/public-trunk/
SVNWC=/mnt/0ad/0ad/
SVNREV=`svnversion -n ${SVNWC}`
PREFIX=0ad-r${SVNREV}-alpha
PREFIX=0ad-0.0.XXX-alpha
XZOPTS="-9 -e"
BZ2OPTS="-9"
@ -47,15 +47,11 @@ tar cf $PREFIX-unix-data.tar \
# Compress
xz -kv ${XZOPTS} $PREFIX-unix-build.tar
xz -kv ${XZOPTS} $PREFIX-unix-data.tar
#bzip2 -kp ${BZ2OPTS} $PREFIX-unix-build.tar
#bzip2 -kp ${BZ2OPTS} $PREFIX-unix-data.tar
#gzip -cv ${GZIPOPTS} $PREFIX-unix-build.tar > $PREFIX-unix-build.tar.gz
#gzip -cv ${GZIPOPTS} $PREFIX-unix-data.tar > $PREFIX-unix-data.tar.gz
7z a ${GZIP7ZOPTS} $PREFIX-unix-build.tar.gz $PREFIX-unix-build.tar
7z a ${GZIP7ZOPTS} $PREFIX-unix-data.tar.gz $PREFIX-unix-data.tar
# Create Windows installer
wine ~/.wine/drive_c/Program\ Files/NSIS/makensis.exe /nocd /dcheckoutpath=export-win32 /drevision=${SVNREV} export-win32/source/tools/dist/0ad.nsi
makensis -nocd -dcheckoutpath=export-win32 -drevision=${SVNREV} -dprefix=${PREFIX} export-win32/source/tools/dist/0ad.nsi
# Fix permissions
chmod -f 644 ${PREFIX}-{unix-{build,data}.tar.{xz,bz2,gz},win32.exe}