From 233081e94c7567359587eeb6c30ea27b98cf43df Mon Sep 17 00:00:00 2001
From: sekelsenmat <sekelsenmat@idefix.freepascal.org>
Date: Mon, 29 Aug 2011 11:14:46 +0000
Subject: [PATCH] Adds Sorokin's RegExpr.pas to the Free Pascal Packages, as
discussed in the mailling list. Renamed the old RegExpr.pp to oldregexpr.pp
git-svn-id: trunk@18891 -
---
.gitattributes | 2 +-
packages/regexpr/examples/testreg1.pp | 2 +-
packages/regexpr/fpmake.pp | 7 ++++++-
packages/regexpr/src/{regexpr.pp => oldregexpr.pp} | 0
4 files changed, 8 insertions(+), 3 deletions(-)
rename packages/regexpr/src/{regexpr.pp => oldregexpr.pp} (100%)
diff --git a/.gitattributes b/.gitattributes
index 95a549351a..933bce7bb8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5831,8 +5831,8 @@ packages/regexpr/examples/Makefile.fpc svneol=native#text/plain
packages/regexpr/examples/testreg1.pp svneol=native#text/plain
packages/regexpr/fpmake.pp svneol=native#text/plain
packages/regexpr/src/old/regexpr.pp svneol=native#text/plain
+packages/regexpr/src/oldregexpr.pp svneol=native#text/pascal
packages/regexpr/src/regex.pp svneol=native#text/plain
-packages/regexpr/src/regexpr.pp svneol=native#text/plain
packages/rexx/Makefile svneol=native#text/plain
packages/rexx/Makefile.fpc svneol=native#text/plain
packages/rexx/examples/Makefile svneol=native#text/plain
diff --git a/packages/regexpr/examples/testreg1.pp b/packages/regexpr/examples/testreg1.pp
index 2347ff8649..45905efab2 100644
--- a/packages/regexpr/examples/testreg1.pp
+++ b/packages/regexpr/examples/testreg1.pp
@@ -4,7 +4,7 @@
program testreg1;
uses
- regexpr;
+ oldregexpr;
var
r : tregexprengine;
diff --git a/packages/regexpr/fpmake.pp b/packages/regexpr/fpmake.pp
index da5ec12583..0823c84448 100644
--- a/packages/regexpr/fpmake.pp
+++ b/packages/regexpr/fpmake.pp
@@ -19,8 +19,13 @@ begin
P.Version:='2.7.1';
P.SourcePath.Add('src');
- T:=P.Targets.AddUnit('regexpr.pp');
+ // Sorokin's RegExpr
+ T:=P.Targets.AddUnit('regexpr.pas');
+
+ // RegEx from Joost
+ T:=P.Targets.AddUnit('oldregexpr.pp');
T:=P.Targets.AddUnit('regex.pp');
+
T.ResourceStrings := True;
P.ExamplePath.Add('tests');
diff --git a/packages/regexpr/src/regexpr.pp b/packages/regexpr/src/oldregexpr.pp
similarity index 100%
rename from packages/regexpr/src/regexpr.pp
rename to packages/regexpr/src/oldregexpr.pp