Author: cazfi
Date: Fri Mar 14 18:10:34 2014
New Revision: 24665
URL: http://svn.gna.org/viewcvs/freeciv?rev=24665&view=rev
Log:
Added fcruledit script to run freeciv-ruledit from build directory.
See patch #4593
Added:
trunk/bootstrap/fcruledit.in
Modified:
trunk/Makefile.am
trunk/configure.ac
trunk/diff_ignore
Modified: trunk/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/Makefile.am?rev=24665&r1=24664&r2=24665&view=diff
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Fri Mar 14 18:10:34 2014
@@ -31,6 +31,7 @@
diff_ignore \
bootstrap/fcgui.in \
bootstrap/fcser.in \
+ bootstrap/fcruledit.in \
bootstrap/fc_svnrev_gen.h.tmpl \
bootstrap/generate_svnrev.sh \
bootstrap/fc_gitrev_gen.h.tmpl \
Added: trunk/bootstrap/fcruledit.in
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/fcruledit.in?rev=24665&view=auto
==============================================================================
--- trunk/bootstrap/fcruledit.in (added)
+++ trunk/bootstrap/fcruledit.in Fri Mar 14 18:10:34 2014
@@ -0,0 +1,47 @@
+#!/bin/sh
+#/**********************************************************************
+# Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
+# script by Rene Schalburg
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+#***********************************************************************/
+
+BUILDDIR=`dirname $0`
+PROGNAME=freeciv-ruledit
+EXENAME=${PROGNAME}@EXEEXT@
+
+if test -x "$BUILDDIR/tools/ruledit/$EXENAME" ; then
+ EXE=$BUILDDIR/tools/ruledit/$EXENAME
+elif test -x "$BUILDDIR/$EXENAME" ; then
+ EXE=$BUILDDIR/$EXENAME
+else
+ echo "Unable to find rule editor executable: $EXENAME"
+ exit 1
+fi
+
+if test "x$FREECIV_DATA_PATH" = "x" ; then
+ if test "x$FREECIV_PATH" = "x" ; then
+
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@~/.freeciv/@DATASUBDIR@"
+ else
+ FREECIV_DATA_PATH="${FREECIV_PATH}"
+ fi
+fi
+FREECIV_DATA_PATH="${FREECIV_DATA_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@/data@HOST_PATH_SEPARATOR@@abs_top_srcdir@/data"
+export FREECIV_DATA_PATH
+
+if test "x$FREECIV_PATH" = "x" ; then
+
FREECIV_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@~/.freeciv@HOST_PATH_SEPARATOR@~/.freeciv/@DATASUBDIR@"
+fi
+FREECIV_PATH="${FREECIV_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@"
+export FREECIV_PATH
+
+echo "Running $EXE"
+exec "$EXE" ${1+"$@"}
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=24665&r1=24664&r2=24665&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Fri Mar 14 18:10:34 2014
@@ -1616,6 +1616,9 @@
tools/freeciv-modpack.appdata.xml:bootstrap/freeciv-modpack.appdata.xml.in])
AC_CONFIG_FILES([fcgui:bootstrap/fcgui.in], [chmod +x fcgui])
AC_CONFIG_FILES([fcser:bootstrap/fcser.in], [chmod +x fcser])
+if test "x$ruledit" = "xyes" ; then
+ AC_CONFIG_FILES([fcruledit:bootstrap/fcruledit.in], [chmod +x fcruledit])
+fi
if test "$USE_NLS" != "yes" ; then
Modified: trunk/diff_ignore
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/diff_ignore?rev=24665&r1=24664&r2=24665&view=diff
==============================================================================
--- trunk/diff_ignore (original)
+++ trunk/diff_ignore Fri Mar 14 18:10:34 2014
@@ -56,6 +56,7 @@
ref-add.sed
ref-del.sed
fcser
+fcruledit
stamp-cat-id
stamp-h
stamp-h1
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
