Some more features and bug-fixes.

LongDirtyAnimAlf · Nov 23, 2016 · 9e0ec28 · 9e0ec28
1 parent 373d5b4
commit 9e0ec28
Show file tree

Hide file tree

Showing 14 changed files with 395 additions and 367 deletions.
diff --git a/chimp.png b/chimp.png
diff --git a/extrasettings.lfm b/extrasettings.lfm
diff --git a/extrasettings.pas b/extrasettings.pas
@@ -30,19 +30,16 @@   TCrossUtil = record
   TForm2 = class(TForm)
     BitBtn1: TBitBtn;
     BitBtn2: TBitBtn;
-    btnCygwin: TButton;
     btnSelectLibDir: TButton;
     btnSelectBinDir: TButton;
-    btnOSXCross: TButton;
-    CheckIncludeFPCIDE1: TCheckBox;
+    CheckIncludeFPCIDE: TCheckBox;
+    CheckIncludeHelp: TCheckBox;
     CheckIncludeLCL: TCheckBox;
     CheckUpdateOnly: TCheckBox;
     CheckRepo: TCheckBox;
     CheckPackageRepo: TCheckBox;
     ComboBoxOS: TComboBox;
     ComboBoxCPU: TComboBox;
-    EditOSXCrossLocation: TEdit;
-    EditCygwinLocation: TEdit;
     EditFPCbranch: TEdit;
     EditFPCrevision: TEdit;
     EditLazarusbranch: TEdit;
@@ -57,7 +54,6 @@   TForm2 = class(TForm)
     EditHTTPProxyPort: TEdit;
     EditHTTPProxyUser: TEdit;
     EditHTTPProxyPassword: TEdit;
-    GroupBox5: TGroupBox;
     GroupBoxFPCLazBranchRevision: TGroupBox;
     Label1: TLabel;
     Label2: TLabel;
@@ -71,7 +67,6 @@   TForm2 = class(TForm)
     RadioGroupNPLazarusbranch: TRadioGroup;
     RadioGroup3: TRadioGroup;
     SelectDirectoryDialog1: TSelectDirectoryDialog;
