Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Setup for BrewBuddy on macOS (Darwin) #53

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
Open

Setup for BrewBuddy on macOS (Darwin) #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ead4580
Setup for BrewBuddy on Darwin
roed Dec 26, 2018
7b5bcbe
Removed backup directories
roed Dec 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Darwin-copy-resources-to-bundle.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh

appfolder=BrewBuddy.app
cp -R ./Misc/Standaard\ databanken/* Output/$appfolder/Contents/Resources/
cp ./Misc/Handleiding/Introductie\ BrouwHulp\ Sassy\ Saison.pdf Output/$appfolder/Contents/Resources/Introductie\ BrewBuddy\ Sassy\ Saison.pdf
Binary file added Source/3rdParty/fann/usr/local/lib/libdoublefann.2.2.0.dylib
View file
Open in desktop
Binary file not shown.
Binary file added Source/3rdParty/fann/usr/local/lib/libfann.2.2.0.dylib
View file
Open in desktop
Binary file not shown.
Binary file added Source/3rdParty/fann/usr/local/lib/libfixedfann.2.2.0.dylib
View file
Open in desktop
Binary file not shown.
Binary file added Source/3rdParty/fann/usr/local/lib/libfloatfann.2.2.0.dylib
View file
Open in desktop
Binary file not shown.
7 changes: 6 additions & 1 deletion Source/Units/bh_report.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,8 +934,9 @@ procedure TBHRElement.SetTop(t : word);
BRect.Left:= 0;
BRect.Bottom:= SRect.Bottom - SRect.Top;
BRect.Right:= SRect.Right - SRect.Left;

{$ifndef Darwin}
OTFH:= FChart.AxisList[0].Title.Font.Size;
{$endif}
OMFH:= FChart.AxisList[0].Marks.LabelFont.Size;
OTL:= FChart.AxisList[0].TickLength;
OLFH:= FChart.Legend.Font.Size;
Expand All @@ -946,7 +947,9 @@ procedure TBHRElement.SetTop(t : word);
for i:= 0 to FChart.AxisList.Count - 1 do
begin
FChart.AxisList[i].Marks.LabelFont.Size:= round(GSc * 9);
{$ifndef Darwin}
FChart.AxisList[i].Title.Font.Size:= round(GSC * 9);
{$endif}
FChart.AxisList[i].TickLength:= round(GSc * OTL);
end;
FChart.Legend.Font.Size:= round(GSc * 9);
Expand All @@ -962,7 +965,9 @@ procedure TBHRElement.SetTop(t : word);
for i:= 0 to FChart.AxisList.Count - 1 do
begin
FChart.AxisList[i].Marks.LabelFont.Size:= OMFH;
{$ifndef Darwin}
FChart.AxisList[i].Title.Font.Size:= OTFH;
{$endif}
FChart.AxisList[i].TickLength:= OTL;
end;
FChart.Legend.Font.Size:= OLFH;
Expand Down
14 changes: 7 additions & 7 deletions Source/Units/containers.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3059,11 +3059,11 @@ TStyleLetters = record
end;
var sourcedata, destdata, sourcesounds, destsounds : string;
begin
{$ifdef UNIX}
{$ifdef linux}
sourcedata:= '/usr/share/brewbuddy/';
{$endif}
{$ifdef darwin}
sourcedata:= '/usr/share/brewbuddy/';
sourcedata:= ProgramDirectory() + 'BrewBuddy.app/Contents/Resources/';
{$endif}
{$ifdef Windows}
sourcedata:= ExtractFilePath(Application.ExeName) + 'brewbuddy\';
Expand Down Expand Up @@ -3116,9 +3116,9 @@ TStyleLetters = record
CheckFile(sourcedata, destdata, 'Introductie BrewBuddy Sassy Saison.pdf');
{$endif}
{$ifdef Darwin}
CheckFile('/usr/share/doc/brewbuddy/', destdata, 'Introductie BrewBuddy Sassy Saison.pdf');
CheckFile(sourcedata, destdata, 'Introductie BrewBuddy Sassy Saison.pdf');
{$endif}
{$ifdef Unix}
{$ifdef linux}
CheckFile('/usr/share/doc/brewbuddy/', destdata, 'Introductie BrewBuddy Sassy Saison.pdf');
{$endif}
CheckFile(sourcesounds, destsounds, 'alarm.wav');
Expand Down Expand Up @@ -3232,11 +3232,11 @@ TStyleLetters = record
end
else //copy previous database to new location, but clear brews
begin
{$ifdef UNIX}
{$ifdef linux}
sourcedata:= '/usr/share/brewbuddy/';
{$endif}
{$ifdef darwin}
sourcedata:= '/usr/share/brewbuddy/';
sourcedata:= '/usr/local/share/brewbuddy/';
{$endif}
{$ifdef Windows}
sourcedata:= ExtractFilePath(Application.ExeName) + 'brewbuddy\';
Expand Down Expand Up @@ -3353,7 +3353,7 @@ TStyleLetters = record
ExecFolder:= Application.Location;
log('ExecFolder = ' + ExecFolder);
OnUSB:= false;
{$ifdef UNIX}
{$ifdef linux}
{DriveLetter:= LeftStr(ExecFolder, 6);
if DriveLetter = '/media' then
begin
Expand Down
Loading