fpc/installer/Makefile.fpc
pierre f0eedd5d71 Merge of revisions 39726 39732 39734 39735 39736 39801 39806 39807 40002 40014 40358 40363 40392 40397 40481 40537 from trunk to fixes_3_2
------------------------------------------------------------------------
r39726 | pierre | 2018-09-10 13:30:42 +0000 (Mon, 10 Sep 2018) | 1 line

 pass -D__I8086_SMARTLINK_SECTIONS__ to nasm if FPCOPT contains -dTEST_I8086_SMARTLINK_SECTIONS
------------------------------------------------------------------------
--- Merging r39726 into '.':
U    rtl/msdos/Makefile
U    rtl/msdos/Makefile.fpc
--- Recording mergeinfo for merge of r39726 into '.':
 U   .
------------------------------------------------------------------------
r39732 | pierre | 2018-09-11 08:02:48 +0000 (Tue, 11 Sep 2018) | 1 line

 Add FPC_SOFT_FPUX80 and FPC_SOFT_FPU128 define handling
------------------------------------------------------------------------
--- Merging r39732 into '.':
U    rtl/linux/system.pp
--- Recording mergeinfo for merge of r39732 into '.':
 G   .
------------------------------------------------------------------------
r39734 | pierre | 2018-09-11 13:08:51 +0000 (Tue, 11 Sep 2018) | 1 line

 Increase default trace size to 16
------------------------------------------------------------------------
--- Merging r39734 into '.':
U    rtl/inc/heaptrc.pp
--- Recording mergeinfo for merge of r39734 into '.':
 G   .
------------------------------------------------------------------------
r39735 | pierre | 2018-09-11 13:10:59 +0000 (Tue, 11 Sep 2018) | 1 line

 Avoid wrap on 32-bit system for StackTop calculation
------------------------------------------------------------------------
--- Merging r39735 into '.':
U    rtl/inc/system.inc
--- Recording mergeinfo for merge of r39735 into '.':
 G   .
------------------------------------------------------------------------
r39736 | pierre | 2018-09-11 13:13:50 +0000 (Tue, 11 Sep 2018) | 5 lines

  * Add PAGESIZE local constant.
  + Set LAST_PAGE_GENERATES_SIGNAL macro for linux powerpc/powerpc64.
  + Use page_size for StackBottom computation.
  + Use LAST_PAGE_GENERATES_SIGNAL in StackBottom computation.

------------------------------------------------------------------------
--- Merging r39736 into '.':
G    rtl/linux/system.pp
--- Recording mergeinfo for merge of r39736 into '.':
 G   .
