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

Merge r4010,r4013,r4014 (configure and bundle/dmg generation fixes.)

Browse source 
Originally committed to SVN as r4024.
This commit is contained in:
Amar Takhar 2010-01-21 00:34:45 +00:00
parent 113ae0cd6d
commit e247dec1f3
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
aegisub/Makefile.am
View file

@ -25,11 +25,10 @@ SUBDIRS = \
po po
osx-bundle: osx-bundle:
@SHELL@ tools/osx-bundle.sh "Aegisub (r@SVN_REVISION@-@DARWIN_ARCH@@PACKAGE_DEBUG@)" @AEGISUB_VERSION_DATA@ DICT_DIR=$(DICT_DIR) @SHELL@ scripts/osx-bundle.sh "@BUNDLE_STRING@" @AEGISUB_VERSION_DATA@ DICT_DIR=$(DICT_DIR)
osx-dmg: osx-dmg:
@SHELL@ tools/osx-dmg.sh "Aegisub (r@SVN_REVISION@-@DARWIN_ARCH@@PACKAGE_DEBUG@)" "Aegisub (r@SVN_REVISION@-@DARWIN_ARCH@@PACKAGE_DEBUG@)" @SHELL@ scripts/osx-dmg.sh "@BUNDLE_STRING@" "@DMG_STRING@"
osx-tinderbox-bundle: osx-tinderbox-bundle:
@SHELL@ tools/osx-bundle.sh "$(T_BUNDLE)" @AEGISUB_VERSION_DATA@ DICT_DIR="$(DICT_DIR)" @SHELL@ tools/osx-bundle.sh "$(T_BUNDLE)" @AEGISUB_VERSION_DATA@ DICT_DIR="$(DICT_DIR)"

18
aegisub/configure.in
View file

@ -77,10 +77,12 @@ esac
case "$target_or_host" in case "$target_or_host" in
ppc-*-* | powerpc-*) ppc-*-* | powerpc-*)
arch_ppc="yes" arch_ppc="yes"
arch_bundle="ppc"
;; ;;
i*86-*-*) i*86-*-*)
arch_x86="yes" arch_x86="yes"
arch_bundle="intel"
;; ;;
x86_64-*-*) x86_64-*-*)
@ -228,13 +230,15 @@ AC_DEFINE_UNQUOTED([BUILD_SVN_REVISION], [$SVN_REVISION], [SVN Revision number,
# Release information. # Release information.
if test "aegisub_FINAL_RELEASE" = "1"; then if test "aegisub_FINAL_RELEASE" = "1"; then
AC_DEFINE([FINAL_RELEASE], [aegisub_FINAL_RELEASE], [This is only set to 1 for a RELEASE VERSION.]) AC_DEFINE([FINAL_RELEASE], [aegisub_FINAL_RELEASE], [This is only set to 1 for a RELEASE VERSION.])
PACKAGE_STRING="${PACKAGE_STRING}" BUNDLE_STRING="Aegisub"
PACKAGE_VERSION="${PACKAGE_VERSION}" DMG_STRING="Aegisub-${PACKAGE_VERSION}-${arch_bundle}"
VERSION="${VERSION}"
else else
PACKAGE_STRING="${PACKAGE_STRING}-dev-r$SVN_REVISION" PACKAGE_STRING="${PACKAGE_STRING}-dev-r${SVN_REVISION}"
PACKAGE_VERSION="${PACKAGE_VERSION}-dev-r$SVN_REVISION" PACKAGE_VERSION="${PACKAGE_VERSION}-dev-r${SVN_REVISION}"
VERSION="${VERSION}-dev-r$SVN_REVISION" VERSION="${VERSION}-dev-r${SVN_REVISION}"
BUNDLE_STRING="Aegisub-${PACKAGE_VERSION}-dev-${SVN_REVISION}"
DMG_STRING="Aegisub-${PACKAGE_VERSION}-dev-${SVN_REVISION}-${arch_bundle}"
fi fi
@ -245,6 +249,8 @@ AC_MSG_RESULT($BUILD_DATE)
AC_SUBST(SVN_REVISION) AC_SUBST(SVN_REVISION)
AC_SUBST(BUILD_DATE) AC_SUBST(BUILD_DATE)
AC_SUBST(BUNDLE_STRING)
AC_SUBST(DMG_STRING)