mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-16 01:39:27 +02:00
* Package fcl-web switched to fpmake building
git-svn-id: trunk@17658 -
This commit is contained in:
parent
69e7d8b02f
commit
e94da0b495
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -2351,7 +2351,7 @@ packages/fcl-stl/tests/suiteconfig.pp svneol=native#text/plain
|
||||
packages/fcl-stl/tests/testrunner.pp svneol=native#text/plain
|
||||
packages/fcl-web/Makefile svneol=native#text/plain
|
||||
packages/fcl-web/Makefile.fpc svneol=native#text/plain
|
||||
packages/fcl-web/Makefile.fpm svneol=native#text/plain
|
||||
packages/fcl-web/Makefile.fpc.fpcmake svneol=native#text/plain
|
||||
packages/fcl-web/examples/combined/combined.html svneol=native#text/plain
|
||||
packages/fcl-web/examples/combined/combined.ico -text
|
||||
packages/fcl-web/examples/combined/combined.ini svneol=native#text/plain
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -6,14 +6,8 @@
|
||||
name=fcl-web
|
||||
version=2.5.1
|
||||
|
||||
[target]
|
||||
dirs=src/base src/webdata src/jsonrpc
|
||||
|
||||
[require]
|
||||
packages=fcl-base fcl-xml fcl-db fcl-json fcl-net fcl-process
|
||||
|
||||
[compiler]
|
||||
options=-S2h
|
||||
packages=rtl fpmkunit
|
||||
|
||||
[install]
|
||||
fpcpackage=y
|
||||
@ -21,10 +15,44 @@ fpcpackage=y
|
||||
[default]
|
||||
fpcdir=../..
|
||||
|
||||
[prerules]
|
||||
# If no fpmake exists and clean is called, do not try to build fpmake, it will
|
||||
# most often fail because the dependencies are cleared. So simply skip the
|
||||
# clean by replacing the command with 'echo'
|
||||
FPMAKE_BIN_CLEAN=$(wildcard ./fpmake$(SRCEXEEXT))
|
||||
ifeq ($(FPMAKE_BIN_CLEAN),)
|
||||
FPMAKE_BIN_CLEAN=$(ECHO)
|
||||
endif
|
||||
ifdef OS_TARGET
|
||||
FPC_TARGETOPT+=--os=$(OS_TARGET)
|
||||
endif
|
||||
ifdef CPU_TARGET
|
||||
FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
|
||||
endif
|
||||
LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
|
||||
|
||||
[rules]
|
||||
.NOTPARALLEL:
|
||||
distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
|
||||
clean: $(addsuffix _clean,$(TARGET_DIRS)) fpc_clean
|
||||
cleanall: $(addsuffix _cleanall,$(TARGET_DIRS)) fpc_cleanall
|
||||
|
||||
fpmake: fpmake.pp
|
||||
$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR))
|
||||
all: fpmake
|
||||
$(LOCALFPMAKE) build --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
|
||||
smart: fpmake
|
||||
$(LOCALFPMAKE) build --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o "-XX -CX"
|
||||
release: fpmake
|
||||
$(LOCALFPMAKE) build --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o "-dRELEASE"
|
||||
debug: fpmake
|
||||
$(LOCALFPMAKE) build --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o "-dDEBUG"
|
||||
clean:
|
||||
$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
|
||||
install: fpmake
|
||||
ifdef UNIXHier
|
||||
$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX)
|
||||
else
|
||||
$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)
|
||||
endif
|
||||
|
||||
# Normally distinstall also installs the examples, but in this case there are
|
||||
# none.
|
||||
distinstall: install
|
||||
distclean: clean
|
||||
-$(DEL) $(LOCALFPMAKE)
|
||||
|
30
packages/fcl-web/Makefile.fpc.fpcmake
Normal file
30
packages/fcl-web/Makefile.fpc.fpcmake
Normal file
@ -0,0 +1,30 @@
|
||||
#
|
||||
# Makefile.fpc for TDataSet for FCL
|
||||
#
|
||||
|
||||
[package]
|
||||
name=fcl-web
|
||||
version=2.5.1
|
||||
|
||||
[target]
|
||||
dirs=src/base src/webdata src/jsonrpc
|
||||
|
||||
[require]
|
||||
packages=fcl-base fcl-xml fcl-db fcl-json fcl-net fcl-process
|
||||
|
||||
[compiler]
|
||||
options=-S2h
|
||||
|
||||
[install]
|
||||
fpcpackage=y
|
||||
|
||||
[default]
|
||||
fpcdir=../..
|
||||
|
||||
[rules]
|
||||
.NOTPARALLEL:
|
||||
distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
|
||||
clean: $(addsuffix _clean,$(TARGET_DIRS)) fpc_clean
|
||||
cleanall: $(addsuffix _cleanall,$(TARGET_DIRS)) fpc_cleanall
|
||||
|
||||
|
@ -1,58 +0,0 @@
|
||||
#
|
||||
# Makefile.fpc for TDataSet for FCL
|
||||
#
|
||||
|
||||
[package]
|
||||
name=fcl-web
|
||||
version=2.5.1
|
||||
|
||||
[require]
|
||||
packages=rtl fpmkunit
|
||||
|
||||
[install]
|
||||
fpcpackage=y
|
||||
|
||||
[default]
|
||||
fpcdir=../..
|
||||
|
||||
[prerules]
|
||||
# If no fpmake exists and clean is called, do not try to build fpmake, it will
|
||||
# most often fail because the dependencies are cleared. So simply skip the
|
||||
# clean by replacing the command with 'echo'
|
||||
FPMAKE_BIN_CLEAN=$(wildcard ./fpmake$(SRCEXEEXT))
|
||||
ifeq ($(FPMAKE_BIN_CLEAN),)
|
||||
FPMAKE_BIN_CLEAN=$(ECHO)
|
||||
endif
|
||||
ifdef OS_TARGET
|
||||
FPC_TARGETOPT+=--os=$(OS_TARGET)
|
||||
endif
|
||||
ifdef CPU_TARGET
|
||||
FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
|
||||
endif
|
||||
LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
|
||||
|
||||
[rules]
|
||||
fpmake: fpmake.pp
|
||||
$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR))
|
||||
all: fpmake
|
||||
$(LOCALFPMAKE) build --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
|
||||
smart: fpmake
|
||||
$(LOCALFPMAKE) build --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o "-XX -CX"
|
||||
release: fpmake
|
||||
$(LOCALFPMAKE) build --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o "-dRELEASE"
|
||||
debug: fpmake
|
||||
$(LOCALFPMAKE) build --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o "-dDEBUG"
|
||||
clean:
|
||||
$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
|
||||
install: fpmake
|
||||
ifdef UNIXHier
|
||||
$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX)
|
||||
else
|
||||
$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)
|
||||
endif
|
||||
|
||||
# Normally distinstall also installs the examples, but in this case there are
|
||||
# none.
|
||||
distinstall: install
|
||||
distclean: clean
|
||||
-$(DEL) $(LOCALFPMAKE)
|
Loading…
Reference in New Issue
Block a user