Issue information

Issue ID
#5167
Status
Fixed
Severity
None
Started
Hercules Elf Bot
Dec 26, 2011 0:15
Last Post
Hercules Elf Bot
Apr 19, 2012 19:00
Confirmation
Yes (3)
No (0)

Hercules Elf Bot - Dec 26, 2011 0:15

Originally posted by [b]Vianna[/b]
The import folder "creation" (the process that copies "import-tmpl" to "import" and removes the ".svn" folders inside it, so the custom configs made by "the right way" don't get overwritten when their default values are changed by a svn update) was removed on r15238.

I don't know if this was intended, but I don't think so, because:
1) It was supposed to be a "clean up", as says the changeset, but removes an important feature.
2) The "import-tmpl" wasn't renamed to "import", so the server fires up missing file errors when it's launched.
3) It was probably a mistake since the save folder has the same behavior and it was supposed to be removed.

Hercules Elf Bot - Dec 26, 2011 8:21

Originally posted by [b]KeiKun[/b]
is this what your saying??

[attachment=468:error.JPG]

Hercules Elf Bot - Dec 26, 2011 13:16

Originally posted by [b]Vianna[/b]
Yes, but I guess it always happens if you're running it on Windows. *not sure*

On Linux, "make sql", "make all" and "make import" copies "/conf/import-tmpl" to "/conf/import", but it was removed by mistake since r15238 (goodbye_txt branch only).

Hercules Elf Bot - Dec 26, 2011 14:19

Originally posted by [b]KeiKun[/b]
hi actually
im using Trunk :))

Hercules Elf Bot - Dec 26, 2011 14:19

Originally posted by [b]KeiKun[/b]
hi actually
im using Trunk :))

Hercules Elf Bot - Dec 26, 2011 14:39

Originally posted by [b]xazax[/b]
@Vianna
[codebox]
Index: Makefile.in
===================================================================
--- Makefile.in (revision 15285)
+++ Makefile.in (working copy)
@@ -2,8 +2,8 @@

HAVE_MYSQL=@HAVE_MYSQL@
ifeq ($(HAVE_MYSQL),yes)
- ALL_DEPENDS=common_sql login_sql char_sql map_sql tools
- SQL_DEPENDS=common_sql login_sql char_sql map_sql
+ ALL_DEPENDS=common_sql login_sql char_sql map_sql tools import
+ SQL_DEPENDS=common_sql login_sql char_sql map_sql import
COMMON_SQL_DEPENDS=mt19937ar
LOGIN_SQL_DEPENDS=mt19937ar common_sql
CHAR_SQL_DEPENDS=mt19937ar common_sql
@@ -34,12 +34,15 @@
char_sql \
map_sql \
tools plugins addons \
+ import \
clean help

all: $(ALL_DEPENDS)

sql: $(SQL_DEPENDS)

+conf: import
+
common_sql: $(COMMON_SQL_DEPENDS)
@$(MAKE) -C src/common sql

@@ -60,6 +63,15 @@

plugins addons: $(PLUGIN_DEPENDS)
@$(MAKE) -C src/plugins
+
+import:
+# 1) create conf/import folder
+# 2) add missing files
+# 3) remove remaining .svn folder
+ @echo "building conf/import folder..."
+ @if test ! -d conf/import ; then mkdir conf/import ; fi
+ @for f in $$(ls conf/import-tmpl) ; do if test ! -e conf/import/$$f ; then cp conf/import-tmpl/$$f conf/import ; fi ; done
+ @rm -rf conf/import/.svn

clean:
@$(MAKE) -C src/common $@

[/codebox]

Does this solve the problem?

Hercules Elf Bot - Dec 26, 2011 17:59

Originally posted by [b]Brian[/b]
Updating status to: [b]Confirmed[/b] (blame goes to [rev=15238])

@KeiKun: as far as I know, there is currently no Windows code that creates the /conf and /save folders.

Hercules Elf Bot - Dec 27, 2011 7:32

Originally posted by [b]KeiKun[/b]
hmmm

i see
so thats why
xD

Hercules Elf Bot - Dec 27, 2011 10:43

Originally posted by [b]xazax[/b]
Hmm.. On windows we could create a batch file that could be executed as post build event.

Hercules Elf Bot - Dec 28, 2011 17:03

Originally posted by [b]xazax[/b]
Commited my patch [rev=15294].

This post has been edited by xazax on Dec 28, 2011 18:11