diff --git a/bin/evennia b/bin/evennia index 8f10566192..3dbada2663 100755 --- a/bin/evennia +++ b/bin/evennia @@ -28,7 +28,7 @@ EVENNIA_BIN = os.path.join(EVENNIA_ROOT, "bin") import evennia EVENNIA_LIB = os.path.join(os.path.dirname(os.path.abspath(evennia.__file__))) EVENNIA_RUNNER = os.path.join(EVENNIA_BIN, "evennia_runner.py") -EVENNIA_TEMPLATE = os.path.join(EVENNIA_ROOT, "share", "evennia", "game_template") +EVENNIA_TEMPLATE = os.path.join(EVENNIA_LIB, "game_template") EVENNIA_BINTESTING = os.path.join(EVENNIA_BIN, "testing") EVENNIA_DUMMYRUNNER = os.path.join(EVENNIA_BINTESTING, "dummyrunner.py") diff --git a/game_template/__init__.py b/evennia/game_template/__init__.py similarity index 100% rename from game_template/__init__.py rename to evennia/game_template/__init__.py diff --git a/game_template/commands/__init__.py b/evennia/game_template/commands/__init__.py similarity index 100% rename from game_template/commands/__init__.py rename to evennia/game_template/commands/__init__.py diff --git a/game_template/commands/command.py b/evennia/game_template/commands/command.py similarity index 100% rename from game_template/commands/command.py rename to evennia/game_template/commands/command.py diff --git a/game_template/commands/default_cmdsets.py b/evennia/game_template/commands/default_cmdsets.py similarity index 100% rename from game_template/commands/default_cmdsets.py rename to evennia/game_template/commands/default_cmdsets.py diff --git a/game_template/server/__init__.py b/evennia/game_template/server/__init__.py similarity index 100% rename from game_template/server/__init__.py rename to evennia/game_template/server/__init__.py diff --git a/game_template/server/conf/__init__.py b/evennia/game_template/server/conf/__init__.py similarity index 100% rename from game_template/server/conf/__init__.py rename to evennia/game_template/server/conf/__init__.py diff --git a/game_template/server/conf/at_initial_setup.py b/evennia/game_template/server/conf/at_initial_setup.py similarity index 100% rename from game_template/server/conf/at_initial_setup.py rename to evennia/game_template/server/conf/at_initial_setup.py diff --git a/game_template/server/conf/at_search.py b/evennia/game_template/server/conf/at_search.py similarity index 100% rename from game_template/server/conf/at_search.py rename to evennia/game_template/server/conf/at_search.py diff --git a/game_template/server/conf/at_server_startstop.py b/evennia/game_template/server/conf/at_server_startstop.py similarity index 100% rename from game_template/server/conf/at_server_startstop.py rename to evennia/game_template/server/conf/at_server_startstop.py diff --git a/game_template/server/conf/cmdparser.py b/evennia/game_template/server/conf/cmdparser.py similarity index 100% rename from game_template/server/conf/cmdparser.py rename to evennia/game_template/server/conf/cmdparser.py diff --git a/game_template/server/conf/connection_screens.py b/evennia/game_template/server/conf/connection_screens.py similarity index 100% rename from game_template/server/conf/connection_screens.py rename to evennia/game_template/server/conf/connection_screens.py diff --git a/game_template/server/conf/inlinefunc.py b/evennia/game_template/server/conf/inlinefunc.py similarity index 100% rename from game_template/server/conf/inlinefunc.py rename to evennia/game_template/server/conf/inlinefunc.py diff --git a/game_template/server/conf/lockfuncs.py b/evennia/game_template/server/conf/lockfuncs.py similarity index 100% rename from game_template/server/conf/lockfuncs.py rename to evennia/game_template/server/conf/lockfuncs.py diff --git a/game_template/server/conf/mssp.py b/evennia/game_template/server/conf/mssp.py similarity index 100% rename from game_template/server/conf/mssp.py rename to evennia/game_template/server/conf/mssp.py diff --git a/game_template/server/conf/oobfuncs.py b/evennia/game_template/server/conf/oobfuncs.py similarity index 100% rename from game_template/server/conf/oobfuncs.py rename to evennia/game_template/server/conf/oobfuncs.py diff --git a/game_template/server/conf/portal_services_plugins.py b/evennia/game_template/server/conf/portal_services_plugins.py similarity index 100% rename from game_template/server/conf/portal_services_plugins.py rename to evennia/game_template/server/conf/portal_services_plugins.py diff --git a/game_template/server/conf/server_services_plugins.py b/evennia/game_template/server/conf/server_services_plugins.py similarity index 100% rename from game_template/server/conf/server_services_plugins.py rename to evennia/game_template/server/conf/server_services_plugins.py diff --git a/game_template/server/conf/serversession.py b/evennia/game_template/server/conf/serversession.py similarity index 100% rename from game_template/server/conf/serversession.py rename to evennia/game_template/server/conf/serversession.py diff --git a/game_template/server/conf/settings.py b/evennia/game_template/server/conf/settings.py similarity index 100% rename from game_template/server/conf/settings.py rename to evennia/game_template/server/conf/settings.py diff --git a/game_template/server/logs/server.log b/evennia/game_template/server/logs/server.log similarity index 100% rename from game_template/server/logs/server.log rename to evennia/game_template/server/logs/server.log diff --git a/game_template/typeclasses/__init__.py b/evennia/game_template/typeclasses/__init__.py similarity index 100% rename from game_template/typeclasses/__init__.py rename to evennia/game_template/typeclasses/__init__.py diff --git a/game_template/typeclasses/channels.py b/evennia/game_template/typeclasses/channels.py similarity index 100% rename from game_template/typeclasses/channels.py rename to evennia/game_template/typeclasses/channels.py diff --git a/game_template/typeclasses/characters.py b/evennia/game_template/typeclasses/characters.py similarity index 100% rename from game_template/typeclasses/characters.py rename to evennia/game_template/typeclasses/characters.py diff --git a/game_template/typeclasses/exits.py b/evennia/game_template/typeclasses/exits.py similarity index 100% rename from game_template/typeclasses/exits.py rename to evennia/game_template/typeclasses/exits.py diff --git a/game_template/typeclasses/objects.py b/evennia/game_template/typeclasses/objects.py similarity index 100% rename from game_template/typeclasses/objects.py rename to evennia/game_template/typeclasses/objects.py diff --git a/game_template/typeclasses/players.py b/evennia/game_template/typeclasses/players.py similarity index 100% rename from game_template/typeclasses/players.py rename to evennia/game_template/typeclasses/players.py diff --git a/game_template/typeclasses/rooms.py b/evennia/game_template/typeclasses/rooms.py similarity index 100% rename from game_template/typeclasses/rooms.py rename to evennia/game_template/typeclasses/rooms.py diff --git a/game_template/typeclasses/scripts.py b/evennia/game_template/typeclasses/scripts.py similarity index 100% rename from game_template/typeclasses/scripts.py rename to evennia/game_template/typeclasses/scripts.py diff --git a/game_template/web/__init__.py b/evennia/game_template/web/__init__.py similarity index 100% rename from game_template/web/__init__.py rename to evennia/game_template/web/__init__.py diff --git a/game_template/web/media/README.md b/evennia/game_template/web/media/README.md similarity index 100% rename from game_template/web/media/README.md rename to evennia/game_template/web/media/README.md diff --git a/game_template/web/static/README.md b/evennia/game_template/web/static/README.md similarity index 100% rename from game_template/web/static/README.md rename to evennia/game_template/web/static/README.md diff --git a/game_template/web/static/admin/css/base.css b/evennia/game_template/web/static/admin/css/base.css similarity index 100% rename from game_template/web/static/admin/css/base.css rename to evennia/game_template/web/static/admin/css/base.css diff --git a/game_template/web/static/admin/css/changelists.css b/evennia/game_template/web/static/admin/css/changelists.css similarity index 100% rename from game_template/web/static/admin/css/changelists.css rename to evennia/game_template/web/static/admin/css/changelists.css diff --git a/game_template/web/static/admin/css/dashboard.css b/evennia/game_template/web/static/admin/css/dashboard.css similarity index 100% rename from game_template/web/static/admin/css/dashboard.css rename to evennia/game_template/web/static/admin/css/dashboard.css diff --git a/game_template/web/static/admin/css/forms.css b/evennia/game_template/web/static/admin/css/forms.css similarity index 100% rename from game_template/web/static/admin/css/forms.css rename to evennia/game_template/web/static/admin/css/forms.css diff --git a/game_template/web/static/admin/css/ie.css b/evennia/game_template/web/static/admin/css/ie.css similarity index 100% rename from game_template/web/static/admin/css/ie.css rename to evennia/game_template/web/static/admin/css/ie.css diff --git a/game_template/web/static/admin/css/login.css b/evennia/game_template/web/static/admin/css/login.css similarity index 100% rename from game_template/web/static/admin/css/login.css rename to evennia/game_template/web/static/admin/css/login.css diff --git a/game_template/web/static/admin/css/rtl.css b/evennia/game_template/web/static/admin/css/rtl.css similarity index 100% rename from game_template/web/static/admin/css/rtl.css rename to evennia/game_template/web/static/admin/css/rtl.css diff --git a/game_template/web/static/admin/css/widgets.css b/evennia/game_template/web/static/admin/css/widgets.css similarity index 100% rename from game_template/web/static/admin/css/widgets.css rename to evennia/game_template/web/static/admin/css/widgets.css diff --git a/game_template/web/static/admin/img/changelist-bg.gif b/evennia/game_template/web/static/admin/img/changelist-bg.gif similarity index 100% rename from game_template/web/static/admin/img/changelist-bg.gif rename to evennia/game_template/web/static/admin/img/changelist-bg.gif diff --git a/game_template/web/static/admin/img/changelist-bg_rtl.gif b/evennia/game_template/web/static/admin/img/changelist-bg_rtl.gif similarity index 100% rename from game_template/web/static/admin/img/changelist-bg_rtl.gif rename to evennia/game_template/web/static/admin/img/changelist-bg_rtl.gif diff --git a/game_template/web/static/admin/img/chooser-bg.gif b/evennia/game_template/web/static/admin/img/chooser-bg.gif similarity index 100% rename from game_template/web/static/admin/img/chooser-bg.gif rename to evennia/game_template/web/static/admin/img/chooser-bg.gif diff --git a/game_template/web/static/admin/img/chooser_stacked-bg.gif b/evennia/game_template/web/static/admin/img/chooser_stacked-bg.gif similarity index 100% rename from game_template/web/static/admin/img/chooser_stacked-bg.gif rename to evennia/game_template/web/static/admin/img/chooser_stacked-bg.gif diff --git a/game_template/web/static/admin/img/default-bg-reverse.gif b/evennia/game_template/web/static/admin/img/default-bg-reverse.gif similarity index 100% rename from game_template/web/static/admin/img/default-bg-reverse.gif rename to evennia/game_template/web/static/admin/img/default-bg-reverse.gif diff --git a/game_template/web/static/admin/img/default-bg.gif b/evennia/game_template/web/static/admin/img/default-bg.gif similarity index 100% rename from game_template/web/static/admin/img/default-bg.gif rename to evennia/game_template/web/static/admin/img/default-bg.gif diff --git a/game_template/web/static/admin/img/deleted-overlay.gif b/evennia/game_template/web/static/admin/img/deleted-overlay.gif similarity index 100% rename from game_template/web/static/admin/img/deleted-overlay.gif rename to evennia/game_template/web/static/admin/img/deleted-overlay.gif diff --git a/game_template/web/static/admin/img/gis/move_vertex_off.png b/evennia/game_template/web/static/admin/img/gis/move_vertex_off.png similarity index 100% rename from game_template/web/static/admin/img/gis/move_vertex_off.png rename to evennia/game_template/web/static/admin/img/gis/move_vertex_off.png diff --git a/game_template/web/static/admin/img/gis/move_vertex_on.png b/evennia/game_template/web/static/admin/img/gis/move_vertex_on.png similarity index 100% rename from game_template/web/static/admin/img/gis/move_vertex_on.png rename to evennia/game_template/web/static/admin/img/gis/move_vertex_on.png diff --git a/game_template/web/static/admin/img/icon-no.gif b/evennia/game_template/web/static/admin/img/icon-no.gif similarity index 100% rename from game_template/web/static/admin/img/icon-no.gif rename to evennia/game_template/web/static/admin/img/icon-no.gif diff --git a/game_template/web/static/admin/img/icon-unknown.gif b/evennia/game_template/web/static/admin/img/icon-unknown.gif similarity index 100% rename from game_template/web/static/admin/img/icon-unknown.gif rename to evennia/game_template/web/static/admin/img/icon-unknown.gif diff --git a/game_template/web/static/admin/img/icon-yes.gif b/evennia/game_template/web/static/admin/img/icon-yes.gif similarity index 100% rename from game_template/web/static/admin/img/icon-yes.gif rename to evennia/game_template/web/static/admin/img/icon-yes.gif diff --git a/game_template/web/static/admin/img/icon_addlink.gif b/evennia/game_template/web/static/admin/img/icon_addlink.gif similarity index 100% rename from game_template/web/static/admin/img/icon_addlink.gif rename to evennia/game_template/web/static/admin/img/icon_addlink.gif diff --git a/game_template/web/static/admin/img/icon_alert.gif b/evennia/game_template/web/static/admin/img/icon_alert.gif similarity index 100% rename from game_template/web/static/admin/img/icon_alert.gif rename to evennia/game_template/web/static/admin/img/icon_alert.gif diff --git a/game_template/web/static/admin/img/icon_calendar.gif b/evennia/game_template/web/static/admin/img/icon_calendar.gif similarity index 100% rename from game_template/web/static/admin/img/icon_calendar.gif rename to evennia/game_template/web/static/admin/img/icon_calendar.gif diff --git a/game_template/web/static/admin/img/icon_changelink.gif b/evennia/game_template/web/static/admin/img/icon_changelink.gif similarity index 100% rename from game_template/web/static/admin/img/icon_changelink.gif rename to evennia/game_template/web/static/admin/img/icon_changelink.gif diff --git a/game_template/web/static/admin/img/icon_clock.gif b/evennia/game_template/web/static/admin/img/icon_clock.gif similarity index 100% rename from game_template/web/static/admin/img/icon_clock.gif rename to evennia/game_template/web/static/admin/img/icon_clock.gif diff --git a/game_template/web/static/admin/img/icon_deletelink.gif b/evennia/game_template/web/static/admin/img/icon_deletelink.gif similarity index 100% rename from game_template/web/static/admin/img/icon_deletelink.gif rename to evennia/game_template/web/static/admin/img/icon_deletelink.gif diff --git a/game_template/web/static/admin/img/icon_error.gif b/evennia/game_template/web/static/admin/img/icon_error.gif similarity index 100% rename from game_template/web/static/admin/img/icon_error.gif rename to evennia/game_template/web/static/admin/img/icon_error.gif diff --git a/game_template/web/static/admin/img/icon_searchbox.png b/evennia/game_template/web/static/admin/img/icon_searchbox.png similarity index 100% rename from game_template/web/static/admin/img/icon_searchbox.png rename to evennia/game_template/web/static/admin/img/icon_searchbox.png diff --git a/game_template/web/static/admin/img/icon_success.gif b/evennia/game_template/web/static/admin/img/icon_success.gif similarity index 100% rename from game_template/web/static/admin/img/icon_success.gif rename to evennia/game_template/web/static/admin/img/icon_success.gif diff --git a/game_template/web/static/admin/img/inline-delete-8bit.png b/evennia/game_template/web/static/admin/img/inline-delete-8bit.png similarity index 100% rename from game_template/web/static/admin/img/inline-delete-8bit.png rename to evennia/game_template/web/static/admin/img/inline-delete-8bit.png diff --git a/game_template/web/static/admin/img/inline-delete.png b/evennia/game_template/web/static/admin/img/inline-delete.png similarity index 100% rename from game_template/web/static/admin/img/inline-delete.png rename to evennia/game_template/web/static/admin/img/inline-delete.png diff --git a/game_template/web/static/admin/img/inline-restore-8bit.png b/evennia/game_template/web/static/admin/img/inline-restore-8bit.png similarity index 100% rename from game_template/web/static/admin/img/inline-restore-8bit.png rename to evennia/game_template/web/static/admin/img/inline-restore-8bit.png diff --git a/game_template/web/static/admin/img/inline-restore.png b/evennia/game_template/web/static/admin/img/inline-restore.png similarity index 100% rename from game_template/web/static/admin/img/inline-restore.png rename to evennia/game_template/web/static/admin/img/inline-restore.png diff --git a/game_template/web/static/admin/img/inline-splitter-bg.gif b/evennia/game_template/web/static/admin/img/inline-splitter-bg.gif similarity index 100% rename from game_template/web/static/admin/img/inline-splitter-bg.gif rename to evennia/game_template/web/static/admin/img/inline-splitter-bg.gif diff --git a/game_template/web/static/admin/img/nav-bg-grabber.gif b/evennia/game_template/web/static/admin/img/nav-bg-grabber.gif similarity index 100% rename from game_template/web/static/admin/img/nav-bg-grabber.gif rename to evennia/game_template/web/static/admin/img/nav-bg-grabber.gif diff --git a/game_template/web/static/admin/img/nav-bg-reverse.gif b/evennia/game_template/web/static/admin/img/nav-bg-reverse.gif similarity index 100% rename from game_template/web/static/admin/img/nav-bg-reverse.gif rename to evennia/game_template/web/static/admin/img/nav-bg-reverse.gif diff --git a/game_template/web/static/admin/img/nav-bg-selected.gif b/evennia/game_template/web/static/admin/img/nav-bg-selected.gif similarity index 100% rename from game_template/web/static/admin/img/nav-bg-selected.gif rename to evennia/game_template/web/static/admin/img/nav-bg-selected.gif diff --git a/game_template/web/static/admin/img/nav-bg.gif b/evennia/game_template/web/static/admin/img/nav-bg.gif similarity index 100% rename from game_template/web/static/admin/img/nav-bg.gif rename to evennia/game_template/web/static/admin/img/nav-bg.gif diff --git a/game_template/web/static/admin/img/selector-icons.gif b/evennia/game_template/web/static/admin/img/selector-icons.gif similarity index 100% rename from game_template/web/static/admin/img/selector-icons.gif rename to evennia/game_template/web/static/admin/img/selector-icons.gif diff --git a/game_template/web/static/admin/img/selector-search.gif b/evennia/game_template/web/static/admin/img/selector-search.gif similarity index 100% rename from game_template/web/static/admin/img/selector-search.gif rename to evennia/game_template/web/static/admin/img/selector-search.gif diff --git a/game_template/web/static/admin/img/sorting-icons.gif b/evennia/game_template/web/static/admin/img/sorting-icons.gif similarity index 100% rename from game_template/web/static/admin/img/sorting-icons.gif rename to evennia/game_template/web/static/admin/img/sorting-icons.gif diff --git a/game_template/web/static/admin/img/tool-left.gif b/evennia/game_template/web/static/admin/img/tool-left.gif similarity index 100% rename from game_template/web/static/admin/img/tool-left.gif rename to evennia/game_template/web/static/admin/img/tool-left.gif diff --git a/game_template/web/static/admin/img/tool-left_over.gif b/evennia/game_template/web/static/admin/img/tool-left_over.gif similarity index 100% rename from game_template/web/static/admin/img/tool-left_over.gif rename to evennia/game_template/web/static/admin/img/tool-left_over.gif diff --git a/game_template/web/static/admin/img/tool-right.gif b/evennia/game_template/web/static/admin/img/tool-right.gif similarity index 100% rename from game_template/web/static/admin/img/tool-right.gif rename to evennia/game_template/web/static/admin/img/tool-right.gif diff --git a/game_template/web/static/admin/img/tool-right_over.gif b/evennia/game_template/web/static/admin/img/tool-right_over.gif similarity index 100% rename from game_template/web/static/admin/img/tool-right_over.gif rename to evennia/game_template/web/static/admin/img/tool-right_over.gif diff --git a/game_template/web/static/admin/img/tooltag-add.gif b/evennia/game_template/web/static/admin/img/tooltag-add.gif similarity index 100% rename from game_template/web/static/admin/img/tooltag-add.gif rename to evennia/game_template/web/static/admin/img/tooltag-add.gif diff --git a/game_template/web/static/admin/img/tooltag-add.png b/evennia/game_template/web/static/admin/img/tooltag-add.png similarity index 100% rename from game_template/web/static/admin/img/tooltag-add.png rename to evennia/game_template/web/static/admin/img/tooltag-add.png diff --git a/game_template/web/static/admin/img/tooltag-add_over.gif b/evennia/game_template/web/static/admin/img/tooltag-add_over.gif similarity index 100% rename from game_template/web/static/admin/img/tooltag-add_over.gif rename to evennia/game_template/web/static/admin/img/tooltag-add_over.gif diff --git a/game_template/web/static/admin/img/tooltag-arrowright.gif b/evennia/game_template/web/static/admin/img/tooltag-arrowright.gif similarity index 100% rename from game_template/web/static/admin/img/tooltag-arrowright.gif rename to evennia/game_template/web/static/admin/img/tooltag-arrowright.gif diff --git a/game_template/web/static/admin/img/tooltag-arrowright.png b/evennia/game_template/web/static/admin/img/tooltag-arrowright.png similarity index 100% rename from game_template/web/static/admin/img/tooltag-arrowright.png rename to evennia/game_template/web/static/admin/img/tooltag-arrowright.png diff --git a/game_template/web/static/admin/img/tooltag-arrowright_over.gif b/evennia/game_template/web/static/admin/img/tooltag-arrowright_over.gif similarity index 100% rename from game_template/web/static/admin/img/tooltag-arrowright_over.gif rename to evennia/game_template/web/static/admin/img/tooltag-arrowright_over.gif diff --git a/game_template/web/static/admin/js/LICENSE-JQUERY.txt b/evennia/game_template/web/static/admin/js/LICENSE-JQUERY.txt similarity index 100% rename from game_template/web/static/admin/js/LICENSE-JQUERY.txt rename to evennia/game_template/web/static/admin/js/LICENSE-JQUERY.txt diff --git a/game_template/web/static/admin/js/SelectBox.js b/evennia/game_template/web/static/admin/js/SelectBox.js similarity index 100% rename from game_template/web/static/admin/js/SelectBox.js rename to evennia/game_template/web/static/admin/js/SelectBox.js diff --git a/game_template/web/static/admin/js/SelectFilter2.js b/evennia/game_template/web/static/admin/js/SelectFilter2.js similarity index 100% rename from game_template/web/static/admin/js/SelectFilter2.js rename to evennia/game_template/web/static/admin/js/SelectFilter2.js diff --git a/game_template/web/static/admin/js/actions.js b/evennia/game_template/web/static/admin/js/actions.js similarity index 100% rename from game_template/web/static/admin/js/actions.js rename to evennia/game_template/web/static/admin/js/actions.js diff --git a/game_template/web/static/admin/js/actions.min.js b/evennia/game_template/web/static/admin/js/actions.min.js similarity index 100% rename from game_template/web/static/admin/js/actions.min.js rename to evennia/game_template/web/static/admin/js/actions.min.js diff --git a/game_template/web/static/admin/js/admin/DateTimeShortcuts.js b/evennia/game_template/web/static/admin/js/admin/DateTimeShortcuts.js similarity index 100% rename from game_template/web/static/admin/js/admin/DateTimeShortcuts.js rename to evennia/game_template/web/static/admin/js/admin/DateTimeShortcuts.js diff --git a/game_template/web/static/admin/js/admin/RelatedObjectLookups.js b/evennia/game_template/web/static/admin/js/admin/RelatedObjectLookups.js similarity index 100% rename from game_template/web/static/admin/js/admin/RelatedObjectLookups.js rename to evennia/game_template/web/static/admin/js/admin/RelatedObjectLookups.js diff --git a/game_template/web/static/admin/js/admin/ordering.js b/evennia/game_template/web/static/admin/js/admin/ordering.js similarity index 100% rename from game_template/web/static/admin/js/admin/ordering.js rename to evennia/game_template/web/static/admin/js/admin/ordering.js diff --git a/game_template/web/static/admin/js/calendar.js b/evennia/game_template/web/static/admin/js/calendar.js similarity index 100% rename from game_template/web/static/admin/js/calendar.js rename to evennia/game_template/web/static/admin/js/calendar.js diff --git a/game_template/web/static/admin/js/collapse.js b/evennia/game_template/web/static/admin/js/collapse.js similarity index 100% rename from game_template/web/static/admin/js/collapse.js rename to evennia/game_template/web/static/admin/js/collapse.js diff --git a/game_template/web/static/admin/js/collapse.min.js b/evennia/game_template/web/static/admin/js/collapse.min.js similarity index 100% rename from game_template/web/static/admin/js/collapse.min.js rename to evennia/game_template/web/static/admin/js/collapse.min.js diff --git a/game_template/web/static/admin/js/core.js b/evennia/game_template/web/static/admin/js/core.js similarity index 100% rename from game_template/web/static/admin/js/core.js rename to evennia/game_template/web/static/admin/js/core.js diff --git a/game_template/web/static/admin/js/getElementsBySelector.js b/evennia/game_template/web/static/admin/js/getElementsBySelector.js similarity index 100% rename from game_template/web/static/admin/js/getElementsBySelector.js rename to evennia/game_template/web/static/admin/js/getElementsBySelector.js diff --git a/game_template/web/static/admin/js/inlines.js b/evennia/game_template/web/static/admin/js/inlines.js similarity index 100% rename from game_template/web/static/admin/js/inlines.js rename to evennia/game_template/web/static/admin/js/inlines.js diff --git a/game_template/web/static/admin/js/inlines.min.js b/evennia/game_template/web/static/admin/js/inlines.min.js similarity index 100% rename from game_template/web/static/admin/js/inlines.min.js rename to evennia/game_template/web/static/admin/js/inlines.min.js diff --git a/game_template/web/static/admin/js/jquery.init.js b/evennia/game_template/web/static/admin/js/jquery.init.js similarity index 100% rename from game_template/web/static/admin/js/jquery.init.js rename to evennia/game_template/web/static/admin/js/jquery.init.js diff --git a/game_template/web/static/admin/js/jquery.js b/evennia/game_template/web/static/admin/js/jquery.js similarity index 100% rename from game_template/web/static/admin/js/jquery.js rename to evennia/game_template/web/static/admin/js/jquery.js diff --git a/game_template/web/static/admin/js/jquery.min.js b/evennia/game_template/web/static/admin/js/jquery.min.js similarity index 100% rename from game_template/web/static/admin/js/jquery.min.js rename to evennia/game_template/web/static/admin/js/jquery.min.js diff --git a/game_template/web/static/admin/js/prepopulate.js b/evennia/game_template/web/static/admin/js/prepopulate.js similarity index 100% rename from game_template/web/static/admin/js/prepopulate.js rename to evennia/game_template/web/static/admin/js/prepopulate.js diff --git a/game_template/web/static/admin/js/prepopulate.min.js b/evennia/game_template/web/static/admin/js/prepopulate.min.js similarity index 100% rename from game_template/web/static/admin/js/prepopulate.min.js rename to evennia/game_template/web/static/admin/js/prepopulate.min.js diff --git a/game_template/web/static/admin/js/timeparse.js b/evennia/game_template/web/static/admin/js/timeparse.js similarity index 100% rename from game_template/web/static/admin/js/timeparse.js rename to evennia/game_template/web/static/admin/js/timeparse.js diff --git a/game_template/web/static/admin/js/urlify.js b/evennia/game_template/web/static/admin/js/urlify.js similarity index 100% rename from game_template/web/static/admin/js/urlify.js rename to evennia/game_template/web/static/admin/js/urlify.js diff --git a/game_template/web/static/ev/css/prosimii-print.css b/evennia/game_template/web/static/ev/css/prosimii-print.css similarity index 100% rename from game_template/web/static/ev/css/prosimii-print.css rename to evennia/game_template/web/static/ev/css/prosimii-print.css diff --git a/game_template/web/static/ev/css/prosimii-screen-alt.css b/evennia/game_template/web/static/ev/css/prosimii-screen-alt.css similarity index 100% rename from game_template/web/static/ev/css/prosimii-screen-alt.css rename to evennia/game_template/web/static/ev/css/prosimii-screen-alt.css diff --git a/game_template/web/static/ev/css/prosimii-screen.css b/evennia/game_template/web/static/ev/css/prosimii-screen.css similarity index 100% rename from game_template/web/static/ev/css/prosimii-screen.css rename to evennia/game_template/web/static/ev/css/prosimii-screen.css diff --git a/game_template/web/static/ev/images/LICENCE b/evennia/game_template/web/static/ev/images/LICENCE similarity index 100% rename from game_template/web/static/ev/images/LICENCE rename to evennia/game_template/web/static/ev/images/LICENCE diff --git a/game_template/web/static/ev/images/evennia_logo.png b/evennia/game_template/web/static/ev/images/evennia_logo.png similarity index 100% rename from game_template/web/static/ev/images/evennia_logo.png rename to evennia/game_template/web/static/ev/images/evennia_logo.png diff --git a/game_template/web/static/ev/images/evennia_logo_small.png b/evennia/game_template/web/static/ev/images/evennia_logo_small.png similarity index 100% rename from game_template/web/static/ev/images/evennia_logo_small.png rename to evennia/game_template/web/static/ev/images/evennia_logo_small.png diff --git a/game_template/web/static/ev/images/favicon.ico b/evennia/game_template/web/static/ev/images/favicon.ico similarity index 100% rename from game_template/web/static/ev/images/favicon.ico rename to evennia/game_template/web/static/ev/images/favicon.ico diff --git a/game_template/web/static/evennia_general/css/prosimii-print.css b/evennia/game_template/web/static/evennia_general/css/prosimii-print.css similarity index 100% rename from game_template/web/static/evennia_general/css/prosimii-print.css rename to evennia/game_template/web/static/evennia_general/css/prosimii-print.css diff --git a/game_template/web/static/evennia_general/css/prosimii-screen-alt.css b/evennia/game_template/web/static/evennia_general/css/prosimii-screen-alt.css similarity index 100% rename from game_template/web/static/evennia_general/css/prosimii-screen-alt.css rename to evennia/game_template/web/static/evennia_general/css/prosimii-screen-alt.css diff --git a/game_template/web/static/evennia_general/css/prosimii-screen.css b/evennia/game_template/web/static/evennia_general/css/prosimii-screen.css similarity index 100% rename from game_template/web/static/evennia_general/css/prosimii-screen.css rename to evennia/game_template/web/static/evennia_general/css/prosimii-screen.css diff --git a/game_template/web/static/evennia_general/images/LICENCE b/evennia/game_template/web/static/evennia_general/images/LICENCE similarity index 100% rename from game_template/web/static/evennia_general/images/LICENCE rename to evennia/game_template/web/static/evennia_general/images/LICENCE diff --git a/game_template/web/static/evennia_general/images/evennia_logo.png b/evennia/game_template/web/static/evennia_general/images/evennia_logo.png similarity index 100% rename from game_template/web/static/evennia_general/images/evennia_logo.png rename to evennia/game_template/web/static/evennia_general/images/evennia_logo.png diff --git a/game_template/web/static/evennia_general/images/evennia_logo_small.png b/evennia/game_template/web/static/evennia_general/images/evennia_logo_small.png similarity index 100% rename from game_template/web/static/evennia_general/images/evennia_logo_small.png rename to evennia/game_template/web/static/evennia_general/images/evennia_logo_small.png diff --git a/game_template/web/static/evennia_general/images/favicon.ico b/evennia/game_template/web/static/evennia_general/images/favicon.ico similarity index 100% rename from game_template/web/static/evennia_general/images/favicon.ico rename to evennia/game_template/web/static/evennia_general/images/favicon.ico diff --git a/game_template/web/static/webclient/css/webclient.css b/evennia/game_template/web/static/webclient/css/webclient.css similarity index 100% rename from game_template/web/static/webclient/css/webclient.css rename to evennia/game_template/web/static/webclient/css/webclient.css diff --git a/game_template/web/static/webclient/js/evennia_ajax_webclient.js b/evennia/game_template/web/static/webclient/js/evennia_ajax_webclient.js similarity index 100% rename from game_template/web/static/webclient/js/evennia_ajax_webclient.js rename to evennia/game_template/web/static/webclient/js/evennia_ajax_webclient.js diff --git a/game_template/web/static/webclient/js/evennia_webclient.js b/evennia/game_template/web/static/webclient/js/evennia_webclient.js similarity index 100% rename from game_template/web/static/webclient/js/evennia_webclient.js rename to evennia/game_template/web/static/webclient/js/evennia_webclient.js diff --git a/game_template/web/static/webclient/js/evennia_websocket_webclient.js b/evennia/game_template/web/static/webclient/js/evennia_websocket_webclient.js similarity index 100% rename from game_template/web/static/webclient/js/evennia_websocket_webclient.js rename to evennia/game_template/web/static/webclient/js/evennia_websocket_webclient.js diff --git a/game_template/web/static_overrides/README.md b/evennia/game_template/web/static_overrides/README.md similarity index 100% rename from game_template/web/static_overrides/README.md rename to evennia/game_template/web/static_overrides/README.md diff --git a/game_template/web/template_overrides/README.md b/evennia/game_template/web/template_overrides/README.md similarity index 100% rename from game_template/web/template_overrides/README.md rename to evennia/game_template/web/template_overrides/README.md diff --git a/game_template/web/urls.py b/evennia/game_template/web/urls.py similarity index 100% rename from game_template/web/urls.py rename to evennia/game_template/web/urls.py diff --git a/game_template/world/__init__.py b/evennia/game_template/world/__init__.py similarity index 100% rename from game_template/world/__init__.py rename to evennia/game_template/world/__init__.py diff --git a/game_template/world/batch_cmds.ev b/evennia/game_template/world/batch_cmds.ev similarity index 100% rename from game_template/world/batch_cmds.ev rename to evennia/game_template/world/batch_cmds.ev diff --git a/game_template/world/prototypes.py b/evennia/game_template/world/prototypes.py similarity index 100% rename from game_template/world/prototypes.py rename to evennia/game_template/world/prototypes.py diff --git a/setup.py b/setup.py index 7d573b56e1..cf916fd22f 100644 --- a/setup.py +++ b/setup.py @@ -5,11 +5,15 @@ os.chdir(os.path.dirname(os.path.realpath(__file__))) def get_requirements(): + """ + To update the requirements for Evennia, edit the requirements.txt file. + """ req_lines = open('requirements.txt', 'r').readlines() reqs = [] for line in req_lines: - line = line.strip() - if line and not line.startswith('#'): + # Avoid adding comments. + line = line.split('#')[0].strip() + if line: reqs.append(line) return reqs @@ -17,41 +21,36 @@ VERSION_PATH = os.path.join('evennia', 'VERSION.txt') def get_version(): + """ + When updating the Evennia package for release, remember to increment the + version number in evennia/VERSION.txt + """ return open(VERSION_PATH).read().strip() def package_data(): + """ + By default, the distribution tools ignore all non-python files. + + Make sure we get everything. + """ file_set = [] for root, dirs, files in os.walk('evennia'): for f in files: + if '.git' in f.split(os.path.normpath(os.path.join(root, f))): + # Prevent the repo from bing added. + continue file_name = os.path.relpath(os.path.join(root, f), 'evennia') file_set.append(file_name) return file_set - -def template_data(): - """ - Finds all of the static and template dirs in the project and adds - them to the package data. - - By default setup.py only installs Python modules. - """ - data = [] - for dirname, _, files in os.walk("game_template"): - for root, ___, current_files in os.walk(dirname): - for f in current_files: - file_name = os.path.join(root, f) - data.append((os.path.join('share', 'evennia', root), [file_name])) - return data - setup( name='evennia', version=get_version(), description='A full-featured MUD building toolkit.', - packages=find_packages(exclude=['game_template', 'game_template.*']), + packages=find_packages(), scripts=['bin/evennia', 'bin/evennia_runner.py'], install_requires=get_requirements(), package_data={'': package_data()}, - data_files=template_data(), zip_safe=False )