Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Got rid of the BIN dir

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-03-18 22:05:24 +00:00
parent b2bacf13e3
commit 312cca179a
7 changed files with 54 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wxPython/distrib/howto-distrib.txt
View File

@@ -45,18 +45,6 @@ Preflight Checklist
Windows (build env is on Cyclops)
----------------------------------
* Clean out unneded files from wx/BIN
*.pdb # debugger data
wx*d_*.dll # debug version of the DLLs
# also old versions
# etc.
* Clean out the same files in wx/lib/vc_dll. (NOTE to self: There is
probably no reason any more to move stuff to the BIN dir. Update
the build and packager scripts and the PATHs and then get rid of
it.)
* Do a clean build of the ansi and unicode hybrid versions of
wxWidgets:
@@ -71,7 +59,8 @@ Windows (build env is on Cyclops)
* Build the tools. This btm script makes a static release version of
wxWidgets, and then builds copies of wxrc.exe and tex2rtf.exe
linking with that lib, placing them in wx/BIN.
linking with that lib, placing them in wx/lib/vc_dll, (which you
should have on the PATH.)
.make_tools.btm

12
wxPython/distrib/make_installer.py
View File

@@ -69,7 +69,7 @@ Name: core; Description: "wxPython modules and library"; Types: full compact
Name: docs; Description: "Documentation"; Types: full
Name: demo; Description: "Demo application"; Types: full
Name: samples; Description: "Sample applications"; Types: full
Name: ; Description: "Manifest files for XP LnF"; Types: full
;;------------------------------------------------------------
@@ -78,7 +78,7 @@ Source: "%(SYSDIR)s\MSVCRT.dll"; DestDir: "{code:GetPythonDir}"; CopyMode
Source: "%(SYSDIR)s\MSVCIRT.dll"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core
Source: "%(SYSDIR)s\MSVCP60.dll"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core
Source: "%(WXDIR)s\BIN\wx*%(WXDLLVER)s_*.dll"; DestDir: "{app}\wx"; Components: core
Source: "%(WXDIR)s\lib\vc_dll\wx*%(WXDLLVER)s_*.dll"; DestDir: "{app}\wx"; Components: core
%(MSLU)s
Source: "wx\_core.pyd"; DestDir: "{app}\wx"; Components: core
Source: "wx\_gdi.pyd"; DestDir: "{app}\wx"; Components: core
@@ -191,7 +191,7 @@ Source: "scripts\pyshell"; DestDir: "{code:GetPythonDir}\Script
Source: "scripts\pycrust"; DestDir: "{code:GetPythonDir}\Scripts"; Components: core
Source: "scripts\pywrap"; DestDir: "{code:GetPythonDir}\Scripts"; Components: core
Source: "scripts\xrced"; DestDir: "{code:GetPythonDir}\Scripts"; Components: core
Source: "%(WXDIR)s\BIN\wxrc.exe"; DestDir: "{code:GetPythonDir}\Scripts"; Components: core
Source: "%(WXDIR)s\lib\vc_dll\wxrc.exe"; DestDir: "{code:GetPythonDir}\Scripts"; Components: core
Source: "samples\doodle\*.py"; DestDir: "{app}\wx\samples\doodle"; Components: samples
Source: "samples\doodle\*.txt"; DestDir: "{app}\wx\samples\doodle"; Components: samples
@@ -228,8 +228,8 @@ Source: "samples\wxProject\*.txt"; DestDir: "{app}\wx\samples\wxProject
Source: "samples\wxProject\*.py"; DestDir: "{app}\wx\samples\wxProject"; Components: samples
Source: "src\winxp.manifest"; DestDir: "{code:GetPythonDir}"; DestName: "python.exe.manifest"; Components: core
Source: "src\winxp.manifest"; DestDir: "{code:GetPythonDir}"; DestName: "pythonw.exe.manifest"; Components: core
Source: "src\winxp.manifest"; DestDir: "{code:GetPythonDir}"; DestName: "python.exe.manifest"; Components: manifest
Source: "src\winxp.manifest"; DestDir: "{code:GetPythonDir}"; DestName: "pythonw.exe.manifest"; Components: manifest
;;------------------------------------------------------------
@@ -511,7 +511,7 @@ def main():
MSLU=''
if len(sys.argv) > 1 and sys.argv[1] == "UNICODE=1":
MSLU=r'Source: "%(WXDIR)s\BIN\unicows.dll"; DestDir: "{code:GetPythonDir}"; Components: core' % vars()
MSLU=r'Source: "%(WXDIR)s\lib\vc_dll\unicows.dll"; DestDir: "{code:GetPythonDir}"; Components: core' % vars()
f = open(ISSFILE, "w")
f.write(ISS_Template % vars())

24
wxPython/distrib/msw/.make.btm
View File

