Updated the Makefile.in and setup.py with all the new dirs for the wx
and py packages. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
122
Makefile.in
122
Makefile.in
@@ -1424,70 +1424,66 @@ MANUAL_DIST:
|
|||||||
|
|
||||||
# this target does not generate a complete wxPython dist, it only includes
|
# this target does not generate a complete wxPython dist, it only includes
|
||||||
# those files needed for the Debian source package.
|
# those files needed for the Debian source package.
|
||||||
# see utils/wxPython/distrib for scripts to make a proper wxPython dist.
|
# see wxPython/distrib for scripts to make a proper wxPython dist.
|
||||||
|
#
|
||||||
|
# first copy everything and then clean up the CVS stuff and etc...
|
||||||
PYTHON_DIST:
|
PYTHON_DIST:
|
||||||
mkdir $(DISTDIR)/wxPython
|
for dir in \
|
||||||
mkdir $(DISTDIR)/wxPython/contrib
|
wxPython \
|
||||||
mkdir $(DISTDIR)/wxPython/contrib/dllwidget
|
wxPython/contrib \
|
||||||
mkdir $(DISTDIR)/wxPython/contrib/gizmos
|
wxPython/contrib/dllwidget \
|
||||||
mkdir $(DISTDIR)/wxPython/contrib/glcanvas
|
wxPython/contrib/gizmos \
|
||||||
mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk
|
wxPython/contrib/glcanvas \
|
||||||
mkdir $(DISTDIR)/wxPython/contrib/ogl
|
wxPython/contrib/glcanvas/gtk \
|
||||||
mkdir $(DISTDIR)/wxPython/contrib/stc
|
wxPython/contrib/ogl \
|
||||||
mkdir $(DISTDIR)/wxPython/contrib/stc/gtk
|
wxPython/contrib/stc \
|
||||||
mkdir $(DISTDIR)/wxPython/contrib/xrc
|
wxPython/contrib/stc/gtk \
|
||||||
mkdir $(DISTDIR)/wxPython/demo
|
wxPython/contrib/xrc \
|
||||||
mkdir $(DISTDIR)/wxPython/demo/bitmaps
|
wxPython/demo \
|
||||||
mkdir $(DISTDIR)/wxPython/demo/bmp_source
|
wxPython/demo/bitmaps \
|
||||||
mkdir $(DISTDIR)/wxPython/demo/data
|
wxPython/demo/bmp_source \
|
||||||
mkdir $(DISTDIR)/wxPython/demo/dllwidget
|
wxPython/demo/data \
|
||||||
mkdir $(DISTDIR)/wxPython/distutils
|
wxPython/demo/dllwidget \
|
||||||
mkdir $(DISTDIR)/wxPython/distutils/command
|
wxPython/distutils \
|
||||||
mkdir $(DISTDIR)/wxPython/src
|
wxPython/distutils/command \
|
||||||
mkdir $(DISTDIR)/wxPython/src/gtk
|
wxPython/scripts \
|
||||||
mkdir $(DISTDIR)/wxPython/scripts
|
wxPython/src \
|
||||||
mkdir $(DISTDIR)/wxPython/wxPython
|
wxPython/src/gtk \
|
||||||
mkdir $(DISTDIR)/wxPython/wxPython/lib
|
wxPython/wx \
|
||||||
mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust
|
wxPython/wx/examples \
|
||||||
mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust/wxd
|
wxPython/wx/examples/basic \
|
||||||
mkdir $(DISTDIR)/wxPython/wxPython/lib/colourchooser
|
wxPython/wx/examples/hello \
|
||||||
mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
|
wxPython/wx/examples/screenshots \
|
||||||
mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins
|
wxPython/wx/lib \
|
||||||
mkdir $(DISTDIR)/wxPython/wxPython/tools
|
wxPython/wx/lib/colourchooser \
|
||||||
mkdir $(DISTDIR)/wxPython/wxPython/tools/XRCed
|
wxPython/wx/lib/editor \
|
||||||
|
wxPython/wx/lib/mixins \
|
||||||
cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython
|
wxPython/wx/py \
|
||||||
cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython
|
wxPython/wxPython \
|
||||||
cp $(WXDIR)/wxPython/setup.cfg $(DISTDIR)/wxPython
|
wxPython/wxPython/lib \
|
||||||
cp $(WXDIR)/wxPython/MANIFEST.in $(DISTDIR)/wxPython
|
wxPython/wxPython/lib/PyCrust \
|
||||||
cp $(WXDIR)/wxPython/contrib/dllwidget/*.{py,cpp,h,i} $(DISTDIR)/wxPython/contrib/dllwidget
|
wxPython/wxPython/lib/colourchooser \
|
||||||
cp $(WXDIR)/wxPython/contrib/gizmos/*.{py,cpp,i} $(DISTDIR)/wxPython/contrib/gizmos
|
wxPython/wxPython/lib/editor \
|
||||||
-cp $(WXDIR)/wxPython/contrib/glcanvas/* $(DISTDIR)/wxPython/contrib/glcanvas
|
wxPython/wxPython/lib/mixins \
|
||||||
cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk
|
wxPython/wxPython/tools \
|
||||||
-cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl
|
wxPython/wxPython/tools/XRCed \
|
||||||
-cp $(WXDIR)/wxPython/contrib/stc/* $(DISTDIR)/wxPython/contrib/stc
|
wxPython/wxPython/tools/XRCed/src-images \
|
||||||
-cp $(WXDIR)/wxPython/contrib/stc/gtk/* $(DISTDIR)/wxPython/contrib/stc/gtk
|
wxPython/wxPython/py \
|
||||||
-cp $(WXDIR)/wxPython/contrib/xrc/xrc.* $(DISTDIR)/wxPython/contrib/xrc
|
wxPython/wxPython/py/tests \
|
||||||
-cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo
|
wxPython/wxPython/py/wxd \
|
||||||
-cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps
|
; do \
|
||||||
-cp $(WXDIR)/wxPython/demo/bmp_source/* $(DISTDIR)/wxPython/demo/bmp_source
|
echo "Copying dir: $$dir..."; \
|
||||||
-cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data
|
mkdir $(DISTDIR)/$$dir; \
|
||||||
-cp $(WXDIR)/wxPython/demo/dllwidget/Makefile $(DISTDIR)/wxPython/demo/dllwidget
|
cp $(WXDIR)/$$dir/* $(DISTDIR)/$$dir > /dev/null 2>&1; \
|
||||||
-cp $(WXDIR)/wxPython/demo/dllwidget/test_* $(DISTDIR)/wxPython/demo/dllwidget
|
done; \
|
||||||
cp $(WXDIR)/wxPython/distutils/*.py $(DISTDIR)/wxPython/distutils
|
\
|
||||||
cp $(WXDIR)/wxPython/distutils/command/*.py $(DISTDIR)/wxPython/distutils/command
|
find $(DISTDIR)/wxPython -name "*~" > RM_FILES; \
|
||||||
-cp $(WXDIR)/wxPython/scripts/* $(DISTDIR)/wxPython/scripts
|
find $(DISTDIR)/wxPython -name "*.pyc" >> RM_FILES; \
|
||||||
-cp $(WXDIR)/wxPython/src/* $(DISTDIR)/wxPython/src
|
find $(DISTDIR)/wxPython -name "*.bat" >> RM_FILES; \
|
||||||
cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk
|
find $(DISTDIR)/wxPython -name "core" >> RM_FILES; \
|
||||||
cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk
|
find $(DISTDIR)/wxPython -name "core.[0-9]*" >> RM_FILES; \
|
||||||
cp $(WXDIR)/wxPython/wxPython/lib/*.py $(DISTDIR)/wxPython/wxPython/lib
|
for f in `cat RM_FILES`; do rm $$f; done; \
|
||||||
cp $(WXDIR)/wxPython/wxPython/lib/PyCrust/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust
|
rm RM_FILES
|
||||||
cp $(WXDIR)/wxPython/wxPython/lib/PyCrust/wxd/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust/wxd
|
|
||||||
cp $(WXDIR)/wxPython/wxPython/lib/colourchooser/*.py $(DISTDIR)/wxPython/wxPython/lib/colourchooser
|
|
||||||
cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
|
|
||||||
cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins
|
|
||||||
cp $(WXDIR)/wxPython/wxPython/tools/*.py $(DISTDIR)/wxPython/wxPython/tools
|
|
||||||
cp $(WXDIR)/wxPython/wxPython/tools/XRCed/*.{py,ico,sh,xrc} $(DISTDIR)/wxPython/wxPython/tools/XRCed
|
|
||||||
|
|
||||||
distclean:
|
distclean:
|
||||||
$(RM) -r _dist_dir
|
$(RM) -r _dist_dir
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
#----------------------------------------------------------------------
|
#----------------------------------------------------------------------
|
||||||
|
|
||||||
import sys, os, glob
|
import sys, os, glob, fnmatch
|
||||||
from distutils.core import setup, Extension
|
from distutils.core import setup, Extension
|
||||||
from distutils.file_util import copy_file
|
from distutils.file_util import copy_file
|
||||||
from distutils.dir_util import mkpath
|
from distutils.dir_util import mkpath
|
||||||
@@ -300,6 +300,24 @@ def build_locale_list(srcdir):
|
|||||||
return file_list
|
return file_list
|
||||||
|
|
||||||
|
|
||||||
|
def find_data_files(srcdir, *wildcards):
|
||||||
|
# get a list of all files under the srcdir matching wildcards,
|
||||||
|
# returned in a format to be used for install_data
|
||||||
|
|
||||||
|
def walk_helper(arg, dirname, files):
|
||||||
|
names = []
|
||||||
|
lst, wildcards = arg
|
||||||
|
for wc in wildcards:
|
||||||
|
for f in files:
|
||||||
|
filename = opj(dirname, f)
|
||||||
|
if fnmatch.fnmatch(filename, wc) and not os.path.isdir(filename):
|
||||||
|
names.append(filename)
|
||||||
|
if names:
|
||||||
|
lst.append( (dirname, names ) )
|
||||||
|
|
||||||
|
file_list = []
|
||||||
|
os.path.walk(srcdir, walk_helper, (file_list, wildcards))
|
||||||
|
return file_list
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -405,6 +423,9 @@ elif os.name == 'posix' and sys.platform[:6] == "darwin":
|
|||||||
WXPLAT = '__WXMAC__'
|
WXPLAT = '__WXMAC__'
|
||||||
GENDIR = 'mac'
|
GENDIR = 'mac'
|
||||||
|
|
||||||
|
if debug:
|
||||||
|
BUILD_BASE = BUILD_BASE + '-dbg'
|
||||||
|
|
||||||
includes = ['src']
|
includes = ['src']
|
||||||
defines = [('SWIG_GLOBAL', None),
|
defines = [('SWIG_GLOBAL', None),
|
||||||
('HAVE_CONFIG_H', None),
|
('HAVE_CONFIG_H', None),
|
||||||
@@ -452,6 +473,9 @@ elif os.name == 'posix':
|
|||||||
else:
|
else:
|
||||||
raise SystemExit, "Unknown WXPORT value: " + WXPORT
|
raise SystemExit, "Unknown WXPORT value: " + WXPORT
|
||||||
|
|
||||||
|
if debug:
|
||||||
|
BUILD_BASE = BUILD_BASE + '-dbg'
|
||||||
|
|
||||||
includes = ['src']
|
includes = ['src']
|
||||||
defines = [('SWIG_GLOBAL', None),
|
defines = [('SWIG_GLOBAL', None),
|
||||||
('HAVE_CONFIG_H', None),
|
('HAVE_CONFIG_H', None),
|
||||||
@@ -1197,18 +1221,17 @@ else:
|
|||||||
opj('scripts/xrced'),
|
opj('scripts/xrced'),
|
||||||
opj('scripts/pyshell'),
|
opj('scripts/pyshell'),
|
||||||
opj('scripts/pycrust'),
|
opj('scripts/pycrust'),
|
||||||
opj('scripts/pycwrap'),
|
opj('scripts/pywrap'),
|
||||||
|
opj('scripts/pywrap'),
|
||||||
|
opj('scripts/pyalacarte'),
|
||||||
|
opj('scripts/pyalamode'),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
DATA_FILES.append( ('wxPython/tools/XRCed', glob.glob('wxPython/tools/XRCed/*.txt') +
|
DATA_FILES += find_data_files('wxPython/tools/XRCed', '*.txt', '*.xrc')
|
||||||
[ 'wxPython/tools/XRCed/xrced.xrc']))
|
DATA_FILES += find_data_files('wxPython/py', '*.txt', '*.ico', '*.css', '*.html')
|
||||||
|
DATA_FILES += find_data_files('wx', '*.txt', '*.ico', '*.css', '*.html', '*.jpg', '*.png')
|
||||||
|
|
||||||
DATA_FILES.append( ('wxPython/lib/PyCrust', glob.glob('wxPython/lib/PyCrust/*.txt') +
|
|
||||||
glob.glob('wxPython/lib/PyCrust/*.ico')))
|
|
||||||
|
|
||||||
|
|
||||||
# TODO: get datafiles under the new wx pacakge
|
|
||||||
|
|
||||||
#----------------------------------------------------------------------
|
#----------------------------------------------------------------------
|
||||||
# Do the Setup/Build/Install/Whatever
|
# Do the Setup/Build/Install/Whatever
|
||||||
@@ -1225,26 +1248,27 @@ if __name__ == "__main__":
|
|||||||
url = URL,
|
url = URL,
|
||||||
license = LICENSE,
|
license = LICENSE,
|
||||||
|
|
||||||
packages = [PKGDIR,
|
packages = ['wxPython',
|
||||||
PKGDIR+'.lib',
|
'wxPython.lib',
|
||||||
PKGDIR+'.lib.colourchooser',
|
'wxPython.lib.colourchooser',
|
||||||
PKGDIR+'.lib.editor',
|
'wxPython.lib.editor',
|
||||||
PKGDIR+'.lib.mixins',
|
'wxPython.lib.mixins',
|
||||||
PKGDIR+'.lib.PyCrust',
|
'wxPython.lib.PyCrust',
|
||||||
PKGDIR+'.lib.PyCrust.wxd',
|
'wxPython.py',
|
||||||
PKGDIR+'.tools',
|
'wxPython.py.tests',
|
||||||
PKGDIR+'.tools.XRCed',
|
'wxPython.py.wxd',
|
||||||
|
'wxPython.tools',
|
||||||
|
'wxPython.tools.XRCed',
|
||||||
|
|
||||||
'wx',
|
'wx',
|
||||||
'wx.examples',
|
'wx.examples',
|
||||||
'wx.examples.basic',
|
'wx.examples.basic',
|
||||||
'wx.examples.hello',
|
'wx.examples.hello',
|
||||||
'wx.lib',
|
'wx.lib',
|
||||||
'wx.lib.PyCrust',
|
|
||||||
#'wx.lib.PyCrust.wxd', ???
|
|
||||||
'wx.lib.colourchooser',
|
'wx.lib.colourchooser',
|
||||||
'wx.lib.editor',
|
'wx.lib.editor',
|
||||||
'wx.lib.mixins',
|
'wx.lib.mixins',
|
||||||
|
'wx.py',
|
||||||
#'wx.tools', ???
|
#'wx.tools', ???
|
||||||
#'wx.tools.XRCed', ???
|
#'wx.tools.XRCed', ???
|
||||||
],
|
],
|
||||||
|
|||||||
Reference in New Issue
Block a user