Re: [Freeciv-Dev] 2.1 abandoned, now 2.2 (was: 2.1.0-beta7)
On 9/24/07, William Allen Simpson [EMAIL PROTECTED] wrote: Apparently without discussion, 2.1 has been officially abandoned, as 2.2 has been branched in the repository. I will no longer work on 2.1. Unfortunately, nobody has yet added the 2.2 tag in RT. I cannot tag things for 2.2, until then I won't be working on 2.2 either. According to http://freeciv.wikia.com/wiki/Coding the only additional features for 2.2 are the editor, and a complete re-write of governments. Since the governments were never applied to trunk, they are missing from 2.2 branch. Therefore, only the map editor is a feature of 2.2. What's the beta schedule for 2.2? Advanced Goverments is Per's project. The last thing I heard though is that he's rethinking the design. Maybe we ought to just scratch it from the 2.2 roadmap and postpone it to 2.3 instead. Before we can think of a 2.2 beta, the editor needs more work. It's IMO only alpha level featurewise. So let's focus on finishing the editor! I could assemble a list of needed features and do a gui mockup, if this would be useful. ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] 2.1 abandoned, now 2.2 (was: 2.1.0-beta7)
On Mon, 24 Sep 2007, William Allen Simpson wrote: Apparently without discussion, 2.1 has been officially abandoned, as 2.2 has been branched in the repository. If you did not read the discussion, how could you reach the conclusion it has been abandoned? The plan is still to release 2.1 soon (as has been the plan for a very long time). Unfortunately, nobody has yet added the 2.2 tag in RT. I cannot tag things for 2.2, until then I won't be working on 2.2 either. Added. Anything else I need to to do? According to http://freeciv.wikia.com/wiki/Coding the only additional features for 2.2 are the editor, and a complete re-write of governments. Since the governments were never applied to trunk, they are missing from 2.2 branch. Therefore, only the map editor is a feature of 2.2. What's the beta schedule for 2.2? After 2.1 is released and the map editor is complete, I would say. I think any rules work like advanced governments will go into trunk only now. - Per Your brain is a masterpiece, divided into two parts, left and right. In the left nothing is right and in the right nothing is left ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Segfault bug in advance_has_flag in common/tech.c
Thanks, see (PR#39715) Crash when discovering a Future Tech. In the future, please post to [EMAIL PROTECTED] for tracking. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39715) Crash when discovering a Future Tech
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39715
Also reported by [EMAIL PROTECTED] on freeciv-dev list with savegame
and proposed patch:
Re: [Freeciv-Dev] Segfault bug in advance_has_flag in common/tech.c
Committed trunk revision 13640.
Index: server/techtools.c
===
--- server/techtools.c (revision 13638)
+++ server/techtools.c (working copy)
@@ -203,7 +203,8 @@
remove_obsolete_buildings(plr);
/* Give free rails in every city */
- if (advance_has_flag(tech_found, TF_RAILROAD)) {
+ if (tech_found != A_FUTURE
+advance_has_flag(tech_found, TF_RAILROAD)) {
upgrade_city_rails(plr, was_discovery);
}
@@ -303,7 +304,8 @@
} improvement_iterate_end;
}
- if (advance_has_flag(tech_found, TF_BONUS_TECH) was_first) {
+ if (was_first tech_found != A_FUTURE
+advance_has_flag(tech_found, TF_BONUS_TECH)) {
bonus_tech_hack = TRUE;
}
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] 2.1 abandoned, now 2.2
Per I. Mathisen wrote: On Mon, 24 Sep 2007, William Allen Simpson wrote: Apparently without discussion, 2.1 has been officially abandoned, as 2.2 has been branched in the repository. If you did not read the discussion, how could you reach the conclusion it has been abandoned? The plan is still to release 2.1 soon (as has been the plan for a very long time). There was no discussion on this list -- nor on any other list that I'm subscribed -- about branching 2.2. The usual meaning of a branch is the working version for release, or a private copy for a particular developer to be merged back into trunk. Therefore, since 2.2 has been branched and is not a private copy, 2.1 is now abandoned. Unfortunately, nobody has yet added the 2.2 tag in RT. I cannot tag things for 2.2, until then I won't be working on 2.2 either. Added. Anything else I need to to do? That's helpful. What's the beta schedule for 2.2? After 2.1 is released and the map editor is complete, I would say. If the map editor is not complete, then 2.2 should not have been branched, as it was not ready. I think any rules work like advanced governments will go into trunk only now. Agreed. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#37063) Readline on macosx
URL: http://bugs.freeciv.org/Ticket/Display.html?id=37063 I got a non tested working GNU readline framework (no need of fink or darwin ports) that compile fine with freeciv if someone is interrested. Let me know where to send it. cheers Francois Le 24 sept. 07 à 10:22, Erik Johansson a écrit : URL: http://bugs.freeciv.org/Ticket/Display.html?id=37063 [cproc - Wed Feb 28 01:14:16 2007]: [emj - Di 27. Feb 2007, 12:08:14]: [emj - Tir. 27. Feb. 2007 11:25:54]: _rl_forced_update_display _history_truncate_file stdinhand.c:4654: error: 'rl_attempted_completion_over' undeclared (first use in this function) s anyone has a good solution? It's a questiong wether you think this version readline is useable, and if anyone know what is used on other *BSD than MacOSX? readline 5.1 was reported to work a while ago: http://forum.freeciv.org/viewtopic.php?t=1524 Great thread but that will include GNU readline *I think*, not the one included in MacOSX. The full help for compiling the SVN version with fink on MacOSX is doing this: export CFLAGS=-I/sw/include export LDFLAGS=-L/sw/lib export CXXFLAGS=$CFLAGS export CPPFLAGS=$CXXFLAGS export ACLOCAL_FLAGS=-I /sw/share/aclocal export PKG_CONFIG_PATH=/sw/lib/pkgconfig export MACOSX_DEPLOYMENT_TARGET=10.4 . /sw/bin/init.sh But this still doesn't solve using another type of readline.. I'm closing this bug now. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] Use the Wiki as Forum
Check out the wiki forum - I have expanded it to roughly fill the functions of our phpbb: http://freeciv.wikia.com/wiki/Forum:Index What could stop us from locking the old forums and direct users here? ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Freeciv webclient
On Mon, 24 Sep 2007, Erik Johansson wrote: Hi again I think I installed the pro version of resin and that's why it didn't work.. ;-) But it still doesn't work, I've attached a log and here is what I do: 1. I start resin 2. goto http://localhost:8080/ 2.1 get a 404 3. goto http://localhost:8080/webapp/intro.jsp (WORKS) 4. press start new game 4.1 get a black screen and lots of 0.5 fps repeated over and over. 5. write /start in the web client console 5.1 Still black screen and lots of 0.5 fps repeated over and over. 5.3 the console log gets some binary junk (two chars represented as ?? in the file) I don't know where to go from here Hello Erik! Great progress so far, now you have the JSP part setup correctly. It seems that the Freeciv Web service isn't working. Take a look here for debugging information: http://freeciv.wikia.com/wiki/FreecivWebClient More specifically, what happens when you enter these URL's in your browser? http://localhost:8080/axis/FreecivWebService.jws?wsdl http://localhost:8080/axis/FreecivWebService.jws?method=getFreecivState The first should give you the WSDL (XML with Web service definition), and the second should give you the result of invoking the getFreecivState method. So, where have you put the file FreecivWebService.jws? Is Axis installed correctly? Do you get any Javascript errors? Try installing Firebug for Firefox, which will help debugging. I have attached a listing of where all the files of my working web application are located: http://www.pvv.org/~andrearo/files.txt As you can see, everything is installed under home/projects/freecivweb/ It would be great if you could update the Wiki with additional information, once we get this setup correctly on your machine. Then it will not be so difficult for others wanting to set it up. Perhaps we should use Maven or Ant to do the deployment automatically. - Andreas ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39545) [Patch] Up to date freeciv.spec.in
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39545
On 29/08/2007, Egor Vyscrebentsov wrote:
On Sun, 12 Aug 2007 Marko Lindqvist wrote:
Noticed that freeciv.spec.in still contains package for gtk-client
(that is: gtk1.2). Attached patch fixes obvious errors from
freeciv.spec.in
Two quick notes:
+ Packager field contains wrong e-mail address.
+ Why there is no gui-sdl?
- Replaced email address with URL as we don't want to put email
address in clear text to svn.
- Added comment about missing gui-sdl (I'm not adding it as I have no
means to test such change)
- Removed doc/PEOPLE reference
- Use same description as in freeciv.desktop.in
- ML
diff -Nurd -X.diff_ignore freeciv/bootstrap/freeciv.spec.in freeciv/bootstrap/freeciv.spec.in
--- freeciv/bootstrap/freeciv.spec.in 2007-03-05 19:14:04.0 +0200
+++ freeciv/bootstrap/freeciv.spec.in 2007-09-24 21:02:13.0 +0300
@@ -1,6 +1,12 @@
# This is spec file provided by www.freeciv.org
# We strongly suggest that you base the RPM which will be
# included in your distribution on this file.
+#
+# One thing to add is handling of icons. They can be found as
+# data/freeciv-client.png and data/freeciv-server.png from source tree
+#
+# Another thing missing is handling of SDL -client
+#
%define version_full @VERSION@
%define name @PACKAGE@
@@ -10,7 +16,7 @@
%define def_without() %{expand:%%{!?_with_%{1}: %%{!?_without_%{1}: %%global _without_%{1} --without-%{1
%define if_with() %if %{expand:%%{?_with_%{1}:1}%%{!?_with_%{1}:0}}
-Summary: Turn-based strategy game, inspired by the commercial Civilization series
+Summary: Turn-based strategy game inspired by the history of human civilization
Name: %{name}
Version: @VERSION_WITHOUT_LABEL@
Release: 1
@@ -23,12 +29,11 @@
Requires: %name-server = %version-%release
%def_with gtk2
-%def_with gtk
%def_with xaw
-%define clients_list %{?_with_gtk2:gtk2} %{?_with_gtk:gtk} %{?_with_xaw:xaw}
+%define clients_list %{?_with_gtk2:gtk2} %{?_with_xaw:xaw}
BuildRoot: %{_tmppath}/%{name}-%{version_full}-buildroot
-Packager: Freeciv Team [EMAIL PROTECTED]
+Packager: Freeciv Team, http://www.freeciv.org
%package common
Summary: Turn-based strategy game, inspired by the commercial Civilization series - common files
@@ -50,12 +55,6 @@
Provides: %name-client-gui = %version-%release
Requires: %name-common = %version-%release
-%package client-gtk
-Summary: Turn-based strategy game, inspired by the commercial Civilization series - GTK client
-Group: Games/Strategy
-Provides: %name-client-gui = %version-%release
-Requires: %name-common = %version-%release
-
%package client-xaw
Summary: Turn-based strategy game, inspired by the commercial Civilization series - Xaw client
Group: Games/Strategy
@@ -82,7 +81,7 @@
enthusiasts, and is easily one of the most fun and addictive network
games out there!
-This package contains files common for client ans server.
+This package contains files common for client and server.
%description server
Freeciv is a free turn-based multiplayer strategy game, in which each
@@ -121,18 +120,6 @@
This package contains Freeciv client with Gtk2 interface (default
Freeciv GUI).
-%description client-gtk
-Freeciv is a free turn-based multiplayer strategy game, in which each
-player becomes the leader of a civilization, fighting to obtain the
-ultimate goal: To become the greatest civilization.
-Players of Civilization II by Microprose should feel at home, since
-one aim of Freeciv is to have compatible rules.
-Freeciv is maintained by an international team of coders and
-enthusiasts, and is easily one of the most fun and addictive network
-games out there!
-
-This package contains Freeciv client with Gtk+ interface.
-
%description client-xaw
Freeciv is a free turn-based multiplayer strategy game, in which each
player becomes the leader of a civilization, fighting to obtain the
@@ -223,18 +210,6 @@
%name-client \
%{_gamesbindir}/civclient-gtk2
-%post client-gtk
-/usr/sbin/update-alternatives --install \
-%{_gamesbindir}/civclient \
-%name-client \
-%{_gamesbindir}/civclient-gtk 20
-
-%preun client-gtk
-[ $1 = 0 ] || exit 0
-/usr/sbin/update-alternatives --remove \
-%name-client \
-%{_gamesbindir}/civclient-gtk
-
%post client-xaw
/usr/sbin/update-alternatives --install \
%{_gamesbindir}/civclient \
@@ -250,14 +225,14 @@
%files common -f %name.lang
%defattr(644, root, root, 0755)
-%doc COPYING NEWS doc/BUGS doc/HOWTOPLAY doc/PEOPLE doc/README
+%doc COPYING NEWS doc/BUGS doc/HOWTOPLAY doc/README
%files server
%defattr(755, root, games, 0755)
%{_gamesbindir}/civserver
%defattr(644, root, root, 0755)
%doc COPYING NEWS
-%doc doc/BUGS doc/HACKING doc/PEOPLE doc/README
+%doc doc/BUGS doc/HACKING doc/README
%doc doc/README.AI doc/README.agents doc/README.attributes doc/README.cma
%doc doc/README.delta doc/README.effects doc/README.ftwl
#README.graphics and README.sound are
Re: [Freeciv-Dev] (PR#15260) GTK2: interface quirks being observer
URL: http://bugs.freeciv.org/Ticket/Display.html?id=15260 On 10/09/2007, Marko Lindqvist wrote: On 19/07/07, Ulrik Sverdrup wrote: Bug [for global observers, not attached to player] : - 'Wonders of the World' and 'Top Five Cities' should be available but doesn't currently have any effect when selected. QUESTION: This patch allows even detached connections to send report packets and get the reports back. Is this a fundamental problem? If observers are not allowed at all in a game, they could still get this information. Modified your patches to fix that problem. Since Ulrik is not around, and this is S2_1 bug, I'm going to commit this. - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#38558) [patch] client segfault during automove with 30 players and 2 pirates
URL: http://bugs.freeciv.org/Ticket/Display.html?id=38558 On 12/08/2007, Marko Lindqvist wrote: Attached related patches for S2_1 and trunk. S2_1 just adds client side legality check for phase number. Trunk version adds several asserts to help finding root cause bug. As bug itself is (probably) already fixed, I'm going to commit version without additional asserts to trunk (and S2_2) also. - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] 2.1 abandoned, now 2.2
On 9/24/07, William Allen Simpson [EMAIL PROTECTED] wrote: Per I. Mathisen wrote: On Mon, 24 Sep 2007, William Allen Simpson wrote: Apparently without discussion, 2.1 has been officially abandoned, as 2.2 has been branched in the repository. If you did not read the discussion, how could you reach the conclusion it has been abandoned? The plan is still to release 2.1 soon (as has been the plan for a very long time). There was no discussion on this list -- nor on any other list that I'm subscribed -- about branching 2.2. (...) Most of the discussion took place in PR#39690 IIRC. ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Use the Wiki as Forum
I guess the dev part is 'Contribution' - though it is ambiguously named. Could you think of a better label? ~Daniel On 9/24/07, François Marlier [EMAIL PROTECTED] wrote: just great (in my case it means I can finaly access the freeciv forum !) can we have a dev part (or is a freeciv dev forum still existing??) Francois Le 24 sept. 07 à 16:25, Daniel Markstedt a écrit : Check out the wiki forum - I have expanded it to roughly fill the functions of our phpbb: http://freeciv.wikia.com/wiki/Forum:Index What could stop us from locking the old forums and direct users here? ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
