Added a simple makefile for those whose fingers can't type anything

but "make install"

Ensure that the full TARGETDIR exists

changed the build scripts to play nicer with make.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/wxPython/Makefile b/utils/wxPython/Makefile
new file mode 100644 (file)
index 0000000..f0c1f75
--- /dev/null
+++ b/utils/wxPython/Makefile
@@ -0,0 +1,18 @@
+#----------------------------------------------------------------------
+# Convenience makefile to drive the build script in a more user
+# friendly manner.
+#----------------------------------------------------------------------
+
+
+all:
+       ./buildall -b
+
+
+install: all
+       ./buildall -i
+
+clean:
+       ./buildall -c
+
+uninstall:
+       ./buildall -u

diff --git a/utils/wxPython/buildall b/utils/wxPython/buildall
index 56830c495cbfec02dfed4c3c5c6bca9a90a56625..26870e3f482527b605c442f40c96751c04218420 100755 (executable)
--- a/utils/wxPython/buildall
+++ b/utils/wxPython/buildall
@@ -1,11 +1,11 @@
 #!/bin/bash
 cd src
 #!/bin/bash
 cd src

-build $*
+python ../distrib/build.py $*

 if [ "$?" != "0" ]; then
     exit 1
 fi
 
 cd ../modules
 if [ "$?" != "0" ]; then
     exit 1
 fi
 
 cd ../modules

-buildall.py $*
+python buildall.py $*

 cd ..
 
 cd ..
 

diff --git a/utils/wxPython/buildall.bat b/utils/wxPython/buildall.bat
index e6ebf75a76b687874dadc8ad6b0d93801128b94f..87de38f02898abbb5eeb15ff66644ced147c9ded 100755 (executable)
--- a/utils/wxPython/buildall.bat
+++ b/utils/wxPython/buildall.bat
@@ -1,9 +1,9 @@
 
 cd %WXWIN%\utils\wxPython\src
 
 cd %WXWIN%\utils\wxPython\src

-build %1 %2 %3 %4 %5 %6 %7 %8 %9
+python ..\distrib\build.py %1 %2 %3 %4 %5 %6 %7 %8 %9

 
 cd %WXWIN%\utils\wxPython\modules
 
 cd %WXWIN%\utils\wxPython\modules

-buildall %1 %2 %3 %4 %5 %6 %7 %8 %9
+python .\buildall.py %1 %2 %3 %4 %5 %6 %7 %8 %9

 
 
 cd %WXWIN%\utils\wxPython
 
 
 cd %WXWIN%\utils\wxPython

diff --git a/utils/wxPython/distrib/build.py b/utils/wxPython/distrib/build.py
index c783a6bf6ccfd5b8bcb67d155862d4595f85b810..3ff35d745d02b1615e632e48da0b28ec2b4b9a0f 100755 (executable)
--- a/utils/wxPython/distrib/build.py
+++ b/utils/wxPython/distrib/build.py
@@ -757,7 +757,7 @@ pycfiles : $(PYMODULES)
 
 
 $(TARGETDIR) :
 
 
 $(TARGETDIR) :

-       mkdir $(TARGETDIR)
+       mkdir -p $(TARGETDIR)

 
 $(GENCODEDIR):
        mkdir $(GENCODEDIR)
 
 $(GENCODEDIR):
        mkdir $(GENCODEDIR)


@@ -775,7 +775,8 @@ $(GENCODEDIR):
 #----------------------------------------------------------------------------
 
 if __name__ == '__main__':
 #----------------------------------------------------------------------------
 
 if __name__ == '__main__':

-    main(sys.argv)
+    err = main(sys.argv)
+    sys.exit(err)

 
 #----------------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------------
 

diff --git a/utils/wxPython/modules/buildall.py b/utils/wxPython/modules/buildall.py
index 97ed35d1ffbbf4e49a4aafd011704a04e44da20b..79ef843b1f1453c3909857bcf301393e89503ca7 100755 (executable)
--- a/utils/wxPython/modules/buildall.py
+++ b/utils/wxPython/modules/buildall.py
@@ -28,3 +28,4 @@ for module in MODULELIST:
     if err:
         break
 
     if err:
         break
 

+sys.exit(err)