texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[5199] * tp/Makefile.am, tp/maintain/*: modularize and rename sc


From: Patrice Dumas
Subject: [5199] * tp/Makefile.am, tp/maintain/*: modularize and rename scripts
Date: Sat, 23 Feb 2013 18:05:11 +0000

Revision: 5199
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5199
Author:   pertusus
Date:     2013-02-23 18:05:11 +0000 (Sat, 23 Feb 2013)
Log Message:
-----------
        * tp/Makefile.am, tp/maintain/*: modularize and rename scripts
        associated to standalone modules handling.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/MANIFEST
    trunk/tp/Makefile.am
    trunk/tp/TODO

Added Paths:
-----------
    trunk/tp/maintain/clean_perl_module_files.sh
    trunk/tp/maintain/prepare_perl_module_files.sh
    trunk/tp/maintain/prepare_perl_standalone_module_archive.sh

Removed Paths:
-------------
    trunk/tp/maintain/prepare_perl_module.sh
    trunk/tp/maintain/regenerate_perl_module_files.sh

Property Changed:
----------------
    trunk/tp/

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2013-02-23 17:59:23 UTC (rev 5198)
+++ trunk/ChangeLog     2013-02-23 18:05:11 UTC (rev 5199)
@@ -3,6 +3,8 @@
        * tp/t/input_files/sample_utf8.texi: avoid having two nodes differing
        only in case, for case-sensitve filesystems.
        Report in http://savannah.gnu.org/bugs/?38380.
+       * tp/Makefile.am, tp/maintain/*: modularize and rename scripts
+       associated to standalone modules handling.
 
 2013-02-22  Karl Berry  <address@hidden>
 


Property changes on: trunk/tp
___________________________________________________________________
Modified: svn:ignore
   - LocaleData
Makefile
Makefile.docstr
Makefile.in
Makefile.tres
Texinfo-*.tar.gz
blib
defs
makeinfo
pm_to_blib
po
po_document
t_texis
test-suite.log
texi2any
texi2any-perl
texi_sort_elements_count
*.trs
*.log

   + LocaleData
Makefile
Makefile.docstr
Makefile.in
Makefile.tres
Texinfo-*.tar.gz
defs
makeinfo
t_texis
test-suite.log
texi2any
texi2any-perl
texi_sort_elements_count
*.trs
*.log


Modified: trunk/tp/MANIFEST
===================================================================
--- trunk/tp/MANIFEST   2013-02-23 17:59:23 UTC (rev 5198)
+++ trunk/tp/MANIFEST   2013-02-23 18:05:11 UTC (rev 5199)
@@ -77,14 +77,15 @@
 maintain/all_tests.sh
 maintain/catalog.xml.in
 maintain/change_perl_modules_version.sh
+maintain/clean_perl_module_files.sh
 maintain/language-subtag-registry
-maintain/prepare_perl_module.sh
+maintain/prepare_perl_module_files.sh
+maintain/prepare_perl_standalone_module_archive.sh
 maintain/regenerate_cmd_tests.sh
 maintain/regenerate_converters_documentation.sh
 maintain/regenerate_docstr.sh
 maintain/regenerate_documentlanguages.pl
 maintain/regenerate_file_lists.pl
-maintain/regenerate_perl_module_files.sh
 maintain/template.pod
 po/Makefile
 po/PACKAGE
@@ -280,6 +281,7 @@
 t/results/conditionals/ifclear_in_ifset_set.pl
 t/results/conditionals/ifnot_format_conditional.pl
 t/results/conditionals/ifnotinfo_exception.pl
+t/results/conditionals/ifset_in_command.pl
 t/results/conditionals/ignore_not_closed.pl
 t/results/conditionals/ignored_in_ifset.pl
 t/results/conditionals/info_ifinfo_ifnotplaintext.pl
@@ -410,7 +412,7 @@
 t/results/converters_tests/refs_formatting.pl
 t/results/converters_tests/sample_utf8.pl
 
t/results/converters_tests/sample_utf8/res_html/DiYiZhang_0028First-Chapter_0029.html
-t/results/converters_tests/sample_utf8/res_html/Index.html
+t/results/converters_tests/sample_utf8/res_html/Index-node.html
 t/results/converters_tests/sample_utf8/res_html/Second-Chapter-AE-AE-ae-ae.html
 t/results/converters_tests/sample_utf8/res_html/index.html
 t/results/converters_tests/sample_utf8/res_info/sample_utf8.info

Modified: trunk/tp/Makefile.am
===================================================================
--- trunk/tp/Makefile.am        2013-02-23 17:59:23 UTC (rev 5198)
+++ trunk/tp/Makefile.am        2013-02-23 18:05:11 UTC (rev 5199)
@@ -177,16 +177,17 @@
 maintenance_files = \
   maintain/all_tests.sh \
   maintain/change_perl_modules_version.sh \
+  maintain/clean_perl_module_files.sh \
   maintain/language-subtag-registry \
   maintain/Makefile_perl_po \
   maintain/MANIFEST_generated_files \
-  maintain/prepare_perl_module.sh \
+  maintain/prepare_perl_module_files.sh \
+  maintain/prepare_perl_standalone_module_archive.sh \
   maintain/regenerate_cmd_tests.sh \
   maintain/regenerate_converters_documentation.sh \
   maintain/regenerate_docstr.sh \
   maintain/regenerate_documentlanguages.pl \
   maintain/regenerate_file_lists.pl \
-  maintain/regenerate_perl_module_files.sh \
   maintain/template.pod \
   maintain/catalog.xml.in
 

Modified: trunk/tp/TODO
===================================================================
--- trunk/tp/TODO       2013-02-23 17:59:23 UTC (rev 5198)
+++ trunk/tp/TODO       2013-02-23 18:05:11 UTC (rev 5199)
@@ -102,6 +102,10 @@
 Future features
 ===============
 
+Update Unicode-EastAsianWidth.  The new version has improved tests
+and a new license, but no functional change.  So maybe wait a
+bit to update.
+
 Add some elements of texinfo that are not of interest in the
 tree, like beginning and end of included file, @ protecting
 end of line in @def*, begin and end of user defined macro

Added: trunk/tp/maintain/clean_perl_module_files.sh
===================================================================
--- trunk/tp/maintain/clean_perl_module_files.sh                                
(rev 0)
+++ trunk/tp/maintain/clean_perl_module_files.sh        2013-02-23 18:05:11 UTC 
(rev 5199)
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+mv texi2any texi2any-perl
+rm COPYING
+rm pm_to_blib
+rm -rf blib
+rm -rf po po_document
+(cd ../ && ./config.status)
+make texi2any


Property changes on: trunk/tp/maintain/clean_perl_module_files.sh
___________________________________________________________________
Added: svn:executable
   + *

Deleted: trunk/tp/maintain/prepare_perl_module.sh
===================================================================
--- trunk/tp/maintain/prepare_perl_module.sh    2013-02-23 17:59:23 UTC (rev 
5198)
+++ trunk/tp/maintain/prepare_perl_module.sh    2013-02-23 18:05:11 UTC (rev 
5199)
@@ -1,24 +0,0 @@
-#! /bin/sh
-
-# Make sure that we start with the automake generated Makefile
-(cd ../ && ./config.status)
-./maintain/regenerate_perl_module_files.sh
-make MANIFEST
-sed 's/\(my \$hardcoded_version = \).*/\1 undef;/' texi2any.pl > texi2any
-chmod a+x texi2any
-touch -r texi2any.pl texi2any 
-perl Makefile.PL
-VERSION=`grep '^VERSION = ' Makefile | sed 's/^VERSION = *//'`
-[ z"$VERSION" = 'z' ] && exit 1
-./maintain/change_perl_modules_version.sh $VERSION
-rm -f Texinfo-$VERSION.tar.gz
-cp -p ../COPYING .
-make && make dist
-rm COPYING MYMETA.yml
-tar xzvf Texinfo-$VERSION.tar.gz
-(cd Texinfo-$VERSION/ && perl Makefile.PL && make && make test && \
-                 ./maintain/all_tests.sh clean && make distcheck) || exit 1
-rm -rf Texinfo-$VERSION/
-(cd ../ && ./config.status)
-mv texi2any texi2any-perl
-make texi2any

