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.

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

enhanced examples compilation #69

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
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
3 changes: 3 additions & 0 deletions examples/apps/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*/bin
*/units
*/exe
10 changes: 10 additions & 0 deletions examples/apps/charpalette/extrafpc.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
-FEbin/
-Fu../../../lib/$fpctarget
-Fi.
-Xs
-XX
-CX
#ifdef mswindows
-WG
#endif

12 changes: 12 additions & 0 deletions examples/apps/compileall.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
@ECHO OFF

SET FPC=fpc

FOR /D %%D IN (*) DO (
Pushd %%D
ECHO doing %%D in %%D.lpr
If NOT EXIST bin MKDIR bin
%FPC% "@extrafpc.cfg" %%D.lpr
ECHO ###############################################################################
Popd
)
6 changes: 3 additions & 3 deletions examples/apps/compileall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ do
LPRNAME=`basename $PROJECT .lpr`
echo Doing $LPRNAME in $DIR
cd $DIR
if [ ! -d units ]; then
echo 'Missing units dir'
mkdir units
if [ ! -d bin ]; then
echo 'Missing bin dir'
mkdir bin
fi
$FPC @extrafpc.cfg $PROJECT;
cd ..
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/debugserver/extrafpc.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-FUunits
-FEbin/
-Fu../../../lib/$fpctarget
-Fi.
-Xs
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/docedit/docedit.lpi
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<Filename Value="docedit"/>
</Target>
<SearchPaths>
<UnitOutputDirectory Value="units"/>
<UnitOutputDirectory Value="bin"/>
</SearchPaths>
<Parsing>
<SyntaxOptions>
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/docedit/extrafpc.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-FUunits
-FEbin/
-Fu../../../lib/$fpctarget
-Xs
-XX
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/globe/extrafpc.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-FUunits
-FEbin/
-Fu../../../lib/$fpctarget
-Fi.
-Xs
Expand Down
Empty file.
11 changes: 11 additions & 0 deletions examples/apps/guitestrunner/extrafpc.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
-FEbin/
-Fu../../../lib/$fpctarget
-Fi.
-Fiimages
-Xs
-XX
-CX
#ifdef mswindows
-WG
#endif

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<CONFIG>
<Package Version="3">
<Name Value="guitestrunner_fpgui"/>
<Name Value="guitestrunner"/>
<Author Value="Graeme Geldenhuys"/>
<CompilerOptions>
<Version Value="5"/>
Expand All @@ -21,7 +21,7 @@
<Version Minor="1"/>
<Files Count="2">
<Item1>
<Filename Value="fpg_guitestrunner.pas"/>
<Filename Value="fpg_guitestrunner.lpr"/>
<UnitName Value="fpg_GuiTestRunner"/>
</Item1>
<Item2>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
This source is only used to compile and install the package.
}

unit guitestrunner_fpgui;
unit guitestrunner;

interface

Expand Down
10 changes: 10 additions & 0 deletions examples/apps/hexviewer/extrafpc.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
-FEbin/
-Fu../../../lib/$fpctarget
-Fi.
-Xs
-XX
-CX
#ifdef mswindows
-WG
#endif

2 changes: 1 addition & 1 deletion examples/apps/ide/src/extrafpc.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-FUunits/$fpctarget
-FEbin/$fpctarget
-Fu../../../../lib/$fpctarget
-Fi.
#ifdef mswindows
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/ide/src/maximus.lpi
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
</Target>
<SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/>
<UnitOutputDirectory Value="units/$(TargetCPU)-$(TargetOS)"/>
<UnitOutputDirectory Value="bin/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<Parsing>
<SyntaxOptions>
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/nanoedit/extrafpc.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-FUunits
-FEbin/
-Fu../../../lib/$fpctarget
-Fu../ide/src/
-Xs
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/nanoedit/nanoedit.lpi
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</SyntaxOptions>
</Parsing>
<Other>
<CustomOptions Value="-FUunits"/>
<CustomOptions Value="-FEbin"/>
</Other>
</CompilerOptions>
</CONFIG>
3 changes: 3 additions & 0 deletions examples/corelib/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*/bin
*/units
*/exe
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</Flags>
<SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<Title Value="agg_canvas_test"/>
<Title Value="aggcanvas"/>
</General>
<VersionInfo>
<StringTable ProductVersion=""/>
Expand All @@ -36,19 +36,19 @@
</RequiredPackages>
<Units Count="1">
<Unit0>
<Filename Value="agg_canvas_test.lpr"/>
<Filename Value="aggcanvas.lpr"/>
<IsPartOfProject Value="True"/>
<UnitName Value="agg_canvas_test"/>
<UnitName Value="aggcanvas"/>
</Unit0>
</Units>
</ProjectOptions>
<CompilerOptions>
<Version Value="11"/>
<Target>
<Filename Value="agg_canvas_test"/>
<Filename Value="aggcanvas"/>
</Target>
<SearchPaths>
<UnitOutputDirectory Value="units"/>
<UnitOutputDirectory Value="bin"/>
</SearchPaths>
<Parsing>
<SyntaxOptions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
the AggCanvas compiler define enabled.
}

program agg_canvas_test;
program aggcanvas;

{$mode objfpc}{$H+}

