Changeset 9
- Timestamp:
- Feb 12, 2011, 12:33:04 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 4 added
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:ignore
-
old new 4 4 Source 5 5 Instance 6 FreePascalManager
-
- Property svn:ignore
-
trunk/Forms/UInstanceOptions.lfm
r6 r9 37 37 Height = 14 38 38 Top = 72 39 Width = 6739 Width = 76 40 40 Caption = 'IDE selection:' 41 41 ParentColor = False … … 45 45 Height = 14 46 46 Top = 40 47 Width = 6947 Width = 77 48 48 Caption = 'FPC selection:' 49 49 ParentColor = False … … 61 61 Height = 14 62 62 Top = 8 63 Width = 3 263 Width = 37 64 64 Caption = 'Name:' 65 65 ParentColor = False -
trunk/Forms/UInstanceOptions.pas
r7 r9 7 7 uses 8 8 Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls, 9 ComCtrls, ExtCtrls, DOM, XMLWrite, XMLRead, HTTPSend,USource, UInstance,9 ComCtrls, ExtCtrls, DOM, XMLWrite, XMLRead, USource, UInstance, 10 10 USourceSelection; 11 11 -
trunk/Forms/UMainForm.lfm
r8 r9 35 35 item 36 36 Caption = 'Compiled' 37 Width = 95 37 38 end> 38 39 OwnerData = True … … 49 50 Height = 14 50 51 Top = 8 51 Width = 9452 Width = 108 52 53 Caption = 'Installed instances:' 53 54 ParentColor = False -
trunk/Forms/UMainForm.pas
r7 r9 8 8 Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls, 9 9 StdCtrls, ActnList, Menus, ExtCtrls, Contnrs, USource, UInstance, 10 UInstanceOptions, DOM, XMLWrite, XMLRead, HTTPSend,UMainOptions,11 USourceSelection ;10 UInstanceOptions, DOM, XMLWrite, XMLRead, UMainOptions, 11 USourceSelection, HTTPSend; 12 12 13 13 const … … 81 81 Sources: TSourceList; 82 82 function GetBinUtilsDir: string; 83 function GetCompilerPath: string; 83 84 function GetBaseDir: string; 85 procedure InstallDependencies; 84 86 end; 85 87 … … 254 256 AStart.Enabled := False; 255 257 ARemove.Enabled := False; 258 AUpdate.Enabled := False; 256 259 end; 257 260 end; … … 492 495 function TMainForm.GetBinUtilsDir: string; 493 496 begin 497 {$IFDEF Windows} 494 498 Result := GetBaseDir + DirectorySeparator + 495 499 BinUtilsDir + DirectorySeparator + Platform; 500 {$ENDIF} 501 {$IFDEF Linux} 502 Result := '/usr/bin'; 503 {$ENDIF} 504 end; 505 506 function TMainForm.GetCompilerPath: string; 507 begin 508 {$IFDEF Windows} 509 Result := GetBinUtilsDir + DirectorySeparator + 'fpc'; 510 {$ENDIF} 511 {$IFDEF Linux} 512 Result := '/usr/lib/fpc/2.4.0/ppc386'; 513 {$ENDIF} 496 514 end; 497 515 … … 499 517 begin 500 518 Result := ExtractFileDir(Application.ExeName); 519 end; 520 521 procedure TMainForm.InstallDependencies; 522 begin 523 {$IFDEF Windows} 524 {$ENDIF} 525 {$IFDEF Linux} 526 if FileExistsUTF8('yum') then begin 527 end else 528 if FileExistsUTF8('apt-get') then begin 529 (* sudo apt-get install -y subversion 530 sudo apt-get install -y cvs 531 sudo apt-get install -y alien 532 sudo apt-get install -y libncurses5-dev 533 sudo apt-get install -y libgtk2.0-dev 534 sudo apt-get install -y libgdk-pixbuf-dev 535 sudo apt-get install -y libXp-dev 536 sudo apt-get install -y libgtk1.2-dev 537 sudo apt-get install -y libXxf86vm-dev 538 sudo apt-get install -y glutg3-dev 539 sudo apt-get install -y libgli-mesa-dev 540 sudo apt-get install -y mesa-utils 541 *) 542 end else ShowMessage('No package manager found.'); 543 {$ENDIF} 501 544 end; 502 545 -
trunk/Forms/UMainOptions.lfm
r7 r9 1 1 object MainOptionsForm: TMainOptionsForm 2 Left = 3 202 Left = 307 3 3 Height = 350 4 Top = 814 Top = 161 5 5 Width = 489 6 6 Caption = 'Options' … … 35 35 Height = 14 36 36 Top = 8 37 Width = 7937 Width = 92 38 38 Caption = 'Bit utils location:' 39 39 ParentColor = False … … 51 51 Height = 14 52 52 Top = 50 53 Width = 4 153 Width = 46 54 54 Caption = 'Platform' 55 55 ParentColor = False … … 67 67 Height = 14 68 68 Top = 90 69 Width = 1 3569 Width = 155 70 70 Caption = 'Web source list file location:' 71 71 ParentColor = False … … 83 83 Height = 14 84 84 Top = 128 85 Width = 9885 Width = 113 86 86 Caption = 'Subversion location:' 87 87 ParentColor = False -
trunk/Forms/USourceSelection.pas
r7 r9 7 7 uses 8 8 Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls, 9 StdCtrls, USource, H TTPSend;9 StdCtrls, USource, HttpSend; 10 10 11 11 type -
trunk/FreePascalManager.lpi
r8 r9 28 28 <local> 29 29 <FormatVersion Value="1"/> 30 <LaunchingApplication PathPlusParams="\usr\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/> 30 31 </local> 31 32 </RunParams> … … 46 47 <TopLine Value="1"/> 47 48 <CursorPos X="1" Y="15"/> 48 <UsageCount Value="11 6"/>49 <UsageCount Value="119"/> 49 50 </Unit0> 50 51 <Unit1> … … 56 57 <EditorIndex Value="0"/> 57 58 <WindowIndex Value="0"/> 58 <TopLine Value=" 163"/>59 <CursorPos X=" 55" Y="167"/>60 <UsageCount Value="11 6"/>59 <TopLine Value="495"/> 60 <CursorPos X="3" Y="512"/> 61 <UsageCount Value="119"/> 61 62 <Loaded Value="True"/> 62 63 <LoadedDesigner Value="True"/> … … 72 73 <TopLine Value="96"/> 73 74 <CursorPos X="36" Y="108"/> 74 <UsageCount Value="11 6"/>75 <UsageCount Value="119"/> 75 76 <Loaded Value="True"/> 76 77 <LoadedDesigner Value="True"/> … … 81 82 <UnitName Value="UInstance"/> 82 83 <IsVisibleTab Value="True"/> 83 <EditorIndex Value=" 5"/>84 <WindowIndex Value="0"/> 85 <TopLine Value="12 2"/>86 <CursorPos X=" 1" Y="131"/>87 <UsageCount Value="11 6"/>84 <EditorIndex Value="4"/> 85 <WindowIndex Value="0"/> 86 <TopLine Value="128"/> 87 <CursorPos X="69" Y="154"/> 88 <UsageCount Value="119"/> 88 89 <Loaded Value="True"/> 89 90 </Unit3> … … 92 93 <IsPartOfProject Value="True"/> 93 94 <UnitName Value="USource"/> 94 <EditorIndex Value=" 11"/>95 <EditorIndex Value="7"/> 95 96 <WindowIndex Value="0"/> 96 97 <TopLine Value="6"/> 97 98 <CursorPos X="8" Y="19"/> 98 <UsageCount Value="11 6"/>99 <UsageCount Value="119"/> 99 100 <Loaded Value="True"/> 100 101 </Unit4> 101 102 <Unit5> 102 103 <Filename Value="E:\Programy\Lazarus\0.9.31_2.5.1\fpc\2.5.1\source\rtl\objpas\classes\classesh.inc"/> 103 <EditorIndex Value="6"/>104 104 <WindowIndex Value="0"/> 105 105 <TopLine Value="616"/> 106 106 <CursorPos X="40" Y="638"/> 107 107 <UsageCount Value="12"/> 108 <Loaded Value="True"/>109 108 </Unit5> 110 109 <Unit6> … … 177 176 <ResourceBaseClass Value="Form"/> 178 177 <UnitName Value="UOperationProgress"/> 179 <EditorIndex Value=" 8"/>180 <WindowIndex Value="0"/> 181 <TopLine Value=" 43"/>182 <CursorPos X=" 3" Y="58"/>183 <UsageCount Value="7 2"/>178 <EditorIndex Value="5"/> 179 <WindowIndex Value="0"/> 180 <TopLine Value="73"/> 181 <CursorPos X="82" Y="82"/> 182 <UsageCount Value="75"/> 184 183 <Loaded Value="True"/> 185 184 <LoadedDesigner Value="True"/> … … 210 209 <Unit18> 211 210 <Filename Value="E:\Programy\Lazarus\0.9.31_2.5.1\fpc\2.5.1\source\rtl\objpas\classes\stringl.inc"/> 212 <EditorIndex Value="7"/>213 211 <WindowIndex Value="0"/> 214 212 <TopLine Value="443"/> 215 213 <CursorPos X="3" Y="441"/> 216 214 <UsageCount Value="12"/> 217 <Loaded Value="True"/>218 215 </Unit18> 219 216 <Unit19> … … 236 233 <Filename Value="ReadMe.txt"/> 237 234 <IsPartOfProject Value="True"/> 238 <EditorIndex Value=" 10"/>235 <EditorIndex Value="6"/> 239 236 <WindowIndex Value="0"/> 240 237 <TopLine Value="1"/> 241 238 <CursorPos X="6" Y="22"/> 242 <UsageCount Value="7 0"/>239 <UsageCount Value="73"/> 243 240 <Loaded Value="True"/> 244 241 <DefaultSyntaxHighlighter Value="None"/> … … 247 244 <Filename Value="E:\Programy\Lazarus\0.9.31_2.5.1\lcl\interfaces\win32\win32wscontrols.pp"/> 248 245 <UnitName Value="Win32WSControls"/> 249 <EditorIndex Value="9"/>250 246 <WindowIndex Value="0"/> 251 247 <TopLine Value="254"/> 252 248 <CursorPos X="10" Y="265"/> 253 249 <UsageCount Value="12"/> 254 <Loaded Value="True"/>255 250 </Unit22> 256 251 <Unit23> … … 272 267 <TopLine Value="43"/> 273 268 <CursorPos X="22" Y="57"/> 274 <UsageCount Value="6 3"/>269 <UsageCount Value="66"/> 275 270 <Loaded Value="True"/> 276 271 <LoadedDesigner Value="True"/> … … 318 313 <ResourceBaseClass Value="Form"/> 319 314 <UnitName Value="USourceSelection"/> 320 <EditorIndex Value=" 4"/>315 <EditorIndex Value="3"/> 321 316 <WindowIndex Value="0"/> 322 317 <TopLine Value="38"/> 323 318 <CursorPos X="33" Y="54"/> 324 <UsageCount Value="2 4"/>319 <UsageCount Value="27"/> 325 320 <Loaded Value="True"/> 326 321 <LoadedDesigner Value="True"/> … … 328 323 <Unit31> 329 324 <Filename Value="E:\Programy\Lazarus\0.9.31_2.5.1\lcl\include\listitem.inc"/> 330 <EditorIndex Value="3"/>331 325 <WindowIndex Value="0"/> 332 326 <TopLine Value="760"/> 333 327 <CursorPos X="1" Y="773"/> 334 328 <UsageCount Value="11"/> 335 <Loaded Value="True"/>336 329 </Unit31> 337 330 </Units> 338 <JumpHistory Count="30" HistoryIndex="2 9">331 <JumpHistory Count="30" HistoryIndex="28"> 339 332 <Position1> 340 <Filename Value="Forms\U SourceSelection.pas"/>341 <Caret Line=" 86" Column="5" TopLine="79"/>333 <Filename Value="Forms\UMainForm.pas"/> 334 <Caret Line="294" Column="35" TopLine="279"/> 342 335 </Position1> 343 336 <Position2> 344 <Filename Value="Forms\U SourceSelection.pas"/>345 <Caret Line=" 29" Column="19" TopLine="16"/>337 <Filename Value="Forms\UMainForm.pas"/> 338 <Caret Line="167" Column="55" TopLine="163"/> 346 339 </Position2> 347 340 <Position3> 348 <Filename Value="U Source.pas"/>349 <Caret Line=" 29" Column="53" TopLine="21"/>341 <Filename Value="UInstance.pas"/> 342 <Caret Line="109" Column="15" TopLine="102"/> 350 343 </Position3> 351 344 <Position4> 352 <Filename Value="U Source.pas"/>353 <Caret Line="1 9" Column="10" TopLine="7"/>345 <Filename Value="UInstance.pas"/> 346 <Caret Line="139" Column="41" TopLine="122"/> 354 347 </Position4> 355 348 <Position5> 356 349 <Filename Value="Forms\UMainForm.pas"/> 357 <Caret Line="36 6" Column="47" TopLine="356"/>350 <Caret Line="362" Column="36" TopLine="433"/> 358 351 </Position5> 359 352 <Position6> 360 353 <Filename Value="Forms\UMainForm.pas"/> 361 <Caret Line=" 364" Column="44" TopLine="353"/>354 <Caret Line="129" Column="8" TopLine="124"/> 362 355 </Position6> 363 356 <Position7> 364 <Filename Value=" Forms\UMainForm.pas"/>365 <Caret Line=" 367" Column="42" TopLine="353"/>357 <Filename Value="UInstance.pas"/> 358 <Caret Line="90" Column="28" TopLine="78"/> 366 359 </Position7> 367 360 <Position8> 368 <Filename Value=" Forms\UMainForm.pas"/>369 <Caret Line=" 370" Column="52" TopLine="354"/>361 <Filename Value="UInstance.pas"/> 362 <Caret Line="80" Column="61" TopLine="78"/> 370 363 </Position8> 371 364 <Position9> 372 365 <Filename Value="Forms\UMainForm.pas"/> 373 <Caret Line=" 276" Column="32" TopLine="265"/>366 <Caret Line="84" Column="34" TopLine="65"/> 374 367 </Position9> 375 368 <Position10> 376 <Filename Value="Forms\UMain Options.pas"/>377 <Caret Line=" 44" Column="44" TopLine="37"/>369 <Filename Value="Forms\UMainForm.pas"/> 370 <Caret Line="534" Column="89" TopLine="506"/> 378 371 </Position10> 379 372 <Position11> 380 373 <Filename Value="Forms\UMainForm.pas"/> 381 <Caret Line=" 389" Column="58" TopLine="378"/>374 <Caret Line="130" Column="9" TopLine="125"/> 382 375 </Position11> 383 376 <Position12> 384 <Filename Value=" Forms\UMainForm.pas"/>385 <Caret Line=" 293" Column="45" TopLine="279"/>377 <Filename Value="UInstance.pas"/> 378 <Caret Line="95" Column="20" TopLine="78"/> 386 379 </Position12> 387 380 <Position13> 388 <Filename Value=" Forms\UMainOptions.pas"/>389 <Caret Line=" 45" Column="44" TopLine="38"/>381 <Filename Value="UInstance.pas"/> 382 <Caret Line="86" Column="24" TopLine="78"/> 390 383 </Position13> 391 384 <Position14> 392 <Filename Value="Forms\UMain Options.pas"/>393 <Caret Line=" 64" Column="3" TopLine="43"/>385 <Filename Value="Forms\UMainForm.pas"/> 386 <Caret Line="248" Column="40" TopLine="225"/> 394 387 </Position14> 395 388 <Position15> 396 <Filename Value=" Forms\UMainForm.pas"/>397 <Caret Line=" 268" Column="16" TopLine="258"/>389 <Filename Value="UInstance.pas"/> 390 <Caret Line="33" Column="41" TopLine="16"/> 398 391 </Position15> 399 392 <Position16> 400 <Filename Value=" Forms\UMainForm.pas"/>401 <Caret Line=" 269" Column="16" TopLine="259"/>393 <Filename Value="UInstance.pas"/> 394 <Caret Line="63" Column="3" TopLine="61"/> 402 395 </Position16> 403 396 <Position17> 404 <Filename Value=" Forms\UMainForm.pas"/>405 <Caret Line=" 270" Column="16" TopLine="260"/>397 <Filename Value="UInstance.pas"/> 398 <Caret Line="64" Column="95" TopLine="56"/> 406 399 </Position17> 407 400 <Position18> 408 <Filename Value=" Forms\UMainForm.pas"/>409 <Caret Line=" 277" Column="16" TopLine="267"/>401 <Filename Value="UInstance.pas"/> 402 <Caret Line="65" Column="1" TopLine="56"/> 410 403 </Position18> 411 404 <Position19> 412 <Filename Value=" Forms\UMainForm.pas"/>413 <Caret Line=" 158" Column="19" TopLine="156"/>405 <Filename Value="UInstance.pas"/> 406 <Caret Line="57" Column="95" TopLine="41"/> 414 407 </Position19> 415 408 <Position20> 416 <Filename Value=" Forms\UMainForm.pas"/>417 <Caret Line=" 11" Column="19" TopLine="1"/>409 <Filename Value="UInstance.pas"/> 410 <Caret Line="74" Column="76" TopLine="43"/> 418 411 </Position20> 419 412 <Position21> 420 <Filename Value=" Forms\UMainForm.pas"/>421 <Caret Line=" 159" Column="24" TopLine="146"/>413 <Filename Value="UInstance.pas"/> 414 <Caret Line="73" Column="1" TopLine="45"/> 422 415 </Position21> 423 416 <Position22> 424 <Filename Value=" Forms\USourceSelection.pas"/>425 <Caret Line=" 54" Column="33" TopLine="38"/>417 <Filename Value="UInstance.pas"/> 418 <Caret Line="75" Column="1" TopLine="47"/> 426 419 </Position22> 427 420 <Position23> 428 <Filename Value=" Forms\UMainForm.pas"/>429 <Caret Line=" 294" Column="35" TopLine="279"/>421 <Filename Value="UInstance.pas"/> 422 <Caret Line="76" Column="1" TopLine="48"/> 430 423 </Position23> 431 424 <Position24> 432 <Filename Value=" UInstance.pas"/>433 <Caret Line=" 90" Column="25" TopLine="75"/>425 <Filename Value="Forms\UMainForm.pas"/> 426 <Caret Line="237" Column="1" TopLine="225"/> 434 427 </Position24> 435 428 <Position25> 436 429 <Filename Value="UInstance.pas"/> 437 <Caret Line=" 80" Column="1" TopLine="75"/>430 <Caret Line="66" Column="88" TopLine="48"/> 438 431 </Position25> 439 432 <Position26> 440 433 <Filename Value="UInstance.pas"/> 441 <Caret Line=" 91" Column="51" TopLine="75"/>434 <Caret Line="32" Column="33" TopLine="13"/> 442 435 </Position26> 443 436 <Position27> 444 <Filename Value=" Forms\UMainForm.pas"/>445 <Caret Line=" 294" Column="35" TopLine="279"/>437 <Filename Value="UInstance.pas"/> 438 <Caret Line="178" Column="62" TopLine="149"/> 446 439 </Position27> 447 440 <Position28> 448 <Filename Value=" Forms\UMainForm.pas"/>449 <Caret Line="1 67" Column="55" TopLine="163"/>441 <Filename Value="UInstance.pas"/> 442 <Caret Line="146" Column="70" TopLine="128"/> 450 443 </Position28> 451 444 <Position29> 452 445 <Filename Value="UInstance.pas"/> 453 <Caret Line="1 09" Column="15" TopLine="102"/>446 <Caret Line="147" Column="64" TopLine="128"/> 454 447 </Position29> 455 448 <Position30> 456 <Filename Value=" UInstance.pas"/>457 <Caret Line=" 139" Column="41" TopLine="122"/>449 <Filename Value="Forms\UMainForm.pas"/> 450 <Caret Line="512" Column="3" TopLine="495"/> 458 451 </Position30> 459 452 </JumpHistory> -
trunk/FreePascalManager.lpr
r6 r9 8 8 {$ENDIF}{$ENDIF} 9 9 Interfaces, // this includes the LCL widgetset 10 Forms, UMainForm,11 UInstanceOptions, UInstance, USource, synapse,UOperationProgress,10 Forms, synapse, UMainForm, 11 UInstanceOptions, UInstance, USource, UOperationProgress, 12 12 UMainOptions, USourceSelection 13 13 { you can add units after this }; -
trunk/Template/environmentoptions.xml
r6 r9 5 5 <LazarusDirectory Value="%LazarusDir%"> 6 6 </LazarusDirectory> 7 <CompilerFilename Value="%FPC Dir%\bin\%FPCPlatform%\fpc.exe">7 <CompilerFilename Value="%FPCCompiler%"> 8 8 </CompilerFilename> 9 9 <FPCSourceDirectory Value="%FPCDir%"> 10 10 </FPCSourceDirectory> 11 <MakeFilename Value="% FPCDir%\bin\%FPCPlatform%\make.exe">11 <MakeFilename Value="%Make%"> 12 12 </MakeFilename> 13 13 <TestBuildDirectory Value="%Temp%"> 14 14 </TestBuildDirectory> 15 15 <Debugger Class="TGDBMIDebugger"/> 16 <DebuggerFilename Value="% BaseDir%\BinUtils\%FPCPlatform%\mingw\gdb.exe">16 <DebuggerFilename Value="%GDB%"> 17 17 </DebuggerFilename> 18 18 </EnvironmentOptions> -
trunk/UInstance.pas
r8 r9 30 30 procedure UpdateFPCConfig; 31 31 function GetPath: string; 32 function GetBinPath: string; 32 33 property Downloaded: Boolean read GetDownloaded; 33 34 property Compiled: Boolean read GetCompiled; … … 61 62 function TInstance.GetCompiled: Boolean; 62 63 begin 63 Result := FileExistsUTF8(GetPath + DirectorySeparator + FPCSource.ProjectShortName + 64 DirectorySeparator + 'bin' + DirectorySeparator + 65 MainForm.Platform + DirectorySeparator + FPCSource.GetExecutableFile); 64 Result := FileExistsUTF8(GetBinPath + DirectorySeparator + FPCSource.GetExecutableFile); 66 65 if Assigned(IDESource) then Result := Result and 67 66 FileExistsUTF8(GetPath + DirectorySeparator + IDESource.ProjectShortName + … … 78 77 procedure TInstance.Build; 79 78 begin 80 OperationProgressForm.Environment := 'path=' + MainForm.GetBinUtilsDir; 79 {$IFDEF Windows} 80 OperationProgressForm.Environment := 'PATH=' + MainForm.GetBinUtilsDir; 81 {$ENDIF} 81 82 OperationProgressForm.Path := GetPath + DirectorySeparator + FPCSource.ProjectShortName; 82 83 OperationProgressForm.CommandLine := 'make clean all PP="' + 83 MainForm.Get BinUtilsDir + DirectorySeparator + 'fpc"';84 MainForm.GetCompilerPath + '"'; 84 85 OperationProgressForm.ShowModal; 85 86 86 OperationProgressForm.Environment := 'path=' + MainForm.GetBinUtilsDir; 87 {$IFDEF Windows} 88 OperationProgressForm.Environment := 'PATH=' + MainForm.GetBinUtilsDir; 89 {$ENDIF} 87 90 OperationProgressForm.Path := GetPath + DirectorySeparator + FPCSource.ProjectShortName; 88 OperationProgressForm.CommandLine := 'make install PREFIX= "' +89 GetPath + DirectorySeparator + FPCSource.ProjectShortName + ' "' +90 ' PP= "' + MainForm.GetBinUtilsDir + DirectorySeparator + 'fpc"';91 OperationProgressForm.CommandLine := 'make install PREFIX=' + 92 GetPath + DirectorySeparator + FPCSource.ProjectShortName + '' + 93 ' PP=' + MainForm.GetCompilerPath + ''; 91 94 OperationProgressForm.ShowModal; 92 95 93 96 if Assigned(IDESource) then begin 94 OperationProgressForm.Environment := 'path=' + MainForm.GetBinUtilsDir; 97 {$IFDEF Windows} 98 OperationProgressForm.Environment := 'PATH=' + MainForm.GetBinUtilsDir; 99 {$ENDIF} 95 100 OperationProgressForm.Path := GetPath + DirectorySeparator + IDESource.ProjectShortName; 96 101 OperationProgressForm.CommandLine := … … 124 129 Config: TStringList; 125 130 ConfigFileName: string; 131 ConfigPath: string; 126 132 begin 127 ConfigFileName := GetPath + DirectorySeparator + IDESource.ProjectShortName + 128 DirectorySeparator + 'config' + DirectorySeparator + 'environmentoptions.xml'; 133 ConfigPath := GetPath + DirectorySeparator + IDESource.ProjectShortName + 134 DirectorySeparator + 'config'; 135 ForceDirectoriesUTF8(ConfigPath); 136 ConfigFileName := ConfigPath + DirectorySeparator + 'environmentoptions.xml'; 129 137 if not FileExistsUTF8(ConfigFileName) then 130 138 try … … 135 143 Config.Text := StringReplace(Config.Text, '%BaseDir%', MainForm.GetBaseDir, [rfReplaceAll]); 136 144 Config.Text := StringReplace(Config.Text, '%LazarusDir%', GetPath + DirectorySeparator + IDESource.ProjectShortName, [rfReplaceAll]); 137 Config.Text := StringReplace(Config.Text, '%FPCPlatform%', MainForm.Platform, [rfReplaceAll]); 138 Config.Text := StringReplace(Config.Text, '%Temp%', GetEnvironmentVariableUTF8('Temp'), [rfReplaceAll]); 145 Config.Text := StringReplace(Config.Text, '%FPCCompiler%', GetBinPath + DirectorySeparator + FPCSource.ExecutableFile, [rfReplaceAll]); 146 Config.Text := StringReplace(Config.Text, '%Make%', MainForm.GetBinUtilsDir + DirectorySeparator + 'make', [rfReplaceAll]); 147 {$IFDEF Windows} 148 Config.Text := StringReplace(Config.Text, '%Temp%', GetEnvironmentVariableUTF8('TEMP'), [rfReplaceAll]); 149 Config.Text := StringReplace(Config.Text, '%GDB%', MainForm.GetBinUtilsDir + DirectorySeparator + 'mingw\gdb.exe', [rfReplaceAll]); 150 {$ENDIF} 151 {$IFDEF Linux} 152 Config.Text := StringReplace(Config.Text, '%Temp%', '/tmp', [rfReplaceAll]); 153 Config.Text := StringReplace(Config.Text, '%GDB%', '/usr/bin/gdb', [rfReplaceAll]); 154 {$ENDIF} 139 155 Config.SaveToFile(ConfigFileName); 140 156 finally … … 153 169 Config.Text := StringReplace(Config.Text, '$(FPCDir)', GetPath + 154 170 DirectorySeparator + FPCSource.ProjectShortName, [rfReplaceAll]); 155 Config.SaveToFile(GetPath + DirectorySeparator + FPCSource.ProjectShortName + 156 DirectorySeparator + 'bin' + DirectorySeparator + 157 MainForm.Platform + DirectorySeparator + 'fpc.cfg'); 171 Config.SaveToFile(GetBinPath + DirectorySeparator + 'fpc.cfg'); 158 172 finally 159 173 Config.Free; … … 167 181 end; 168 182 183 function TInstance.GetBinPath: string; 184 begin 185 Result := GetPath + DirectorySeparator + FPCSource.ProjectShortName + 186 DirectorySeparator + 'bin'; 187 {$IFDEF Windows} 188 Result := Result + DirectorySeparator + MainForm.Platform; 189 {$ENDIF} 190 end; 191 169 192 end. 170 193 -
trunk/USource.pas
r6 r9 7 7 uses 8 8 Classes, SysUtils, Contnrs, FileUtil, Dialogs, Forms, 9 DOM, XMLWrite, XMLRead , HTTPSend;9 DOM, XMLWrite, XMLRead; 10 10 11 11 type
Note:
See TracChangeset
for help on using the changeset viewer.