Copied: trunk/tp/maintain/prepare_perl_module_files.sh (from rev 5194, 
trunk/tp/maintain/regenerate_perl_module_files.sh)
===================================================================
--- trunk/tp/maintain/prepare_perl_module_files.sh                              
(rev 0)
+++ trunk/tp/maintain/prepare_perl_module_files.sh      2013-02-23 18:05:11 UTC 
(rev 5199)
@@ -0,0 +1,40 @@
+#! /bin/sh
+
+# Regenerate files required for perl
+
+# This regenerate files in t/include_dir/
+make
+PACKAGE=`grep '^PACKAGE = ' Makefile | sed 's/^PACKAGE = //'`
+[ z"$PACKAGE" = 'z' ] && exit 1
+VERSION=`grep '^VERSION = ' Makefile | sed 's/^VERSION = *//'`
+[ z"$VERSION" = 'z' ] && exit 1
+# LocaleData are also generated through Makefile.docstr.  Here we want
+# them to be generated by the Makefile in po*/ to test that it works.
+rm -rf LocaleData
+
+for dir in po po_document; do
+  rm -rf $dir
+  mkdir $dir
+  cp maintain/Makefile_perl_po $dir/Makefile
+  grep '^tp\/' ../$dir/POTFILES.in | sed -e 's/^tp/../' > $dir/POTFILES.in
+  echo "# File automatically generated from texinfo files"
+  echo "PACKAGE = $PACKAGE" > $dir/PACKAGE
+  cat ../$dir/Makevars >> $dir/PACKAGE
+  linguas_str=
+  for lingua in `cat ../$dir/LINGUAS`; do
+    linguas_str="$linguas_str $lingua"
+    cp -p ../$dir/$lingua.po $dir
+  done
+  echo "LINGUAS = $linguas_str" >> $dir/PACKAGE
+
+  (cd $dir && make all && make clean)
+done
+
+find LocaleData po_document po t/include_dir -type f | sort > 
maintain/MANIFEST_generated_files
+make MANIFEST
+./maintain/change_perl_modules_version.sh $VERSION
+cp -p ../COPYING .
+sed 's/\(my \$hardcoded_version = \).*/\1 undef;/' texi2any.pl > texi2any
+chmod a+x texi2any
+touch -r texi2any.pl texi2any
+