------------------------------------------------------------------------
r39801 | pierre | 2018-09-24 22:20:30 +0000 (Mon, 24 Sep 2018) | 1 line

 define iconv_is_in_libc by default for netbsd OS (can be disabled by adding -dDISABLE_ICONV_LIBC option
------------------------------------------------------------------------
--- Merging r39801 into '.':
U    rtl/unix/cwstring.pp
--- Recording mergeinfo for merge of r39801 into '.':
 G   .
------------------------------------------------------------------------
r39806 | pierre | 2018-09-26 09:25:54 +0000 (Wed, 26 Sep 2018) | 1 line

 Rename Result parameter to _Result to avoid compilation error for ppcjvm
------------------------------------------------------------------------
--- Merging r39806 into '.':
U    packages/jni/src/jni.pas
--- Recording mergeinfo for merge of r39806 into '.':
 G   .
------------------------------------------------------------------------
r39807 | pierre | 2018-09-26 09:27:33 +0000 (Wed, 26 Sep 2018) | 1 line

 Explicitly also disable java OS target
------------------------------------------------------------------------
--- Merging r39807 into '.':
U    packages/sdl/fpmake.pp
--- Recording mergeinfo for merge of r39807 into '.':
 G   .
------------------------------------------------------------------------
r40002 | pierre | 2018-10-20 22:30:20 +0000 (Sat, 20 Oct 2018) | 1 line

 Add explicit typecast to avoid range ccheck error
------------------------------------------------------------------------
--- Merging r40002 into '.':
U    rtl/linux/termiosproc.inc
--- Recording mergeinfo for merge of r40002 into '.':
 G   .
------------------------------------------------------------------------
r40014 | pierre | 2018-10-22 21:14:59 +0000 (Mon, 22 Oct 2018) | 1 line

 Add missing unicode related units to netware OS
------------------------------------------------------------------------
--- Merging r40014 into '.':
U    rtl/netware/Makefile
U    rtl/netware/Makefile.fpc
--- Recording mergeinfo for merge of r40014 into '.':
 G   .
------------------------------------------------------------------------
r40358 | pierre | 2018-11-20 22:02:59 +0000 (Tue, 20 Nov 2018) | 1 line

 Add classes unit
------------------------------------------------------------------------
--- Merging r40358 into '.':
U    rtl/watcom/Makefile
U    rtl/watcom/Makefile.fpc
--- Recording mergeinfo for merge of r40358 into '.':
 G   .
------------------------------------------------------------------------
r40363 | pierre | 2018-11-23 13:29:01 +0000 (Fri, 23 Nov 2018) | 1 line

 Also disable fpdoc and pas2jni utils packages for targets not supporting fcl-process package
------------------------------------------------------------------------
--- Merging r40363 into '.':
U    utils/pas2jni/fpmake.pp
U    utils/fpdoc/fpmake.pp
--- Recording mergeinfo for merge of r40363 into '.':
 G   .
------------------------------------------------------------------------
r40392 | pierre | 2018-11-29 14:23:44 +0000 (Thu, 29 Nov 2018) | 1 line

 Fix delete of gdbver.inc generated file after gdbint unit compilation when called from packages level
------------------------------------------------------------------------
--- Merging r40392 into '.':
U    packages/gdbint/fpmake.pp
--- Recording mergeinfo for merge of r40392 into '.':
 G   .
------------------------------------------------------------------------
r40397 | pierre | 2018-11-29 16:55:07 +0000 (Thu, 29 Nov 2018) | 1 line

 Fix cleaning of unicode utils package in fpmake
------------------------------------------------------------------------
--- Merging r40397 into '.':
U    utils/unicode/fpmake.pp
--- Recording mergeinfo for merge of r40397 into '.':
 G   .
------------------------------------------------------------------------
r40481 | pierre | 2018-12-06 17:06:45 +0000 (Thu, 06 Dec 2018) | 1 line

 Fix compilation of installer for win32 target
------------------------------------------------------------------------
--- Merging r40481 into '.':
U    installer/Makefile
U    installer/Makefile.fpc
U    packages/ide/Makefile.fpc
U    packages/ide/Makefile
--- Recording mergeinfo for merge of r40481 into '.':
 G   .
------------------------------------------------------------------------
r40537 | pierre | 2018-12-13 10:21:58 +0000 (Thu, 13 Dec 2018) | 1 line

Always accept empty string as meaning zero is TryRomanToInt, fixes intermittent errors in tromantoint test
------------------------------------------------------------------------
--- Merging r40537 into '.':
U    packages/rtl-objpas/src/inc/strutils.pp
U    tests/test/units/strutils/tromantoint.pp
--- Recording mergeinfo for merge of r40537 into '.':
 G   .

git-svn-id: branches/fixes_3_2@40618 -
2018-12-23 14:44:32 +00:00

51 lines
818 B
Makefile

#
# Makefile.fpc for Free Pascal installer
#
[package]
name=installer
version=3.2.0-beta
[target]
programs_go32v2=install writeidx
programs_win32=install writeidx
programs_os2=install writeidx
programs_linux=installer writeidx
programs_freebsd=installer writeidx
[clean]
units=scroll insthelp
files_linux=installer.pas
files_freebsd=installer.pas
[require]
packages=rtl-console fv unzip rtl-extra ide
[compiler]
[install]
fpcpackage=y
[default]
fpcdir=..
[rules]
.NOTPARALLEL:
#
# FVision or old FV detection
#
ifneq ($(wildcard $(UNITDIR_FV)/fvconsts$(PPUEXT)),)
override COMPILER+=-dFVISION
endif
installer.pas: install.pas
$(COPY) install.pas installer.pas
install$(EXEEXT) : install.pas scroll.pas
installer$(EXEEXT) : installer.pas scroll.pas
writeidx$(EXEEXT) : writeidx.pas insthelp.pas