added svn2revisioninc to the makefiles

git-svn-id: trunk@7862 -
This commit is contained in:
vincents 2005-09-30 20:42:04 +00:00
parent 8aa081ebd9
commit f8cf04723c
3 changed files with 58 additions and 38 deletions

View File

@ -340,103 +340,103 @@ ifeq ($(FULL_TARGET),arm-linux)
override TARGET_DIRS+=apiwizz override TARGET_DIRS+=apiwizz
endif endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),i386-go32v2) ifeq ($(FULL_TARGET),i386-go32v2)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),i386-win32) ifeq ($(FULL_TARGET),i386-win32)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),i386-os2) ifeq ($(FULL_TARGET),i386-os2)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),i386-freebsd) ifeq ($(FULL_TARGET),i386-freebsd)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),i386-beos) ifeq ($(FULL_TARGET),i386-beos)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),i386-solaris) ifeq ($(FULL_TARGET),i386-solaris)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),i386-qnx) ifeq ($(FULL_TARGET),i386-qnx)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),i386-netware) ifeq ($(FULL_TARGET),i386-netware)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),i386-openbsd) ifeq ($(FULL_TARGET),i386-openbsd)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),i386-wdosx) ifeq ($(FULL_TARGET),i386-wdosx)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),i386-emx) ifeq ($(FULL_TARGET),i386-emx)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),i386-watcom) ifeq ($(FULL_TARGET),i386-watcom)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),i386-netwlibc) ifeq ($(FULL_TARGET),i386-netwlibc)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),m68k-linux) ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),m68k-freebsd) ifeq ($(FULL_TARGET),m68k-freebsd)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),m68k-netbsd) ifeq ($(FULL_TARGET),m68k-netbsd)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),m68k-amiga) ifeq ($(FULL_TARGET),m68k-amiga)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),m68k-atari) ifeq ($(FULL_TARGET),m68k-atari)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),m68k-openbsd) ifeq ($(FULL_TARGET),m68k-openbsd)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),m68k-palmos) ifeq ($(FULL_TARGET),m68k-palmos)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),powerpc-linux) ifeq ($(FULL_TARGET),powerpc-linux)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),powerpc-netbsd) ifeq ($(FULL_TARGET),powerpc-netbsd)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),powerpc-macos) ifeq ($(FULL_TARGET),powerpc-macos)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),powerpc-darwin) ifeq ($(FULL_TARGET),powerpc-darwin)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),powerpc-morphos) ifeq ($(FULL_TARGET),powerpc-morphos)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),sparc-linux) ifeq ($(FULL_TARGET),sparc-linux)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),sparc-netbsd) ifeq ($(FULL_TARGET),sparc-netbsd)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),sparc-solaris) ifeq ($(FULL_TARGET),sparc-solaris)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),x86_64-linux) ifeq ($(FULL_TARGET),x86_64-linux)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),x86_64-freebsd) ifeq ($(FULL_TARGET),x86_64-freebsd)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),arm-linux) ifeq ($(FULL_TARGET),arm-linux)
override TARGET_PROGRAMS+=lazres updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl
@ -2909,4 +2909,5 @@ endif
.PHONY: all .PHONY: all
all: apiwizz_all all: apiwizz_all
$(MAKE) --assume-new=lazres.pp lazres$(EXEEXT) $(MAKE) --assume-new=lazres.pp lazres$(EXEEXT)
$(MAKE) --assume-new=svn2revisioninc.pas svn2revisioninc.pas$(EXEEXT)
$(MAKE) --assume-new=updatepofiles.pas updatepofiles$(EXEEXT) $(MAKE) --assume-new=updatepofiles.pas updatepofiles$(EXEEXT)

View File

@ -9,7 +9,7 @@ version=0.9b
[target] [target]
dirs=apiwizz dirs=apiwizz
programs=lazres updatepofiles programs=lazres svn2revisioninc updatepofiles
[require] [require]
packages=rtl fcl packages=rtl fcl
@ -41,6 +41,7 @@ export LCL_PLATFORM
all: apiwizz_all all: apiwizz_all
$(MAKE) --assume-new=lazres.pp lazres$(EXEEXT) $(MAKE) --assume-new=lazres.pp lazres$(EXEEXT)
$(MAKE) --assume-new=svn2revisioninc.pas svn2revisioninc.pas$(EXEEXT)
$(MAKE) --assume-new=updatepofiles.pas updatepofiles$(EXEEXT) $(MAKE) --assume-new=updatepofiles.pas updatepofiles$(EXEEXT)
# end. # end.

View File

@ -51,6 +51,10 @@ var
RevisionIncFileName: string; RevisionIncFileName: string;
RevisionStr: string = 'Unknown'; RevisionStr: string = 'Unknown';
const
RevisionIncComment = '// Created by Svn2RevisionInc';
ConstStart = 'const RevisionStr = ''';
function FindRevision: boolean; function FindRevision: boolean;
var var
SvnDir: string; SvnDir: string;
@ -87,7 +91,6 @@ var
EntriesFileName: string; EntriesFileName: string;
EntriesDoc: TXMLDocument; EntriesDoc: TXMLDocument;
EntryNode: TDomNode; EntryNode: TDomNode;
NameAttribute: TDOMNode;
begin begin
Result:=false; Result:=false;
EntriesFileName:=AppendPathDelim(SourceDirectory)+'.svn'+PathDelim+'entries'; EntriesFileName:=AppendPathDelim(SourceDirectory)+'.svn'+PathDelim+'entries';
@ -114,14 +117,29 @@ begin
Result := GetRevisionFromSvnVersion or GetRevisionFromEntries; Result := GetRevisionFromSvnVersion or GetRevisionFromEntries;
end; end;
function IsValidRevisionInc: boolean;
var
Lines: TStringList;
begin
Result:=false;
if FileExists(RevisionIncFileName) then begin
Lines := TStringList.Create;
Lines.LoadFromFile(RevisionIncFileName);
if (Lines.Count=2) and
(Lines[1]=RevisionIncComment) and
(copy(Lines[2], 1, length(ConstStart))=ConstStart) then
Result:=true;
end;
end;
procedure WriteRevisionInc; procedure WriteRevisionInc;
var var
RevisionIncText: Text; RevisionIncText: Text;
begin begin
AssignFile(RevisionIncText, RevisionIncFileName); AssignFile(RevisionIncText, RevisionIncFileName);
Rewrite(RevisionIncText); Rewrite(RevisionIncText);
writeln(RevisionIncText, '// Created by Svn2RevisionInc'); writeln(RevisionIncText, RevisionIncComment);
writeln(RevisionIncText, 'const RevisionStr = ''', RevisionStr, ''';'); writeln(RevisionIncText, ConstStart, RevisionStr, ''';');
CloseFile(RevisionIncText); CloseFile(RevisionIncText);
writeln(format('Created %s for revision: %s', writeln(format('Created %s for revision: %s',
[RevisionIncFileName, RevisionStr])); [RevisionIncFileName, RevisionStr]));
@ -152,7 +170,7 @@ begin
writeln('Usage: ',ExtractFileName(ParamStr(0)),' sourcedir revision.inc'); writeln('Usage: ',ExtractFileName(ParamStr(0)),' sourcedir revision.inc');
halt(1); halt(1);
end; end;
if FindRevision or not FileExists(RevisionIncFileName) then if FindRevision or not IsValidRevisionInc then
WriteRevisionInc; WriteRevisionInc;
end. end.