From 786df47e09e9771db61882ca9bda5686ab52763c Mon Sep 17 00:00:00 2001 From: Steve Date: Sat, 1 May 2021 13:35:52 +0100 Subject: [PATCH] Misc. tidying. --- .gitignore | 2 +- makefile | 2 - tools/potHeader.txt | 17 --- tools/spelling.sh | 42 ------- tools/tidyHeaders.sh | 267 ------------------------------------------- tools/updateI18N.sh | 175 ---------------------------- 6 files changed, 1 insertion(+), 504 deletions(-) delete mode 100644 tools/potHeader.txt delete mode 100755 tools/spelling.sh delete mode 100755 tools/tidyHeaders.sh delete mode 100755 tools/updateI18N.sh diff --git a/.gitignore b/.gitignore index 687c8fa..33bddd2 100644 --- a/.gitignore +++ b/.gitignore @@ -43,5 +43,5 @@ build/* # Misc .DS_Store - /.errors +tools diff --git a/makefile b/makefile index dfc64cc..51478c1 100644 --- a/makefile +++ b/makefile @@ -25,9 +25,7 @@ MAKEFLAGS += -j$(NPROCS) CXXFLAGS += `sdl2-config --cflags` -DVERSION=$(VERSION) -DREVISION=$(REVISION) -DDATA_DIR=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" CXXFLAGS += -ansi -pedantic CXXFLAGS += -g -lefence -ifneq ("$(wildcard .errors)","") CXXFLAGS += -Wall -Wempty-body -Werror -Wstrict-prototypes -Werror=maybe-uninitialized -Warray-bounds -endif LDFLAGS += `sdl2-config --libs` -lSDL2_mixer -lSDL2_image -lSDL2_ttf -lm diff --git a/tools/potHeader.txt b/tools/potHeader.txt deleted file mode 100644 index 9ba47f9..0000000 --- a/tools/potHeader.txt +++ /dev/null @@ -1,17 +0,0 @@ -# PO file for TBFTSS : The Pandoran War -# Copyright 2015-2016, Stephen J Sweeney -# This file is distributed under the GNU GPL 3.0 -# Email: stephenjsweeney@battleforthesolarsystem.com -# https://github.com/stephenjsweeney/tbftss - -msgid "" -msgstr "" -"Project-Id-Version: TBFTSS: The Pandoran War\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: {POT_CREATION_DATE}\n" -"PO-Revision-Date: ???\n" -"Last-Translator: ???\n" -"Language-Team: ???\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" diff --git a/tools/spelling.sh b/tools/spelling.sh deleted file mode 100755 index 7bad54f..0000000 --- a/tools/spelling.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/php - - diff --git a/tools/tidyHeaders.sh b/tools/tidyHeaders.sh deleted file mode 100755 index 8d38d5e..0000000 --- a/tools/tidyHeaders.sh +++ /dev/null @@ -1,267 +0,0 @@ -#!/usr/bin/php - - 0) - { - $newHeader[] = "\n"; - $newHeader = array_merge($newHeader, $defines); - } - - if (count($functions) > 0) - { - $newHeader[] = "\n"; - $newHeader = array_merge($newHeader, $functions); - } - - if (count($structs) > 0) - { - $newHeader[] = "\n"; - $newHeader = array_merge($newHeader, $structs); - } - - return $newHeader; -} - -function cleanHeader($headerFile) -{ - global $UPDATE_FILES; - - $func_pattern = "/(([A-Z0-9_]+)\\()/i"; - $struct_pattern = "/([A-Z]+);/i"; - $define_pattern = "/#define ([A-Z]+)/i"; - - $bodyFile = $headerFile; - $bodyFile[strlen($bodyFile) - 1] = 'c'; - - if (file_exists($bodyFile)) - { - $header = file($headerFile); - $body = file_get_contents($bodyFile); - $isMain = strpos($body, "int main("); - $lines = []; - $defines = []; - $functions = []; - $structs = []; - - $i = 0; - $hasChanges = false; - - foreach ($header as $line) - { - if ((preg_match("/extern|define/", $line) || preg_match("/;$/", $line))) - { - preg_match($func_pattern, $line, $matches); - - if (count($matches) == 3) - { - unset($header[$i]); - - $extern = $matches[2]; - - if (!preg_match_all("/\b${extern}\b/", $body)) - { - if (!$hasChanges) - { - echo "$headerFile\n"; - $hasChanges = true; - } - echo "\t- $line"; - } - else if (!in_array($line, $lines)) - { - $functions[] = $line; - } - } - - preg_match($struct_pattern, $line, $matches); - - if (count($matches) == 2) - { - unset($header[$i]); - - $extern = $matches[1]; - - $externs[] = $extern; - - if (!$isMain) - { - if (!preg_match_all("/\b${extern}\b/", $body)) - { - if (!$hasChanges) - { - echo "$headerFile\n"; - $hasChanges = true; - } - echo "\t- $line"; - } - else if (!in_array($line, $lines)) - { - $structs[] = $line; - } - } - else if (!in_array($line, $lines)) - { - $structs[] = $line; - } - } - - preg_match($define_pattern, $line, $matches); - - if (count($matches) == 2) - { - unset($header[$i]); - - $extern = $matches[1]; - - $externs[] = $extern; - - if (strstr($body, "$extern") === FALSE) - { - if (!$hasChanges) - { - echo "$headerFile\n"; - $hasChanges = true; - } - echo "\t- $line"; - } - else if (!in_array($line, $lines)) - { - $defines[] = $line; - } - } - } - - $i++; - } - - do - { - $wasBlank = false; - $line = trim(end($header)); - if (strlen($line) == 0) - { - array_pop($header); - $wasBlank = true; - } - } - while ($wasBlank); - - $defines = array_unique($defines); - $functions = array_unique($functions); - $structs = array_unique($structs); - - $defines = alignDefines($defines); - - $header = updateExterns($header, $defines, $functions, $structs); - - if ($UPDATE_FILES) - { - file_put_contents($headerFile, $header); - } - } -} - -function alignDefines($defines) -{ - $newAligns = []; - $largest = 0; - $defineName; - $defineValue; - - foreach ($defines as $define) - { - sscanf($define, "%*s %s", $defineName); - - $largest = max($largest, strlen($defineName) + 4); - } - - foreach ($defines as $define) - { - sscanf($define, "%*s %s %[^\n]", $defineName, $defineValue); - - $newAligns[] = "#define " . str_pad($defineName, $largest, " ") . $defineValue . "\n"; - } - - return $newAligns; -} - -function recurseDir($dir) -{ - if ($dir != "../src/json") - { - $files = array_diff(scandir($dir), array('..', '.')); - - foreach ($files as $file) - { - if (is_dir("$dir/$file")) - { - recurseDir("$dir/$file"); - } - else if (strstr($file, ".h") !== FALSE && $file != 'i18n.h') - { - cleanHeader("$dir/$file"); - } - } - } -} - -if (isset($argv[1])) -{ - $UPDATE_FILES = ($argv[1] == "-commit"); -} - -recurseDir("../src"); - -if (!$UPDATE_FILES) -{ - echo "\nNo files updated. Use -commit to update headers\n"; -} - -?> diff --git a/tools/updateI18N.sh b/tools/updateI18N.sh deleted file mode 100755 index 8224bdd..0000000 --- a/tools/updateI18N.sh +++ /dev/null @@ -1,175 +0,0 @@ -#!/usr/bin/php - - 0) - { - addString($matches[1]); - } - } -} - -function extractJSON($filename) -{ - $data = file_get_contents($filename); - $json = json_decode($data); - - if (strpos($filename, "widget") !== false) - { - foreach ($json as $widget) - { - if (array_key_exists("text", $widget)) - { - addString($widget->{"text"}, $filename); - } - } - } - else if (strpos($filename, "trophies") !== false) - { - foreach ($json as $trophy) - { - addString($trophy->{"title"}); - addString($trophy->{"description"}); - } - } - else if (strpos($filename, "missions") !== false) - { - addString($json->{"name"}); - addString($json->{"description"}); - - if (array_key_exists("objectives", $json)) - { - foreach ($json->{"objectives"} as $objective) - { - addString($objective->{"description"}, $filename); - } - } - - if (array_key_exists("script", $json)) - { - foreach ($json->{"script"} as $scripts) - { - foreach ($scripts->{"lines"} as $line) - { - if (strpos($line, "MSG_BOX") === 0 || strpos($line, "IMPORTANT_MSG_BOX") === 0) - { - $i = strpos($line, ";") + 1; - - $line = substr($line, $i); - - addString($line, $filename); - } - } - } - } - } - else if (strpos($filename, "challenges") !== false) - { - addString($json->{"description"}); - } - else if (strpos($filename, "fighters") !== false) - { - addString($json->{"description"}); - } -} - -function recurseDir($dir) -{ - $files = array_diff(scandir($dir), array('..', '.')); - - foreach ($files as $file) - { - if (is_dir("$dir/$file")) - { - recurseDir("$dir/$file"); - } - else if (strstr($file, ".c") !== FALSE) - { - extractC("$dir/$file"); - } - else if (strstr($file, ".json") !== FALSE) - { - extractJSON("$dir/$file"); - } - } -} - -recurseDir("../src"); - -recurseDir("../data/widgets"); - -recurseDir("../data/missions"); - -recurseDir("../data/challenges"); - -recurseDir("../data/trophies"); - -recurseDir("../data/fighters"); - -$potHeader = file_get_contents("../tools/potHeader.txt"); - -$handle = fopen("../locale/tbftss.pot", "w"); - -$dateTime = date("Y-m-d H:i:sO"); - -$potHeader = str_replace("{POT_CREATION_DATE}", $dateTime, $potHeader); - -fwrite($handle, "$potHeader\n"); - -foreach ($strings as $string) -{ - fwrite($handle, "msgid \"$string\"\n"); - fwrite($handle, "msgstr \"\"\n"); - fwrite($handle, "\n"); -} - -fclose($handle); - -?>