-    procedure OSXCrossSelect(Sender: TObject);
     procedure ComboBoxCPUOSChange(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
@@ -83,12 +78,11 @@   TForm2 = class(TForm)
     function GetPackageRepo:boolean;
     function GetUpdateOnly:boolean;
     function GetIncludeLCL:boolean;
+    function GetIncludeHelp:boolean;
     function GetHTTPProxyHost:string;
     function GetHTTPProxyPort:integer;
     function GetHTTPProxyUser:string;
     function GetHTTPProxyPass:string;
-    function GetCygwinLocation:string;
-    function GetOSXCrossLocation:string;
   public
     function GetLibraryDirectory(aCPU,aOS:string):string;
     function GetToolsDirectory(aCPU,aOS:string):string;
@@ -99,15 +93,12 @@   TForm2 = class(TForm)
     property UpdateOnly:boolean read GetUpdateOnly;
 
     property IncludeLCL:boolean read GetIncludeLCL;
+    property IncludeHelp:boolean read GetIncludeHelp;
 
     property HTTPProxyHost:string read GetHTTPProxyHost;
     property HTTPProxyPort:integer read GetHTTPProxyPort;
     property HTTPProxyUser:string read GetHTTPProxyUser;
     property HTTPProxyPass:string read GetHTTPProxyPass;
-
-    property CygwinLocation:string read GetCygwinLocation;
-    property OSXCrossLocation:string read GetOSXCrossLocation;
-
   end;
 
 var
@@ -166,6 +157,7 @@ procedure TForm2.FormCreate(Sender: TObject);
   try
     CheckRepo.Checked:=ReadBool('General','GetRepo',True);
     CheckPackageRepo.Checked:=ReadBool('General','GetPackageRepo',False);
+    CheckIncludeHelp.Checked:=ReadBool('General','IncludeHelp',True);
 
     CheckIncludeLCL.Checked:=ReadBool('Cross','IncludeLCL',False);
 
@@ -174,9 +166,6 @@ procedure TForm2.FormCreate(Sender: TObject);
     EditHTTPProxyUser.Text:=ReadString('ProxySettings','HTTPProxyUser','');
     EditHTTPProxyPassword.Text:=ReadString('ProxySettings','HTTPProxyPass','');
 
-    EditOSXCrossLocation.Text:=ReadString('OSXCross','OSXCrossLocation','');
-    EditCygwinLocation.Text:=ReadString('OSXCross','CygwinLocation','');
-
     for OS := Low(TOS) to High(TOS) do
     begin
       for CPU := Low(TCPU) to High(TCPU) do
@@ -209,17 +198,6 @@ procedure TForm2.ComboBoxCPUOSChange(Sender: TObject);
   end;
 end;
 
-procedure TForm2.OSXCrossSelect(Sender: TObject);
-begin
-  if Sender=btnOSXCross then SelectDirectoryDialog1.InitialDir:=EditOSXCrossLocation.Text;
-  if Sender=btnCygwin then SelectDirectoryDialog1.InitialDir:=EditCygwinLocation.Text;
-  if SelectDirectoryDialog1.Execute then
-  begin
-    if Sender=btnOSXCross then EditOSXCrossLocation.Text:=SelectDirectoryDialog1.FileName;
-    if Sender=btnCygwin then EditCygwinLocation.Text:=SelectDirectoryDialog1.FileName;
-  end;
-end;
-
 procedure TForm2.FormDestroy(Sender: TObject);
 var
   CPU:TCPU;
@@ -230,6 +208,7 @@ procedure TForm2.FormDestroy(Sender: TObject);
   try
     WriteBool('General','GetRepo',CheckRepo.Checked);
     WriteBool('General','GetPackageRepo',CheckPackageRepo.Checked);
+    WriteBool('General','IncludeHelp',CheckIncludeHelp.Checked);
 
     WriteBool('Cross','IncludeLCL',CheckIncludeLCL.Checked);
 
@@ -238,9 +217,6 @@ procedure TForm2.FormDestroy(Sender: TObject);
     WriteString('ProxySettings','HTTPProxyUser',EditHTTPProxyUser.Text);
     WriteString('ProxySettings','HTTPProxyPass',EditHTTPProxyPassword.Text);
 
-    WriteString('OSXCross','OSXCrossLocation',EditOSXCrossLocation.Text);
-    WriteString('OSXCross','CygwinLocation',EditCygwinLocation.Text);
-
     for OS := Low(TOS) to High(TOS) do
     begin
       for CPU := Low(TCPU) to High(TCPU) do
@@ -342,6 +318,11 @@ function TForm2.GetIncludeLCL:boolean;
   result:=CheckIncludeLCL.Checked;
 end;
 
+function TForm2.GetIncludeHelp:boolean;
+begin
+  result:=CheckIncludeHelp.Checked;
+end;
+
 function TForm2.GetHTTPProxyHost:string;
 begin
   result:=EditHTTPProxyHost.Text;
@@ -362,16 +343,5 @@ function TForm2.GetHTTPProxyPass:string;
   result:=EditHTTPProxyPassword.Text;
 end;
 
-function TForm2.GetCygwinLocation:string;
-begin
-  result:=EditCygwinLocation.Text;
-end;
-
-function TForm2.GetOSXCrossLocation:string;
-begin
-  result:=EditOSXCrossLocation.Text;
-end;
-
-
 end.
 
diff --git a/fpclazup.lpi b/fpclazup.lpi
@@ -36,7 +36,7 @@
           <Version Value="11"/>
           <PathDelim Value="\"/>
           <Target>
-            <Filename Value="bin\$(TargetCPU)-$(TargetOS)\fpclazup"/>
+            <Filename Value="bin\debug-$NameOnly($(ProjFile))-$(TargetCPU)-$(TargetOS)"/>
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
@@ -89,7 +89,7 @@ end;"/>
           <Version Value="11"/>
           <PathDelim Value="\"/>
           <Target>
-            <Filename Value="bin\$(TargetCPU)-$(TargetOS)\fpclazup"/>
+            <Filename Value="bin\$NameOnly($(ProjFile))-$(TargetCPU)-$(TargetOS)"/>
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
@@ -124,7 +124,7 @@ end;"/>
           <Version Value="11"/>
           <PathDelim Value="\"/>
           <Target>
-            <Filename Value="bin\$(TargetCPU)-$(TargetOS)\fpclazup64"/>
+            <Filename Value="bin\$NameOnly($(ProjFile))-$(TargetCPU)-$(TargetOS)"/>
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
@@ -160,7 +160,7 @@ end;"/>
           <Version Value="11"/>
           <PathDelim Value="\"/>
           <Target>
-            <Filename Value="bin\$(TargetCPU)-$(TargetOS)\fpclazup_linux_x86"/>
+            <Filename Value="bin\$NameOnly($(ProjFile))-$(TargetCPU)-$(TargetOS)"/>
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
@@ -199,7 +199,7 @@ end;"/>
           <Version Value="11"/>
           <PathDelim Value="\"/>
           <Target>
-            <Filename Value="bin\$(TargetCPU)-$(TargetOS)\fpclazup_linux_x64"/>
+            <Filename Value="bin\$NameOnly($(ProjFile))-$(TargetCPU)-$(TargetOS)"/>
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
@@ -238,7 +238,7 @@ end;"/>
           <Version Value="11"/>
           <PathDelim Value="\"/>
           <Target>
-            <Filename Value="bin\$(TargetCPU)-$(TargetOS)\fpclazup_linux_aarch64"/>
+            <Filename Value="bin\$NameOnly($(ProjFile))-$(TargetCPU)-$(TargetOS)"/>
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
@@ -497,7 +497,7 @@ end;"/>
     <Version Value="11"/>
     <PathDelim Value="\"/>
     <Target>
-      <Filename Value="bin\$(TargetCPU)-$(TargetOS)\fpclazup"/>
+      <Filename Value="bin\$NameOnly($(ProjFile))-$(TargetCPU)-$(TargetOS)"/>
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>

diff --git a/fpcup.ini b/fpcup.ini
@@ -19,7 +19,7 @@
 ; ... and you can define your own, like below:
 
 [fpcupinfo]
-inifileversion=1.0.0.4
+inifileversion=1.0.0.5
 
 [ALIASfpcURL]
 default=http://svn.freepascal.org/svn/fpc/tags/release_3_0_0
@@ -284,7 +284,7 @@ SVNURL=svn://svn.code.sf.net/p/lazarus-ccr/svn
 ;AddPackage23=$(Installdir)\components\chelper\chelper.lpk <<<<<<<<<< fpcup problem
 ;lclextensions is needed by vtv
 ;trunk version of lclextensions is needed by trunk vtv
-AddPackage24=$(Installdir)\components\lclextensions\lclextensions_package.lpk
+; AddPackage24=$(Installdir)\components\lclextensions\lclextensions_package.lpk
 AddPackage25=$(Installdir)\components\cmdline\cmdbox.lpk
 AddPackage26=$(Installdir)\components\colorpalette\lazcolorpalette.lpk
 ; At this moment, epiktimer does not compile, due to illegal characters in the lpk-files.
@@ -385,7 +385,8 @@ UnInstall=rm -Rf $(Installdir)
 Name=virtualtreeview
 Description="Virtual Treeview 4.8"
 Installdir=$(fpcdir)/../ccr/$(name)
-Requires=lclextensions
+; Requires=lclextensions
+Requires=luipack
 Enabled=0
 SVNURL=svn://svn.code.sf.net/p/lazarus-ccr/svn/components/virtualtreeview-new
 AddPackage=$(Installdir)/branches/4.8/virtualtreeview_package.lpk
@@ -397,14 +398,13 @@ UnInstall=rm -Rf $(Installdir)
 ; some room for extra (separate) lazarus-ccr modules
 
 [FPCUpModule18]
-Name=luipacknew
+Name=luipack
 Description="Extensive library and control set for Lazarus."
 Installdir=$(fpcdir)/../ccr/$(name)
 Enabled=0
-Requires=lclextensions
 GitURL=https://github.com/blikblum/luipack
 ArchiveURL=https://github.com/blikblum/luipack/archive/master.zip
-; AddPackage1=$(Installdir)/lclextensions/lclextensions_package.lpk
+AddPackage=$(Installdir)/lclextensions/lclextensions_package.lpk
 ; sqlite3 is needed for luicomponents !!
 ; AddPackage2=$(Installdir)/luicomponents/luicomponents.lpk
 ; AddPackage3=$(Installdir)/luicontrols/luicontrols.lpk
@@ -415,7 +415,8 @@ UnInstall=rm -Rf $(Installdir)
 Name=virtualtreeviewnew
 Description="New Virtual Treeview"
 Installdir=$(fpcdir)/../ccr/$(name)
-Requires=lclextensions
+; Requires=lclextensions
+Requires=luipack
 Enabled=0
 ; vtv trunk needs lclextensions trunk
 GITURL=https://github.com/blikblum/VirtualTreeView-Lazarus