[Lazarus] RE : Lazarus debugger location on Win x86/x64

[Reinier Olislagers]

On 30-7-2012 14:31, Martin wrote:
> On 30/07/2012 12:28, Reinier Olislagers wrote:
>> Ok - patch submitted for the environment setting:
>>
>> http://bugs.freepascal.org/view.php?id=22533
>>
>> This also needs changes for the Windows source directory that is used to
>> build the installer...
>>
> 
> Not sure what you mean by this.
The Lazarus\tools\install\win\lazarus.iss Inno Setup file refers to
Source: {#BuildDir}\*.*; DestDir: {app}; Flags: recursesubdirs
to presumably get its source files.
I have no gdb.exe in my svn checkout and therefore suppose the build
directory in question is generated in another way... from some sort of
source directory.
... see below though - I think changing create_installer.bat should be
sufficient

> Also not sure why you patch the RemoveFiles, if you dont batch the rest
> of the installer files?
You mean why do I remove gdb.exe from the old position while not adding
it to the new position?
See above: I didn't understand how to do that.

> Changes probably have to go into the lazarus.iss file (maybe, but
> probably not, the batch)
Ah got you, create_installer.bat should indeed be changed.
(Just read your other mail about that)

So changing lines 110-111:
:: copy gdb into build dir
if exist %GDBDIR% %SVN% export %GDBDIR% %BUILDDIR%\mingw
into
:: copy gdb below the build dir for the proper os/cpu combination
if exist %GDBDIR% %SVN% export %GDBDIR% %BUILDDIR%\mingw\%FPCFULLTARGET%\

would mean we'd get e.g.
<lazarus>\mingw\i386-win32\bin\gdb.exe
or
<lazarus>\mingw\x86_64-win64\bin\gdb.exe
Right?


> In any case, the RC (coming soon) have been build with the current
> structure. So the current structure will be presented for testing. That
> means it is not wise to change the structure before 1.0, because then
> the new structure can not be tested any more
I don't mind when it changes because I'm on SVN anyway.

I would welcome a change in the post 1.0 branch though, because:
1. this seems to be useful functionality for not much added effort
2. I'm adjusting fpcup already and would like to stay as close as the
official installers as possible
-------------- next part --------------
Index: tools/install/win/create_installer.bat
===================================================================
--- tools/install/win/create_installer.bat	(revision 38091)
+++ tools/install/win/create_installer.bat	(working copy)
@@ -107,8 +107,8 @@
 if not exist %BUILDDIR%\lazarus.exe goto END
 if not exist %BUILDDIR%\startlazarus.exe goto END
 
-:: copy gdb into build dir
-if exist %GDBDIR% %SVN% export %GDBDIR% %BUILDDIR%\mingw
+:: copy gdb below the build dir for the proper os/cpu combination
+if exist %GDBDIR% %SVN% export %GDBDIR% %BUILDDIR%\mingw\bin\%FPCFULLTARGET%\
 
 :: create the installer
 IF [%BUILDLAZRELEASE%]==[] GOTO SNAPSHOT