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

* Build the restart-helper program in a makefile rather than in osx-bundle.sh

Browse source 
* Update paths to use tools/ instead of scripts/ in osx-bundle.sh

Originally committed to SVN as r3337.
This commit is contained in:
Amar Takhar 2009-07-31 20:29:29 +00:00
parent 79e4065579
commit 127a39626b
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
aegisub/tools/Makefile.am
View file

@ -3,6 +3,11 @@ common_respack_CPPFLAGS = @WX_CPPFLAGS@
common_respack_LDFLAGS = @WX_LIBS@ common_respack_LDFLAGS = @WX_LIBS@
common_respack_SOURCES = common-respack.cpp common_respack_SOURCES = common-respack.cpp
if BUILD_DARWIN
bin_PROGRAMS += osx-bundle-restart-helper
osx_bundle_restart_helper_SOURCES = osx-bundle-restart-helper.c
endif
EXTRA_DIST = \ EXTRA_DIST = \
osx-bundle-restart-helper.c \ osx-bundle-restart-helper.c \
osx-bundle.sh \ osx-bundle.sh \

9
aegisub/tools/osx-bundle.sh
View file

@ -38,9 +38,9 @@ echo "---- Copying Skel Files ----"
find ${SKEL_DIR} -type f -not -regex ".*.svn.*" find ${SKEL_DIR} -type f -not -regex ".*.svn.*"
cp ${SKEL_DIR}/Contents/Resources/*.icns "${PKG_DIR}/Contents/Resources" cp ${SKEL_DIR}/Contents/Resources/*.icns "${PKG_DIR}/Contents/Resources"
cp ${SKEL_DIR}/Contents/Resources/etc/fonts/fonts.dtd "${PKG_DIR}/Contents/Resources/etc/fonts" cp ${SKEL_DIR}/Contents/Resources/etc/fonts/fonts.dtd "${PKG_DIR}/Contents/Resources/etc/fonts"
cat ${SKEL_DIR}/Contents/Resources/etc/fonts/fonts.conf |sed -f scripts/osx-bundle.sed > "${PKG_DIR}/Contents/Resources/etc/fonts/fonts.conf" cat ${SKEL_DIR}/Contents/Resources/etc/fonts/fonts.conf |sed -f tools/osx-bundle.sed > "${PKG_DIR}/Contents/Resources/etc/fonts/fonts.conf"
cp ${SKEL_DIR}/Contents/Resources/etc/fonts/conf.d/*.conf "${PKG_DIR}/Contents/Resources/etc/fonts/conf.d" cp ${SKEL_DIR}/Contents/Resources/etc/fonts/conf.d/*.conf "${PKG_DIR}/Contents/Resources/etc/fonts/conf.d"
cat ${SKEL_DIR}/Contents/Info.plist |sed -f scripts/osx-bundle.sed > "${PKG_DIR}/Contents/Info.plist" cat ${SKEL_DIR}/Contents/Info.plist |sed -f tools/osx-bundle.sed > "${PKG_DIR}/Contents/Info.plist"
echo echo
@ -98,12 +98,11 @@ else
cp -v src/.libs/${AEGISUB_BIN} "${PKG_DIR}/Contents/MacOS/aegisub" || exit $? cp -v src/.libs/${AEGISUB_BIN} "${PKG_DIR}/Contents/MacOS/aegisub" || exit $?
fi fi
echo cc -o "${PKG_DIR}/Contents/MacOS/restart-helper scripts/osx-bundle-restart-helper.c" cp -v tools/osx-bundle-restart-helper "${PKG_DIR}/Contents/MacOS/restart-helper" || exit $?
${CC} -o "${PKG_DIR}/Contents/MacOS/restart-helper" scripts/osx-bundle-restart-helper.c || exit $?
echo echo
echo "---- Libraries ----" echo "---- Libraries ----"
python scripts/osx-fix-libs.py "${PKG_DIR}/Contents/MacOS/aegisub" || exit $? python tools/osx-fix-libs.py "${PKG_DIR}/Contents/MacOS/aegisub" || exit $?
echo echo
echo "Done Creating \"${PKG_DIR}\"" echo "Done Creating \"${PKG_DIR}\""