Some distrib updates for wxPythonOSX, and reSWIGged a bit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -127,7 +127,7 @@ fi
|
||||
#-----------------------------------
|
||||
msg configuring wxWindows
|
||||
buildDir="$srcPath/build-pkg"
|
||||
dFlag=
|
||||
dFlag="--enable-optimise --enable-debug_flag"
|
||||
if [ $debug ]; then
|
||||
buildDir="$srcPath/build-pkg-debug"
|
||||
dFlag="--enable-debug"
|
||||
@@ -141,7 +141,7 @@ if [ $force ]; then
|
||||
fi
|
||||
msgdo mkdir -m 775 "$buildDir"
|
||||
msgdo cd "$buildDir"
|
||||
msgdo ../configure --with-mac --with-opengl $dFlag
|
||||
msgdo ../configure --with-mac --with-opengl --enable-precomp=no $dFlag
|
||||
cd $curDir
|
||||
|
||||
else
|
||||
@@ -153,12 +153,14 @@ fi
|
||||
msg building wxWindows
|
||||
msgdo cd $buildDir
|
||||
msgdo make
|
||||
msgdo cd ../locale
|
||||
msgdo make allmo
|
||||
cd $curDir
|
||||
|
||||
|
||||
#-----------------------------------
|
||||
msg installing wxWindows
|
||||
msgdo mkdir -p -m 755 "$dstPath/$temp/$wxWindowsInst"
|
||||
msgdo mkdir -p -m 1755 "$dstPath/$temp/$wxWindowsInst"
|
||||
msgdo cd "$buildDir"
|
||||
|
||||
# install once to the package directory, and once to the
|
||||
@@ -207,13 +209,20 @@ msg copying additional wxPython files
|
||||
msgdo cp -pR "$srcPath/wxPython/samples" "$dstPath/$temp/$dmgRoot"
|
||||
msgdo cp -pR "$srcPath/wxPython/demo" "$dstPath/$temp/$dmgRoot"
|
||||
msgdo cp -pR "$srcPath/wxPython/licence" "$dstPath/$temp/$dmgRoot"
|
||||
msgdo cp -pR "$srcPath/wxPython/tools" "$dstPath/$temp/$dmgRoot"
|
||||
find "$dstPath/$temp/$dmgRoot" -name "CVS" -type d -print0 | xargs -0 rm -rf
|
||||
find "$dstPath/$temp/$dmgRoot" -name ".DS_Store" -type f -print0 | xargs -0 rm
|
||||
find "$dstPath/$temp/$dmgRoot" -name ".cvsignore" -type f -print0 | xargs -0 rm
|
||||
find "$dstPath/$temp/$dmgRoot" -name ".#*" -type f -print0 | xargs -0 rm
|
||||
find "$dstPath/$temp/$dmgRoot" -name "b" -type f -print0 | xargs -0 rm
|
||||
find "$dstPath/$temp/$dmgRoot" -name "*~*~" -type f -print0 | xargs -0 rm
|
||||
|
||||
msgdo cd "$srcPath/wxPython/scripts"
|
||||
sFiles=`$pythonExec CreateMacScripts.py`
|
||||
for f in $sFiles; do
|
||||
msgdo cp $f "$dstPath/$temp/$wxWindowsInst/bin"
|
||||
done
|
||||
cd $curDir
|
||||
|
||||
msgdo chown -R ${user}:staff "$dstPath/$temp/$dmgRoot"
|
||||
|
||||
|
||||
|
@@ -1,9 +1,9 @@
|
||||
#!/usr/bin/perl -w
|
||||
#
|
||||
#
|
||||
# make disk image from folder
|
||||
#
|
||||
#
|
||||
# usage: makedmg src dst name
|
||||
#
|
||||
#
|
||||
# (C)opyright 2002 Frank Vercruesse
|
||||
|
||||
|
||||
@@ -25,12 +25,12 @@ sub make_dmg
|
||||
my $src = $_[0];
|
||||
my $dst = $_[1];
|
||||
my $name = $_[2];
|
||||
|
||||
|
||||
# check dirs
|
||||
if( not -d $dst && -d $src ) {
|
||||
die "src and dst must be directories\n";
|
||||
}
|
||||
|
||||
|
||||
# calc disk image size
|
||||
if( not open( MYPIPE, "$duExec -sk \"${src}\" |") ) {
|
||||
die "couldn't open pipe\n";
|
||||
@@ -38,15 +38,15 @@ sub make_dmg
|
||||
(my $dmgsize) = split( /\s+/, <MYPIPE>);
|
||||
close( MYPIPE);
|
||||
$dmgsize /= 1024;
|
||||
$dmgsize = int($dmgsize + 2);
|
||||
$dmgsize = int($dmgsize + 4);
|
||||
if( $dmgsize < 5 ) {
|
||||
$dmgsize = 5
|
||||
}
|
||||
|
||||
|
||||
# create disk image
|
||||
system "cd \"$dst\"; $hdiUtilExec create -megabytes $dmgsize -ov \"_${name}\"";
|
||||
if( $? ) { die "couldn't create disk image\n"; }
|
||||
|
||||
|
||||
# format disk image
|
||||
if( not open( MYPIPE, "cd \"$dst\"; $hdiDrvExec -nomount \"_${name}.dmg\" |") ) {
|
||||
die "couldn't open pipe\n";
|
||||
@@ -68,7 +68,7 @@ sub make_dmg
|
||||
if( $? ) { system "$hdiUtilExec eject $dev"; die "couldn't format disk image\n"; }
|
||||
system "$hdiUtilExec eject $dev";
|
||||
if( $? ) { die "couldn't eject disk image\n"; }
|
||||
|
||||
|
||||
# copy files
|
||||
if( not open( MYPIPE, "cd \"$dst\"; $hdiDrvExec \"_${name}.dmg\" |") ) {
|
||||
die "couldn't open pipe\n";
|
||||
@@ -88,7 +88,7 @@ sub make_dmg
|
||||
if( $? ) { system "$hdiUtilExec eject $dev"; die "couldn't copy files\n"; }
|
||||
system "$hdiUtilExec eject $dev";
|
||||
if( $? ) { die "couldn't eject disk image\n"; }
|
||||
|
||||
|
||||
# convert disk image
|
||||
system "cd \"$dst\"; $hdiUtilExec convert \"_${name}.dmg\" -format UDCO -o \"${name}\"";
|
||||
if( $? ) { die "couldn't convert disk image\n"; }
|
||||
|
@@ -1,8 +1,8 @@
|
||||
Title wxMacPython
|
||||
Title wxPythonOSX
|
||||
Version 2.3.3
|
||||
Description wxMac and wxPython
|
||||
Description wxMac and wxPython for OSX
|
||||
DefaultLocation /
|
||||
DeleteWarning
|
||||
DeleteWarning
|
||||
|
||||
### Package Flags
|
||||
|
Reference in New Issue
Block a user