Expand Down
2 changes: 1 addition & 1 deletion examples/corelib/aggcanvas/extrafpc.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-FUunits
-FEbin/
-Fu../../../lib/$fpctarget
-Xs
-XX
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@
<LinkSmart Value="True"/>
</Linking>
<Other>
<CustomOptions Value="-FUunits
"/>
<CustomOptions Value="-FEbin"/>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-FUunits
-FEbin/
-Fu../../../lib/$fpctarget
-Xs
-XX
Expand Down
1 change: 0 additions & 1 deletion examples/corelib/canvastest/units/.gitignore

This file was deleted.

12 changes: 12 additions & 0 deletions examples/corelib/compileall.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
@ECHO OFF

SET FPC=fpc

FOR /D %%D IN (*) DO (
Pushd %%D
ECHO doing %%D in %%D.lpr
If NOT EXIST bin MKDIR bin
%FPC% "@extrafpc.cfg" %%D.lpr
ECHO ###############################################################################
Popd
)
6 changes: 3 additions & 3 deletions examples/corelib/compileall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ do
LPRNAME=`basename $PROJECT .lpr`
echo Doing $LPRNAME in $DIR
cd $DIR
if [ ! -d units ]; then
echo 'Missing units dir'
mkdir units
if [ ! -d bin ]; then
echo 'Missing bin dir'
mkdir bin
fi
$FPC @extrafpc.cfg $PROJECT;
cd ..
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@
<LinkSmart Value="True"/>
</Linking>
<Other>
<CustomOptions Value="-FUunits
"/>
<CustomOptions Value="-FEbin"/>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-FUunits
-FEbin/
-Fu../../../lib/$fpctarget
-Xs
-XX
Expand Down
1 change: 0 additions & 1 deletion examples/corelib/eventtest/units/.gitignore

This file was deleted.

2 changes: 1 addition & 1 deletion examples/corelib/helloworld/extrafpc.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-FUunits
-FEbin/
-Fu../../../lib/$fpctarget
-Xs
-XX
Expand Down
2 changes: 1 addition & 1 deletion examples/corelib/helloworld/helloworld.lpi
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<CompilerOptions>
<Version Value="8"/>
<Other>
<CustomOptions Value="-FUunits"/>
<CustomOptions Value="-FEbin"/>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>
Expand Down
1 change: 0 additions & 1 deletion examples/corelib/helloworld/units/.gitignore

This file was deleted.

3 changes: 3 additions & 0 deletions examples/gui/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*/bin
*/units
*/exe
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,20 @@
</RequiredPackages>
<Units Count="1">
<Unit0>
<Filename Value="aligntest.lpr"/>
<Filename Value="alignement.lpr"/>
<IsPartOfProject Value="True"/>
</Unit0>
</Units>
</ProjectOptions>
<CompilerOptions>
<Version Value="11"/>
<Target>
<Filename Value="aligntest"/>
<Filename Value="alignement"/>
</Target>
<SearchPaths>
<IncludeFiles Value="../src"/>
<OtherUnitFiles Value="../src"/>
<UnitOutputDirectory Value="units"/>
<UnitOutputDirectory Value="bin"/>
</SearchPaths>
<Parsing>
<SyntaxOptions>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
program aligntest;
program alignement;

{$mode objfpc}{$H+}

Expand Down
2 changes: 1 addition & 1 deletion examples/gui/alignment/extrafpc.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-FUunits
-FEbin/
-Fu../../../lib/$fpctarget
-Xs
-XX
Expand Down
1 change: 0 additions & 1 deletion examples/gui/alignment/units/.gitignore

This file was deleted.

2 changes: 1 addition & 1 deletion examples/gui/alignment_resize/alignment_resize.lpi
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<Filename Value="alignment_resize"/>
</Target>
<SearchPaths>
<UnitOutputDirectory Value="units"/>
<UnitOutputDirectory Value="bin"/>
</SearchPaths>
<Parsing>
<SyntaxOptions>
Expand Down
2 changes: 1 addition & 1 deletion examples/gui/alignment_resize/extrafpc.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-FUunits
-FEbin/
-Fu../../../lib/$fpctarget
-Xs
-XX
Expand Down
1 change: 0 additions & 1 deletion examples/gui/alignment_resize/units/.gitignore

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@
</RequiredPackages>
<Units Count="1">
<Unit0>
<Filename Value="anim_test.lpr"/>
<Filename Value="animation.lpr"/>
<IsPartOfProject Value="True"/>
<UnitName Value="anim_test"/>
<UnitName Value="animation"/>
</Unit0>
</Units>
</ProjectOptions>
<CompilerOptions>
<Version Value="11"/>
<Target>
<Filename Value="anim_test"/>
<Filename Value="animation"/>
</Target>
<SearchPaths>
<UnitOutputDirectory Value="units"/>
<UnitOutputDirectory Value="bin"/>
</SearchPaths>
<Parsing>
<SyntaxOptions>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
program anim_test;
program animation;

{$mode objfpc}{$H+}

Expand Down
2 changes: 1 addition & 1 deletion examples/gui/animation/extrafpc.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-FUunits
-FEbin/
-Fu../../../lib/$fpctarget
-Xs
-XX
Expand Down
1 change: 0 additions & 1 deletion examples/gui/animation/units/.gitignore

This file was deleted.

Loading