From 951aa70eb410423ef37c0d0572e062f2491f84e1 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 12 Mar 2004 20:17:22 +0000 Subject: [PATCH] distrib tweaks git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/distrib/README.devel.txt | 23 ++++----- wxPython/distrib/makedev.bat | 77 +++++++++++++++++-------------- 2 files changed, 53 insertions(+), 47 deletions(-) diff --git a/wxPython/distrib/README.devel.txt b/wxPython/distrib/README.devel.txt index 080bf7bb6b..b96b1743fe 100644 --- a/wxPython/distrib/README.devel.txt +++ b/wxPython/distrib/README.devel.txt @@ -1,26 +1,23 @@ This tarball contains all the files needed (I hope!) to allow you to write win32 programs or Python extension modules that link to the same wxWindows DLL that wxPython does. Files for both the normal (ANSI) -and unicode builds are included. +and Unicode builds are included. You'll need to add the following directories to your Include path (the /I flag for MSVC): - wxPython-[version]\lib\mswdllh [for ANSI builds] - wxPython-[version]\lib\mswdlluh [for Unicode builds] + wxPython-[version]\lib\vc_dll\mswh [for ANSI builds] + wxPython-[version]\lib\vc_dll\mswuh [for Unicode builds] wxPython-[version]\include -And also you should link with one of the wxmsw*.lib files in the lib -dir, use the one with the 'u' in the name for the Unicode build and -the one without for the ANSI build. +And also you should link with a set of the *.lib files in the +lib/vc_dll dir. Us the ones with the 'u' in the name after the version +numbers for Unicode builds, the ones without the 'u' are for ANSI +builds. -I've also included some makefiles in the src dir to give you an idea -of what compiler and linker flags are required. You can also get this -info from wxPython's setup.py script. - -I'm sure I've forgotten something, so when you discover what it is -please let me know. Also, if anyone feels like turning this text into -a more detailed HOW-TO please send your text to me. +I'm sure I've forgotten some files or something, so when you discover +what it is please let me know. Also, if anyone feels like turning +this text into a more detailed HOW-TO please send your text to me. Robin diff --git a/wxPython/distrib/makedev.bat b/wxPython/distrib/makedev.bat index 252606a81f..f007113d02 100755 --- a/wxPython/distrib/makedev.bat +++ b/wxPython/distrib/makedev.bat @@ -14,57 +14,66 @@ mkdir %BASE% rem *** copy files copy distrib\README.devel.txt %BASE%\README.txt + mkdir %BASE%\include mkdir %BASE%\include\wx -copy /s %WXWIN%\include\wx\* %BASE%\include\wx +copy /s %WXWIN%\include\wx\* %BASE%\include\wx + +copy /s %WXWIN%\contrib\include\wx\gizmos %BASE%\include\wx\gizmos +copy /s %WXWIN%\contrib\include\wx\ogl %BASE%\include\wx\ogl +copy /s %WXWIN%\contrib\include\wx\stc %BASE%\include\wx\stc +copy /s %WXWIN%\contrib\include\wx\xrc %BASE%\include\wx\xrc + +copy /s %WXWIN%\wxPython\include\wx\* %BASE%\include\wx +mkdir %BASE%\include\wx\wxPython\i_files +copy %WXWIN%\wxPython\src\*.i %BASE%\include\wx\wxPython\i_files mkdir %BASE%\lib -mkdir %BASE%\lib\mswdllh -mkdir %BASE%\lib\mswdlluh -copy /s %WXWIN%\lib\mswdllh\* %BASE%\lib\mswdllh -copy /s %WXWIN%\lib\mswdlluh\* %BASE%\lib\mswdlluh -copy %WXWIN%\lib\wxmsw*h.lib %BASE%\lib -copy %WXWIN%\lib\wxmsw*h.dll %BASE%\lib -copy %WXWIN%\lib\mslu.txt %BASE%\lib -copy %WXWIN%\lib\unicows.dll %BASE%\lib -copy %WXWIN%\lib\unicows.lib %BASE%\lib +mkdir %BASE%\lib\vc_dll +mkdir %BASE%\lib\vc_dll\mswh +mkdir %BASE%\lib\vc_dll\mswuh -mkdir %BASE%\src -copy %WXWIN%\src\makevc.env %BASE%\src -copy %WXWIN%\src\makelib.vc %BASE%\src +copy /s %WXWIN%\lib\vc_dll\mswh\* %BASE%\lib\vc_dll\mswh +copy /s %WXWIN%\lib\vc_dll\mswuh\* %BASE%\lib\vc_dll\mswuh +copy %WXWIN%\lib\vc_dll\* %BASE%\lib\vc_dll rem *** remove unneeded files -del /sxzy %BASE%\include\wx\CVS -del /sxzy %BASE%\include\wx\generic\CVS -del /sxzy %BASE%\include\wx\gtk\CVS -del /sxzy %BASE%\include\wx\html\CVS -del /sxzy %BASE%\include\wx\mac\CVS -del /sxzy %BASE%\include\wx\mgl\CVS -del /sxzy %BASE%\include\wx\motif\CVS -del /sxzy %BASE%\include\wx\msw\CVS -del /sxzy %BASE%\include\wx\msw\ctl3d\CVS -del /sxzy %BASE%\include\wx\msw\gnuwin32\CVS -del /sxzy %BASE%\include\wx\msw\gnuwin32\gl\CVS -del /sxzy %BASE%\include\wx\msw\ole\CVS -del /sxzy %BASE%\include\wx\os2\CVS -del /sxzy %BASE%\include\wx\protocol\CVS -del /sxzy %BASE%\include\wx\univ\CVS -del /sxzy %BASE%\include\wx\unix\CVS -del /sxzy %BASE%\include\wx\x11\CVS -del /sxzy %BASE%\include\wx\x11\nanox\CVS -del /sxzy %BASE%\include\wx\x11\nanox\X11\CVS +cd _distrib_zip + +ffind /SB wx*d_*.* > del-files +ffind /SB wx*d.* >> del-files +ffind /SB .#* >> del-files +ffind /SB .cvsignore >> del-files +for %f in (@del-files) do rm -fv %f +rem del /y @del-files +ffind /SB /A:D CVS > del-dirs +echo wxPython-%1\include\wx\cocoa >> del-dirs +echo wxPython-%1\include\wx\gtk >> del-dirs +echo wxPython-%1\include\wx\mac >> del-dirs +echo wxPython-%1\include\wx\mgl >> del-dirs +echo wxPython-%1\include\wx\motif >> del-dirs +echo wxPython-%1\include\wx\os2 >> del-dirs +echo wxPython-%1\include\wx\univ >> del-dirs +echo wxPython-%1\include\wx\unix >> del-dirs +echo wxPython-%1\include\wx\x11 >> del-dirs + +for %d in (@del-dirs) do rm -rfv %d +rem del /sxzy @del-dirs + +rm del-files +rm del-dirs + rem *** bundle it all up -cd _distrib_zip tar cvf ../dist/wxPythonWIN32-devel-%1.tar wxPython-%1 gzip -9 ../dist/wxPythonWIN32-devel-%1.tar rem *** cleanup cd .. -del /sxzy _distrib_zip +rm -rf _distrib_zip endlocal -- 2.47.2