Copied: trunk/tp/maintain/prepare_perl_standalone_module_archive.sh (from rev 
5194, trunk/tp/maintain/prepare_perl_module.sh)
===================================================================
--- trunk/tp/maintain/prepare_perl_standalone_module_archive.sh                 
        (rev 0)
+++ trunk/tp/maintain/prepare_perl_standalone_module_archive.sh 2013-02-23 
18:05:11 UTC (rev 5199)
@@ -0,0 +1,17 @@
+#! /bin/sh
+
+# Make sure that we start with the automake generated Makefile
+(cd ../ && ./config.status)
+./maintain/prepare_perl_module_files.sh
+
+VERSION=`grep '^VERSION = ' Makefile | sed 's/^VERSION = *//'`
+[ z"$VERSION" = 'z' ] && exit 1
+perl Makefile.PL NO_MYMETA=1
+rm -f Texinfo-$VERSION.tar.gz
+make && make dist
+tar xzvf Texinfo-$VERSION.tar.gz
+(cd Texinfo-$VERSION/ && perl Makefile.PL && make && make test && \
+                 ./maintain/all_tests.sh clean && make distcheck) || exit 1
+rm -rf Texinfo-$VERSION/
+
+./maintain/clean_perl_module_files.sh

Deleted: trunk/tp/maintain/regenerate_perl_module_files.sh
===================================================================
--- trunk/tp/maintain/regenerate_perl_module_files.sh   2013-02-23 17:59:23 UTC 
(rev 5198)
+++ trunk/tp/maintain/regenerate_perl_module_files.sh   2013-02-23 18:05:11 UTC 
(rev 5199)
@@ -1,29 +0,0 @@
-#! /bin/sh
-
-# Regenerate files required for perl
-
-# This regenerate files in t/include_dir/
-make
-PACKAGE=`grep '^PACKAGE = ' Makefile | sed 's/^PACKAGE = //'`
-[ z"$PACKAGE" = 'z' ] && exit 1
-rm -rf LocaleData
-
-for dir in po po_document; do
-  rm -rf $dir
-  mkdir $dir
-  cp maintain/Makefile_perl_po $dir/Makefile
-  grep '^tp\/' ../$dir/POTFILES.in | sed -e 's/^tp/../' > $dir/POTFILES.in
-  echo "# File automatically generated from texinfo files"
-  echo "PACKAGE = $PACKAGE" > $dir/PACKAGE
-  cat ../$dir/Makevars >> $dir/PACKAGE
-  linguas_str=
-  for lingua in `cat ../$dir/LINGUAS`; do
-    linguas_str="$linguas_str $lingua"
-    cp -p ../$dir/$lingua.po $dir
-  done
-  echo "LINGUAS = $linguas_str" >> $dir/PACKAGE
-
-  (cd $dir && make all && make clean)
-done
-
-find LocaleData po_document po t/include_dir -type f | sort > 
maintain/MANIFEST_generated_files




reply via email to

[Prev in Thread] Current Thread [Next in Thread]