Tweaks for demos on MacOSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -7,6 +7,7 @@
|
|||||||
PROGNAME=$0
|
PROGNAME=$0
|
||||||
WXSRCDIR=$WXWIN
|
WXSRCDIR=$WXWIN
|
||||||
WXDESTDIR=$WXSRCDIR/deliver
|
WXDESTDIR=$WXSRCDIR/deliver
|
||||||
|
PLATFORM=linux
|
||||||
|
|
||||||
# Default binary subdirectory to copy sample executable from
|
# Default binary subdirectory to copy sample executable from
|
||||||
WINBINDIR=vc_msw
|
WINBINDIR=vc_msw
|
||||||
@@ -14,6 +15,16 @@ WINBINDIR=vc_msw
|
|||||||
# Suffix to append to each demo tarball, e.g. SuSE92 for widgets-SuSE92
|
# Suffix to append to each demo tarball, e.g. SuSE92 for widgets-SuSE92
|
||||||
SUFFIX=linux
|
SUFFIX=linux
|
||||||
|
|
||||||
|
# Determine if the binary name is .app or not
|
||||||
|
determine_binary()
|
||||||
|
{
|
||||||
|
if [ "$PLATFORM" = "mac" ]; then
|
||||||
|
BINARYNAME=$1.app
|
||||||
|
else
|
||||||
|
BINARYNAME=$1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
dobuilddemos_unix()
|
dobuilddemos_unix()
|
||||||
{
|
{
|
||||||
if [ ! -d "$WXSRCDIR" ] ; then
|
if [ ! -d "$WXSRCDIR" ] ; then
|
||||||
@@ -28,7 +39,7 @@ dobuilddemos_unix()
|
|||||||
echo Cannot find samples directory. Invoke this script from the root of the build folder.
|
echo Cannot find samples directory. Invoke this script from the root of the build folder.
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
if [ -d src ] ; then
|
if [ -d include ] ; then
|
||||||
echo Do not invoke this from the source directory - invoke from the build directory.
|
echo Do not invoke this from the source directory - invoke from the build directory.
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
@@ -45,8 +56,9 @@ dobuilddemos_unix()
|
|||||||
pushd samples/dialogs
|
pushd samples/dialogs
|
||||||
make
|
make
|
||||||
if [ -f dialogs ] ; then
|
if [ -f dialogs ] ; then
|
||||||
|
determine_binary dialogs
|
||||||
cp $WXSRCDIR/samples/dialogs/*.cpp $WXSRCDIR/samples/dialogs/*.h .
|
cp $WXSRCDIR/samples/dialogs/*.cpp $WXSRCDIR/samples/dialogs/*.h .
|
||||||
tar cfz $WXDESTDIR/wxWidgets-DialogsDemo-$SUFFIX.tar.gz dialogs *.cpp *.h
|
tar cfz $WXDESTDIR/wxWidgets-DialogsDemo-$SUFFIX.tar.gz $BINARYNAME *.cpp *.h
|
||||||
rm -f *.cpp *.h
|
rm -f *.cpp *.h
|
||||||
else
|
else
|
||||||
echo "*** Warning: dialogs sample did not build"
|
echo "*** Warning: dialogs sample did not build"
|
||||||
@@ -58,9 +70,15 @@ dobuilddemos_unix()
|
|||||||
pushd samples/html/test
|
pushd samples/html/test
|
||||||
make
|
make
|
||||||
if [ -f test ] ; then
|
if [ -f test ] ; then
|
||||||
|
if [ "$PLATFORM" = "mac" ]; then
|
||||||
|
# Don't rename app on Mac in case it messes up the bundle
|
||||||
|
determine_binary test
|
||||||
|
else
|
||||||
mv test htmldemo
|
mv test htmldemo
|
||||||
|
determine_binary htmldemo
|
||||||
|
fi
|
||||||
cp $WXSRCDIR/samples/html/test/*.cpp $WXSRCDIR/samples/html/test/*.htm* $WXSRCDIR/samples/html/test/*.png $WXSRCDIR/samples/html/test/*.gif .
|
cp $WXSRCDIR/samples/html/test/*.cpp $WXSRCDIR/samples/html/test/*.htm* $WXSRCDIR/samples/html/test/*.png $WXSRCDIR/samples/html/test/*.gif .
|
||||||
tar cfz $WXDESTDIR/wxWidgets-HtmlDemo-$SUFFIX.tar.gz htmldemo *.cpp *.png *.gif *.htm*
|
tar cfz $WXDESTDIR/wxWidgets-HtmlDemo-$SUFFIX.tar.gz $BINARYNAME *.cpp *.png *.gif *.htm*
|
||||||
rm -f *.cpp *.gif *.png *.htm*
|
rm -f *.cpp *.gif *.png *.htm*
|
||||||
else
|
else
|
||||||
echo "*** Warning: HTML sample did not build"
|
echo "*** Warning: HTML sample did not build"
|
||||||
@@ -72,8 +90,9 @@ dobuilddemos_unix()
|
|||||||
pushd samples/widgets
|
pushd samples/widgets
|
||||||
make
|
make
|
||||||
if [ -f widgets ] ; then
|
if [ -f widgets ] ; then
|
||||||
|
determine_binary widgets
|
||||||
cp $WXSRCDIR/samples/widgets/*.cpp $WXSRCDIR/samples/widgets/*.h .
|
cp $WXSRCDIR/samples/widgets/*.cpp $WXSRCDIR/samples/widgets/*.h .
|
||||||
tar cfz $WXDESTDIR/wxWidgets-WidgetsDemo-$SUFFIX.tar.gz widgets *.cpp *.h
|
tar cfz $WXDESTDIR/wxWidgets-WidgetsDemo-$SUFFIX.tar.gz $BINARYNAME *.cpp *.h
|
||||||
rm -f *.cpp *.h
|
rm -f *.cpp *.h
|
||||||
else
|
else
|
||||||
echo "*** Warning: widgets sample did not build"
|
echo "*** Warning: widgets sample did not build"
|
||||||
@@ -85,10 +104,11 @@ dobuilddemos_unix()
|
|||||||
pushd demos/life
|
pushd demos/life
|
||||||
make
|
make
|
||||||
if [ -f life ] ; then
|
if [ -f life ] ; then
|
||||||
|
determine_binary life
|
||||||
cp $WXSRCDIR/demos/life/*.cpp $WXSRCDIR/demos/life/*.h $WXSRCDIR/demos/life/*.xpm $WXSRCDIR/demos/life/*.inc $WXSRCDIR/demos/life/*.lif .
|
cp $WXSRCDIR/demos/life/*.cpp $WXSRCDIR/demos/life/*.h $WXSRCDIR/demos/life/*.xpm $WXSRCDIR/demos/life/*.inc $WXSRCDIR/demos/life/*.lif .
|
||||||
mkdir bitmaps
|
mkdir bitmaps
|
||||||
cp $WXSRCDIR/demos/life/bitmaps/*.* bitmaps
|
cp $WXSRCDIR/demos/life/bitmaps/*.* bitmaps
|
||||||
tar cfz $WXDESTDIR/wxWidgets-LifeDemo-$SUFFIX.tar.gz life *.cpp *.h *.xpm *.inc *.lif bitmaps/*.*
|
tar cfz $WXDESTDIR/wxWidgets-LifeDemo-$SUFFIX.tar.gz $BINARYNAME *.cpp *.h *.xpm *.inc *.lif bitmaps/*.*
|
||||||
rm -f *.cpp *.h *.xpm *.inc *.lif
|
rm -f *.cpp *.h *.xpm *.inc *.lif
|
||||||
rm -f -r bitmaps
|
rm -f -r bitmaps
|
||||||
else
|
else
|
||||||
@@ -174,6 +194,7 @@ usage()
|
|||||||
echo " --suffix Append suffix to each tarball"
|
echo " --suffix Append suffix to each tarball"
|
||||||
echo " --wxdir wxWidgets source dir"
|
echo " --wxdir wxWidgets source dir"
|
||||||
echo " --deliver Tarball destination dir"
|
echo " --deliver Tarball destination dir"
|
||||||
|
echo " --mac Whether we're building on Mac"
|
||||||
echo.
|
echo.
|
||||||
echo Note that options only override settings in $SCRIPTDIR/setup.var.
|
echo Note that options only override settings in $SCRIPTDIR/setup.var.
|
||||||
exit 1
|
exit 1
|
||||||
@@ -187,6 +208,7 @@ do
|
|||||||
--suffix) SUFFIX=$2; shift;;
|
--suffix) SUFFIX=$2; shift;;
|
||||||
--wxdir) WXSRCDIR=$2; WXDESTDIR=$WXSRCDIR/deliver; shift;;
|
--wxdir) WXSRCDIR=$2; WXDESTDIR=$WXSRCDIR/deliver; shift;;
|
||||||
--deliver) WXDESTDIR=$2; shift;;
|
--deliver) WXDESTDIR=$2; shift;;
|
||||||
|
--mac) PLATFORM=mac;;
|
||||||
*)
|
*)
|
||||||
usage
|
usage
|
||||||
exit
|
exit
|
||||||
@@ -195,10 +217,11 @@ do
|
|||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ $OS == "Windows_NT" ] ; then
|
if [ "$OS" = "Windows_NT" ]; then
|
||||||
dobuilddemos_windows
|
dobuilddemos_windows
|
||||||
else
|
else
|
||||||
dobuilddemos_linux
|
dobuilddemos_unix
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user