[Freeciv-Dev] [patch #4679] Convert nreqs to reqs on ruleset load, and only use reqs internally.

2014-06-19 Thread Emmet Hikory
Update of patch #4679 (project freeciv):

  Status:  Ready For Test = Done   
 Open/Closed:Open = Closed 


___

Reply to this item at:

  http://gna.org/patch/?4679

___
  Message sent via/by Gna!
  http://gna.org/


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


[Freeciv-Dev] [patch #4679] Convert nreqs to reqs on ruleset load, and only use reqs internally.

2014-06-17 Thread Emmet Hikory
Update of patch #4679 (project freeciv):

  Status:   Need Info = Ready For Test 
 Summary: Remove nreqs support entirely = Convert nreqs to
reqs on ruleset load, and only use reqs internally.

___

Follow-up Comment #3:

Updated patch, now allows rulesets to use nreqs, and silently converts them to
reqs on ruleset load.  Those portions of the patch affected by the changes
from bug #21992 have been removed.  README.effects remains unmodified, that
being addressed in patch #4401.

The iteration issue in advdata.c mentioned in comment #2 was addressed in bug
#21999.

I believe this suitable for 2.6, as it no longer requires ruleset authors to
make a hard transition, and reduces the maintenance overhead for separate
management of reqs and nreqs (and the various corner cases that might
otherwise still exist, where only reqs are examined).

(file #21073)
___

Additional Item Attachment:

File name: migrate-nreqs-to-reqs.patchSize:9 KB


___

Reply to this item at:

  http://gna.org/patch/?4679

___
  Message sent via/by Gna!
  http://gna.org/


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


[Freeciv-Dev] [patch #4679] Convert nreqs to reqs on ruleset load, and only use reqs internally.

2014-06-17 Thread Marko Lindqvist
Follow-up Comment #4, patch #4679 (project freeciv):

I assume that freeciv-ruledit now does not save anything as nreqs, but ruleset
get converted to present=FALSE model simply by loading it to freeciv-ruledit
and saving.

___

Reply to this item at:

  http://gna.org/patch/?4679

___
  Message sent via/by Gna!
  http://gna.org/


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


[Freeciv-Dev] [patch #4679] Convert nreqs to reqs on ruleset load, and only use reqs internally.

2014-06-17 Thread Emmet Hikory
Follow-up Comment #5, patch #4679 (project freeciv):

I haven't tested that, but loading should convert, and I removed the save
function for nreqs, so it should always save to reqs.  At the current state of
development, my interaction with freeciv-ruledit is mostly limited to making
sure it compiles, and changing things that show up in there when I grep the
code.  Having just tried to launch it now, the interface is sufficiently
limited that I'm not sure what it has done (I don't mean to criticise the work
under development, I just don't feel comfortable testing it yet).

___

Reply to this item at:

  http://gna.org/patch/?4679

___
  Message sent via/by Gna!
  http://gna.org/


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


[Freeciv-Dev] [patch #4679] Convert nreqs to reqs on ruleset load, and only use reqs internally.

2014-06-17 Thread Marko Lindqvist
Follow-up Comment #6, patch #4679 (project freeciv):

The only test-case I ever use for freeciv-ruledit part when changing ruleset
format is 1) Load ruleset to it 2) Save 3) Try to load that ruleset saved by
freeciv-ruledit to server (4) In some simple cases also manually inspect saved
rulesets (but the formatting as saved by freeciv-ruledit is often not easiest
to read).

___

Reply to this item at:

  http://gna.org/patch/?4679

___
  Message sent via/by Gna!
  http://gna.org/


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


[Freeciv-Dev] [patch #4679] Convert nreqs to reqs on ruleset load, and only use reqs internally.

2014-06-17 Thread Emmet Hikory
Follow-up Comment #7, patch #4679 (project freeciv):

Tested with something similar to a reversion of patch #4411 (some interaction
with bug #22080 means I may not have gotten this perfectly correct), and from
manual inspection of the ruledit-generated effects.ruleset, it appears that
this does work (so that if ruledit can be convinced to write pretty files,
this becomes a viable way for ruleset authors to convert from nreqs to
present==FALSE reqs).

___

Reply to this item at:

  http://gna.org/patch/?4679

___
  Message sent via/by Gna!
  http://gna.org/


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


[Freeciv-Dev] [patch #4679] Convert nreqs to reqs on ruleset load, and only use reqs internally.

2014-06-17 Thread Emmet Hikory
Follow-up Comment #8, patch #4679 (project freeciv):

Found a few more instances when trying to work on the logical next patch:
expanded patch attached.

(file #21074)
___

Additional Item Attachment:

File name: migrate-nreqs-to-reqs+moreso.patch Size:11 KB


___

Reply to this item at:

  http://gna.org/patch/?4679

___
  Message sent via/by Gna!
  http://gna.org/


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