From 5eea42b9ebccb4aa7a920a0440ae23142260ccbf Mon Sep 17 00:00:00 2001
From: Bo Peng <bpeng@lyx.org>
Date: Mon, 30 Apr 2007 16:50:24 +0000
Subject: [PATCH] Scons: fix a bug in scons_utils.py that leads to duplicate
 entries in POTFILES.in

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18123 a592a061-630c-0410-9148-cb99ea01b6c8
---
 development/scons/scons_utils.py |  5 +++--
 po/POTFILES.in                   | 34 --------------------------------
 2 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/development/scons/scons_utils.py b/development/scons/scons_utils.py
index 4deef5eb13..1e3d6acaef 100644
--- a/development/scons/scons_utils.py
+++ b/development/scons/scons_utils.py
@@ -153,8 +153,9 @@ def env_potfiles(target, source, env):
     potfiles = []
     trans = re.compile('_\(".*"\)', re.M)
     for file in source:
-        if str(file) not in potfiles and trans.search(open(str(file)).read()):
-            potfiles.append(relativePath(str(file), env.subst('$TOP_SRCDIR')))
+        rel_file = relativePath(str(file), env.subst('$TOP_SRCDIR'))
+        if rel_file not in potfiles and trans.search(open(str(file)).read()):
+            potfiles.append(rel_file)
     potfiles.sort()
     print >> target_file, '\n'.join(potfiles)
     target_file.close()
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c0c4806fc5..e8d836f1c7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -46,80 +46,46 @@ src/frontends/controllers/ControlSpellchecker.cpp
 src/frontends/controllers/ControlToc.cpp
 src/frontends/controllers/frontend_helpers.cpp
 src/frontends/qt4/BulletsModule.cpp
-src/frontends/qt4/BulletsModule.cpp
 src/frontends/qt4/Dialogs.cpp
 src/frontends/qt4/FileDialog.cpp
 src/frontends/qt4/GuiView.cpp
-src/frontends/qt4/GuiView.cpp
-src/frontends/qt4/GuiWorkArea.cpp
 src/frontends/qt4/GuiWorkArea.cpp
 src/frontends/qt4/QAbout.cpp
-src/frontends/qt4/QAbout.cpp
-src/frontends/qt4/QBibitem.cpp
 src/frontends/qt4/QBibitem.cpp
 src/frontends/qt4/QBibtex.cpp
-src/frontends/qt4/QBibtex.cpp
-src/frontends/qt4/QBox.cpp
 src/frontends/qt4/QBox.cpp
 src/frontends/qt4/QBranch.cpp
-src/frontends/qt4/QBranch.cpp
-src/frontends/qt4/QBranches.cpp
 src/frontends/qt4/QBranches.cpp
 src/frontends/qt4/QChanges.cpp
-src/frontends/qt4/QChanges.cpp
-src/frontends/qt4/QCharacter.cpp
 src/frontends/qt4/QCharacter.cpp
 src/frontends/qt4/QCitationDialog.cpp
-src/frontends/qt4/QCitationDialog.cpp
-src/frontends/qt4/QCommandBuffer.cpp
 src/frontends/qt4/QCommandBuffer.cpp
 src/frontends/qt4/QDelimiterDialog.cpp
-src/frontends/qt4/QDelimiterDialog.cpp
-src/frontends/qt4/QDocument.cpp
 src/frontends/qt4/QDocument.cpp
 src/frontends/qt4/QERT.cpp
-src/frontends/qt4/QERT.cpp
-src/frontends/qt4/QExternal.cpp
 src/frontends/qt4/QExternal.cpp
 src/frontends/qt4/QFloat.cpp
 src/frontends/qt4/QGraphics.cpp
 src/frontends/qt4/QInclude.cpp
-src/frontends/qt4/QInclude.cpp
-src/frontends/qt4/QMathMatrixDialog.cpp
 src/frontends/qt4/QMathMatrixDialog.cpp
 src/frontends/qt4/QNote.cpp
-src/frontends/qt4/QNote.cpp
 src/frontends/qt4/QParagraph.cpp
-src/frontends/qt4/QParagraph.cpp
-src/frontends/qt4/QPrefs.cpp
 src/frontends/qt4/QPrefs.cpp
 src/frontends/qt4/QPrint.cpp
 src/frontends/qt4/QRef.cpp
-src/frontends/qt4/QRef.cpp
-src/frontends/qt4/QSearch.cpp
 src/frontends/qt4/QSearch.cpp
 src/frontends/qt4/QSendto.cpp
-src/frontends/qt4/QSendto.cpp
-src/frontends/qt4/QShowFile.cpp
 src/frontends/qt4/QShowFile.cpp
 src/frontends/qt4/QSpellchecker.cpp
-src/frontends/qt4/QSpellchecker.cpp
-src/frontends/qt4/QTabular.cpp
 src/frontends/qt4/QTabular.cpp
 src/frontends/qt4/QTabularCreate.cpp
-src/frontends/qt4/QTabularCreate.cpp
-src/frontends/qt4/QTexinfo.cpp
 src/frontends/qt4/QTexinfo.cpp
 src/frontends/qt4/QThesaurus.cpp
-src/frontends/qt4/QThesaurus.cpp
-src/frontends/qt4/QVSpace.cpp
 src/frontends/qt4/QVSpace.cpp
 src/frontends/qt4/QWrap.cpp
-src/frontends/qt4/QWrap.cpp
 src/frontends/qt4/Qt2BC.h
 src/frontends/qt4/UrlView.cpp
 src/frontends/qt4/Validator.cpp
-src/frontends/qt4/Validator.cpp
 src/frontends/qt4/alert_pimpl.cpp
 src/gettext.h
 src/insets/Inset.cpp
-- 
2.39.5