@@ -4,28 +4,28 @@ setlocal
iff "%1" == "both" then
shift
call .make debug %$ & if %? != 0 quit $?
call .make hybrid %$ & if %? != 0 quit $?
call .make debug %$ & if %? != 0 quit %?
call .make hybrid %$ & if %? != 0 quit %?
quit
elseiff "%1" == "both-uni" then
shift
call .make debug-uni %$ & if %? != 0 quit $?
call .make hybrid-uni %$ & if %? != 0 quit $?
call .make debug-uni %$ & if %? != 0 quit %?
call .make hybrid-uni %$ & if %? != 0 quit %?
quit
elseiff "%1" == "both-hybrid" then
shift
call .make hybrid %$ & if %? != 0 quit $?
call .make hybrid-uni %$ & if %? != 0 quit $?
call .make hybrid %$ & if %? != 0 quit %?
call .make hybrid-uni %$ & if %? != 0 quit %?
quit
elseiff "%1" == "all" then
shift
call .make debug %$ & if %? != 0 quit $?
call .make hybrid %$ & if %? != 0 quit $?
call .make debug-uni %$ & if %? != 0 quit $?
call .make hybrid-uni %$ & if %? != 0 quit $?
call .make debug %$ & if %? != 0 quit %?
call .make hybrid %$ & if %? != 0 quit %?
call .make debug-uni %$ & if %? != 0 quit %?
call .make hybrid-uni %$ & if %? != 0 quit %?
quit
elseiff "%1" == "debug" then
@@ -113,8 +113,8 @@ cd -
@echo -- SUCCESS! --
@echo -----------------
REM copy DLLs to a dir on the PATH
copy /U %WXWIN%\lib\vc_dll\*.dll %WXWIN%\BIN
copy /U %WXWIN%\lib\vc_dll\*.pdb %WXWIN%\BIN
REM copy /U %WXWIN%\lib\vc_dll\*.dll %WXWIN%\BIN
REM copy /U %WXWIN%\lib\vc_dll\*.pdb %WXWIN%\BIN
quit 0

20
wxPython/distrib/msw/.make_tools.btm Normal file
View File

@@ -0,0 +1,20 @@
nmake -f makefile.vc BUILD=release %$
pushd %WXWIN%\contrib\build\xrc
nmake -f makefile.vc BUILD=release %$
pushd %WXWIN%\contrib\utils\wxrc
nmake -f makefile.vc BUILD=release %$
copy vc_msw\wxrc.exe %WXWIN%\lib\vc_dll\wxrc.exe
pushd %WXWIN%\utils\tex2rtf\src
nmake -f makefile.vc BUILD=release %$
copy vc_msw\tex2rtf.exe %WXWIN%\lib\vc_dll\tex2rtf.exe
popd
popd
popd

12
wxPython/distrib/msw/.makesetup.mk
View File

@@ -1,5 +1,5 @@
SRC=..\..\include\wx\msw\setup.h
SRC=$(WXWIN)\include\wx\msw\setup.h
DIR=$(WXWIN)\lib
FILES= $(DIR)\vc_dll\mswd\wx\setup.h \
$(DIR)\vc_dll\mswh\wx\setup.h \
@@ -26,6 +26,11 @@ $(DIR)\vc_dll\mswh\wx\setup.h : $(SRC) .makesetup.mk
-if not exist $(DIR)\vc_dll\mswh\wx mkdir /s $(DIR)\vc_dll\mswh\wx
cat $(SRC) | $(HYB_SEDCMD) > $@
# release
$(DIR)\vc_dll\msw\wx\setup.h : $(SRC) .makesetup.mk
-if not exist $(DIR)\vc_dll\msw\wx mkdir /s $(DIR)\vc_dll\msw\wx
cat $(SRC) > $@
# debug-uni
$(DIR)\vc_dll\mswud\wx\setup.h : $(SRC) .makesetup.mk
-if not exist $(DIR)\vc_dll\mswud\wx mkdir /s $(DIR)\vc_dll\mswud\wx
@@ -36,11 +41,6 @@ $(DIR)\vc_dll\mswuh\wx\setup.h : $(SRC) .makesetup.mk
-if not exist $(DIR)\vc_dll\mswuh\wx mkdir /s $(DIR)\vc_dll\mswuh\wx
cat $(SRC) | $(UNI_SEDCMD) | $(HYB_SEDCMD) > $@
# release
$(DIR)\vc_dll\msw\wx\setup.h : $(SRC) .makesetup.mk
-if not exist $(DIR)\vc_dll\msw\wx mkdir /s $(DIR)\vc_dll\msw\wx
cat $(SRC) > $@
# release-uni
$(DIR)\vc_dll\mswu\wx\setup.h : $(SRC) .makesetup.mk
-if not exist $(DIR)\vc_dll\mswu\wx mkdir /s $(DIR)\vc_dll\mswu\wx

5
wxPython/docs/BUILD.txt
View File

@@ -256,8 +256,9 @@ here. There is a copy of my build scripts in wxWidgets\wxPython\distrib\msw
wxUSE_DISPLAY 1
4. Make a %WXWIN%\BIN directory and add it to the PATH. My build
scripts will copy the wxWidgets DLLs there.
4. Make sure that %WXWIN%\lib\vc_dll directory is on the PATH. The
wxWidgets DLLs will end up there as part of the build and so you'll
need it on the PATH for them to be found at runtime.
5. Change to the %WXWIN%\build\msw directory and copy my build scripts

2
wxPython/docs/INSTALL.txt
View File

@@ -134,6 +134,6 @@ Installing on Windows
found at runtime by the extension modules without requiring that
they be installed on the PATH::
copy %WXWIN%\BIN\wx*h_*.dll c:\Python23\Lib\site-pacakges\wx
copy %WXWIN%\lib\vc_dll\wx*h_*.dll c:\Python23\Lib\site-pacakges\wx