Re: [Freeciv-Dev] (PR#40256) Freeciv 2.1.4 bug

2008-06-05 Thread Daniel Markstedt

URL: http://bugs.freeciv.org/Ticket/Display.html?id=40256 

On 6/5/08, Madeline Book [EMAIL PROTECTED] wrote:

  URL: http://bugs.freeciv.org/Ticket/Display.html?id=40256 


 The previous patch works but is a little inefficient
  in that it adds a useless call to get_server_scan_list
  before a new scan is actually started. So here is
  a slight variation that fixes this.



Excellent work Madeline. :)

Could you commit it to S2_1 before Saturday to it makes it into the
next maintenance release?

Thanks,
 ~Daniel



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] 2.1.5

2008-06-05 Thread Marko Lindqvist
2008/5/26 Daniel Markstedt:

 One week later it is; Targeted release date June 8.


 Freeciv doesn't compile with current gcc 4.3 branch, and 4.3.1 will
be released any day now.

 --

 btw  I made my local metaserver installation available to anybody:
http://vcust127.louhi.net/freeciv/metaserver/


 - ML

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#40247) [Patch] civ ser path separator

2008-06-05 Thread Marko Lindqvist

URL: http://bugs.freeciv.org/Ticket/Display.html?id=40247 

2008/5/22 Marko Lindqvist:

  Attached patch makes civ  ser scripts to work in mingw32.

 This version applies cleanly to trunk (previous one is for S2_2)


 - ML

diff -Nurd -X.diff_ignore freeciv/bootstrap/civ.in freeciv/bootstrap/civ.in
--- freeciv/bootstrap/civ.in	2008-04-17 01:27:03.0 +0300
+++ freeciv/bootstrap/civ.in	2008-06-04 23:32:09.0 +0300
@@ -18,12 +18,12 @@
 [EMAIL PROTECTED]@
 
 if [ x$FREECIV_PATH = x ] ; then
-  FREECIV_PATH=.:data:~/.freeciv
+  FREECIV_PATH=[EMAIL PROTECTED]@[EMAIL PROTECTED]@~/.freeciv
 fi
-export FREECIV_PATH=$FREECIV_PATH:@abs_top_builddir@/data:@abs_top_srcdir@/data
+export FREECIV_PATH=[EMAIL PROTECTED]@@abs_top_builddir@/[EMAIL PROTECTED]@@abs_top_srcdir@/data
 
-[ -x $BUILDDIR/client/civclient ]  EXE=$BUILDDIR/client/$EXENAME
-[ -x $BUILDDIR/civclient ]  EXE=$BUILDDIR/$EXENAME
+[ -x $BUILDDIR/client/$EXENAME ]  EXE=$BUILDDIR/client/$EXENAME
+[ -x $BUILDDIR/$EXENAME ]  EXE=$BUILDDIR/$EXENAME
 
 if [ $EXE =  ]; then
   echo $0: Unable to find $EXENAME.
diff -Nurd -X.diff_ignore freeciv/bootstrap/ser.in freeciv/bootstrap/ser.in
--- freeciv/bootstrap/ser.in	2008-04-17 01:27:03.0 +0300
+++ freeciv/bootstrap/ser.in	2008-06-04 23:32:58.0 +0300
@@ -18,12 +18,12 @@
 [EMAIL PROTECTED]@
 
 if [ x$FREECIV_PATH = x ] ; then
-  FREECIV_PATH=.:data:~/.freeciv
+  FREECIV_PATH=[EMAIL PROTECTED]@[EMAIL PROTECTED]@~/.freeciv
 fi
-export FREECIV_PATH=$FREECIV_PATH:@abs_top_builddir@/data:@abs_top_srcdir@/data
+export FREECIV_PATH=[EMAIL PROTECTED]@@abs_top_builddir@/[EMAIL PROTECTED]@@abs_top_srcdir@/data
 
-[ -x $BUILDDIR/server/civserver ]  EXE=$BUILDDIR/server/$EXENAME
-[ -x $BUILDDIR/civserver ]  EXE=$BUILDDIR/$EXENAME
+[ -x $BUILDDIR/server/$EXENAME ]  EXE=$BUILDDIR/server/$EXENAME
+[ -x $BUILDDIR/$EXENAME ]  EXE=$BUILDDIR/$EXENAME
 
 if [ $EXE =  ]; then
   echo $0: Unable to find $EXENAME.
diff -Nurd -X.diff_ignore freeciv/configure.ac freeciv/configure.ac
--- freeciv/configure.ac	2008-05-04 16:48:09.0 +0300
+++ freeciv/configure.ac	2008-06-04 23:28:50.0 +0300
@@ -373,6 +373,7 @@
 dnl Defaults
 MINGW32=no
 AMIGA=no
+HOST_PATH_SEPARATOR=:
 
 dnl Settings specific to host OS
 case $host_os in
@@ -385,6 +386,8 @@
 	  AC_MSG_ERROR([*** 'windres' missing.  Install binutils, fix your \$PATH, or set \$WINDRES manually. ***])
 fi
 
+HOST_PATH_SEPARATOR=;
+
 AC_DEFINE([SOCKET_ZERO_ISNT_STDIN], [1], [Mingw32-specific setting - stdin])
 AC_DEFINE([ALWAYS_ROOT], [1], [Can execute program as root - Mingw32])
 AC_DEFINE([WIN32_NATIVE], [1], [Mingw32-specific setting - native])
@@ -405,6 +408,12 @@
 
 esac
 
