From 97cf8ba03ad3f107f9d0a296fa715c83ee784955 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 2 Dec 2009 20:10:34 +0000 Subject: [PATCH 1/1] Global fix/add/update: - index.php updated in all projects from ship-simu - Missing todo-builder.sh added - TODOs.txt updated in all projects - Missing svn:executable added --- .gitattributes | 1 + clear-cache.sh | 0 index.php | 4 ++-- package.sh | 0 pdepend.sh | 0 todo-builder.sh | 24 ++++++++++++++++++++++++ 6 files changed, 27 insertions(+), 2 deletions(-) mode change 100644 => 100755 clear-cache.sh mode change 100644 => 100755 package.sh mode change 100644 => 100755 pdepend.sh create mode 100755 todo-builder.sh diff --git a/.gitattributes b/.gitattributes index 08abd88b84..576f27988b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -30,3 +30,4 @@ docs/THANKS -text /package.sh -text /pdepend.sh -text /rebuild_doc.sh -text +/todo-builder.sh -text diff --git a/clear-cache.sh b/clear-cache.sh old mode 100644 new mode 100755 diff --git a/index.php b/index.php index f2e1c4c495..979aa45f3d 100644 --- a/index.php +++ b/index.php @@ -62,13 +62,13 @@ final class ApplicationEntryPoint { */ public static function app_die ($message = '', $code = false, $extraData = '', $silentMode = false) { // Is this method already called? - if (defined('EMERGENCY_EXIT_CALLED')) { + if (isset($GLOBALS['app_die_called'])) { // Then output the text directly die($message); } // END - if // This method shall not be called twice - define('EMERGENCY_EXIT_CALLED', true); + $GLOBALS['app_die_called'] = true; // Is a message set? if (empty($message)) { diff --git a/package.sh b/package.sh old mode 100644 new mode 100755 diff --git a/pdepend.sh b/pdepend.sh old mode 100644 new mode 100755 diff --git a/todo-builder.sh b/todo-builder.sh new file mode 100755 index 0000000000..360b8888e2 --- /dev/null +++ b/todo-builder.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +# This script helps building the file docs/TODOs.txt and should be executed by +# developers with SVN write-access + +TYPES="php ctp xml" + +if ! test -e "index.php"; then + echo "$0: Please execute this script from root directory." + exit 1 +fi + +echo "$0: Generating TODOs.txt..." +echo "### WARNING: THIS FILE IS AUTO-GENERATED BY $0 ###" > docs/TODOs.txt +echo "### DO NOT EDIT THIS FILE. ###" >> docs/TODOs.txt +for type in $TYPES; do + find -type f -name "*.$type" -exec grep -Hin "@TODO" {} \; | sort >> docs/TODOs.txt +done +echo "### ### DEPRECATION FOLLOWS: ### ###" >> docs/TODOs.txt +for type in $TYPES; do + find -type f -name "*.$type" -exec grep -Hin "@DEPRECATED" {} \; | sort >> docs/TODOs.txt +done +echo "$0: Done." +exit 0 -- 2.30.2