mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Commit a WIP for fixing tinderbox distfile building.

Browse source 
Originally committed to SVN as r5287.
This commit is contained in:
Amar Takhar 2011-02-05 22:23:31 +00:00
parent 75711f8041
commit 7508420000
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aegisub/packages/distfile/distfile.sh
View file

@ -2,6 +2,8 @@
SRCDIR=`pwd` SRCDIR=`pwd`
TMPFILE=`mktemp /tmp/aegisub_dist.XXXXXX` TMPFILE=`mktemp /tmp/aegisub_dist.XXXXXX`
EXTRA=`find . -name Makefile -or -name wscript` EXTRA=`find . -name Makefile -or -name wscript`
distdir?=aegisub-pkg
rm -rf aegisub-pkg rm -rf aegisub-pkg
if ! test -d src; then if ! test -d src; then
@ -16,7 +18,7 @@ gmake distfiles \
for i in ${EXTRA}; do for i in ${EXTRA}; do
echo "aegisub-pkg/$i"; echo "aegisub-pkg/$i";
./install-sh -m 0644 $i aegisub-pkg/$i; ./install-sh -m 0644 $i ${distdir}/$i;
done done
sh ${TMPFILE} sh ${TMPFILE}

14
aegisub/tinderbox/unix/dist.sh
View file

@ -1,6 +1,11 @@
#!/bin/sh #!/bin/sh
DIST_NAME="aegisub-snap-r${1}" DIST_NAME="aegisub-snap-r${1}"
UNAME_S=`uname -s` UNAME_S=`uname -s`
CONFIGURE_ARGS="/mnt/devel/build/debug-wx-trunk-r66440//lib/wx/config/gtk2-unicode-2.9"
BIN_MAKE="make"
ACLOCAL_FLAGS="-I /home/verm/build/wx/share/aclocal" ./autogen.sh ${CONFIGURE_ARGS} || exit $?
CONFIGURE_ARGS="/mnt/devel/build/debug-wx-trunk-r66440//lib/wx/config/gtk2-unicode-2.9"
if test -z "${1}"; then if test -z "${1}"; then
echo "You must supply a revision number!" echo "You must supply a revision number!"
@ -10,16 +15,8 @@ fi
# On FreeBSD "make" is PMake, so we need to use 'gmake' # On FreeBSD "make" is PMake, so we need to use 'gmake'
if test "${UNAME_S}" = "FreeBSD"; then if test "${UNAME_S}" = "FreeBSD"; then
BIN_MAKE="gmake" BIN_MAKE="gmake"
CONFIGURE_ARGS="--with-wx-config=/usr/home/verm/build/wx/lib/wx/config/gtk2-unicode-debug-2.9"
else
BIN_MAKE="make"
CONFIGURE_ARGS="--with-wx-config=/home/verm/build/wx/lib/wx/config/gtk2-unicode-debug-2.9"
fi fi
ACLOCAL_FLAGS="-I /home/verm/build/wx/share/aclocal" ./autogen.sh ${CONFIGURE_ARGS} || exit $?
# XXX: Work around ancient versions of intltool (cough DEBIAN)
touch intltool-update.in intltool-merge.in intltool-extract.in
${BIN_MAKE} distdir distdir="${DIST_NAME}" || exit $? ${BIN_MAKE} distdir distdir="${DIST_NAME}" || exit $?
@ -30,4 +27,3 @@ echo "${2}" > "${DIST_NAME}/slave_info"
tar cf "${DIST_NAME}.tar" "${DIST_NAME}" || exit $? tar cf "${DIST_NAME}.tar" "${DIST_NAME}" || exit $?
bzip2 -v ${DIST_NAME}.tar bzip2 -v ${DIST_NAME}.tar
mv "${DIST_NAME}.tar.bz2" dist.tar.bz2 mv "${DIST_NAME}.tar.bz2" dist.tar.bz2