diff options
author | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2017-12-01 14:53:04 +0000 |
---|---|---|
committer | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2017-12-01 14:53:04 +0000 |
commit | 3d59714c56aba4730bb1fa3990b2dfff0d869d69 (patch) | |
tree | 3a218c6253ffba6e3bd683c4f0b409fdb37a261e /installer | |
parent | b04dbb3e1214c6d7dd527167afb79066e5ce739b (diff) | |
download | fpc-3d59714c56aba4730bb1fa3990b2dfff0d869d69.tar.gz |
* version updates to 3.0.5
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37640 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'installer')
-rw-r--r-- | installer/Makefile | 172 | ||||
-rw-r--r-- | installer/Makefile.fpc | 2 | ||||
-rw-r--r-- | installer/install.dat | 4 | ||||
-rw-r--r-- | installer/install.pas | 2 |
4 files changed, 9 insertions, 171 deletions
diff --git a/installer/Makefile b/installer/Makefile index 7068ce98a8..aab1c23c3a 100644 --- a/installer/Makefile +++ b/installer/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -184,12 +184,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -332,7 +326,7 @@ FPCFPMAKE=$(FPC) endif endif override PACKAGE_NAME=installer -override PACKAGE_VERSION=3.0.3 +override PACKAGE_VERSION=3.0.5 ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=installer writeidx endif @@ -381,9 +375,6 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=installer writeidx endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=installer writeidx -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=scroll insthelp endif @@ -543,12 +534,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override CLEAN_UNITS+=scroll insthelp endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override CLEAN_UNITS+=scroll insthelp -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override CLEAN_UNITS+=scroll insthelp -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override CLEAN_UNITS+=scroll insthelp endif @@ -579,9 +564,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override CLEAN_UNITS+=scroll insthelp endif -ifeq ($(FULL_TARGET),arm-aros) -override CLEAN_UNITS+=scroll insthelp -endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=scroll insthelp endif @@ -621,21 +603,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override CLEAN_UNITS+=scroll insthelp endif -ifeq ($(FULL_TARGET),i8086-embedded) -override CLEAN_UNITS+=scroll insthelp -endif ifeq ($(FULL_TARGET),i8086-msdos) override CLEAN_UNITS+=scroll insthelp endif -ifeq ($(FULL_TARGET),i8086-win16) -override CLEAN_UNITS+=scroll insthelp -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_UNITS+=scroll insthelp -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override CLEAN_UNITS+=scroll insthelp -endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=installer.pas endif @@ -675,9 +645,6 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_FILES+=installer.pas endif -ifeq ($(FULL_TARGET),aarch64-linux) -override CLEAN_FILES+=installer.pas -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=../ide @@ -838,12 +805,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_UNITDIR+=../ide endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_UNITDIR+=../ide -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_UNITDIR+=../ide -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_UNITDIR+=../ide endif @@ -874,9 +835,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_UNITDIR+=../ide endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_UNITDIR+=../ide -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITDIR+=../ide endif @@ -916,21 +874,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_UNITDIR+=../ide endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_UNITDIR+=../ide -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_UNITDIR+=../ide endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_UNITDIR+=../ide -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_UNITDIR+=../ide -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_UNITDIR+=../ide -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1326,21 +1272,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2232,30 +2163,6 @@ REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 REQUIRE_PACKAGES_RTL-EXTRA=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_RTL-CONSOLE=1 -REQUIRE_PACKAGES_FV=1 -REQUIRE_PACKAGES_UNZIP=1 -REQUIRE_PACKAGES_RTL-EXTRA=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_RTL-CONSOLE=1 -REQUIRE_PACKAGES_FV=1 -REQUIRE_PACKAGES_UNZIP=1 -REQUIRE_PACKAGES_RTL-EXTRA=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2376,18 +2283,6 @@ REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 REQUIRE_PACKAGES_RTL-EXTRA=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_RTL-CONSOLE=1 -REQUIRE_PACKAGES_FV=1 -REQUIRE_PACKAGES_UNZIP=1 -REQUIRE_PACKAGES_RTL-EXTRA=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2544,18 +2439,6 @@ REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 REQUIRE_PACKAGES_RTL-EXTRA=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_RTL-CONSOLE=1 -REQUIRE_PACKAGES_FV=1 -REQUIRE_PACKAGES_UNZIP=1 -REQUIRE_PACKAGES_RTL-EXTRA=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2568,42 +2451,6 @@ REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 REQUIRE_PACKAGES_RTL-EXTRA=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_RTL-CONSOLE=1 -REQUIRE_PACKAGES_FV=1 -REQUIRE_PACKAGES_UNZIP=1 -REQUIRE_PACKAGES_RTL-EXTRA=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_RTL-CONSOLE=1 -REQUIRE_PACKAGES_FV=1 -REQUIRE_PACKAGES_UNZIP=1 -REQUIRE_PACKAGES_RTL-EXTRA=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL-PROCESS=1 -REQUIRE_PACKAGES_HASH=1 -REQUIRE_PACKAGES_LIBTAR=1 -REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_RTL-CONSOLE=1 -REQUIRE_PACKAGES_FV=1 -REQUIRE_PACKAGES_UNZIP=1 -REQUIRE_PACKAGES_RTL-EXTRA=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2996,7 +2843,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3009,7 +2855,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3109,9 +2954,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3303,7 +3145,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3475,10 +3317,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo diff --git a/installer/Makefile.fpc b/installer/Makefile.fpc index 033f2ef20a..c05d2b2edd 100644 --- a/installer/Makefile.fpc +++ b/installer/Makefile.fpc @@ -4,7 +4,7 @@ [package] name=installer -version=3.0.3 +version=3.0.5 [target] programs_go32v2=install writeidx diff --git a/installer/install.dat b/installer/install.dat index e9dea35267..d196997693 100644 --- a/installer/install.dat +++ b/installer/install.dat @@ -6,8 +6,8 @@ # Warning: no package should contain more than 31 files (32-bit version # of TV/FV cannot hold more than 31 members of a checkbox group) -title=Free Pascal Compiler 3.0.3 -version=3.0.3 +title=Free Pascal Compiler 3.0.5 +version=3.0.5 # # General diff --git a/installer/install.pas b/installer/install.pas index fcae800190..cec9d2863e 100644 --- a/installer/install.pas +++ b/installer/install.pas @@ -93,7 +93,7 @@ program install; WHTMLScn,insthelp; const - installerversion='3.0.3'; + installerversion='3.0.5'; installercopyright='Copyright (c) 1993-2017 Florian Klaempfl'; |