mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-09-15 11:49:27 +02:00
* fixed "make install" for jvm targets
+ implemented top level "make (cross)zipinstall" for jvm targets
(mantis #23005)
git-svn-id: trunk@22493 -
This commit is contained in:
Jonas Maebe
parent
8258b99c70
commit
21e162604c
8
Makefile
8
Makefile
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/24]
|
||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/09/27]
|
||||
#
|
||||
default: help
|
||||
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 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 arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android
|
||||
@ -2618,9 +2618,11 @@ BUILDSTAMP=build-stamp.$(FULL_TARGET)
|
||||
ifeq ($(findstring $(CPU_TARGET),$(BuildOnlyBaseCPUs)),)
|
||||
all: build
|
||||
install: installall
|
||||
zipinstall: zipinstallall
|
||||
else
|
||||
all: buildbase
|
||||
install: installbase
|
||||
zipinstall: zipinstallbase
|
||||
endif
|
||||
clean: $(addsuffix _distclean,$(TARGET_DIRS))
|
||||
-$(DEL) build-stamp.*
|
||||
@ -2683,8 +2685,8 @@ installall: $(BUILDSTAMP)
|
||||
ifeq ($(findstring $(CPU_TARGET), $(BuildOnlyBaseCPUs)),)
|
||||
$(MAKE) installother $(INSTALLOPTS)
|
||||
endif
|
||||
singlezipinstall: zipinstall
|
||||
zipinstall: $(BUILDSTAMP)
|
||||
singlezipinstall: zipinstallall
|
||||
zipinstallall: $(BUILDSTAMP)
|
||||
$(MAKE) fpc_zipinstall ZIPTARGET=install FULLZIPNAME=fpc-$(PACKAGE_VERSION).$(TARGETSUFFIX) $(INSTALLOPTS)
|
||||
.PHONY: crossall crossinstall crosszipinstall crosssinglezipinstall
|
||||
crossall:
|
||||
|
||||
@ -236,9 +236,11 @@ BUILDSTAMP=build-stamp.$(FULL_TARGET)
|
||||
ifeq ($(findstring $(CPU_TARGET),$(BuildOnlyBaseCPUs)),)
|
||||
all: build
|
||||
install: installall
|
||||
zipinstall: zipinstallall
|
||||
else
|
||||
all: buildbase
|
||||
install: installbase
|
||||
zipinstall: zipinstallbase
|
||||
endif
|
||||
|
||||
clean: $(addsuffix _distclean,$(TARGET_DIRS))
|
||||
@ -320,8 +322,8 @@ ifeq ($(findstring $(CPU_TARGET), $(BuildOnlyBaseCPUs)),)
|
||||
$(MAKE) installother $(INSTALLOPTS)
|
||||
endif
|
||||
|
||||
singlezipinstall: zipinstall
|
||||
zipinstall: $(BUILDSTAMP)
|
||||
singlezipinstall: zipinstallall
|
||||
zipinstallall: $(BUILDSTAMP)
|
||||
$(MAKE) fpc_zipinstall ZIPTARGET=install FULLZIPNAME=fpc-$(PACKAGE_VERSION).$(TARGETSUFFIX) $(INSTALLOPTS)
|
||||
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25]
|
||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/09/27]
|
||||
#
|
||||
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 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 arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android
|
||||
@ -210,6 +210,14 @@ endif
|
||||
ifeq ($(OS_TARGET),linux)
|
||||
linuxHier=1
|
||||
endif
|
||||
ifndef CROSSCOMPILE
|
||||
BUILDFULLNATIVE=1
|
||||
export BUILDFULLNATIVE
|
||||
endif
|
||||
ifdef BUILDFULLNATIVE
|
||||
BUILDNATIVE=1
|
||||
export BUILDNATIVE
|
||||
endif
|
||||
export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
|
||||
ifdef FPCDIR
|
||||
override FPCDIR:=$(subst \,/,$(FPCDIR))
|
||||
@ -1662,17 +1670,12 @@ endif
|
||||
endif
|
||||
ifdef CREATESHARED
|
||||
override FPCOPT+=-Cg
|
||||
ifeq ($(CPU_TARGET),i386)
|
||||
override FPCOPT+=-Aas
|
||||
endif
|
||||
endif
|
||||
ifeq ($(findstring 2.0.,$(FPC_VERSION)),)
|
||||
ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),)
|
||||
ifeq ($(CPU_TARGET),x86_64)
|
||||
override FPCOPT+=-Cg
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
ifdef LINKSHARED
|
||||
endif
|
||||
ifdef OPT
|
||||
@ -2072,6 +2075,15 @@ ifneq ($(wildcard fpcmake.loc),)
|
||||
include fpcmake.loc
|
||||
endif
|
||||
.NOTPARALLEL:
|
||||
.PHONY: installclasses
|
||||
installclasses:
|
||||
$(MKDIRTREE) $(INSTALL_UNITDIR)/org/freepascal/rtl
|
||||
ifdef inUnix
|
||||
$(INSTALL) $(subst $$,\$$, $(wildcard $(UNITTARGETDIRPREFIX)/org/freepascal/rtl/*.class)) $(INSTALL_UNITDIR)/org/freepascal/rtl
|
||||
else
|
||||
$(INSTALL) $(wildcard $(UNITTARGETDIRPREFIX)/org/freepascal/rtl/*.class) $(INSTALL_UNITDIR)/org/freepascal/rtl
|
||||
endif
|
||||
fpc_install: installclasses
|
||||
include $(INC)/makefile.inc
|
||||
SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
|
||||
include $(PROCINC)/makefile.cpu
|
||||
|
||||
@ -43,6 +43,20 @@ SYSINIT_UNITS=
|
||||
|
||||
[rules]
|
||||
.NOTPARALLEL:
|
||||
|
||||
.PHONY: installclasses
|
||||
|
||||
installclasses:
|
||||
$(MKDIRTREE) $(INSTALL_UNITDIR)/org/freepascal/rtl
|
||||
ifdef inUnix
|
||||
$(INSTALL) $(subst $$,\$$, $(wildcard $(UNITTARGETDIRPREFIX)/org/freepascal/rtl/*.class)) $(INSTALL_UNITDIR)/org/freepascal/rtl
|
||||
else
|
||||
$(INSTALL) $(wildcard $(UNITTARGETDIRPREFIX)/org/freepascal/rtl/*.class) $(INSTALL_UNITDIR)/org/freepascal/rtl
|
||||
endif
|
||||
|
||||
fpc_install: installclasses
|
||||
|
||||
|
||||
# Get the system independent include file names.
|
||||
# This will set the following variables :
|
||||
# SYSINCNAMES
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25]
|
||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/09/27]
|
||||
#
|
||||
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 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 arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android
|
||||
@ -210,6 +210,14 @@ endif
|
||||
ifeq ($(OS_TARGET),linux)
|
||||
linuxHier=1
|
||||
endif
|
||||
ifndef CROSSCOMPILE
|
||||
BUILDFULLNATIVE=1
|
||||
export BUILDFULLNATIVE
|
||||
endif
|
||||
ifdef BUILDFULLNATIVE
|
||||
BUILDNATIVE=1
|
||||
export BUILDNATIVE
|
||||
endif
|
||||
export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
|
||||
ifdef FPCDIR
|
||||
override FPCDIR:=$(subst \,/,$(FPCDIR))
|
||||
@ -1666,17 +1674,12 @@ endif
|
||||
endif
|
||||
ifdef CREATESHARED
|
||||
override FPCOPT+=-Cg
|
||||
ifeq ($(CPU_TARGET),i386)
|
||||
override FPCOPT+=-Aas
|
||||
endif
|
||||
endif
|
||||
ifeq ($(findstring 2.0.,$(FPC_VERSION)),)
|
||||
ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),)
|
||||
ifeq ($(CPU_TARGET),x86_64)
|
||||
override FPCOPT+=-Cg
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
ifdef LINKSHARED
|
||||
endif
|
||||
ifdef OPT
|
||||
@ -2076,6 +2079,15 @@ ifneq ($(wildcard fpcmake.loc),)
|
||||
include fpcmake.loc
|
||||
endif
|
||||
.NOTPARALLEL:
|
||||
.PHONY: installclasses
|
||||
installclasses:
|
||||
$(MKDIRTREE) $(INSTALL_UNITDIR)/org/freepascal/rtl
|
||||
ifdef inUnix
|
||||
$(INSTALL) $(subst $$,\$$, $(wildcard $(UNITTARGETDIRPREFIX)/org/freepascal/rtl/*.class)) $(INSTALL_UNITDIR)/org/freepascal/rtl
|
||||
else
|
||||
$(INSTALL) $(wildcard $(UNITTARGETDIRPREFIX)/org/freepascal/rtl/*.class) $(INSTALL_UNITDIR)/org/freepascal/rtl
|
||||
endif
|
||||
fpc_install: installclasses
|
||||
include $(INC)/makefile.inc
|
||||
SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
|
||||
include $(PROCINC)/makefile.cpu
|
||||
|
||||
@ -48,6 +48,19 @@ GRAPHDIR=$(INC)/graph
|
||||
|
||||
[rules]
|
||||
.NOTPARALLEL:
|
||||
|
||||
.PHONY: installclasses
|
||||
|
||||
installclasses:
|
||||
$(MKDIRTREE) $(INSTALL_UNITDIR)/org/freepascal/rtl
|
||||
ifdef inUnix
|
||||
$(INSTALL) $(subst $$,\$$, $(wildcard $(UNITTARGETDIRPREFIX)/org/freepascal/rtl/*.class)) $(INSTALL_UNITDIR)/org/freepascal/rtl
|
||||
else
|
||||
$(INSTALL) $(wildcard $(UNITTARGETDIRPREFIX)/org/freepascal/rtl/*.class) $(INSTALL_UNITDIR)/org/freepascal/rtl
|
||||
endif
|
||||
|
||||
fpc_install: installclasses
|
||||
|
||||
# Get the system independent include file names.
|
||||
# This will set the following variables :
|
||||
# SYSINCNAMES
|
||||
|
||||
Loading…
Reference in New Issue
Block a user