• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision2891 (tree)
Zeit2005-03-23 23:23:02
Autorstefankueng

Log Message

Revert the build script to build the MBCS version.

Ändern Zusammenfassung

Diff

--- branches/version_1.1.x/build.bat (revision 2890)
+++ branches/version_1.1.x/build.bat (revision 2891)
@@ -13,6 +13,7 @@
1313
1414 if "%1"=="" (
1515 SET _RELEASE=ON
16+ SET _RELEASE_MBCS=ON
1617 SET _DEBUG=ON
1718 SET _DOCS=ON
1819 SET _SETUP=ON
@@ -23,6 +24,8 @@
2324 if "%1"=="RELEASE" SET _RELEASE=ON
2425 if "%1"=="debug" SET _DEBUG=ON
2526 if "%1"=="DEBUG" SET _DEBUG=ON
27+if "%1"=="release_mbcs" SET _RELEASE_MBCS=ON
28+if "%1"=="RELEASE_MBCS" SET _RELEASE_MBCS=ON
2629 if "%1"=="doc" SET _DOCS=ON
2730 if "%1"=="DOC" SET _DOCS=ON
2831 if "%1"=="setup" SET _SETUP=ON
@@ -30,6 +33,12 @@
3033 shift
3134 if NOT "%1"=="" goto :getparam
3235
36+if DEFINED _RELEASE (
37+ set _RELEASE_OR_RELEASE_MBCS=ON
38+) else if DEFINED _RELEASE_MBCS (
39+ set _RELEASE_OR_RELEASE_MBCS=ON
40+)
41+
3342 rem patch apr-iconv
3443 copy ext\apr-iconv_patch\lib\iconv_module.c ..\Subversion\apr-iconv\lib /Y
3544
@@ -134,6 +143,20 @@
134143 copy ..\Subversion\apr-util\Release\libaprutil.dll bin\Release\bin /Y > NUL
135144 copy ..\Subversion\apr-iconv\Release\libapriconv.dll bin\Release\bin /Y > NUL
136145 )
146+if DEFINED _RELEASE_MBCS (
147+ if EXIST bin\release_mbcs\iconv rmdir /S /Q bin\release_mbcs\iconv > NUL
148+ mkdir bin\release_mbcs\iconv > NUL
149+ copy ..\Subversion\apr-iconv\Release\iconv\*.so bin\release_mbcs\iconv > NUL
150+ if EXIST bin\release_mbcs\bin rmdir /S /Q bin\release_mbcs\bin > NUL
151+ mkdir bin\release_mbcs\bin > NUL
152+ copy ..\Common\openssl\out32dll\*.dll bin\release_mbcs\bin /Y > NUL
153+ copy .\ext\gettext\bin\intl.dll bin\release_mbcs\bin /Y > NUL
154+ copy ..\Subversion\db4-win32\bin\libdb42.dll bin\release_mbcs\bin /Y > NUL
155+ copy ..\Subversion\apr\Release\libapr.dll bin\Release_MBCS\bin /Y > NUL
156+ copy ..\Subversion\apr-util\Release\libaprutil.dll bin\Release_MBCS\bin /Y > NUL
157+ copy ..\Subversion\apr-iconv\Release\libapriconv.dll bin\Release_MBCS\bin /Y > NUL
158+)
159+
137160 echo ================================================================================
138161 echo building TortoiseSVN
139162 cd src
@@ -141,11 +164,12 @@
141164 ..\bin\release\bin\SubWCRev.exe .. version.in version.h
142165 if DEFINED _RELEASE (
143166 devenv TortoiseSVN.sln /rebuild release
144- copy TortoiseSVNSetup\autolist.txt ..\bin\release\bin
145167 )
168+if DEFINED _RELEASE_MBCS (
169+ devenv TortoiseSVN.sln /rebuild release_mbcs
170+)
146171 if DEFINED _DEBUG (
147172 devenv TortoiseSVN.sln /rebuild debug
148- copy TortoiseSVNSetup\autolist.txt ..\bin\debug\bin
149173 )
150174
151175 echo ================================================================================
@@ -154,6 +178,7 @@
154178 nmake -f scintilla.mak
155179 copy ..\bin\SciLexer.dll ..\..\..\..\bin\debug\bin /Y > NUL
156180 copy ..\bin\SciLexer.dll ..\..\..\..\bin\release\bin /Y > NUL
181+copy ..\bin\SciLexer.dll ..\..\..\..\bin\release_mbcs\bin /Y > NUL
157182 del ..\bin\*.dll > NUL
158183 del ..\bin\*.exp > NUL
159184 del ..\bin\*.lib > NUL
Show on old repository browser