|
From: <tb...@us...> - 2006-11-18 11:33:21
|
Revision: 683
http://svn.sourceforge.net/wxdsgn/?rev=683&view=rev
Author: tbreina
Date: 2006-11-18 03:33:18 -0800 (Sat, 18 Nov 2006)
Log Message:
-----------
Batch maker workaround for colons in the directory name. GSAR uses colon as its escape character. So we need to transform directory names like C:\wxMSW-2.7.2 into C::\wxMSW-2.7.2 for gsar. (Otherwise it assumes the :\ is an escape sequence rather than just two characters). The workaround is just to create a temporary file that sets a new environmental variable and uses gsar to replace single colons with double colons.
Modified Paths:
--------------
trunk/wxdevcpp/wx_devpak_batchmaker/common_vars.bat
trunk/wxdevcpp/wx_devpak_batchmaker/wxWidgets.bat
Modified: trunk/wxdevcpp/wx_devpak_batchmaker/common_vars.bat
===================================================================
--- trunk/wxdevcpp/wx_devpak_batchmaker/common_vars.bat 2006-11-17 02:46:48 UTC (rev 682)
+++ trunk/wxdevcpp/wx_devpak_batchmaker/common_vars.bat 2006-11-18 11:33:18 UTC (rev 683)
@@ -9,12 +9,22 @@
echo What version of wxWidgets are you building (Default = %WXVER%)?
set /P WXVER=
-set WXWIN=\wxMSW-%WXVER%
+set WXWIN=c:\wxMSW-%WXVER%
echo In what directory is wxWidgets located (Default = %WXWIN%)?
set /P WXWIN=
+rem This is a work around for getting colons to work for gsar
+rem gsar doesn't like the colon in the directory name (e.g. c:\)
+rem so we'll write it to a file, then use gsar to turn the single
+rem colons into double colons. This is saved to the variable
+rem WXWIN_GSAR
+echo set WXWIN_GSAR=%WXWIN%> temp123.bat
+gsar -s:: -r:::: -o temp123.bat
+call temp123.bat
+del temp123.bat
+
rem The path needs to point to where your mingw32-make executable lives
path=c:\Progra~1\Dev-Cpp\bin;%path%
Modified: trunk/wxdevcpp/wx_devpak_batchmaker/wxWidgets.bat
===================================================================
--- trunk/wxdevcpp/wx_devpak_batchmaker/wxWidgets.bat 2006-11-17 02:46:48 UTC (rev 682)
+++ trunk/wxdevcpp/wx_devpak_batchmaker/wxWidgets.bat 2006-11-18 11:33:18 UTC (rev 683)
@@ -52,8 +52,8 @@
%STARTDIR%\gsar -s_WXVER_ -r"%WXVER%" -o wxWidgets_%WXVER%_common.DevPackage
%STARTDIR%\gsar -s_WXVER_ -r"%WXVER%" -o wxWidgets_%WXVER%_gcc.DevPackage
-%STARTDIR%\gsar -s_WXWIN_ -r"%WXWIN%" -o wxWidgets_%WXVER%_common.DevPackage
-%STARTDIR%\gsar -s_WXWIN_ -r"%WXWIN%" -o wxWidgets_%WXVER%_gcc.DevPackage
+%STARTDIR%\gsar -s_WXWIN_ -r"%WXWIN_GSAR%" -o wxWidgets_%WXVER%_common.DevPackage
+%STARTDIR%\gsar -s_WXWIN_ -r"%WXWIN_GSAR%" -o wxWidgets_%WXVER%_gcc.DevPackage
rem Copy the wxWidgets libs and include files to the new devpak directory
xcopy /S %WXWIN%\lib\gcc_lib gcc_lib\
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|