- Here after is a list of tags that are currently being used.
+ Here after is a list of tags that are currently being used. The
+ number in parenthesis is the number of time this tag is used in
+ our pages.
diff --git a/tags/tags.xsl b/tags/tags.xsl
index efdc4af112..b00476a20f 100644
--- a/tags/tags.xsl
+++ b/tags/tags.xsl
@@ -35,8 +35,7 @@
-
-
+
diff --git a/tools/build.pl b/tools/build.pl
index 64cfed489d..9d5f13eeda 100755
--- a/tools/build.pl
+++ b/tools/build.pl
@@ -32,6 +32,9 @@ use IO::Select;
use Socket;
use Fcntl ':flock';
+require "/home/nicolas/FSFE/outdated trad check/comptree.pl";
+our $nbout = 0;
+
# This defines the focuses and their respective preferred / original
# language. For example, it says that we should have a focus called
# "se" (Sweden) which has the preferred language "sv" (Swedish).
@@ -310,6 +313,11 @@ while (wait() != -1) {
sub process {
my ($file, $langs) = @_;
+
+ if (not $file eq "tags/tags") {
+ return;
+ }
+ print "$file\n";
print STDERR "Building $file.. \n" unless $opts{q};
# Create the root note for the above mentioned XML file (used to feed the XSL
@@ -523,6 +531,15 @@ sub process {
# TODO: optimise getting texts-content-xx.xml and texts-content-en.xml,
# since it does not depend on the xsl file being treated, we should do it only once!
+ if ( $lang eq "cs" ) {
+
+ print "--->outputting test.xml\n";
+ open (TEST, '>', "/home/nicolas/FSFE/fsfe-web-out/test.xml");
+ print TEST $sourcedoc->toString();
+ close (TEST);
+
+ }
+
#
# Transform the document using the XSL file and then push the
# result into the element of the document we're building.
@@ -573,17 +590,27 @@ sub process {
# with the original (but maybe a second earlier) isn't marked outdated.
#
my $originalsource = "$file.".$root->getAttribute("original").".xhtml";
- if ((stat("$opts{i}/$originalsource"))[9] > (stat($source))[9] + 7200) {
- $root->setAttribute("outdated", "yes");
- if ($dir eq "global") {
- lock(*TRANSLATIONS);
- print TRANSLATIONS "$lang $source $originalsource\n";
- unlock(*TRANSLATIONS);
- }
- } else {
- $root->setAttribute("outdated", "no");
- }
-
+ if ((stat("$opts{i}/$originalsource"))[9] > (stat($source))[9] + 7200) {
+ $root->setAttribute("outdated", "yes");
+ if ($dir eq "global") {
+ lock(*TRANSLATIONS);
+ print TRANSLATIONS "$lang $source $originalsource\n";
+ unlock(*TRANSLATIONS);
+ }
+ } else {
+ $root->setAttribute("outdated", "no");
+ }
+
+ if ( not -e "$opts{i}/$originalsource" ) {
+ # do something
+ } else {
+ my ($bool, $err) = areEqual( "$opts{i}/$originalsource", $source );
+ if ( not $bool ) {
+ print "$err\n";
+ $nbout += 1;
+ }
+ }
+
#
# Get the appropriate textset for this language. If one can't be
# found, use the English. (I hope this never happens)
@@ -771,3 +798,6 @@ sub unlock {
my ($fh) = @_;
flock($fh, LOCK_UN);
}
+
+
+print "$nbout pages are out of date\n";
diff --git a/tools/build.sh b/tools/build.sh
index 248033d876..e1cf3555ca 100755
--- a/tools/build.sh
+++ b/tools/build.sh
@@ -7,14 +7,14 @@
# however, is done by the Perl script build.pl.
# -----------------------------------------------------------------------------
-SOURCE=/home/www/fsfe
-DEST=/home/www/html
-TMP=/home/www/tmp.$$
-STATUS=/var/www/web
+SOURCE=.
+DEST=../fsfe-web-out/home/www/html
+TMP=../fsfe-web-out/home/www/tmp.$$
+STATUS=../fsfe-web-out/var/www/web
ALARM_LOCKFILE=alarm_lockfile
MAKEFILE_PL=${SOURCE}/Makefile.PL
-SVNUPOUTFILE=/tmp/fsfe-svnup-out
-SVNUPERRFILE=/tmp/fsfe-svnup-err
+SVNUPOUTFILE=../fsfe-web-out/tmp/fsfe-svnup-out
+SVNUPERRFILE=../fsfe-web-out/tmp/fsfe-svnup-err
# Since we must grep for svn output messages,
# let's ensure we get English messages
@@ -41,7 +41,7 @@ if [[ -n "$BUILD_STARTED" && "10#${BUILD_STARTED}" -gt 30 && ! -f ${STATUS}/${AL
fi
# Redirect output
-exec 1> ${STATUS}/status.txt 2>&1
+#exec 1> ${STATUS}/status.txt 2>&1
# If some build script is already running, don't run it.
if ps -C "build-df.sh,build-test.sh,build.sh" -o pid= | grep -q -v "$$"; then
@@ -65,7 +65,7 @@ echo "$(date) Updating source files from SVN."
# Since the "svn update" exit status cannot be trusted, and "svn update -q" is
# always quiet, we have to test the output of "svn update" (ignoring the final
# "At revision" line) and check for any output lines
-svn --non-interactive update 2>${SVNUPERRFILE} | grep -v 'At revision' >${SVNUPOUTFILE}
+#svn --non-interactive update 2>${SVNUPERRFILE} | grep -v 'At revision' >${SVNUPOUTFILE}
cat ${SVNUPOUTFILE}
# If "svn update" wrote anything to standard error, exit
diff --git a/tools/xsltsl/tagging.xsl b/tools/xsltsl/tagging.xsl
index 15ec289132..3523b3a82c 100644
--- a/tools/xsltsl/tagging.xsl
+++ b/tools/xsltsl/tagging.xsl
@@ -117,29 +117,18 @@
+
+
+ ()
-
-
-
-
@@ -163,49 +152,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-