diff --git a/AB-AUTHORS b/AB-AUTHORS index e41964eef..76b37c391 100644 --- a/AB-AUTHORS +++ b/AB-AUTHORS @@ -1,4 +1,4 @@ -Aleph Bet is a direct descendent of Aleph One, and benefits from all enhancements and extensions by that project's contributors. +Aleph Bet is a direct descendent of Aleph One, and benefits from many enhancements and extensions by that project's contributors. Additional contributions have been made by: diff --git a/Source_Files/CSeries/csstrings.cpp b/Source_Files/CSeries/csstrings.cpp index 2ec4967df..09d64a23e 100644 --- a/Source_Files/CSeries/csstrings.cpp +++ b/Source_Files/CSeries/csstrings.cpp @@ -370,7 +370,7 @@ void expand_app_variables_inplace(std::string& str) boost::replace_all(str, "$appVersion$", AB_DISPLAY_VERSION); boost::replace_all(str, "$appLongVersion$", AB_VERSION_STRING); boost::replace_all(str, "$appPlatform$", AB_DISPLAY_PLATFORM); - boost::replace_all(str, "$appDate$", AB_DISPLAY_DATE_VERSION); + boost::replace_all(str, "$appDate$", AB_DATE_DISPLAY_VERSION); boost::replace_all(str, "$appURL$", AB_HOMEPAGE_URL); boost::replace_all(str, "$appLogFile$", loggingFileName()); boost::replace_all(str, "$scenarioName$", Scenario::instance()->GetName()); diff --git a/Source_Files/Lua/lua_ephemera.h b/Source_Files/Lua/lua_ephemera.h index 24f388636..ff1b3084c 100644 --- a/Source_Files/Lua/lua_ephemera.h +++ b/Source_Files/Lua/lua_ephemera.h @@ -22,6 +22,9 @@ * */ +#ifndef _LUA_EPHEMERA_H +#define _LUA_EPHEMERA_H + #include "cseries.h" extern "C" diff --git a/Source_Files/Misc/a1-authors.h b/Source_Files/Misc/a1-authors.h index 18d94ccbb..996a9a451 100644 --- a/Source_Files/Misc/a1-authors.h +++ b/Source_Files/Misc/a1-authors.h @@ -1,51 +1,51 @@ // Automatically generated by A1-AUTHORS-update.lua // Do not edit manually! -authors.push_back("Joey Adams"); -authors.push_back("Michael Adams (mdmkolbe)"); -authors.push_back("Falko Axmann"); -authors.push_back("Christian Bauer"); -authors.push_back("Mike Benonis"); -authors.push_back("Solra Bizna"); -authors.push_back("Steven Bytnar"); -authors.push_back("Glen Ditchfield"); -authors.push_back("Will Dyson"); -authors.push_back("Carl Gherardi"); -authors.push_back("Chris Hallock (LidMop)"); -authors.push_back(utf8_to_mac_roman("Benoît Hauquier (Kolfering)")); -authors.push_back("Thomas Herzog"); -authors.push_back("Peter Hessler"); -authors.push_back("Matthew Hielscher"); -authors.push_back("Rhys Hill"); -authors.push_back("Alan Jenkins"); -authors.push_back("Jeremy, the MSVC guy"); -authors.push_back("Mark Levin"); -authors.push_back("Bo Lindbergh"); -authors.push_back("Chris Lovell"); -authors.push_back("Jesse Luehrs"); -authors.push_back("Marshall (darealshinji)"); -authors.push_back("Derek Moeller"); -authors.push_back("Jeremiah Morris"); -authors.push_back("Sam Morris"); -authors.push_back("Benoit Nadeau (Benad)"); -authors.push_back("Mihai Parparita"); -authors.push_back("Jeremy Parsons (brefin)"); -authors.push_back("Eric Peterson"); -authors.push_back("Loren Petrich"); -authors.push_back("Ian Pitcher"); -authors.push_back("Chris Pruett"); -authors.push_back("Matthew Reda"); -authors.push_back("Ian Rickard"); -authors.push_back("Etienne Samson (tiennou)"); -authors.push_back("Catherine Seppanen"); -authors.push_back("Gregory Smith (treellama)"); -authors.push_back("Scott Smith (pickle136)"); -authors.push_back("Wolfgang Sourdeau"); -authors.push_back("Peter Stirling"); -authors.push_back("Alexander Strange (mrvacbob)"); -authors.push_back("Alexei Svitkine"); -authors.push_back("Ben Thompson"); -authors.push_back("TrajansRow"); -authors.push_back("Clemens Unterkofler (hogdotmac)"); -authors.push_back("James Willson"); -authors.push_back("Woody Zenfell III"); +a1_authors.push_back("Joey Adams"); +a1_authors.push_back("Michael Adams (mdmkolbe)"); +a1_authors.push_back("Falko Axmann"); +a1_authors.push_back("Christian Bauer"); +a1_authors.push_back("Mike Benonis"); +a1_authors.push_back("Solra Bizna"); +a1_authors.push_back("Steven Bytnar"); +a1_authors.push_back("Glen Ditchfield"); +a1_authors.push_back("Will Dyson"); +a1_authors.push_back("Carl Gherardi"); +a1_authors.push_back("Chris Hallock (LidMop)"); +a1_authors.push_back(utf8_to_mac_roman("Benoît Hauquier (Kolfering)")); +a1_authors.push_back("Thomas Herzog"); +a1_authors.push_back("Peter Hessler"); +a1_authors.push_back("Matthew Hielscher"); +a1_authors.push_back("Rhys Hill"); +a1_authors.push_back("Alan Jenkins"); +a1_authors.push_back("Jeremy, the MSVC guy"); +a1_authors.push_back("Mark Levin"); +a1_authors.push_back("Bo Lindbergh"); +a1_authors.push_back("Chris Lovell"); +a1_authors.push_back("Jesse Luehrs"); +a1_authors.push_back("Marshall (darealshinji)"); +a1_authors.push_back("Derek Moeller"); +a1_authors.push_back("Jeremiah Morris"); +a1_authors.push_back("Sam Morris"); +a1_authors.push_back("Benoit Nadeau (Benad)"); +a1_authors.push_back("Mihai Parparita"); +a1_authors.push_back("Jeremy Parsons (brefin)"); +a1_authors.push_back("Eric Peterson"); +a1_authors.push_back("Loren Petrich"); +a1_authors.push_back("Ian Pitcher"); +a1_authors.push_back("Chris Pruett"); +a1_authors.push_back("Matthew Reda"); +a1_authors.push_back("Ian Rickard"); +a1_authors.push_back("Etienne Samson (tiennou)"); +a1_authors.push_back("Catherine Seppanen"); +a1_authors.push_back("Gregory Smith (treellama)"); +a1_authors.push_back("Scott Smith (pickle136)"); +a1_authors.push_back("Wolfgang Sourdeau"); +a1_authors.push_back("Peter Stirling"); +a1_authors.push_back("Alexander Strange (mrvacbob)"); +a1_authors.push_back("Alexei Svitkine"); +a1_authors.push_back("Ben Thompson"); +a1_authors.push_back("TrajansRow"); +a1_authors.push_back("Clemens Unterkofler (hogdotmac)"); +a1_authors.push_back("James Willson"); +a1_authors.push_back("Woody Zenfell III"); diff --git a/Source_Files/Misc/ab-authors.h b/Source_Files/Misc/ab-authors.h index 90a14ca65..95f5efc1f 100644 --- a/Source_Files/Misc/ab-authors.h +++ b/Source_Files/Misc/ab-authors.h @@ -1,5 +1,5 @@ // Automatically generated by A1-AUTHORS-update.lua // Do not edit manually! -authors.push_back("Solra Bizna"); -authors.push_back("Aaron Freed"); +ab_authors.push_back("Solra Bizna"); +ab_authors.push_back("Aaron Freed"); diff --git a/Source_Files/Misc/interface.cpp b/Source_Files/Misc/interface.cpp index d64d79965..bb3a712ea 100644 --- a/Source_Files/Misc/interface.cpp +++ b/Source_Files/Misc/interface.cpp @@ -1775,37 +1775,33 @@ static void display_about_dialog() vertical_placer *a1_authors_placer = new vertical_placer(); - a1_authors_placer->dual_add(new w_static_text("Aleph Bet is based on the source code for Marathon 2 and"), d); + a1_authors_placer->dual_add(new w_static_text("Aleph One is based on the source code for Marathon 2 and"), d); a1_authors_placer->dual_add(new w_static_text("Marathon Infinity, which was developed by Bungie Software."), d); a1_authors_placer->add(new w_spacer, true); a1_authors_placer->dual_add(new w_static_text("The enhancements and extensions to Marathon 2 and Marathon"), d); - a1_authors_placer->dual_add(new w_static_text("Infinity that constitute Aleph Bet have been made by:"), d); + a1_authors_placer->dual_add(new w_static_text("Infinity that constitute Aleph One have been made by:"), d); a1_authors_placer->add(new w_spacer, true); - { - std::vector authors; + std::vector a1_authors; #include "a1-authors.h" - w_authors_list *a1_authors_w = new w_authors_list(authors, &d); - a1_authors_placer->dual_add(a1_authors_w, d); - } + w_authors_list *a1_authors_w = new w_authors_list(a1_authors, &d); + a1_authors_placer->dual_add(a1_authors_w, d); vertical_placer *ab_authors_placer = new vertical_placer(); - ab_authors_placer->dual_add(new w_static_text("Aleph Bet is a direct descendent of Aleph One, and"), d); - ab_authors_placer->dual_add(new w_static_text("benefits from all enhancements and extensions"), d); - ab_authors_placer->dual_add(new w_static_text("by that project's contributors."), d); + ab_authors_placer->dual_add(new w_static_text("Aleph Bet is a direct descendent of Aleph One, and benefits"), d); + ab_authors_placer->dual_add(new w_static_text("from many enhancements and extensions by that project's"), d); + ab_authors_placer->dual_add(new w_static_text("contributors."), d); ab_authors_placer->add(new w_spacer, true); ab_authors_placer->dual_add(new w_static_text("Additional contributions have been made by:"), d); ab_authors_placer->add(new w_spacer, true); - { - std::vector authors; + std::vector ab_authors; #include "ab-authors.h" - w_authors_list *ab_authors_w = new w_authors_list(authors, &d); - ab_authors_placer->dual_add(ab_authors_w, d); - } + w_authors_list *ab_authors_w = new w_authors_list(ab_authors, &d); + ab_authors_placer->dual_add(ab_authors_w, d); tabs->add(about_placer, true); tabs->add(a1_authors_placer, true); diff --git a/Source_Files/shell.cpp b/Source_Files/shell.cpp index e77e72466..e1e7bb0d6 100644 --- a/Source_Files/shell.cpp +++ b/Source_Files/shell.cpp @@ -323,7 +323,7 @@ void initialize_application(void) size_t dsp_insert_pos = data_search_path.size(); size_t dsp_delete_pos = (size_t)-1; - const string default_data_env = a1_getenv("ALEPHBET_DEFAULT_DATA"); + string default_data_env = a1_getenv("ALEPHBET_DEFAULT_DATA"); if(default_data_env.empty()) { default_data_env = a1_getenv("ALEPHONE_DEFAULT_DATA"); } @@ -340,7 +340,7 @@ void initialize_application(void) data_search_path.push_back(default_data_env); } - const string data_env = a1_getenv("ALEPHBET_DATA"); + string data_env = a1_getenv("ALEPHBET_DATA"); if(data_env.empty()) { data_env = a1_getenv("ALEPHONE_DATA"); } diff --git a/authors-update.lua b/authors-update.lua index 1ccc3b8ab..dafcacf10 100644 --- a/authors-update.lua +++ b/authors-update.lua @@ -1,6 +1,6 @@ #!/usr/bin/env lua -function go(inpath, outpath) +function go(inpath, outpath, symbol) local inf = assert(io.open(inpath, "rb")) -- Skip until we see a line ending in "by:" local l @@ -16,13 +16,13 @@ function go(inpath, outpath) ]] for l in inf:lines() do if l:match("[\x80-\xFF]") then - outf:write(("authors.push_back(utf8_to_mac_roman(%q));\n"):format(l)) + outf:write(("%s.push_back(utf8_to_mac_roman(%q));\n"):format(symbol, l)) else - outf:write(("authors.push_back(%q);\n"):format(l)) + outf:write(("%s.push_back(%q);\n"):format(symbol, l)) end end outf:close() end -go("A1-AUTHORS", "Source_Files/Misc/a1-authors.h") -go("AB-AUTHORS", "Source_Files/Misc/ab-authors.h") +go("A1-AUTHORS", "Source_Files/Misc/a1-authors.h", "a1_authors") +go("AB-AUTHORS", "Source_Files/Misc/ab-authors.h", "ab_authors") diff --git a/dist-check.sh b/dist-check.sh index 4e840a1cd..be30bf3a9 100755 --- a/dist-check.sh +++ b/dist-check.sh @@ -14,6 +14,7 @@ cd "$(dirname $0)" # ----------------------------------------------------------------------------- echo "Checking about screen fodder." + if ! test Source_Files/Misc/a1-authors.h -nt authors-update.lua \ || ! test Source_Files/Misc/a1-authors.h -nt A1-AUTHORS \ || ! test Source_Files/Misc/ab-authors.h -nt authors-update.lua \ @@ -22,6 +23,14 @@ if ! test Source_Files/Misc/a1-authors.h -nt authors-update.lua \ exit 1 fi +displaydate="$(date "+%Y-%m-%d")" +shortdate="$(echo $displaydate | tr -d -)" +if [ "$(grep '^#define AB_DATE_DISPLAY_VERSION' Source_Files/Misc/alephversion.h | sed -e 's/.*"\(.*\)"/\1/g' )" != "$displaydate" -o "$(grep '^#define AB_DATE_VERSION' Source_Files/Misc/alephversion.h | sed -e 's/.*"\(.*\)"/\1/g' )" != "$shortdate" ]; then + echo "Dates in Source_Files/Misc/alephversion.h need to be updated. Please update them and rebuild." + echo " (Today's date is $displaydate)" + exit 1 +fi + # ----------------------------------------------------------------------------- echo "Checking copyright notices." @@ -41,12 +50,15 @@ cargo run -q --release --manifest-path=copyright-check/Cargo.toml -- \ --exclude 'SDL_ffmpeg.*' \ --exclude 'SDL_rwops_zzip.*' \ --exclude 'Statistics.*' \ + --exclude '/Source_Files/CSeries/confpaths.h' \ --exclude '/Source_Files/Lua/l*' \ --exclude '/Source_Files/Lua/COPYRIGHT' \ --exclude '/Source_Files/Lua/README' \ --include '/Source_Files/Lua/language_definition.h' \ - --include '/Source_Files/Lua/lua_*' \ + --include '/Source_Files/Lua/lua_*.cpp' \ + --include '/Source_Files/Lua/lua_*.h' \ --exclude '/Source_Files/Misc/a1-authors.h' \ + --exclude '/Source_Files/Misc/ab-authors.h' \ --exclude '/Source_Files/Misc/AlephSansMono-Bold.h' \ --exclude '/Source_Files/Misc/CourierPrime*.h' \ --exclude '/Source_Files/Misc/ProFontAO.h' \ @@ -59,6 +71,10 @@ cargo run -q --release --manifest-path=copyright-check/Cargo.toml -- \ --exclude '/Source_Files/RenderOther/sdl_resize.*' \ --exclude '/Source_Files/TCPMess/*' \ --include '/Source_Files/TCPMess/Makefile.am' \ + --exclude '*.Po' \ + --exclude '*.o' \ + --exclude '*.a' \ + --exclude 'Source_Files/alephbet' \ --dir Source_Files # -----------------------------------------------------------------------------