Author: cazfi
Date: Mon Jan 11 15:57:23 2016
New Revision: 31448

URL: http://svn.gna.org/viewcvs/freeciv?rev=31448&view=rev
Log:
Set requirement for "+web-compatible" ruleset capability in freeciv-web builds

See patch #6791

Modified:
    trunk/scripts/capabilities
    trunk/server/ruleset.h

Modified: trunk/scripts/capabilities
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/scripts/capabilities?rev=31448&r1=31447&r2=31448&view=diff
==============================================================================
--- trunk/scripts/capabilities  (original)
+++ trunk/scripts/capabilities  Mon Jan 11 15:57:23 2016
@@ -263,8 +263,8 @@
     file=`find $basedir -name "ruleset\.h"`
 
     old=`cat $file \
-         | grep "#define RULESET_CAPABILITIES " \
-         | sed 's/#define RULESET_CAPABILITIES "\(.*\)".*/\1/'`
+         | grep "#define RULESET_CAPABILITIES_BASE " \
+         | sed 's/#define RULESET_CAPABILITIES_BASE "\(.*\)".*/\1/'`
 
     echo "* Replacing \"${old}\" with \"${string}\" in:"
     cat $file \

Modified: trunk/server/ruleset.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/ruleset.h?rev=31448&r1=31447&r2=31448&view=diff
==============================================================================
--- trunk/server/ruleset.h      (original)
+++ trunk/server/ruleset.h      Mon Jan 11 15:57:23 2016
@@ -17,12 +17,17 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#define RULESET_CAPABILITIES "+Freeciv-ruleset-Devel-2015.January.14"
+#define RULESET_CAPABILITIES_BASE "+Freeciv-ruleset-Devel-2015.January.14"
+#ifdef FREECIV_WEB
+#define RULESET_CAPABILITIES RULESET_CAPABILITIES_BASE " +web-compatible"
+#else  /* FREECIV_WEB */
+#define RULESET_CAPABILITIES RULESET_CAPABILITIES_BASE
+#endif /* FREECIV_WEB */
 /*
  * Ruleset capabilities acceptable to this program:
  *
- * +Freeciv-2.3-ruleset
- *    - basic ruleset format for Freeciv versions 2.3.x; required
+ * +Freeciv-3.0-ruleset
+ *    - basic ruleset format for Freeciv versions 3.0.x; required
  *
  * +Freeciv-tilespec-Devel-YYYY.MMM.DD
  *    - ruleset of the development version at the given data


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to