From ab5186f2cc14db54c29b52f1bcd34ecfe7604114 Mon Sep 17 00:00:00 2001
From: Bo Peng <bpeng@lyx.org>
Date: Tue, 1 May 2007 22:04:21 +0000
Subject: [PATCH] Update scons_manifest.py (separate .inc from layout
 directory) to make generated po files in the same order as what autotools
 generates

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18163 a592a061-630c-0410-9148-cb99ea01b6c8
---
 development/scons/SConstruct        |  6 +--
 development/scons/scons_manifest.py | 67 ++++++++++++++++-------------
 2 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 3a89c80440..23b9753f83 100644
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -1966,7 +1966,7 @@ if update_manifest:
     ignore_types = ['.svn', '.deps', '.cache', '.tmp', '.bak', '.gmo', '.pot',
         '.pyc', '.pyo', '.o', '_moc.cpp', 'Makefile.in', 'config.h.in',
         'LaTeXConfig.lyx', 'version.cpp', 'Package.cpp']
-    ext_types = ['_header_files', '_files', '_pre_files', '_post_files', '_moc_files', 
+    ext_types = ['_header_files', '_files', '_pre_files', '_post_files', '_moc_files', '_inc_files',
         '_copied_files', '_copied_header_files', '_extra_header_files', '_extra_src_files', '_extra_files']
     for root,path,files in os.walk(env.Dir('$TOP_SRCDIR').abspath):
         if os.path.split(root)[-1][0] == '.' \
@@ -2048,7 +2048,7 @@ if update_po:
                 ['$TOP_SRCDIR/src/frontends/qt4/ui/%s' % x for x in src_frontends_qt4_ui_files],
                 '$LYX_POT -b $TOP_SRCDIR -t qt4 -o $TARGET $SOURCES'),
              env.Command('$BUILDDIR/po/layouts_l10n.pot', 
-                ['$TOP_SRCDIR/lib/layouts/%s' % x for x in lib_layouts_files],
+                ['$TOP_SRCDIR/lib/layouts/%s' % x for x in lib_layouts_files + lib_layouts_inc_files],
                 '$LYX_POT -b $TOP_SRCDIR -t layouts -o $TARGET $SOURCES'),
              env.Command('$BUILDDIR/po/languages_l10n.pot', '$TOP_SRCDIR/lib/languages', 
                 '$LYX_POT -b $TOP_SRCDIR -t languages -o $TARGET $SOURCES'),
@@ -2251,7 +2251,7 @@ if build_install:
             ('images', lib_images_files),
             ('images/math', lib_images_math_files),
             ('kbd', lib_kbd_files),
-            ('layouts', lib_layouts_files),
+            ('layouts', lib_layouts_files + lib_layouts_inc_files),
             ('lyx2lyx', lib_lyx2lyx_files),
             ('scripts', lib_scripts_files),
             ('templates', lib_templates_files),
diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index f7fbe40fc2..0a4055081c 100644
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -365,6 +365,7 @@ src_support_files = Split('''
 
 
 src_support_extra_header_files = Split('''
+    
 ''')
 
 
@@ -2367,6 +2368,7 @@ lib_doc_de_files = Split('''
 
 
 lib_examples_files = Split('''
+    Armenian-article.lyx
     CV-image.eps
     CV-image.png
     Foils.lyx
@@ -2378,7 +2380,6 @@ lib_examples_files = Split('''
     aas_sample.lyx
     amsart-test.lyx
     amsbook-test.lyx
-    armenian-article.lyx
     beamer-g4-mask.jpg
     beamer-g4.jpg
     beamer-icsi-logo.pdf
@@ -2575,25 +2576,14 @@ lib_lyx2lyx_extra_files = Split('''
 lib_layouts_files = Split('''
     IEEEtran.layout
     aa.layout
-    aapaper.inc
     aapaper.layout
     aastex.layout
     agu-dtd.layout
-    agu_stdclass.inc
-    agu_stdcounters.inc
-    agu_stdlists.inc
-    agu_stdsections.inc
-    agu_stdtitle.inc
     agums.layout
-    aguplus.inc
     amsart-plain.layout
     amsart-seq.layout
     amsart.layout
     amsbook.layout
-    amsdefs.inc
-    amsmaths-plain.inc
-    amsmaths-seq.inc
-    amsmaths.inc
     apa.layout
     arab-article.layout
     armenian-article.layout
@@ -2604,16 +2594,6 @@ lib_layouts_files = Split('''
     chess.layout
     cl2emult.layout
     cv.layout
-    db_lyxmacros.inc
-    db_stdcharstyles.inc
-    db_stdclass.inc
-    db_stdcounters.inc
-    db_stdlayouts.inc
-    db_stdlists.inc
-    db_stdsections.inc
-    db_stdstarsections.inc
-    db_stdstruct.inc
-    db_stdtitle.inc
     dinbrief.layout
     docbook-book.layout
     docbook-chapter.layout
@@ -2645,26 +2625,20 @@ lib_layouts_files = Split('''
     literate-article.layout
     literate-book.layout
     literate-report.layout
-    literate-scrap.inc
     llncs.layout
     ltugboat.layout
-    lyxmacros.inc
     manpage.layout
     memoir.layout
     moderncv.layout
     mwart.layout
     mwbk.layout
     mwrep.layout
-    numarticle.inc
-    numreport.inc
-    numrevtex.inc
     paper.layout
     report.layout
     revtex.layout
     revtex4.layout
     scrartcl.layout
     scrbook.layout
-    scrclass.inc
     scrlettr.layout
     scrlttr2.layout
     scrreprt.layout
@@ -2673,6 +2647,40 @@ lib_layouts_files = Split('''
     simplecv.layout
     slides.layout
     spie.layout
+    svglobal.layout
+    svjog.layout
+    svprobth.layout
+''')
+
+
+lib_layouts_inc_files = Split('''
+    aapaper.inc
+    agu_stdclass.inc
+    agu_stdcounters.inc
+    agu_stdlists.inc
+    agu_stdsections.inc
+    agu_stdtitle.inc
+    aguplus.inc
+    amsdefs.inc
+    amsmaths-plain.inc
+    amsmaths-seq.inc
+    amsmaths.inc
+    db_lyxmacros.inc
+    db_stdcharstyles.inc
+    db_stdclass.inc
+    db_stdcounters.inc
+    db_stdlayouts.inc
+    db_stdlists.inc
+    db_stdsections.inc
+    db_stdstarsections.inc
+    db_stdstruct.inc
+    db_stdtitle.inc
+    literate-scrap.inc
+    lyxmacros.inc
+    numarticle.inc
+    numreport.inc
+    numrevtex.inc
+    scrclass.inc
     stdclass.inc
     stdcounters.inc
     stdfloats.inc
@@ -2683,10 +2691,7 @@ lib_layouts_files = Split('''
     stdstarsections.inc
     stdstruct.inc
     stdtitle.inc
-    svglobal.layout
-    svjog.layout
     svjour.inc
-    svprobth.layout
 ''')
 
 
-- 
2.39.5