* Created a new package for the libtar unit, which was moved in r24287

git-svn-id: trunk@24312 -
This commit is contained in:
joost 2013-04-23 20:02:29 +00:00
parent 61ac7580b7
commit 6c1ea83c5a
8 changed files with 2344 additions and 2 deletions

5
.gitattributes vendored
View File

@ -5253,6 +5253,10 @@ packages/libsee/examples/tlibsee.pp svneol=native#text/plain
packages/libsee/fpmake.pp svneol=native#text/plain
packages/libsee/src/libsee.pas svneol=native#text/plain
packages/libsee/src/libseewrap.c svneol=native#text/plain
packages/libtar/Makefile svneol=native#text/plain
packages/libtar/Makefile.fpc svneol=native#text/plain
packages/libtar/fpmake.pp svneol=native#text/plain
packages/libtar/src/libtar.pp svneol=native#text/plain
packages/libvlc/Makefile svneol=native#text/plain
packages/libvlc/Makefile.fpc svneol=native#text/plain
packages/libvlc/example/testvlc.lpi svneol=native#text/plain
@ -5997,7 +6001,6 @@ packages/paszlib/src/infcodes.pas svneol=native#text/plain
packages/paszlib/src/inffast.pas svneol=native#text/plain
packages/paszlib/src/inftrees.pas svneol=native#text/plain
packages/paszlib/src/infutil.pas svneol=native#text/plain
packages/paszlib/src/libtar.pp svneol=native#text/plain
packages/paszlib/src/paszlib.pas svneol=native#text/plain
packages/paszlib/src/trees.pas svneol=native#text/plain
packages/paszlib/src/unzip.pas svneol=native#text/plain

View File

@ -63,6 +63,7 @@
add_libpng;
add_librsvg;
add_libsee;
add_libtar;
add_libvlc;
add_libxml;
add_lua;

View File

@ -368,6 +368,12 @@ begin
{$include libsee/fpmake.pp}
end;
procedure add_libtar;
begin
with Installer do
{$include libtar/fpmake.pp}
end;
procedure add_libvlc;
begin
with Installer do

2209
packages/libtar/Makefile Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,89 @@
#
# Makefile.fpc for running fpmake
#
[package]
name=libtar
version=2.7.1
[require]
packages=rtl fpmkunit
[install]
fpcpackage=y
[default]
fpcdir=../..
[prerules]
FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT))
ifdef OS_TARGET
FPC_TARGETOPT+=--os=$(OS_TARGET)
endif
ifdef CPU_TARGET
FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
endif
LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
[rules]
# Do not pass the Makefile's unit and binary target locations. fpmake uses it's own.
override FPCOPT:=$(filter-out -FU%,$(FPCOPT))
override FPCOPT:=$(filter-out -FE%,$(FPCOPT))
# Compose general fpmake-parameters
ifdef FPMAKEOPT
FPMAKE_OPT+=$(FPMAKEOPT)
endif
FPMAKE_OPT+=--localunitdir=../..
FPMAKE_OPT+=--globalunitdir=..
FPMAKE_OPT+=$(FPC_TARGETOPT)
FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT))
FPMAKE_OPT+=--compiler=$(FPC)
FPMAKE_OPT+=-bu
.NOTPARALLEL:
fpmake: fpmake.pp
$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT)
all: fpmake
$(LOCALFPMAKE) compile $(FPMAKE_OPT)
smart: fpmake
$(LOCALFPMAKE) compile $(FPMAKE_OPT) -o -XX -o -CX
release: fpmake
$(LOCALFPMAKE) compile $(FPMAKE_OPT) -o -dRELEASE
debug: fpmake
$(LOCALFPMAKE) compile $(FPMAKE_OPT) -o -dDEBUG
# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will
# most often fail because the dependencies are cleared.
# In case of a clean, simply do nothing
ifeq ($(FPMAKE_BIN_CLEAN),)
clean:
else
clean:
$(FPMAKE_BIN_CLEAN) clean $(FPMAKE_OPT)
endif
# In case of a distclean, perform an 'old'-style distclean. This to avoid problems
# when the package is compiled using fpcmake prior to running this clean using fpmake
ifeq ($(FPMAKE_BIN_CLEAN),)
distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall
else
distclean:
ifdef inUnix
{ $(FPMAKE_BIN_CLEAN) distclean $(FPMAKE_OPT); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; }
else
$(FPMAKE_BIN_CLEAN) distclean $(FPMAKE_OPT)
endif
-$(DEL) $(LOCALFPMAKE)
endif
cleanall: distclean
install: fpmake
ifdef UNIXHier
$(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
else
$(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
endif
# distinstall also installs the example-sources
distinstall: fpmake
ifdef UNIXHier
$(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie
else
$(LOCALFPMAKE) install $(FPMAKE_OPT) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie
endif

35
packages/libtar/fpmake.pp Normal file
View File

@ -0,0 +1,35 @@
{$ifndef ALLPACKAGES}
{$mode objfpc}{$H+}
program fpmake;
uses fpmkunit;
Var
P : TPackage;
T : TTarget;
begin
With Installer do
begin
{$endif ALLPACKAGES}
P:=AddPackage('libtar');
{$ifdef ALLPACKAGES}
P.Directory:='libtar';
{$endif ALLPACKAGES}
P.Version:='2.7.1';
P.Author := 'Stefan Heymann';
P.License := 'LGPL with modification, ';
P.HomepageURL := 'http://www.destructor.de/';
P.Description := 'Library for handling tar-files.';
P.OSes:=AllOSes-[embedded];
P.SourcePath.Add('src');
T:=P.Targets.AddUnit('libtar.pp');
{$ifndef ALLPACKAGES}
Run;
end;
end.
{$endif ALLPACKAGES}

View File

@ -25,7 +25,6 @@ begin
P.SourcePath.Add('src');
P.IncludePath.Add('src');
T:=P.Targets.AddUnit('libtar.pp');
T:=P.Targets.AddUnit('paszlib.pas');
T.Dependencies.AddUnit('adler');
T.Dependencies.AddUnit('gzio');