[Commits] CVS: moonbase/libs/wxPython BUILD, 1.5, 1.6 CONFIGURE, 1.2, 1.3 DEPENDS, 1.4, 1.5 DETAILS, 1.6, 1.7

[Terry Chan]

Update of /var/cvs/lunar/moonbase/libs/wxPython
In directory dbguin.lunar-linux.org:/tmp/cvs-serv14716/wxPython

Modified Files:
	BUILD CONFIGURE DEPENDS DETAILS 
Log Message:
Reworked the wxGTK and wxPython modules, from cmak.  Now only ONE 12 Meg
download is needed for both wxGTK and wxPython, instead of two 12 Meg downloads
and wxPython no longer needs to build the entire wxGTK library all over again.
Tested against audacity and BitTorrent modules. gcc-3.2.3, glibc-2.3.2.  Unicode
is disabled because it simply breaks too many modules.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/libs/wxPython/BUILD,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- BUILD	30 Jul 2003 19:50:56 -0000	1.5
+++ BUILD	3 Aug 2003 19:54:38 -0000	1.6
@@ -1,31 +1,16 @@
 (
   if [[ $GTK2 == "y" ]]; then
-    PGTK="WXPORT=gtk2 "
-    CGTK="--enable-gtk2"
-  fi
-  if [[ $UNICODE == "y" ]]; then
-    PUNI="UNICODE=1"
-    CUNI="--enable-unicode"
+    OPTS="$OPTS WXPORT=gtk2 "
   fi
   if [[ $OPENGL == "n" ]]; then
-    PGL="BUILD_GLCANVAS=0";  else 
-    CGL="--with-opengl"
+    OPTS="$OPTS BUILD_GLCANVAS=0"
   fi
-POPTS="$PGTK $PUNI $PGL" 
-OPTS="$OPTS $CGTK $CUNI $CGL"
-#Install wxGTK that comes with wxPython
-    ./configure 	--with-gtk \
-               		--prefix=/usr \
-                	--enable-geometry \
-                     	--enable-optimise \
-                     	--enable-debug_flag \
-			$OPTS  &&
-    make &&
-    make install &&
-    cd $SOURCE_DIRECTORY/wxPython   &&
-    python setup.py                 \
-        $POPTS                       \
-	build install
+
+  cd $SOURCE_DIRECTORY/wxPython   &&
+  prepare_install                 &&
+  python setup.py                 \
+         $OPTS                    \
+	 build install
 
     
 ) > $C_FIFO 2>&1

Index: CONFIGURE
===================================================================
RCS file: /var/cvs/lunar/moonbase/libs/wxPython/CONFIGURE,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CONFIGURE	22 Jul 2003 04:28:30 -0000	1.2
+++ CONFIGURE	3 Aug 2003 19:54:38 -0000	1.3
@@ -4,12 +4,6 @@
   else  echo   "GTK2=n"  >>  $MODULE_CONFIG
   fi
 fi
-if  !  grep  -q  "UNICODE"  $MODULE_CONFIG;  then
-  if    query  "Enable Unicode support?" y
-  then  echo   "UNICODE=y"  >>  $MODULE_CONFIG
-  else  echo   "UNICODE=n"  >>  $MODULE_CONFIG
-  fi
-fi
 
 if ! grep -q "OPENGL" $MODULE_CONFIG; then
  if   query "Enable OpenGL support?" y

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/libs/wxPython/DEPENDS,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- DEPENDS	22 Jul 2003 04:28:30 -0000	1.4
+++ DEPENDS	3 Aug 2003 19:54:38 -0000	1.5
@@ -1,3 +1,4 @@
 depends		Python			&&
+depends		wxGTK			&&
 optional_depends    "PyOpenGL"	 ""   ""  "for OpenGL support"
 optional_depends "gtk+-2" "" "" "for gtk+2 support"

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/libs/wxPython/DETAILS,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- DETAILS	22 Jul 2003 04:28:30 -0000	1.6
+++ DETAILS	3 Aug 2003 19:54:38 -0000	1.7
@@ -5,7 +5,7 @@
    SOURCE_URL[0]=$SFORGE_URL/wxpython/$SOURCE
         WEB_SITE=http://www.wxpython.org
          ENTERED=20010927
-         UPDATED=20030722
+         UPDATED=20030803
            SHORT="wxPython is a GUI toolkit for the Python programming language"
 
 cat << EOF