removed contrib files from the scripts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
# you need to change this if you run from outside this dir.
|
||||
# you need to change this if you run from outside this dir.
|
||||
if [ "$WXROOT" = "" ]; then
|
||||
WXROOT=../../..
|
||||
fi
|
||||
@@ -20,9 +20,4 @@ do_build
|
||||
|
||||
make prefix=$INSTALLDIR install
|
||||
|
||||
if [ "$WXPYTHON" == "1" ]; then
|
||||
make -C contrib/src/gizmos prefix=$INSTALLDIR install
|
||||
make -C contrib/src/stc prefix=$INSTALLDIR install
|
||||
fi
|
||||
|
||||
cd $OLDDIR
|
||||
cd $OLDDIR
|
||||
|
@@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
# you need to change this if you run from outside this dir.
|
||||
# you need to change this if you run from outside this dir.
|
||||
if [ "$WXROOT" = "" ]; then
|
||||
WXROOT=../../..
|
||||
fi
|
||||
@@ -28,30 +28,30 @@ cd $DIR
|
||||
do_build
|
||||
cd ..
|
||||
|
||||
# Copy over everything, then remove files we need to replace with lipo'd versions
|
||||
# Copy over everything, then remove files we need to replace with lipo'd versions
|
||||
mkdir -p bld
|
||||
cp -R bld-i386/* bld
|
||||
cp -R bld-i386/.pch bld/.pch
|
||||
rm bld/lib/*.dylib
|
||||
|
||||
# lipo the files, but make sure not to run it on symbolic links
|
||||
# lipo the files, but make sure not to run it on symbolic links
|
||||
for item in `cd bld-i386/lib; ls *.dylib`
|
||||
do
|
||||
if [ -f bld-i386/lib/$item -a ! -L bld-i386/lib/$item ]; then
|
||||
lipo -create bld-i386/lib/$item bld-ppc/lib/$item -output bld/lib/$item
|
||||
else
|
||||
cp -R bld-i386/lib/$item bld/lib
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
# make install hacks - the copy operations mess up the timestamps and thus
|
||||
# cause make to erroneously think that the libraries need rebuilt
|
||||
touch bld/.pch/wxprec_monodll/wx/*.gch
|
||||
touch bld/.pch/wxprec_gldll/wx/*.gch
|
||||
touch bld/*.o
|
||||
touch bld/lib/*
|
||||
|
||||
# one more hack - inplace wx-config has a hardcoded path in it - we need to
|
||||
|
||||
# one more hack - inplace wx-config has a hardcoded path in it - we need to
|
||||
# change that path from bld-i386 to just bld in case someone wants to build things
|
||||
# in tree. (wxPython does this, for example)
|
||||
python -c "import os; fname = os.path.abspath('bld/wx-config'); data = open(fname).read(); data = data.replace('bld-i386', 'bld'); open(fname, 'w').write(data)"
|
||||
@@ -59,8 +59,3 @@ python -c "import os; fname = os.path.abspath('bld/wx-config'); data = open(fnam
|
||||
cd bld
|
||||
make prefix=$INSTALLDIR install
|
||||
|
||||
if [ "$WXPYTHON" == "1" ]; then
|
||||
make -C contrib/src/animate prefix=$INSTALLDIR install
|
||||
make -C contrib/src/gizmos prefix=$INSTALLDIR install
|
||||
make -C contrib/src/stc prefix=$INSTALLDIR install
|
||||
fi
|
@@ -71,11 +71,7 @@ cat $SCRIPTDIR/manifests/mac.rsp \
|
||||
$SCRIPTDIR/manifests/cw_mac.rsp \
|
||||
$SCRIPTDIR/manifests/tex2rtf.rsp \
|
||||
$SCRIPTDIR/manifests/utils.rsp \
|
||||
$SCRIPTDIR/manifests/ogl.rsp \
|
||||
$SCRIPTDIR/manifests/stc.rsp \
|
||||
$SCRIPTDIR/manifests/xml.rsp \
|
||||
$SCRIPTDIR/manifests/contrib.rsp \
|
||||
$SCRIPTDIR/manifests/deprecated.rsp \
|
||||
$SCRIPTDIR/manifests/makefile.rsp \
|
||||
$SCRIPTDIR/manifests/tiff.rsp \
|
||||
$SCRIPTDIR/manifests/jpeg.rsp \
|
||||
@@ -91,7 +87,6 @@ mkdir wxMac-${WXVER}
|
||||
cd wxMac-${WXVER}
|
||||
|
||||
$TAR xf ../wxMac-${WXVER}.tar
|
||||
rm -f -r contrib/src/mmedia contrib/samples/mmedia
|
||||
echo Copying readme files...
|
||||
cp $WXSRC/docs/mac/readme.txt README-MAC.txt
|
||||
cp $WXSRC/docs/mac/install.txt INSTALL-MAC.txt
|
||||
@@ -144,15 +139,10 @@ cat $SCRIPTDIR/manifests/generic.rsp \
|
||||
$SCRIPTDIR/manifests/univ.rsp \
|
||||
$SCRIPTDIR/manifests/mgl.rsp \
|
||||
$SCRIPTDIR/manifests/dfb.rsp \
|
||||
$SCRIPTDIR/manifests/contrib.rsp \
|
||||
$SCRIPTDIR/manifests/deprecated.rsp \
|
||||
$SCRIPTDIR/manifests/utilmake.rsp \
|
||||
$SCRIPTDIR/manifests/utils.rsp \
|
||||
$SCRIPTDIR/manifests/mmedia.rsp \
|
||||
$SCRIPTDIR/manifests/tex2rtf.rsp \
|
||||
$SCRIPTDIR/manifests/stc.rsp \
|
||||
$SCRIPTDIR/manifests/xml.rsp \
|
||||
$SCRIPTDIR/manifests/ogl.rsp \
|
||||
$SCRIPTDIR/manifests/makefile.rsp \
|
||||
$SCRIPTDIR/manifests/tiff.rsp \
|
||||
$SCRIPTDIR/manifests/jpeg.rsp \
|
||||
|
Reference in New Issue
Block a user