+dnl Autoconf provides path separator for build system.
+dnl Use that instead of our own guess in case of native build.
+if test x$build = x$host ; then
+  HOST_PATH_SEPARATOR=$PATH_SEPARATOR
+fi
+
 dnl note this has to match the path installed by po/Makefile
 if test x$MINGW32 != xyes; then
   CPPFLAGS=$CPPFLAGS -DLOCALEDIR=$localedir
@@ -534,6 +543,7 @@
 AC_SUBST(FTWL_CFLAGS)
 AC_SUBST([VERSION_WITHOUT_LABEL])
 AC_SUBST([VERSION_LABEL])
+AC_SUBST([HOST_PATH_SEPARATOR])
 AM_CONDITIONAL(AUDIO_SDL, test x$SDL_mixer = xyes)
 AM_CONDITIONAL(CLIENT_GUI_SDL, test $gui_sources = gui-sdl)
 AM_CONDITIONAL(CLIENT_GUI_GTK_2_0, test $gui_sources = gui-gtk-2.0)
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] (PR#40256) Freeciv 2.1.4 bug

2008-06-05 Thread Madeline Book

URL: http://bugs.freeciv.org/Ticket/Display.html?id=40256 

 [dmarks - Thu Jun 05 07:24:19 2008]:
 
 On 6/5/08, Madeline Book [EMAIL PROTECTED] wrote:
 
   URL: http://bugs.freeciv.org/Ticket/Display.html?id=40256 
 
 
  The previous patch works but is a little inefficient
   in that it adds a useless call to get_server_scan_list
   before a new scan is actually started. So here is
   a slight variation that fixes this.
 
 
 
 Excellent work Madeline. :)
 
 Could you commit it to S2_1 before Saturday to it makes it into the
 next maintenance release?

I will, once I finish converting my git repository to the
new svn url (sometime today I suppose). :I


--
難しいじゃありませんが、かなりの時間が掛かりますね。

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#40255) [PATCH] Only draw output sprites in citymode.

2008-06-05 Thread Marko Lindqvist

URL: http://bugs.freeciv.org/Ticket/Display.html?id=40255 

2008/5/30 Madeline Book:

 Tiles worked by cities would have their output
 drawn on the main map view because of a missing
 test in fill_city_overlays_sprite_array, when
 they should only draw the output in citymode
 (i.e. in the city dialog's mapview).

 I thought this was new feature (replacing old 't'-key functionality).

 It should be possible to toggle it off from view-menu, though.
There's ticket about that somewhere (I reported it a couple of weeks
ago)


 - ML



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#40254) [PATCH] Cancel AI mode when attaching to aifill player.

2008-06-05 Thread Marko Lindqvist

URL: http://bugs.freeciv.org/Ticket/Display.html?id=40254 

2008/5/30 Madeline Book:

 When a user connected to a server with some
 AI players created by aifill, they were attached
 to an existing AI player but AI mode was not
 reset. So when the game started the player's
 units moved on their own. This patch fixes that
 problem by cancelling AI mode in the attached
 player if AI mode is on and the server is in
 the pregame state.

 I looked this problem too when I were working with the connectdialog
problems (still unsure what to do with the remaining patch I have)

 I don't like how things are not symmetric. When human detach from
player, human - ai toggle comes from client. Your patch makes the
opposite in the server side.
 Not that I'm against your patch. IMHO these both toggles should
happen at server side.


 - ML



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] (PR#40255) [PATCH] Only draw output sprites in citymode.

2008-06-05 Thread Madeline Book

URL: http://bugs.freeciv.org/Ticket/Display.html?id=40255 

 [EMAIL PROTECTED] - Thu Jun 05 20:45:51 2008]:
 
 2008/5/30 Madeline Book:
 
  Tiles worked by cities would have their output
  drawn on the main map view because of a missing
  test in fill_city_overlays_sprite_array, when
  they should only draw the output in citymode
  (i.e. in the city dialog's mapview).
 
  I thought this was new feature (replacing old 't'-key functionality).
 
  It should be possible to toggle it off from view-menu, though.
 There's ticket about that somewhere (I reported it a couple of weeks
 ago)

Alright, I'll check if I haven't missed something in the
view-menu and see if some existing patches could do the job.


--
どこかな〜

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] (PR#40254) [PATCH] Cancel AI mode when attaching to aifill player.

2008-06-05 Thread Madeline Book

URL: http://bugs.freeciv.org/Ticket/Display.html?id=40254 

 [EMAIL PROTECTED] - Thu Jun 05 20:53:32 2008]:
 
 2008/5/30 Madeline Book:
 
  When a user connected to a server with some
  AI players created by aifill, they were attached
  to an existing AI player but AI mode was not
  reset. So when the game started the player's
  units moved on their own. This patch fixes that
  problem by cancelling AI mode in the attached
  player if AI mode is on and the server is in
  the pregame state.
 
  I looked this problem too when I were working with the connectdialog
 problems (still unsure what to do with the remaining patch I have)
 
  I don't like how things are not symmetric. When human detach from
 player, human - ai toggle comes from client. Your patch makes the
 opposite in the server side.
  Not that I'm against your patch. IMHO these both toggles should
 happen at server side.

Possibly there is a better way of handling it. I'll look into
it if you do not beat me to it.


--
ここには絶対ない。

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] (PR#40256) Re: Freeciv 2.1.4 bug

2008-06-05 Thread Madeline Book

URL: http://bugs.freeciv.org/Ticket/Display.html?id=40256 

Committed to branch S2_1 (r14708).
Committed to branch S2_2 (r14709).
Committed to trunk (r14710).

Although minor, future work should consider adding more
visual feedback to the user when using the refresh button,
and fixing the unlikely but possible file handle leak 
(scan-meta.fp). I'll perhaps start new tickets for these
issues later.


--
ぴかぴかになった。

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev