Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 16 additions & 1 deletion .github/workflows/make.pas
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ TMakeRunner = class
function ExtractBinaryFromBuildLog(const AOutput, AFallback: string): string;
function IsGUIProject(const ALpiPath: string): Boolean;
function IsTestProject(const ALpiPath: string): Boolean;
function IsLibraryProject(const ALpiPath: string): Boolean;
procedure RunTestProject(const APath: string);
procedure RunSampleProject(const APath: string);
procedure InitSslForDownloads;
Expand Down Expand Up @@ -2024,7 +2025,7 @@ function TMakeRunner.CollectProjectRequiredNames: TStringList;
try
for Each in List do
begin
if IsGUIProject(Each) then
if IsGUIProject(Each) or IsLibraryProject(Each) then
Continue;
Proj := TLpiProject.CreateFromFile(Each, FTargetCpu, FTargetOs);
try
Expand Down Expand Up @@ -2204,6 +2205,14 @@ function TMakeRunner.IsTestProject(const ALpiPath: string): Boolean;
Result := Pos('consoletestrunner', Content) > 0;
end;

function TMakeRunner.IsLibraryProject(const ALpiPath: string): Boolean;
begin
Result := False;
if not FileExists(ALpiPath) then
Exit;
Result := Pos('<ExecutableType Value="Library"/>', TLazXml.ReadFile(ALpiPath)) > 0;
end;

procedure TMakeRunner.RunTestProject(const APath: string);
var
BinaryPath: string;
Expand Down Expand Up @@ -2275,6 +2284,12 @@ procedure TMakeRunner.BuildAllProjects;
Continue;
end;

if IsLibraryProject(Each) then
begin
Log(CSI_Yellow, 'skip library project ' + Each);
Continue;
end;

if IsTestProject(Each) then
RunTestProject(Each)
else
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
*.dcp
*.so
*.apk
SimpleBaseLib.Tests/FreePascal.Tests/Mobile/Android/build/
*.drc
*.map
*.dres
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- BuildApk.java fills in @PACKAGE@ and @LABEL@ for the library being packaged -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="@PACKAGE@">

<uses-permission android:name="android.permission.INTERNET" />

<application
android:allowBackup="false"
android:label="@LABEL@"
android:theme="@android:style/Theme.DeviceDefault.NoActionBar"
android:usesCleartextTraffic="true">
<activity
android:name="org.fpctests.host.MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>
Loading
Loading