no need to build separate xrc lib anymore

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

diff --git a/wxPython/distrib/msw/.make b/wxPython/distrib/msw/.make
index 11c54d30c9c6555a7f617e69fef43b74301b31b9..02c05932175d110310c17d732ee2447e22f6d19e 100644 (file)
--- a/wxPython/distrib/msw/.make
+++ b/wxPython/distrib/msw/.make
@@ -79,12 +79,8 @@ fi
 
 
 echo ------------------
-WXWIN=`cygpath -m $WXWIN`
+echo cd $WXWIN/build/msw
 cd $WXWIN/build/msw
-
-echo mkdir -p $WXWIN/lib/vc_dll/$WXLIBDIR/wx
-mkdir -p $WXWIN/lib/vc_dll/$WXLIBDIR/wx
-echo nmake -f .makesetup.mk $WXWIN/lib/vc_dll/$WXLIBDIR/wx/setup.h
 nmake -f .makesetup.mk $WXWIN/lib/vc_dll/$WXLIBDIR/wx/setup.h
 
 
@@ -103,12 +99,12 @@ if [ ! $? = 0 ]; then error; fi
 cd -
 
 
-echo ------------------
-echo cd ../../contrib/build/xrc
-cd ../../contrib/build/xrc
-$WXWIN/build/msw/.mymake $BUILD_TYPE $@
-if [ ! $? = 0 ]; then error; fi
-cd -
+# #echo ------------------
+# echo cd ../../contrib/build/xrc
+# cd ../../contrib/build/xrc
+# $WXWIN/build/msw/.mymake $BUILD_TYPE $@
+# if [ ! $? = 0 ]; then error; fi
+# cd -
 
 
 echo ------------------
@@ -131,6 +127,9 @@ cd -
 echo -----------------
 echo --   SUCCESS!  --
 echo -----------------
+# 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
 exit 0
 
 

diff --git a/wxPython/distrib/msw/.make.btm b/wxPython/distrib/msw/.make.btm
index 0bdd070a46dffb130cb1703d79e06a0f4de8ef00..23911f54c3bf56b827ac2cf4099415bceb2d9833 100644 (file)
--- a/wxPython/distrib/msw/.make.btm
+++ b/wxPython/distrib/msw/.make.btm
@@ -84,12 +84,12 @@ call %WXWIN%\build\msw\.mymake.btm %BUILD_TYPE% %$
 if %? != 0 goto done
 cd -
 
-echo ------------------
-echo cd ..\..\contrib\build\xrc
-cd ..\..\contrib\build\xrc
-call %WXWIN%\build\msw\.mymake.btm %BUILD_TYPE% %$
-if %? != 0 goto done
-cd -
+REM echo ------------------
+REM echo cd ..\..\contrib\build\xrc
+REM cd ..\..\contrib\build\xrc
+REM call %WXWIN%\build\msw\.mymake.btm %BUILD_TYPE% %$
+REM if %? != 0 goto done
+REM cd -
 
 
 echo ------------------

diff --git a/wxPython/distrib/msw/.make_tools b/wxPython/distrib/msw/.make_tools
index 09eb67b86711ca55a955e182ea3b4a5a11c5db5f..da4dcc2a71b071d8025f9d706e45cb6967a6a90f 100644 (file)
--- a/wxPython/distrib/msw/.make_tools
+++ b/wxPython/distrib/msw/.make_tools
@@ -1,19 +1,18 @@
-#!/bin/bash
+#! /bin/bash
 
-mkdir -p $WXWIN/lib/vc_lib/msw/wx
 nmake -f .makesetup.mk $WXWIN/lib/vc_lib/msw/wx/setup.h 
 nmake -f makefile.vc BUILD=release $@
 
-cd $WXWIN/contrib/build/xrc
-nmake -f makefile.vc BUILD=release $@
+# cd $WXWIN/contrib/build/xrc
+# nmake -f makefile.vc BUILD=release $@
 
-cd $WXWIN/contrib/utils/wxrc
-nmake -f makefile.vc BUILD=release $@
-cp vc_msw/wxrc.exe $WXWIN/lib/vc_dll/wxrc.exe
+# cd $WXWIN/utils/wxrc
+# nmake -f makefile.vc BUILD=release $@
+# cp vc_msw/wxrc.exe $WXWIN/lib/vc_dll/wxrc.exe
 
 
-# cd $WXWIN/utils/tex2rtf/src
-# nmake -f makefile.vc BUILD=release $@
-# cp vc_msw/tex2rtf.exe $WXWIN/lib/vc_dll/tex2rtf.exe
+cd $WXWIN/utils/tex2rtf/src
+echo nmake -f makefile.vc BUILD=release $@
+echo cp vc_msw/tex2rtf.exe $WXWIN/lib/vc_dll/tex2rtf.exe
 
 

diff --git a/wxPython/distrib/msw/.make_tools.btm b/wxPython/distrib/msw/.make_tools.btm
index a690fd9728f549dae8bd5cc30e196b7ab64e6498..295e19860c589c276323f3d5b737c09ca5de6996 100644 (file)
--- a/wxPython/distrib/msw/.make_tools.btm
+++ b/wxPython/distrib/msw/.make_tools.btm
@@ -1,10 +1,10 @@
 
 nmake -f makefile.vc BUILD=release %$
 
