All right, I'm making progress.
The Make_Pot.bat file has a problem in that it
unconditionally tries to run
..\bin\release\bin\ResText
However, in a native build, that doesn't exist; it
needs to run
..\bin\release64\bin\ResText
I'm not sure what effect this is having-- but I've
attached a patch to fix it. (I'm not sure the patch
is the best approach...)
Log:
Add a version of Make_Pot.bat for 64-bit builds
that uses the ResText out of the correct build
folder and passes in the modules from the correct
build output folder (release64 in both cases.)
Thanks,
Joseph
Joseph Galbraith wrote:
> Stefan Küng wrote:
>> On 3/15/06, Joseph Galbraith <galb@vandyke.com> wrote:
>>> Well, I'm finally trying to get my build environment
>>> set up.
>>>
>>> I'm currently getting the following error:
>>>
>>> [link] Creating library .\release_win32/libapr.lib and object
>>> .\release_win32/libapr.exp
>>> [link] internal.obj : error LNK2019: unresolved external symbol
>>> __imp___realloc_dbg referenced in function _apr_wastrtoastr
>>> [link] start.obj : error LNK2001: unresolved external symbol
>>> __imp___realloc_dbg
>>> [link] internal.obj : error LNK2019: unresolved external symbol
>>> __imp___malloc_dbg referenced in function _apr_wastrtoastr
>>> [link] start.obj : error LNK2001: unresolved external symbol
>>> __imp___malloc_dbg
>>> [link]
>>> E:\Users\Galb\Projects\SVN\TortoiseSVN\ext\apr\release_win32\libapr.dll
>>> : fatal error LNK1120: 2 unresolved externals
>>>
>>> Does anyone have any idea what it is I messed up?
>> Maybe you did a debug build first, but then a release build without
>> the 'clean' param first?
>
> I don't think so... I'm pretty sure that
> after I got the error the first time
> I did a nant clean .
>
> Checking... yes, I just reverified that
>
> nant clean
> nant setup
>
> gives the error.
>
> Thanks,
>
> Joseph
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
> For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
>
>
Index: E:/Users/Galb/Projects/SVN/TortoiseSVN/Languages/Make_Pot64.bat
===================================================================
--- E:/Users/Galb/Projects/SVN/TortoiseSVN/Languages/Make_Pot64.bat (revision 6317)
+++ E:/Users/Galb/Projects/SVN/TortoiseSVN/Languages/Make_Pot64.bat (working copy)
@@ -1,7 +1,7 @@
@echo off
SETLOCAL ENABLEDELAYEDEXPANSION
-..\bin\release\bin\ResText extract ..\bin\release\bin\TortoiseProcLang.dll ..\bin\release\bin\TortoiseMergeLang.dll Tortoise.pot
+..\bin\release64\bin\ResText extract ..\bin\release64\bin\TortoiseProcLang.dll ..\bin\release64\bin\TortoiseMergeLang.dll Tortoise.pot
rem leave the next two lines commented. The msgremove tool changes the
rem sequence "\r\n" to "r\n" - removing the backslash before the r!!!
Index: E:/Users/Galb/Projects/SVN/TortoiseSVN/src/TortoiseMerge/TortoiseMergeLang.vcproj
===================================================================
--- E:/Users/Galb/Projects/SVN/TortoiseSVN/src/TortoiseMerge/TortoiseMergeLang.vcproj (revision 6317)
+++ E:/Users/Galb/Projects/SVN/TortoiseSVN/src/TortoiseMerge/TortoiseMergeLang.vcproj (working copy)
@@ -178,7 +178,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="cd ..\..\Languages
Make_Pot.bat
"
+ CommandLine="cd ..\..\Languages
Make_Pot64.bat
"
/>
</Configuration>
</Configurations>
Index: E:/Users/Galb/Projects/SVN/TortoiseSVN/src/TortoiseProc/TortoiseProcLang.vcproj
===================================================================
--- E:/Users/Galb/Projects/SVN/TortoiseSVN/src/TortoiseProc/TortoiseProcLang.vcproj (revision 6317)
+++ E:/Users/Galb/Projects/SVN/TortoiseSVN/src/TortoiseProc/TortoiseProcLang.vcproj (working copy)
@@ -180,7 +180,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="cd ..\..\Languages\
Make_Pot.bat
"
+ CommandLine="cd ..\..\Languages\
Make_Pot64.bat
"
/>
</Configuration>
</Configurations>
@@ -282,19 +282,19 @@
</File>
</Filter>
<File
- RelativePath="..\Languages\res\bin167.avi"
+ RelativePath="..\Resources\bin167.avi"
>
</File>
<File
- RelativePath="..\Resources\bin167.avi"
+ RelativePath="..\Languages\res\bin167.avi"
>
</File>
<File
- RelativePath="..\Languages\res\bin168.avi"
+ RelativePath="..\Resources\bin168.avi"
>
</File>
<File
- RelativePath="..\Resources\bin168.avi"
+ RelativePath="..\Languages\res\bin168.avi"
>
</File>
<File
@@ -302,7 +302,7 @@
>
</File>
<File
- RelativePath="..\Languages\res\TortoiseProc.manifest"
+ RelativePath="..\Resources\TortoiseProc.manifest"
>
<FileConfiguration
Name="Release|Win32"
@@ -322,7 +322,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\Resources\TortoiseProc.manifest"
+ RelativePath="..\Languages\res\TortoiseProc.manifest"
>
<FileConfiguration
Name="Release|Win32"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Apr 18 06:14:35 2006