-pushd %WXWIN%\contrib\build\xrc
-nmake -f makefile.vc BUILD=release %$
+REM pushd %WXWIN%\contrib\build\xrc
+REM nmake -f makefile.vc BUILD=release %$
 
-pushd %WXWIN%\contrib\utils\wxrc
+pushd %WXWIN%\utils\wxrc
 nmake -f makefile.vc BUILD=release %$
 copy vc_msw\wxrc.exe %WXWIN%\lib\vc_dll\wxrc.exe
 
@@ -15,6 +15,6 @@ copy vc_msw\tex2rtf.exe %WXWIN%\lib\vc_dll\tex2rtf.exe
 
 popd
 popd
-popd
+
 
 

diff --git a/wxPython/distrib/msw/.makesetup.mk b/wxPython/distrib/msw/.makesetup.mk
index 369b10c1dd83a0a7dd9e34b167e31e584315546d..6e4b94ae89bd7489cefe7bd24a9f7f6da253cb58 100644 (file)
--- a/wxPython/distrib/msw/.makesetup.mk
+++ b/wxPython/distrib/msw/.makesetup.mk
@@ -1,14 +1,14 @@
 
-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 \
-        $(DIR)/vc_dll/mswud/wx/setup.h \
-        $(DIR)/vc_dll/mswuh/wx/setup.h \
-        $(DIR)/vc_dll/msw/wx/setup.h \
-        $(DIR)/vc_dll/mswu/wx/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 \
+        $(DIR)\vc_dll\mswud\wx\setup.h \
+        $(DIR)\vc_dll\mswuh\wx\setup.h \
+        $(DIR)\vc_dll\msw\wx\setup.h \
+        $(DIR)\vc_dll\mswu\wx\setup.h \
        \
-        $(DIR)/vc_lib/msw/wx/setup.h \
+        $(DIR)\vc_lib\msw\wx\setup.h \
 
 
 UNI_SEDCMD=sed "s!wxUSE_UNICODE 0!wxUSE_UNICODE 1!g;s!wxUSE_UNICODE_MSLU 0!wxUSE_UNICODE_MSLU 1!g"
@@ -21,37 +21,37 @@ test :
 
 # debug
 $(DIR)\vc_dll\mswd\wx\setup.h : $(SRC) .makesetup.mk
-       cat $(SRC) > setup.h.tmp
-       mv setup.h.tmp $@
+       -if not exist  $(DIR)\vc_dll\mswd\wx mkdir /s $(DIR)\vc_dll\mswd\wx
+       cat $(SRC) > $@
 
 # hybrid
 $(DIR)\vc_dll\mswh\wx\setup.h : $(SRC) .makesetup.mk
-       cat $(SRC) | $(HYB_SEDCMD) > setup.h.tmp
-       mv setup.h.tmp $@
+       -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
-       cat $(SRC) > setup.h.tmp
-       mv setup.h.tmp $@
+       -if not exist  $(DIR)\vc_dll\msw\wx mkdir /s $(DIR)\vc_dll\msw\wx
+       cat $(SRC) > $@
 
 $(DIR)\vc_lib\msw\wx\setup.h : $(SRC) .makesetup.mk
-       cat $(SRC) > setup.h.tmp
-       mv setup.h.tmp $@
+       -if not exist  $(DIR)\vc_lib\msw\wx mkdir /s $(DIR)\vc_lib\msw\wx
+       cat $(SRC) > $@
 
 # debug-uni
 $(DIR)\vc_dll\mswud\wx\setup.h : $(SRC) .makesetup.mk
-       cat $(SRC) | $(UNI_SEDCMD) > setup.h.tmp
-       mv setup.h.tmp $@
+       -if not exist  $(DIR)\vc_dll\mswud\wx mkdir /s $(DIR)\vc_dll\mswud\wx
+       cat $(SRC) | $(UNI_SEDCMD) > $@
 
 # hybrid-uni
 $(DIR)\vc_dll\mswuh\wx\setup.h : $(SRC) .makesetup.mk
-       cat $(SRC) | $(UNI_SEDCMD) | $(HYB_SEDCMD) > setup.h.tmp
-       mv setup.h.tmp $@
+       -if not exist  $(DIR)\vc_dll\mswuh\wx mkdir /s $(DIR)\vc_dll\mswuh\wx
+       cat $(SRC) | $(UNI_SEDCMD) | $(HYB_SEDCMD) > $@
 
 # release-uni
 $(DIR)\vc_dll\mswu\wx\setup.h : $(SRC) .makesetup.mk
-       cat $(SRC) | $(UNI_SEDCMD) > setup.h.tmp
-       mv setup.h.tmp $@
+       -if not exist  $(DIR)\vc_dll\mswu\wx mkdir /s $(DIR)\vc_dll\mswu\wx
+       cat $(SRC) | $(UNI_SEDCMD) > $@
 
 
 

diff --git a/wxPython/distrib/msw/.mymake b/wxPython/distrib/msw/.mymake
index 3558fd3dd3ed43f900e393d9122b0cd9605fbd26..173391f5dbf367431f835da1274fbcff874c0676 100644 (file)
--- a/wxPython/distrib/msw/.mymake
+++ b/wxPython/distrib/msw/.mymake
@@ -1,4 +1,4 @@
-#!/bin/bash
+#! /bin/bash
 
 COMMON_FLAGS="OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1"
 HYBRID_FLAGS="DEBUG_FLAG=1 CXXFLAGS=/D__NO_VC_CRTDBG__ WXDEBUGFLAG=h"